From ac079b868ca1a783cfa7e1bd4bfd5f73361ddf2e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Dec 2015 14:01:55 +0100 Subject: [PATCH 1/7] alsa-lib: update to alsa-lib-1.1.0 Signed-off-by: Stephan Raue --- packages/audio/alsa-lib/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audio/alsa-lib/package.mk b/packages/audio/alsa-lib/package.mk index d9b807757e..7a854bd6a7 100644 --- a/packages/audio/alsa-lib/package.mk +++ b/packages/audio/alsa-lib/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="alsa-lib" -PKG_VERSION="1.0.29" +PKG_VERSION="1.1.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From eef681735a11ad8f01bac2d4b03b71cda850a3a6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Dec 2015 14:02:07 +0100 Subject: [PATCH 2/7] alsa-utils: update to alsa-utils-1.1.0 Signed-off-by: Stephan Raue --- packages/audio/alsa-utils/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/audio/alsa-utils/package.mk b/packages/audio/alsa-utils/package.mk index fbdf999432..b0cdcc3473 100644 --- a/packages/audio/alsa-utils/package.mk +++ b/packages/audio/alsa-utils/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="alsa-utils" -PKG_VERSION="1.0.29" +PKG_VERSION="1.1.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -39,6 +39,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ --disable-alsaconf \ --disable-alsaloop \ --enable-alsatest \ + --disable-bat \ --disable-nls" From 9e236aa3fac9e788cae7f0aa8b6c7d4493790e07 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Dec 2015 14:02:20 +0100 Subject: [PATCH 3/7] alsa-plugins: update to alsa-plugins-1.1.0 Signed-off-by: Stephan Raue --- packages/audio/alsa-plugins/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audio/alsa-plugins/package.mk b/packages/audio/alsa-plugins/package.mk index 6889e17692..dafbeac1d7 100644 --- a/packages/audio/alsa-plugins/package.mk +++ b/packages/audio/alsa-plugins/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="alsa-plugins" -PKG_VERSION="1.0.29" +PKG_VERSION="1.1.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From f0df09c3c8c9da97d372b149ab1a2733c4b1679b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Dec 2015 14:03:58 +0100 Subject: [PATCH 4/7] alsa-plugins: depends on pulseaudio Signed-off-by: Stephan Raue --- packages/audio/alsa-plugins/package.mk | 2 +- packages/mediacenter/kodi/package.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/audio/alsa-plugins/package.mk b/packages/audio/alsa-plugins/package.mk index dafbeac1d7..79adbd4a26 100644 --- a/packages/audio/alsa-plugins/package.mk +++ b/packages/audio/alsa-plugins/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain alsa-lib" +PKG_DEPENDS_TARGET="toolchain alsa-lib pulseaudio" PKG_PRIORITY="optional" PKG_SECTION="audio" PKG_SHORTDESC="" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 5554fded9b..a2522db1d9 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -73,7 +73,7 @@ fi if [ "$PULSEAUDIO_SUPPORT" = yes ]; then # for PulseAudio support - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio alsa-plugins" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio" fi if [ "$ESPEAK_SUPPORT" = yes ]; then From be7bf1e93bc129e8686e3d1058ca215d596fcd56 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Dec 2015 14:16:31 +0100 Subject: [PATCH 5/7] alsa-plugins: optionally build pulseaudio support Signed-off-by: Stephan Raue --- packages/audio/alsa-plugins/package.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/audio/alsa-plugins/package.mk b/packages/audio/alsa-plugins/package.mk index 79adbd4a26..7ed436e9db 100644 --- a/packages/audio/alsa-plugins/package.mk +++ b/packages/audio/alsa-plugins/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain alsa-lib pulseaudio" +PKG_DEPENDS_TARGET="toolchain alsa-lib" PKG_PRIORITY="optional" PKG_SECTION="audio" PKG_SHORTDESC="" @@ -32,9 +32,17 @@ PKG_LONGDESC="" PKG_IS_ADDON="no" PKG_AUTORECONF="yes" +if [ "$PULSEAUDIO_SUPPORT" = yes ]; then +# for PulseAudio support + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio" + ALSA_PLUGINS_PULSEAUDIO="--enable-pulseaudio" +else + ALSA_PLUGINS_PULSEAUDIO="--disable-pulseaudio" +fi + # package specific configure options PKG_CONFIGURE_OPTS_TARGET="--disable-jack \ - --enable-pulseaudio \ + $ALSA_PLUGINS_PULSEAUDIO \ --disable-samplerate \ --disable-maemo-plugin \ --disable-maemo-resource-manager \ From 92149206d2c5acf9dfe28911eb6fc75fdab07b99 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Dec 2015 14:18:59 +0100 Subject: [PATCH 6/7] kodi: drop references to pulseaudio Signed-off-by: Stephan Raue --- packages/mediacenter/kodi/package.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index a2522db1d9..62fc16cad5 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -71,11 +71,6 @@ else KODI_ALSA="--disable-alsa" fi -if [ "$PULSEAUDIO_SUPPORT" = yes ]; then -# for PulseAudio support - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio" -fi - if [ "$ESPEAK_SUPPORT" = yes ]; then # for espeak support PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET espeak" From 9d3c970a786d581b8def807a722694d115bd21cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Dec 2015 14:19:18 +0100 Subject: [PATCH 7/7] alsa: install alsa-plugins by default Signed-off-by: Stephan Raue --- packages/virtual/alsa/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/alsa/package.mk b/packages/virtual/alsa/package.mk index 0743b6b0b9..1feaa8593a 100644 --- a/packages/virtual/alsa/package.mk +++ b/packages/virtual/alsa/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain alsa-lib alsa-utils" +PKG_DEPENDS_TARGET="toolchain alsa-lib alsa-utils alsa-plugins" PKG_PRIORITY="optional" PKG_SECTION="virtual" PKG_SHORTDESC="alsa: Matapackage to install all alsa components"