From 8b2e5e1bacf52d75c7083bb20034fd764eb4e539 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Fri, 1 Aug 2014 19:41:37 -0700
Subject: Fix GitHub update routine

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
---
 Makefile          | 6 ++++++
 src/libdvdnav.mk  | 6 +-----
 src/libdvdread.mk | 6 +-----
 src/picomodel.mk  | 6 +-----
 src/pkgconf.mk    | 6 +-----
 src/plibc.mk      | 6 +-----
 src/vmime.mk      | 6 +-----
 7 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index 0b261af..1540d5a 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,12 @@ MAKE_SHARED_FROM_STATIC = \
 	--libdir '$(PREFIX)/$(TARGET)/lib' \
 	--bindir '$(PREFIX)/$(TARGET)/bin'
 
+define MXE_GET_GITHUB_SHA
+    $(WGET) -q -O- 'https://api.github.com/repos/$(strip $(1))/git/refs/heads/$(strip $(2))' | \
+    $(SED) -n 's#.*"sha": "\([^<]\{7\}\)[^<]\{3\}.*#\1#p' | \
+    head -1
+endef
+
 # use a minimal whitelist of safe environment variables
 ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy
 unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1))
diff --git a/src/libdvdnav.mk b/src/libdvdnav.mk
index 24e51b9..52fc500 100644
--- a/src/libdvdnav.mk
+++ b/src/libdvdnav.mk
@@ -17,11 +17,7 @@ $(PKG)_URL      := https://github.com/mirror/$(PKG)/tarball/$($(PKG)_VERSION)/$(
 # $(PKG)_URL      := https://dvdnav.mplayerhq.hu/releases/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libdvdread
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/mirror/libdvdnav/commits/master' | \
-    $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \
-    head -1
-endef
+$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, mirror/libdvdnav, master)
 
 define $(PKG)_UPDATE_RELEASE
     $(WGET) -q -O- 'https://dvdnav.mplayerhq.hu/releases/' | \
diff --git a/src/libdvdread.mk b/src/libdvdread.mk
index 2e6485c..086b0bc 100644
--- a/src/libdvdread.mk
+++ b/src/libdvdread.mk
@@ -18,11 +18,7 @@ $(PKG)_URL      := https://dvdnav.mplayerhq.hu/releases/$($(PKG)_FILE)
 # directly linking to libdvdcss. We directly links to the library here.
 $(PKG)_DEPS     := gcc libdvdcss
 
-define $(PKG)_UPDATE_GIT
-    $(WGET) -q -O- 'https://github.com/mirror/libdvdread/commits/master' | \
-    $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \
-    head -1
-endef
+$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, mirror/libdvdread, master)
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://dvdnav.mplayerhq.hu/releases/' | \
diff --git a/src/picomodel.mk b/src/picomodel.mk
index f4deef7..9e7220b 100644
--- a/src/picomodel.mk
+++ b/src/picomodel.mk
@@ -10,11 +10,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/ufoai/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/ufoai/picomodel/commits/master' | \
-    $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \
-    head -1
-endef
+$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, ufoai/picomodel, master)
 
 define $(PKG)_BUILD
     cd '$(1)' && ./autogen.sh && ./configure \
diff --git a/src/pkgconf.mk b/src/pkgconf.mk
index cf5de8a..9808056 100644
--- a/src/pkgconf.mk
+++ b/src/pkgconf.mk
@@ -12,11 +12,7 @@ $(PKG)_DEPS     :=
 
 $(PKG)_DEPS_$(BUILD) := automake
 
-define $(PKG)_UPDATE_
-    $(WGET) -q -O- 'https://github.com/pkgconf/pkgconf/commits/master' | \
-    $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \
-    head -1
-endef
+$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, pkgconf/pkgconf, master)
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package pkgconf.' >&2;
diff --git a/src/plibc.mk b/src/plibc.mk
index 23187f6..cb6316d 100644
--- a/src/plibc.mk
+++ b/src/plibc.mk
@@ -10,11 +10,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/mirror/plibc/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/mirror/plibc/commits/master' | \
-    $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \
-    head -1
-endef
+$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, mirror/plibc, master)
 
 define $(PKG)_BUILD
     cd '$(1)' && autoreconf -fi
diff --git a/src/vmime.mk b/src/vmime.mk
index 1422d58..695baf6 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -10,11 +10,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gnutls libgsasl pthreads zlib
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/kisli/vmime/commits/master' | \
-    $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \
-    head -1
-endef
+$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, kisli/vmime, master)
 
 define $(PKG)_BUILD
     # The following hint is probably needed for ICU:
-- 
cgit v0.12