bump version alsa-lib-1.1.6

diff --git a/archive-patches/alsa-lib-1.1.5-link_fix.patch b/archive-patches/alsa-lib-1.1.5-link_fix.patch
deleted file mode 100644 (file)
index 2869dbf..0000000
--- a/archive-patches/alsa-lib-1.1.5-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.5.patch b/archive-patches/alsa-lib-1.1.5.patch
deleted file mode 100644 (file)
index 879ab27..0000000
--- a/archive-patches/alsa-lib-1.1.5.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-1.1.6-link_fix.patch b/archive-patches/alsa-lib-1.1.6-link_fix.patch
new file mode 100644 (file)
index 0000000..2869dbf
--- /dev/null
+++ b/archive-patches/alsa-lib-1.1.6-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-1.1.6.patch b/archive-patches/alsa-lib-1.1.6.patch
new file mode 100644 (file)
index 0000000..879ab27
--- /dev/null
+++ b/archive-patches/alsa-lib-1.1.6.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/versions.mk b/make/versions.mk
index 262403b302447243e692bd416ac43ad2e87e1243..b1e349d72919e22ed356b5750543cf9110b91dc6 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.5
+ALSA_LIB_VER = 1.1.6
 
 AUTOFS4_VER = 4.1.4