3 files changed, 16 insertions, 39 deletions
diff --git a/src/libepoxy.mk b/src/libepoxy.mk
index 707959c..7c22bfb 100644
--- a/src/libepoxy.mk
+++ b/src/libepoxy.mk
@@ -5,25 +5,17 @@ $(PKG)_WEBSITE  := https://github.com/anholt/libepoxy
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.3.1
 $(PKG)_CHECKSUM := 6700ddedffb827b42c72cce1e0be6fba67b678b19bf256e1b5efd3ea38cc2bb4
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_GITHUB   := https://github.com/anholt/$(PKG)
-$(PKG)_URL      := $($(PKG)_GITHUB)/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_GH_CONF  := anholt/libepoxy/releases/latest
 $(PKG)_DEPS     := cc xorg-macros
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- '$(libepoxy_GITHUB)/releases' | \
-    $(SED) -n 's,.*/archive/v\([0-9.]*\)\.tar.*,\1,p' | \
-    head -1
-endef
-
 define $(PKG)_BUILD
-    cd '$(1)' && autoreconf -fi -I'$(PREFIX)/$(TARGET)/share/aclocal'
-    cd '$(1)' && \
+    cd '$(SOURCE_DIR)' && autoreconf -fi -I'$(PREFIX)/$(TARGET)/share/aclocal'
+    cd '$(BUILD_DIR)' && \
         CFLAGS='$(if $(BUILD_STATIC),-DEPOXY_STATIC,-DEPOXY_SHARED -DEPOXY_DLL)' \
-        ./configure \
+        $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT)
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_CRUFT)
     $(SED) 's/Cflags:/Cflags: -DEPOXY_$(if $(BUILD_STATIC),STATIC,SHARED)/' \
         -i '$(PREFIX)/$(TARGET)/lib/pkgconfig/epoxy.pc'
 
diff --git a/src/plibc.mk b/src/plibc.mk
index 145d578..16e4261 100644
--- a/src/plibc.mk
+++ b/src/plibc.mk
@@ -6,23 +6,16 @@ $(PKG)_DESCR    := Plibc
 $(PKG)_IGNORE   := %
 $(PKG)_VERSION  := cd7ed09
 $(PKG)_CHECKSUM := 1e939804e173b8f789e1403964211835b8006253d0a541d55256b540639b0629
-$(PKG)_SUBDIR   := mirror-plibc-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/mirror/plibc/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_GH_CONF  := mirror/plibc/branches/master
 $(PKG)_DEPS     := cc
 
-$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, mirror/plibc, master)
-
 define $(PKG)_BUILD
-    cd '$(1)' && autoreconf -fi
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --includedir='$(PREFIX)/$(TARGET)/include/plibc' \
-        --enable-static \
-        --disable-shared
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    cd '$(SOURCE_DIR)' && autoreconf -fi
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
+        $(MXE_CONFIGURE_OPTS) \
+        --includedir='$(PREFIX)/$(TARGET)/include/plibc'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     # create pkg-config file
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
@@ -41,5 +34,3 @@ define $(PKG)_BUILD
 endef
 
 $(PKG)_BUILD_x86_64-w64-mingw32 =
-
-$(PKG)_BUILD_SHARED =
diff --git a/src/protobuf.mk b/src/protobuf.mk
index ee63c1c..767cb1f 100644
--- a/src/protobuf.mk
+++ b/src/protobuf.mk
@@ -3,19 +3,13 @@
 PKG             := protobuf
 $(PKG)_WEBSITE  := https://github.com/google/protobuf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.5.1.1
-$(PKG)_CHECKSUM := 56b5d9e1ab2bf4f5736c4cfba9f4981fbc6976246721e7ded5602fbaee6d6869
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_VERSION  := 3.5.2
+$(PKG)_CHECKSUM := 4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2
+$(PKG)_GH_CONF  := google/protobuf/tags,v
 $(PKG)_DEPS     := cc googlemock googletest zlib $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS_$(BUILD) := googlemock googletest libtool
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, google/protobuf, v)
-endef
-
 define $(PKG)_BUILD
     $(call PREPARE_PKG_SOURCE,googlemock,$(SOURCE_DIR))
     cd '$(SOURCE_DIR)' && mv '$(googlemock_SUBDIR)' gmock