bump version libcurl-7.72.0 and alsa-lib-1.2.3

diff --git a/archive-patches/alsa-lib-1.1.8-link_fix.patch b/archive-patches/alsa-lib-1.1.8-link_fix.patch
deleted file mode 100644 (file)
index 2869dbf..0000000
--- a/archive-patches/alsa-lib-1.1.8-link_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -421,7 +421,7 @@ clean-libLTLIBRARIES:
-         rm -f $${locs}; \
-       }
- libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES) $(EXTRA_libasound_la_DEPENDENCIES) 
--      $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
-+      $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(DESTDIR)$(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
---- a/src/pcm/scopes/Makefile.in
-+++ b/src/pcm/scopes/Makefile.in
-@@ -348,7 +348,7 @@ clean-pkglibLTLIBRARIES:
-         rm -f $${locs}; \
-       }
- scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES) $(EXTRA_scope_level_la_DEPENDENCIES) 
--      $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
-+      $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(DESTDIR)$(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
-       -rm -f *.$(OBJEXT)

diff --git a/archive-patches/alsa-lib-1.1.8.patch b/archive-patches/alsa-lib-1.1.8.patch
deleted file mode 100644 (file)
index 879ab27..0000000
--- a/archive-patches/alsa-lib-1.1.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/utils/alsa.pc.in
-+++ b/utils/alsa.pc.in
-@@ -1,7 +1,7 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
- 
- Name: alsa
- Description: Advanced Linux Sound Architecture (ALSA) - Library

diff --git a/archive-patches/alsa-lib-link_fix.patch b/archive-patches/alsa-lib-link_fix.patch
new file mode 100644 (file)
index 0000000..2869dbf
--- /dev/null
+++ b/archive-patches/alsa-lib-link_fix.patch
@@ -0,0 +1,22 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -421,7 +421,7 @@ clean-libLTLIBRARIES:
+         rm -f $${locs}; \
+       }
+ libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES) $(EXTRA_libasound_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(DESTDIR)$(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+--- a/src/pcm/scopes/Makefile.in
++++ b/src/pcm/scopes/Makefile.in
+@@ -348,7 +348,7 @@ clean-pkglibLTLIBRARIES:
+         rm -f $${locs}; \
+       }
+ scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES) $(EXTRA_scope_level_la_DEPENDENCIES) 
+-      $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
++      $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(DESTDIR)$(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)

diff --git a/archive-patches/alsa-lib.patch b/archive-patches/alsa-lib.patch
new file mode 100644 (file)
index 0000000..879ab27
--- /dev/null
+++ b/archive-patches/alsa-lib.patch
@@ -0,0 +1,13 @@
+--- a/utils/alsa.pc.in
++++ b/utils/alsa.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: alsa
+ Description: Advanced Linux Sound Architecture (ALSA) - Library

diff --git a/make/multimedia.mk b/make/multimedia.mk
index 9d219226744e76d5c48d7b018c709bf0a0141f93..dfb8a461ba661fabe9d9c617b0971648b1b69e7c 100755 (executable)
--- a/make/multimedia.mk
+++ b/make/multimedia.mk
@@ -148,8 +148,8 @@ $(D)/alsa-lib: $(ARCHIVE)/alsa-lib-$(ALSA_LIB_VER).tar.bz2 | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/alsa-lib-$(ALSA_LIB_VER).tar.bz2
        set -e; cd $(BUILD_TMP)/alsa-lib-$(ALSA_LIB_VER); \
-               $(PATCH)/alsa-lib-$(ALSA_LIB_VER).patch; \
-               $(PATCH)/alsa-lib-$(ALSA_LIB_VER)-link_fix.patch; \
+               $(PATCH)/alsa-lib.patch; \
+               $(PATCH)/alsa-lib-link_fix.patch; \
                $(CONFIGURE) \
                        --prefix= \
                        --datarootdir=/.remove \
@@ -166,6 +166,7 @@ $(D)/alsa-lib: $(ARCHIVE)/alsa-lib-$(ALSA_LIB_VER).tar.bz2 | $(TARGETPREFIX)
                        --disable-alisp \
                        --disable-hwdep \
                        --disable-python \
+                       --disable-topology \
                ; \
                $(MAKE); \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index 7e16eadc374d0ecb10e0637be16bda802d1f952f..409d85a104a1a02e46e42182b9b6b2c2e35eff33 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -1,7 +1,7 @@
 # versions
 
 # The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI functionality to the Linux operating system.
-ALSA_LIB_VER = 1.1.8
+ALSA_LIB_VER = 1.2.3
 
 AUTOFS4_VER = 4.1.4
 
@@ -42,7 +42,7 @@ GETTEXT_VER = 0.19.8.1
 GIFLIB_VER=5.2.1
 
 # curl; command line tool for transferring data with URL syntax
-CURL_VER = 7.70.0
+CURL_VER = 7.72.0
 
 # e2fsprogs; filesystem utilities for use with the ext[x] filesystem
 E2FSPROGS_VER = 1.44.5