From afc6c6d84cbd358e14f565978790f0c3840a16a3 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 14 Mar 2018 02:33:05 +1100
Subject: [PATCH] sparsehash taglib wt xxhash: new-style options, updates, etc

---
 src/sparsehash.mk        | 17 +++++----------
 src/taglib.mk            | 19 +++++-----------
 src/wt.mk                | 21 +++++-------------
 src/xxhash-1-fixes.patch | 47 ----------------------------------------
 src/xxhash.mk            | 20 +++++------------
 5 files changed, 22 insertions(+), 102 deletions(-)
 delete mode 100644 src/xxhash-1-fixes.patch

diff --git a/src/sparsehash.mk b/src/sparsehash.mk
index 62b65f87..b66baf3d 100644
--- a/src/sparsehash.mk
+++ b/src/sparsehash.mk
@@ -5,22 +5,15 @@ $(PKG)_WEBSITE  := https://github.com/sparsehash/sparsehash
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.0.3
 $(PKG)_CHECKSUM := 05e986a5c7327796dad742182b2d10805a8d4f511ad090da0490f146c1ff7a8c
-$(PKG)_SUBDIR   := $(PKG)-$(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/$(PKG)/$(PKG)/archive/$($(PKG)_FILE)
+$(PKG)_GH_CONF  := sparsehash/sparsehash/tags, sparsehash-
 $(PKG)_DEPS     := cc
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, sparsehash/sparsehash, sparsehash-)
-endef
-
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
 
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_DOCS)
-
-    $(INSTALL) '$(1)/hashtable_test.exe' '$(PREFIX)/$(TARGET)/bin/test-sparsehash.exe'
+    $(INSTALL) '$(BUILD_DIR)/hashtable_test.exe' '$(PREFIX)/$(TARGET)/bin/test-sparsehash.exe'
     $(TARGET)-strip '$(PREFIX)/$(TARGET)/bin/test-sparsehash.exe'
 endef
diff --git a/src/taglib.mk b/src/taglib.mk
index e5435b05..6920ae05 100644
--- a/src/taglib.mk
+++ b/src/taglib.mk
@@ -4,20 +4,13 @@ PKG             := taglib
 $(PKG)_WEBSITE  := https://developer.kde.org/~wheeler/taglib.html
 $(PKG)_DESCR    := TagLib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.10
-$(PKG)_CHECKSUM := 24c32d50042cb0ddf162eb263f8ac75c5a158e12bf32ed534c1d5c71ee369baa
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://taglib.github.io/releases/$($(PKG)_FILE)
+$(PKG)_VERSION  := 1.11.1
+$(PKG)_CHECKSUM := b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b
+$(PKG)_GH_CONF  := taglib/taglib/tags,v
 $(PKG)_DEPS     := cc zlib
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, taglib/taglib, v)
-endef
-
 define $(PKG)_BUILD
-    mkdir '$(1)/build'
-    cd '$(1)/build' && '$(TARGET)-cmake' .. \
-        -DENABLE_STATIC=$(CMAKE_STATIC_BOOL)
-    $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
+    cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef
diff --git a/src/wt.mk b/src/wt.mk
index c6c35fae..12a619e8 100644
--- a/src/wt.mk
+++ b/src/wt.mk
@@ -6,22 +6,12 @@ $(PKG)_DESCR    := Wt
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.3.7
 $(PKG)_CHECKSUM := 054af8d62a7c158df62adc174a6a57610868470a07e7192ee7ce60a18552851d
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/emweb/wt/archive/$($(PKG)_VERSION).tar.gz
+$(PKG)_GH_CONF  := emweb/wt/tags
 $(PKG)_DEPS     := cc boost graphicsmagick libharu openssl pango postgresql sqlite
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_ALL_TAGS, emweb/wt) \
-    | grep -v 'rc' \
-    | $(SORT) -V \
-    | tail -1
-endef
-
 define $(PKG)_BUILD
     # build wt libraries
-    mkdir '$(1).build'
-    cd '$(1).build' && '$(TARGET)-cmake' \
+    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
         -DCONFIGDIR='$(PREFIX)/$(TARGET)/etc/wt' \
         -DBUILD_EXAMPLES=OFF \
         -DBUILD_TESTS=OFF \
