bump version libcurl-8.5.0; update libsiqc++ target

diff --git a/make/archives.mk b/make/archives.mk
index 4b63293c7cde00bcd111a5909ce21697e50994c7..e00634a6fe86f104e89621360d280ade09184b9c 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -33,7 +33,7 @@ $(ARCHIVE)/libungif-4.1.4.tar.bz2:
 $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.gz:
        $(WGET) https://sourceforge.net/projects/giflib/files/$(notdir $@)
 
-$(ARCHIVE)/curl-$(CURL_VER).tar.bz2:
+$(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2:
        $(WGET) http://curl.haxx.se/download/$(lastword $(subst /, ,$@))
 
 $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz:

diff --git a/make/libraries.mk b/make/libraries.mk
index 66e0829462f9fee55b61941b7554911a737acc80..6c03a91c985e0341ab1bc5c93e65d35a4e5f741b 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -504,10 +504,10 @@ $(D)/ca-bundle: | $(TARGETPREFIX)
        openssl verify $(TARGETPREFIX)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE)
        $(TOUCH)
 
-$(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib $(D)/ca-bundle | $(TARGETPREFIX)
+$(D)/libcurl: $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib $(D)/ca-bundle | $(TARGETPREFIX)
        $(START_BUILD)
-       $(UNTAR)/curl-$(CURL_VER).tar.bz2
-       set -e; cd $(BUILD_TMP)/curl-$(CURL_VER); \
+       $(UNTAR)/curl-$(LIBCURL_VER).tar.bz2
+       set -e; cd $(BUILD_TMP)/curl-$(LIBCURL_VER); \
                $(BUILDENV) LIBS="-lssl -lcrypto -lrtmp -lz" \
                ./configure \
                        --prefix=${PREFIX} \
@@ -545,7 +545,7 @@ $(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)
        rm -fr $(TARGETPREFIX)/share/man
        $(REWRITE_LIBTOOL)/libcurl.la
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcurl.pc
-       $(REMOVE)/curl-$(CURL_VER)
+       $(REMOVE)/curl-$(LIBCURL_VER)
        $(TOUCH)
 
 $(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-git-$(LIBRTMP_GIT).tar.bz2 | $(TARGETPREFIX)
@@ -801,7 +801,10 @@ $(D)/libsigc: $(ARCHIVE)/libsigc++-$(LIBSIGC_VER).tar.xz | $(TARGETPREFIX)
                ./autogen.sh; \
                $(CONFIGURE) \
                        --prefix= \
-                       --enable-documentation=no; \
+                       --disable-benchmark \
+                       --disable-documentation \
+                       --disable-warnings \
+                       --without-boost; \
                $(MAKE); \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        ln -sf ./sigc++-2.0/sigc++ $(TARGETPREFIX)/include/sigc++

diff --git a/make/versions.mk b/make/versions.mk
index 4906b477b88aba51218329da144ea8a725fb5a56..26cc215e0adadc6c630030dc4c7434655fbede0a 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -46,7 +46,7 @@ GETTEXT_VER = 0.19.8.1
 GIFLIB_VER=5.2.1
 
 # curl; command line tool for transferring data with URL syntax
-CURL_VER = 8.3.0
+LIBCURL_VER = 8.5.0
 
 # e2fsprogs; filesystem utilities for use with the ext[x] filesystem
 E2FSPROGS_VER = 1.44.5
@@ -230,11 +230,8 @@ LIBICONV_VER = 1.16
 LIBOPENTHREADS_VER=3.2
 
 #libsigc++; a typesafe Callback Framework for C++
-LIBSIGC_MAJ=2
-LIBSIGC_MIN=10
-LIBSIGC_MIC=8
-LIBSIGC_VER=$(LIBSIGC_MAJ).$(LIBSIGC_MIN).$(LIBSIGC_MIC)
-
+LIBSIGC_VER_MAJOR = 2.10
+LIBSIGC_VER = $(LIBSIGC_VER_MAJOR).8
 
 # libx264
 LIB_X264_VER=20220819