alsa-lib: update to 1.1.6

packages/audio/alsa-lib/package.mk

@@ -1,47 +1,45 @@
 ################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 #
-#  OpenELEC is free software: you can redistribute it and/or modify
+#  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 2 of the License, or
 #  (at your option) any later version.
 #
-#  OpenELEC is distributed in the hope that it will be useful,
+#  LibreELEC is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 PKG_NAME="alsa-lib"
-PKG_VERSION="1.1.5"
-PKG_SHA256="f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6"
+PKG_VERSION="1.1.6"
+PKG_SHA256="5f2cd274b272cae0d0d111e8a9e363f08783329157e8dd68b3de0c096de6d724"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
-PKG_URL="ftp://ftp.alsa-project.org/pub/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="audio"
-PKG_SHORTDESC="alsa-lib: Advanced Linux Sound Architecture library"
-PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Linux Sound API. It provides much finer (->better) access to the sound hardware, has a unbeatable mixer API and supports stuff like multi channel hardware, digital outs and ins, uninterleaved sound data access, and an oss emulation layer (for the old applications). It is the prefered API for professional sound apps under Linux."
+PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Linux Sound API."
 PKG_TOOLCHAIN="autotools"
-# alsa-lib fails building with LTO support
 PKG_BUILD_FLAGS="-lto +pic"
 
 if build_with_debug; then
-  ALSA_DEBUG=--with-debug
+  PKG_ALSA_DEBUG=--with-debug
 else
-  ALSA_DEBUG=--without-debug
+  PKG_ALSA_DEBUG=--without-debug
 fi
 
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa \
-                           --disable-python \
-                           $ALSA_DEBUG \
-                           --disable-dependency-tracking"
+PKG_CONFIGURE_OPTS_TARGET="$PKG_ALSA_DEBUG \
+                           --disable-dependency-tracking \
+                           --with-plugindir=/usr/lib/alsa \
+                           --disable-python"
 
 post_configure_target() {
   sed -i 's/.*PKGLIBDIR.*/#define PKGLIBDIR ""/' include/config.h

packages/audio/alsa-lib/patches/alsa-lib-USB_Soundblaster_HD.patch

@@ -1,23 +0,0 @@
-From 982c628f484266c8db4f70dc1e856bc7844c1873 Mon Sep 17 00:00:00 2001
-From: Patrick Rasmussen <patrickrasmussen1988@gmail.com>
-Date: Fri, 13 Mar 2015 14:52:56 +0100
-Subject: [PATCH] Add USB Sound Blaster HD
-
----
- src/conf/cards/USB-Audio.conf | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
-index 4cbf85e..2591d00 100644
---- a/src/conf/cards/USB-Audio.conf
-+++ b/src/conf/cards/USB-Audio.conf
-@@ -62,6 +62,7 @@ USB-Audio.pcm.iec958_device {
- # Second iec958 device number, if any.
- USB-Audio.pcm.iec958_2_device {
- 	"PHIREE U2" 1  # 0 = PCM S/PDIF, 1 = non-PCM S/PDIF
-+	"USB Sound Blaster HD" 1
- }
- 
- 
--- 
-2.1.4

packages/audio/alsa-lib/patches/alsa-lib-asound.conf_configdir.patch

@@ -1,9 +1,10 @@
-diff -Naur alsa-lib-1.0.25/src/conf/alsa.conf alsa-lib-1.0.25.patch/src/conf/alsa.conf
---- alsa-lib-1.0.25/src/conf/alsa.conf	2012-01-25 08:56:56.000000000 +0100
-+++ alsa-lib-1.0.25.patch/src/conf/alsa.conf	2012-03-26 01:05:47.913335895 +0200
-@@ -16,7 +16,8 @@
- 				]
- 			}
+diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
+index bb00ff40..cba5b6f2 100644
+--- a/src/conf/alsa.conf
++++ b/src/conf/alsa.conf
+@@ -10,7 +10,8 @@
+ 		files [
+ 			"/etc/alsa/conf.d"
  			"/etc/asound.conf"
 -			"~/.asoundrc"
 +			"/run/asound.conf"