use latest rtmpdump from ffmpeg.org; bumb ver libcurl-8.6.0

diff --git a/make/archives.mk b/make/archives.mk
index 65f656c429c9b868e4e28fdb281a0871f3af4aa0..00875bbba4dc2fb6e10085b68798cf3a5fc52d58 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -367,7 +367,7 @@ $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz:
        $(WGET) http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VER)/pugixml-$(PUGIXML_VER).tar.gz
 
 $(ARCHIVE)/rtmpdump-git-$(LIBRTMP_GIT).tar.bz2:
-       get-git-archive.sh http://git.webhop.me/pub/rtmpdump.git $(LIBRTMP_GIT) $(notdir $@) $(ARCHIVE)
+       get-git-archive.sh https://git.ffmpeg.org/rtmpdump.git $(LIBRTMP_GIT) $(notdir $@) $(ARCHIVE)
 
 $(ARCHIVE)/parted-$(PARTED_VER).tar.xz:
        $(WGET) https://ftp.gnu.org/gnu/parted/parted-$(PARTED_VER).tar.xz

diff --git a/make/libraries.mk b/make/libraries.mk
index 22647a10ab2a19be4e325b2a1abd1e1fb892ee11..b8fd5f07eb2193cbbc2e7e01652103f8e8ace2e5 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -533,6 +533,7 @@ $(D)/libcurl: $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $
                        --disable-rtsp \
                        --disable-dict \
                        --disable-ldap \
+                       --disable-ldaps \
                        --disable-curldebug \
                        --disable-static \
                        --disable-imap \
@@ -544,6 +545,9 @@ $(D)/libcurl: $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $
                        --disable-ntlm-wb \
                        --disable-ares \
                        --without-libidn2 \
+                       --without-winidn \
+                       --without-libpsl \
+                       --without-zstd \
                        --with-ca-bundle=/$(CA_BUNDLE_DIR)/$(CA_BUNDLE) \
                        --with-random=/dev/urandom \
                        --with-ssl=$(TARGETPREFIX) \

diff --git a/make/versions.mk b/make/versions.mk
index efd3132768220f40df3b5d98f11a50e88537f729..328eac0e7c36396a7e79422ee00c66a72db11614 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -47,7 +47,7 @@ GETTEXT_VER = 0.19.8.1
 GIFLIB_VER=5.2.1
 
 # curl; command line tool for transferring data with URL syntax
-LIBCURL_VER = 8.5.0
+LIBCURL_VER = 8.6.0
 
 # e2fsprogs; filesystem utilities for use with the ext[x] filesystem
 E2FSPROGS_VER = 1.44.5
@@ -157,7 +157,7 @@ LIBUSB_COMPAT_VER = 0.1.7
 # rtmpdump is a toolkit for RTMP streams. All forms of RTMP are supported,
 # including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.
 #LIBRTMP_VER = 2.4_p20131018
-LIBRTMP_GIT = master
+LIBRTMP_GIT = 6f6bb13
 
 # This library is minimum, easy-to-use, C implementation for xml file parsing
 LIBROXML_VER = 3.0.2