From c52b8f6c9698e9f42472c9062eb809d853b5b764 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Wed, 17 Feb 2016 18:56:15 +0200 Subject: alsa-plugins: 1.0.29 -> 1.1.0 Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0 The licensing of the libsamplerate plugin was relaxed a bit: if the licensee has a commercial license for libsamplerate, the plugin can be used under the terms of LGPL instead of GPL. Both old patches are included in the new release, so dropped them. Added a new patch to fix building against libspeexdsp 1.2rc3. (From OE-Core rev: 2106108f83001cadc0188612b3e51de0c678d3c0) Signed-off-by: Tanu Kaskinen Signed-off-by: Richard Purdie --- ...nclude-sys-select.h-for-fd_set-definition.patch | 31 ------ ...nclude-speexdsp_types.h-not-speex_types.h.patch | 71 -------------- ...ph-include-config.h-from-rate_speexrate.c.patch | 35 +++++++ .../recipes-multimedia/alsa/alsa-plugins_1.0.29.bb | 103 -------------------- meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb | 105 +++++++++++++++++++++ 5 files changed, 140 insertions(+), 205 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch deleted file mode 100644 index c70c72cb7e..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d28c655be3ac4fcb8024555983884f832ee18787 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 29 May 2015 15:17:30 -0700 -Subject: [PATCH] arcam-av: Include sys/select.h for fd_set definition - -fixes build errors on non-glibc based systems - -arcam-av/arcam_av.c:389:2: error: unknown type name 'fd_set' - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - arcam-av/arcam_av.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arcam-av/arcam_av.c b/arcam-av/arcam_av.c -index 0491fc6..fff96f9 100644 ---- a/arcam-av/arcam_av.c -+++ b/arcam-av/arcam_av.c -@@ -31,6 +31,7 @@ - #include - - #include -+#include - #include - #include - #include --- -2.1.4 - diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch deleted file mode 100644 index e5199fb85a..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch +++ /dev/null @@ -1,71 +0,0 @@ -From ca41e96a49a568128354f65f90a769debf5435f1 Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen -Date: Thu, 9 Jul 2015 11:58:12 +0300 -Subject: [PATCH] include speexdsp_types.h, not speex_types.h - -Speexdsp was separated from speex in 1.2rc2. speex_types.h is not -shipped by speexdsp, so alsa-plugins shouldn't use that file. speexdsp -has speexdsp_types.h, which has the same contents as speex_types.h. - -speexdsp_types.h is a new file introduced in 1.2rc2, so this change -bumps the minimum supported speexdsp version. The version check in -configure.ac will actually break if speexdsp 1.2 ever gets released, -because pkg-config thinks that "1.2" < "1.2rc2", but I think it's -useful to fail if the installed speexdsp version is 1.2rc1 (which I -believe is very common on current distributions). If a non-rc version -of speexdsp will ever get released, I hope version number 1.2 will be -skipped for this reason. (A non-rc version seems unlikely, since -1.2rc1 was released years ago, so it's pretty likely that the project -is stuck on so called "release candidates" forever...) - -Upstream-Status: Submitted (http://thread.gmane.org/gmane.linux.alsa.devel/141149) - -Signed-off-by: Tanu Kaskinen ---- - configure.ac | 2 +- - pph/arch.h | 2 +- - pph/speex_resampler.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 902a6d7..c554d22 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -108,7 +108,7 @@ AC_SUBST(AVCODEC_CFLAGS) - AC_SUBST(AVCODEC_LIBS) - AC_SUBST(AVCODEC_HEADER) - --PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) -+PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2rc2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) - AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") - - AC_ARG_WITH([speex], -diff --git a/pph/arch.h b/pph/arch.h -index e2d731a..a07d0d9 100644 ---- a/pph/arch.h -+++ b/pph/arch.h -@@ -36,7 +36,7 @@ - #define ARCH_H - - #ifndef OUTSIDE_SPEEX --#include "speex/speex_types.h" -+#include "speex/speexdsp_types.h" - #endif - - #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ -diff --git a/pph/speex_resampler.h b/pph/speex_resampler.h -index c44fbcd..aa85abb 100644 ---- a/pph/speex_resampler.h -+++ b/pph/speex_resampler.h -@@ -82,7 +82,7 @@ - - #else /* OUTSIDE_SPEEX */ - --#include "speex/speex_types.h" -+#include "speex/speexdsp_types.h" - - #endif /* OUTSIDE_SPEEX */ - --- -1.9.3 - diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch new file mode 100644 index 0000000000..8e5b6a2a21 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch @@ -0,0 +1,35 @@ +From 4350314c941489833a8baa930e16512e55f72a13 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Wed, 27 Jan 2016 13:22:38 +0200 +Subject: [PATCH] pph: include config.h from rate_speexrate.c + +Fixes compilation against libspeexdsp 1.2rc3. + +rate_speexrate.c includes speex_resampler.h, which depends on config.h +by referencing the HAVE_SPEEX_SPEEXDSP_TYPES_H macro. AFAIK it's not +a good idea to include config.h from headers (I don't know/remember +why, though), which is why I include config.h from rate_speexrate.c +instead of speex_resampler.h. + +Upstream-Status: Accepted [expected in 1.1.1] + +Signed-off-by: Tanu Kaskinen +--- + pph/rate_speexrate.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pph/rate_speexrate.c b/pph/rate_speexrate.c +index 0a1325c..8fc4cef 100644 +--- a/pph/rate_speexrate.c ++++ b/pph/rate_speexrate.c +@@ -28,6 +28,7 @@ + POSSIBILITY OF SUCH DAMAGE. + */ + ++#include "config.h" + #include + #include + #include +-- +2.7.0.rc3 + diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb deleted file mode 100644 index d7c42ce734..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb +++ /dev/null @@ -1,103 +0,0 @@ -SUMMARY = "ALSA Plugins" -HOMEPAGE = "http://alsa-project.org" -SECTION = "multimedia" - -# The primary license of alsa-plugins is LGPLv2.1. -# -# m4/attributes.m4 is licensed under GPLv2+. m4/attributes.m4 is part of the -# build system, and doesn't affect the licensing of the build result. -# -# The samplerate plugin source code is licensed under GPLv2+ to be consistent -# with the libsamplerate license. -LICENSE = "LGPLv2.1 & GPLv2+" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://m4/attributes.m4;endline=33;md5=b25958da44c02231e3641f1bccef53eb \ - file://rate/rate_samplerate.c;endline=19;md5=f3d3ce0b189846a486517d97a854b276 \ -" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \ - file://0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch \ - file://0001-include-speexdsp_types.h-not-speex_types.h.patch \ -" -SRC_URI[md5sum] = "a66797b4471e3cbe96575207bfbe252c" -SRC_URI[sha256sum] = "325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532" - -DEPENDS += "alsa-lib" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "\ - samplerate \ - speexdsp \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ -" -PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav" -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" -PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin" -PACKAGECONFIG[maemo-resource-manager] = "--enable-maemo-resource-manager,--disable-maemo-resource-manager,dbus" -PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" -PACKAGECONFIG[samplerate] = "--enable-samplerate,--disable-samplerate,libsamplerate0" -PACKAGECONFIG[speexdsp] = "--with-speex=lib,--with-speex=no,speexdsp" - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}" - -PACKAGES_DYNAMIC = "^libasound-module-.*" - -# The alsa-plugins package doesn't itself contain anything, it just depends on -# all built plugins. -ALLOW_EMPTY_${PN} = "1" - -do_install_append() { - rm ${D}${libdir}/alsa-lib/*.la - - # We use the example as is, so just drop the .example suffix. - if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then - mv ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf - fi -} - -python populate_packages_prepend() { - plugindir = bb.data.expand('${libdir}/alsa-lib/', d) - packages = " ".join(do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='')) - d.setVar("RDEPENDS_alsa-plugins", packages) -} - -# The rate plugins create some symlinks. For example, the samplerate plugin -# creates these links to the main plugin file: -# -# libasound_module_rate_samplerate_best.so -# libasound_module_rate_samplerate_linear.so -# libasound_module_rate_samplerate_medium.so -# libasound_module_rate_samplerate_order.so -# -# The other rate plugins create similar links. We have to add the links to -# FILES manually, because do_split_packages() skips the links (which is good, -# because we wouldn't want do_split_packages() to create separate packages for -# the symlinks). -# -# The symlinks cause QA errors, because usually it's a bug if a non -# -dev/-dbg/-nativesdk package contains links to .so files, but in this case -# the errors are false positives, so we disable the QA checks. -FILES_${MLPREFIX}libasound-module-rate-lavcrate += "${libdir}/alsa-lib/*rate_lavcrate_*.so" -FILES_${MLPREFIX}libasound-module-rate-samplerate += "${libdir}/alsa-lib/*rate_samplerate_*.so" -FILES_${MLPREFIX}libasound-module-rate-speexrate += "${libdir}/alsa-lib/*rate_speexrate_*.so" -INSANE_SKIP_${MLPREFIX}libasound-module-rate-lavcrate = "dev-so" -INSANE_SKIP_${MLPREFIX}libasound-module-rate-samplerate = "dev-so" -INSANE_SKIP_${MLPREFIX}libasound-module-rate-speexrate = "dev-so" - -# 50-pulseaudio.conf defines a device named "pulse" that applications can use -# if they explicitly want to use the PulseAudio plugin. -# 99-pulseaudio-default.conf configures the "default" device to use the -# PulseAudio plugin. -FILES_${PN}-pulseaudio-conf += "\ - ${datadir}/alsa/alsa.conf.d/50-pulseaudio.conf \ - ${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf \ -" - -RDEPENDS_${PN}-pulseaudio-conf += "\ - libasound-module-conf-pulse \ - libasound-module-ctl-pulse \ - libasound-module-pcm-pulse \ -" diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb new file mode 100644 index 0000000000..fec6575309 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb @@ -0,0 +1,105 @@ +SUMMARY = "ALSA Plugins" +HOMEPAGE = "http://alsa-project.org" +SECTION = "multimedia" + +# The primary license of alsa-plugins is LGPLv2.1. +# +# m4/attributes.m4 is licensed under GPLv2+. m4/attributes.m4 is part of the +# build system, and doesn't affect the licensing of the build result. +# +# The samplerate plugin source code is licensed under GPLv2+ to be consistent +# with the libsamplerate license. However, if the licensee has a commercial +# license for libsamplerate, the samplerate plugin may be used under the terms +# of LGPLv2.1 like the rest of the plugins. +LICENSE = "LGPLv2.1 & GPLv2+" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ + file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://m4/attributes.m4;endline=33;md5=b25958da44c02231e3641f1bccef53eb \ + file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \ +" + +SRC_URI = "\ + ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \ + file://0001-pph-include-config.h-from-rate_speexrate.c.patch \ +" +SRC_URI[md5sum] = "b123e42ed881b9adbc99e4040f257c39" +SRC_URI[sha256sum] = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee" + +DEPENDS += "alsa-lib" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "\ + samplerate \ + speexdsp \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ +" +PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin" +PACKAGECONFIG[maemo-resource-manager] = "--enable-maemo-resource-manager,--disable-maemo-resource-manager,dbus" +PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" +PACKAGECONFIG[samplerate] = "--enable-samplerate,--disable-samplerate,libsamplerate0" +PACKAGECONFIG[speexdsp] = "--with-speex=lib,--with-speex=no,speexdsp" + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}" + +PACKAGES_DYNAMIC = "^libasound-module-.*" + +# The alsa-plugins package doesn't itself contain anything, it just depends on +# all built plugins. +ALLOW_EMPTY_${PN} = "1" + +do_install_append() { + rm ${D}${libdir}/alsa-lib/*.la + + # We use the example as is, so just drop the .example suffix. + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then + mv ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf + fi +} + +python populate_packages_prepend() { + plugindir = bb.data.expand('${libdir}/alsa-lib/', d) + packages = " ".join(do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='')) + d.setVar("RDEPENDS_alsa-plugins", packages) +} + +# The rate plugins create some symlinks. For example, the samplerate plugin +# creates these links to the main plugin file: +# +# libasound_module_rate_samplerate_best.so +# libasound_module_rate_samplerate_linear.so +# libasound_module_rate_samplerate_medium.so +# libasound_module_rate_samplerate_order.so +# +# The other rate plugins create similar links. We have to add the links to +# FILES manually, because do_split_packages() skips the links (which is good, +# because we wouldn't want do_split_packages() to create separate packages for +# the symlinks). +# +# The symlinks cause QA errors, because usually it's a bug if a non +# -dev/-dbg/-nativesdk package contains links to .so files, but in this case +# the errors are false positives, so we disable the QA checks. +FILES_${MLPREFIX}libasound-module-rate-lavcrate += "${libdir}/alsa-lib/*rate_lavcrate_*.so" +FILES_${MLPREFIX}libasound-module-rate-samplerate += "${libdir}/alsa-lib/*rate_samplerate_*.so" +FILES_${MLPREFIX}libasound-module-rate-speexrate += "${libdir}/alsa-lib/*rate_speexrate_*.so" +INSANE_SKIP_${MLPREFIX}libasound-module-rate-lavcrate = "dev-so" +INSANE_SKIP_${MLPREFIX}libasound-module-rate-samplerate = "dev-so" +INSANE_SKIP_${MLPREFIX}libasound-module-rate-speexrate = "dev-so" + +# 50-pulseaudio.conf defines a device named "pulse" that applications can use +# if they explicitly want to use the PulseAudio plugin. +# 99-pulseaudio-default.conf configures the "default" device to use the +# PulseAudio plugin. +FILES_${PN}-pulseaudio-conf += "\ + ${datadir}/alsa/alsa.conf.d/50-pulseaudio.conf \ + ${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf \ +" + +RDEPENDS_${PN}-pulseaudio-conf += "\ + libasound-module-conf-pulse \ + libasound-module-ctl-pulse \ + libasound-module-pcm-pulse \ +" -- cgit 1.2.3-korg