From 905112d088356bb73941f5d02843f3ea22c282d1 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Mon, 13 Mar 2017 17:31:04 +1100
Subject: [PATCH] github: add version separator logic and use in vigra

---
 github.mk    | 20 +++++++++++---------
 src/vigra.mk | 13 +------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/github.mk b/github.mk
index d53592a1..7fb2dcde 100644
--- a/github.mk
+++ b/github.mk
@@ -65,13 +65,14 @@ GH_TAG_FILTER  = $(subst $(__gmsl_aa_magic),,$(word 3,$(GH_TAG_VARS)))
 GH_VERSION_SEP = $(subst $(__gmsl_aa_magic),,$(word 4,$(GH_TAG_VARS)))
 
 define MXE_SETUP_GITHUB
-    $(PKG)_GH_REPO    := $(GH_REPO)
-    $(PKG)_BRANCH     := $(GH_BRANCH)
-    $(PKG)_TAG_VARS   := $(GH_TAG_VARS)
-    $(PKG)_TAG_PREFIX := $(GH_TAG_PREFIX)
-    $(PKG)_TAG_SUFFIX := $(GH_TAG_SUFFIX)
-    $(PKG)_TAG_FILTER := $(GH_TAG_FILTER)
-    $(PKG)_FILE       := $(or $($(PKG)_FILE),$(PKG)-$$($$(PKG)_TAG_PREFIX)$($(PKG)_VERSION)$$($$(PKG)_TAG_SUFFIX).tar.gz)
+    $(PKG)_GH_REPO     := $(GH_REPO)
+    $(PKG)_BRANCH      := $(GH_BRANCH)
+    $(PKG)_TAG_VARS    := $(GH_TAG_VARS)
+    $(PKG)_TAG_PREFIX  := $(GH_TAG_PREFIX)
+    $(PKG)_TAG_SUFFIX  := $(GH_TAG_SUFFIX)
+    $(PKG)_TAG_FILTER  := $(GH_TAG_FILTER)
+    $(PKG)_VERSION_SEP := $(or $(GH_VERSION_SEP),.)
+    $(PKG)_FILE        := $(or $($(PKG)_FILE),$(PKG)-$$($$(PKG)_TAG_PREFIX)$($(PKG)_VERSION)$$($$(PKG)_TAG_SUFFIX).tar.gz)
     $(if $(and $(GH_BRANCH),$(GH_TAG_VARS)),\
         $(error $(newline) $(PKG) specifies both branch and tag variables $(newline)))
     $(if $(GH_BRANCH),$(value MXE_SETUP_GITHUB_BRANCH),$(value MXE_SETUP_GITHUB_TAG))
@@ -84,9 +85,9 @@ define MXE_SETUP_GITHUB_BRANCH
 endef
 
 define MXE_SETUP_GITHUB_TAG
-    $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$(PKG)-$($(PKG)_TAG_PREFIX)$($(PKG)_VERSION)$($(PKG)_TAG_SUFFIX))
+    $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$(PKG)-$($(PKG)_TAG_PREFIX)$(subst .,$($(PKG)_VERSION_SEP),$($(PKG)_VERSION))$($(PKG)_TAG_SUFFIX))
     $(PKG)_URL    := $(or $($(PKG)_URL),https://github.com/$($(PKG)_GH_REPO)/archive/$(subst $(PKG)-,,$($(PKG)_SUBDIR)).tar.gz)
-    $(PKG)_UPDATE := $(or $($(PKG)_UPDATE),$(call MXE_GET_GH_TAG,$($(PKG)_GH_REPO),$($(PKG)_TAG_PREFIX),$($(PKG)_TAG_SUFFIX),$(or $($(PKG)_TAG_FILTER),$(GITHUB_TAG_FILTER))))
+    $(PKG)_UPDATE := $(or $($(PKG)_UPDATE),$(call MXE_GET_GH_TAG,$($(PKG)_GH_REPO),$($(PKG)_TAG_PREFIX),$($(PKG)_TAG_SUFFIX),$(or $($(PKG)_TAG_FILTER),$(GITHUB_TAG_FILTER)),$($(PKG)_VERSION_SEP)))
 endef
 
 # called with owner/repo,branch
@@ -108,6 +109,7 @@ define MXE_GET_GH_TAG
     | $(and $(4),grep -v '$(strip $(4))') \
     | $(SED) 's,^$(strip $(2)),,g' \
     | $(SED) 's,$(strip $(3))$$,,g' \
+    | tr '$(strip $(5))' '.' \
     | $(SORT) -V
     | tail -1
 endef
diff --git a/src/vigra.mk b/src/vigra.mk
index e8c1b08e..36101eff 100644
--- a/src/vigra.mk
+++ b/src/vigra.mk
@@ -5,20 +5,9 @@ $(PKG)_WEBSITE  := https://ukoethe.github.io/vigra/
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.9.0
 $(PKG)_CHECKSUM := dc041f7ccf838d4321e9bcf522fece1758768dd7a3f8350d1e83e2b8e6daf1e6
-$(PKG)_SUBDIR   := vigra-Version-$(subst .,-,$($(PKG)_VERSION))
-$(PKG)_FILE     := vigra-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/ukoethe/vigra/archive/Version-$(subst .,-,$($(PKG)_VERSION)).tar.gz
+$(PKG)_GH_CONF  := ukoethe/vigra, Version-,,vigra\|start\|ilastik,-
 $(PKG)_DEPS     := gcc jpeg libpng openexr tiff
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- "https://api.github.com/repos/ukoethe/vigra/releases" | \
-    grep 'tag_name' | \
-    $(SED) -n 's,.*tag_name": "Version-\([0-9][^>]*\)".*,\1,p' | \
-    tr '-' '.' | \
-    $(SORT) -Vr | \
-    head -1
-endef
-
 define $(PKG)_BUILD
     # Make sure the package gets built statically
     # NB: we're not actually building vigranumpy, but preparing it in case we ever will won't hurt