Mercurial > mxe-octave

changeset 6510:4b8764444acb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create common github call define and start using it * Makefile.in: add GITHUB_PKG_UPDATE * src/blas_switch.mk, src/double-conversion.mk, src/libffi.mk, src/libgeotiff.mk, src/libmodbus.mk, src/libproxy.mk, src/librsvg.mk, src/libsndfile.mk, src/libsodium.mk, src/libvpx.mk, src/netcdf.mk, src/of-statistics.mk, src/openblas.mk, src/opencv.mk, src/openjpeg.mk, src/openlibm.mk, src/paho-mqtt-c.mk, src/pcre2.mk, src/portaudio.mk, src/rapidjson.mk, src/rtmidi.mk, src/suitesparse.mk, src/sundials-ida.mk, src/wt.mk, src/wxwidgets.mk, src/yasm.mk, src/zeromq.mk : call GITHUB_PKG_UPDATE in update
author John Donoghue <john.donoghue@ieee.org>
date Tue, 08 Nov 2022 09:37:16 -0500
parents b77e76368a51
children 8f473adec6db
files Makefile.in src/blas_switch.mk src/double-conversion.mk src/libffi.mk src/libgeotiff.mk src/libmodbus.mk src/libproxy.mk src/librsvg.mk src/libsndfile.mk src/libsodium.mk src/libvpx.mk src/netcdf.mk src/of-statistics.mk src/openblas.mk src/opencv.mk src/openjpeg.mk src/openlibm.mk src/paho-mqtt-c.mk src/pcre2.mk src/portaudio.mk src/rapidjson.mk src/rtmidi.mk src/suitesparse.mk src/sundials-ida.mk src/wt.mk src/wxwidgets.mk src/yasm.mk src/zeromq.mk
diffstat 28 files changed, 36 insertions(+), 82 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Mon Nov 07 09:51:40 2022 -0500
+++ b/Makefile.in	Tue Nov 08 09:37:16 2022 -0500
@@ -1018,6 +1018,15 @@
                       $(wildcard $(PKG_DIR)/*)))
 
 .PHONY: update
+
+define GITHUB_PKG_UPDATE
+  $(WGET) -q -O- "https://github.com/$(1)/$(2)/tags" | \
+  $(SED) -n 's|.*releases/tag/$(3)\([0-9][^"]*\).*|\1|p' | \
+  $(GREP) -i -v RC | $(GREP) -i -v BETA | \
+  $(SORT) -V | \
+  tail -1
+endef
+
 define UPDATE
     $(if $(2),
         $(if $(filter $(2),$($(1)_IGNORE)),
--- a/src/blas_switch.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/blas_switch.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -23,9 +23,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/lostbard/$(PKG)/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,lostbard,blas_switch,v)
 endef
 
 ifneq ($(MXE_NATIVE_BUILD),yes)
--- a/src/double-conversion.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/double-conversion.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -13,9 +13,7 @@
 $(PKG)_CMAKE_FLAGS :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/google/double-conversion/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,google,double-conversion,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/libffi.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/libffi.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/libffi/libffi/tags' | \
-    $(SED) -n 's,.*releases/tag/v\([0-9][^"]*\).*,\1,p' | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,libffi,libffi,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/libgeotiff.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/libgeotiff.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -12,9 +12,7 @@
 $(PKG)_DEPS     := zlib jpeg tiff proj
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/OSGeo/libgeotiff/tags' | \
-    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,OSGeo,libgeotiff,)
 endef
 
 define $(PKG)_BUILD
--- a/src/libmodbus.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/libmodbus.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -8,9 +8,7 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/stephane/libmodbus/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,stephane,libmodbus,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/libproxy.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/libproxy.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -13,9 +13,7 @@
 $(PKG)_CMAKE_FLAGS :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/libproxy/libproxy/tags' | \
-    $(SED) -n 's|.*releases/tag/\([0-9][^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,libproxy,libproxy,)
 endef
 
 define $(PKG)_BUILD
--- a/src/librsvg.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/librsvg.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     := glib libgsf cairo pango gtk2 libcroco
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/GNOME/librsvg/tags' | \
-    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,GNOME,librsvg,)
 endef
 
 define $(PKG)_BUILD
--- a/src/libsndfile.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/libsndfile.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     := sqlite flac mpg123 ogg opus vorbis
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/libsndfile/libsndfile/tags' | \
-    $(SED) -n 's|.*releases/tag/[v]*\([^"]*\).*|\1|p' | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,libsndfile,libsndfile,[v]*)
 endef
 
 define $(PKG)_BUILD
--- a/src/libsodium.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/libsodium.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/jedisct1/libsodium/tags' | \
-    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,jedisct1,libsodium,)
 endef
 
 $(PKG)_EXTRA_CONFIGURE_OPTIONS :=
--- a/src/libvpx.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/libvpx.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -23,9 +23,7 @@
 
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/webmproject/libvpx/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,webmproject,libvpx,v)
 endef
 
 ifeq ($(MXE_NATIVE_BUILD),no)
--- a/src/netcdf.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/netcdf.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     := curl hdf5
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/Unidata/netcdf-c/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,Unidata,netcdf-c,v)
 endef
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
--- a/src/of-statistics.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/of-statistics.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -16,9 +16,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/gnu-octave/statistics/tags' | \
-    $(SED) -n 's|.*releases/tag/release-\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,gnu-octave,statistics,release-)
 endef
 
 define $(PKG)_BUILD
--- a/src/openblas.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/openblas.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     := blas
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/xianyi/OpenBLAS/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -Vr | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,xianyi,OpenBLAS,v)
 endef
 
 ifeq ($(USE_CCACHE),yes)
--- a/src/opencv.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/opencv.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
                    openblas openexr tiff xz zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/opencv/opencv/tags' | \
-    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,opencv,opencv,)
 endef
 
 # -DCMAKE_CXX_STANDARD=98 required for non-posix gcc7 build
--- a/src/openjpeg.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/openjpeg.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -13,9 +13,7 @@
 $(PKG)_CMAKE_FLAGS :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/uclouvain/openjpeg/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([0-9][^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,uclouvain,openjpeg,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/openlibm.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/openlibm.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -24,9 +24,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/JuliaMath/openlibm/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,JuliaMath,openlibm,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/paho-mqtt-c.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/paho-mqtt-c.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -13,9 +13,7 @@
 $(PKG)_CMAKE_FLAGS :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/eclipse/paho.mqtt.c/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,eclipse,paho.mqtt.c,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/pcre2.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/pcre2.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     := zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/PhilipHazel/pcre2/tags' | \
-    $(SED) -n 's|.*releases/tag/pcre2-\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,PhilipHazel,pcre2,pcre2-)
 endef
 
 define $(PKG)_BUILD
--- a/src/portaudio.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/portaudio.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -19,9 +19,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/PortAudio/portaudio/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,PortAudio,portaudio,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/rapidjson.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/rapidjson.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/Tencent/$(PKG)/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,Tencent,rapidjson,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/rtmidi.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/rtmidi.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -13,9 +13,7 @@
 $(PKG)_CMAKE_FLAGS :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/thestk/$(PKG)/tags' | \
-    $(SED) -n 's|.*releases/tag/[v]\{0,1\}\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,thestk,rtmidi,[v]*)
 endef
 
 define $(PKG)_BUILD
--- a/src/suitesparse.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/suitesparse.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -19,9 +19,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/DrTimothyAldenDavis/SuiteSparse/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,DrTimothyAldenDavis,SuiteSparse,v)
 endef
 
 
--- a/src/sundials-ida.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/sundials-ida.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -14,9 +14,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/LLNL/sundials/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,LLNL,sundials,v)
 endef
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
--- a/src/wt.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/wt.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,10 +11,7 @@
 $(PKG)_DEPS     := boost openssl libharu graphicsmagick pango postgresql sqlite
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/emweb/wt/tags' | \
-    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \
-    $(SORT) -Vr | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,emweb,wt,)
 endef
 
 define $(PKG)_BUILD
--- a/src/wxwidgets.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/wxwidgets.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     := libiconv libpng jpeg tiff sdl2 zlib expat
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com//wxWidgets/wxWidgets/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | grep -v '^3\.1' | grep -v 'rc' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,wxWidgets,wxWidgets,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/yasm.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/yasm.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -10,9 +10,7 @@
 $(PKG)_DEPS     := 
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/yasm/yasm/tags' | \
-    $(SED) -n 's,.*href="/yasm/yasm/archive/v\([0-9][^"]*\)\.tar.*,\1,p' | \
-    head -1
+    $(call GITHUB_PKG_UPDATE,yasm,yasm,v)
 endef
 
 define $(PKG)_BUILD
--- a/src/zeromq.mk	Mon Nov 07 09:51:40 2022 -0500
+++ b/src/zeromq.mk	Tue Nov 08 09:37:16 2022 -0500
@@ -11,9 +11,7 @@
 $(PKG)_DEPS     := pthreads libsodium
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/zeromq/libzmq/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \
-    tail -1
+    $(call GITHUB_PKG_UPDATE,zeromq,libzmq,v)
 endef
 
 define $(PKG)_BUILD