@@ -34,8 +24,7 @@ define $(PKG)_BUILD
         -DGM_PREFIX='$(PREFIX)/$(TARGET)' \
         -DGM_LIBS="`'$(TARGET)-pkg-config' --libs-only-l GraphicsMagick++`" \
         -DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \
-        -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \
-        '$(1)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1).build' -j 1 VERBOSE=1
-    $(MAKE) -C '$(1).build' -j 1 install VERBOSE=1
+        -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(BUILD_DIR)' -j 1 VERBOSE=1
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1
 endef
diff --git a/src/xxhash-1-fixes.patch b/src/xxhash-1-fixes.patch
deleted file mode 100644
index a42221d4..00000000
--- a/src/xxhash-1-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Wed, 6 Jul 2016 22:12:35 +0200
-Subject: [PATCH 1/1] install .dll to bin/ instead of lib/
-
-Add cmake option BUILD_SHARED_LIBS to prevent building shared library
-on static target.
-
-diff --git a/cmake_unofficial/CMakeLists.txt b/cmake_unofficial/CMakeLists.txt
-index 1111111..2222222 100644
---- a/cmake_unofficial/CMakeLists.txt
-+++ b/cmake_unofficial/CMakeLists.txt
-@@ -6,11 +6,14 @@ project(xxhash)
- set(XXHASH_LIB_VERSION "0.42.0")
- set(XXHASH_LIB_SOVERSION "0")
- 
--add_library(xxhash SHARED ../xxhash.c)
--set_target_properties(xxhash PROPERTIES COMPILE_DEFINITIONS "XXHASH_EXPORT"
--                       VERSION "${XXHASH_LIB_VERSION}"
--                       SOVERSION "${XXHASH_LIB_SOVERSION}")
--set(install_libs xxhash)
-+set(BUILD_SHARED_LIBS ON CACHE BOOL "Set to ON to build shared libraries")
-+if(BUILD_SHARED_LIBS)
-+  add_library(xxhash SHARED ../xxhash.c)
-+  set_target_properties(xxhash PROPERTIES COMPILE_DEFINITIONS "XXHASH_EXPORT"
-+                         VERSION "${XXHASH_LIB_VERSION}"
-+                         SOVERSION "${XXHASH_LIB_SOVERSION}")
-+  LIST(APPEND install_libs xxhash)
-+endif(BUILD_SHARED_LIBS)
- 
- set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries")
- if(BUILD_STATIC_LIBS)
-@@ -21,4 +24,9 @@ endif(BUILD_STATIC_LIBS)
- 
- 
- INSTALL(FILES ../xxhash.h DESTINATION include)
--INSTALL(TARGETS ${install_libs} DESTINATION lib)
-+INSTALL(
-+    TARGETS ${install_libs}
-+    RUNTIME DESTINATION bin
-+    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib
-+)
diff --git a/src/xxhash.mk b/src/xxhash.mk
index 77c3ea4f..6d82e41a 100644
--- a/src/xxhash.mk
+++ b/src/xxhash.mk
@@ -4,23 +4,15 @@ PKG             := xxhash
 $(PKG)_WEBSITE  := https://cyan4973.github.io/xxHash/
 $(PKG)_DESCR    := xxHash
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.6.1
-$(PKG)_CHECKSUM := a940123baa6c71b75b6c02836bae2155cd2f74f7682e1a1d6f7b889f7bc9e7f8
-$(PKG)_SUBDIR   := xxHash-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/Cyan4973/xxHash/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_VERSION  := 0.6.4
+$(PKG)_CHECKSUM := 4570ccd111df6b6386502791397906bf69b7371eb209af7d41debc2f074cdb22
+$(PKG)_GH_CONF  := Cyan4973/xxHash/tags,v
 $(PKG)_DEPS     := cc
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, Cyan4973/xxHash) | \
-    $(SED) 's,^v,,g'
-endef
-
 define $(PKG)_BUILD
-    mkdir '$(1).build'
-    cd '$(1).build' && '$(TARGET)-cmake' '$(1)/cmake_unofficial'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
+    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)/cmake_unofficial'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     # create pkg-config files
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'