diff options
Diffstat (limited to 'yocto-poky/meta/recipes-multimedia/alsa')
18 files changed, 453 insertions, 267 deletions
diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch deleted file mode 100644 index 583bc3daa..000000000 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 17aeb3565f411e7796cabe403f92d15948a8ca95 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 21 Aug 2015 14:42:45 -0700 -Subject: [PATCH] build: Do not try to detect cross-compiler - -cross compilers are passed via path may not be a gcc based cross -compiler in such cases this check fails and try's to force gcc based -cross compiler detection, This code is a convenience that limits the -build system - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3022cf8..9d77440 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr) - - dnl Checks for programs. - --dnl try to gues cross-compiler if not set --if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`"; --then -- AC_MSG_CHECKING(for cross-compiler) -- -- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc -- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \ -- && CC=${host_cpu}-${host_os}-gcc -- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \ -- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc -- -- AC_MSG_RESULT($CC) --fi -- - CFLAGS="$CFLAGS -D_GNU_SOURCE" - - --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch new file mode 100644 index 000000000..0ead0cdaf --- /dev/null +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch @@ -0,0 +1,35 @@ +From 3f1dba9a821b53b42001605f9a126a958804884f Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Mon, 9 Nov 2015 13:37:26 +0100 +Subject: [PATCH] topology: Add missing include sys/stat.h + +Necessary for proper definitions of S_IRUSR & co. Otherwise it +results in compile errors with old glibc and uclibc: + parser.c: In function 'snd_tplg_build_file': + parser.c:262: error: 'S_IRUSR' undeclared (first use in this function) + parser.c:262: error: (Each undeclared identifier is reported only once + parser.c:262: error: for each function it appears in.) + +Upstream-Status: Backport + +Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + src/topology/parser.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/topology/parser.c b/src/topology/parser.c +index 80a0ae0..18bb9c7 100644 +--- a/src/topology/parser.c ++++ b/src/topology/parser.c +@@ -16,6 +16,7 @@ + Liam Girdwood <liam.r.girdwood@linux.intel.com> + */ + ++#include <sys/stat.h> + #include "list.h" + #include "tplg_local.h" + +-- +2.4.0 + diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch index 75a6eb8a3..795e48ab2 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch @@ -1,4 +1,4 @@ -From e33357b59a10d44e9bec5d24100ce23ca300cc79 Mon Sep 17 00:00:00 2001 +From 3408f8e78776b12f131e433749721602f87e0a70 Mon Sep 17 00:00:00 2001 From: "Hong H. Pham" <hong.pham@windriver.com> Date: Fri, 29 Aug 2014 17:13:55 +0300 Subject: [PATCH] Check if wordexp function is supported @@ -18,15 +18,15 @@ Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index b8353a0..773b72f 100644 +index 9490d39..b08a90a 100644 --- a/configure.ac +++ b/configure.ac -@@ -311,7 +311,10 @@ fi +@@ -295,7 +295,10 @@ fi AC_SUBST(ALSA_DEPLIBS) dnl Check for headers --AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h]) -+AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h], +-AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h]) ++AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h], + dnl Make sure wordexp is supported by the C library + AC_CHECK_FUNCS([wordexp]) +) @@ -34,7 +34,7 @@ index b8353a0..773b72f 100644 dnl Check for resmgr support... AC_MSG_CHECKING(for resmgr support) diff --git a/src/userfile.c b/src/userfile.c -index 3a73836..b8ce809 100644 +index 72779da..e9d13e6 100644 --- a/src/userfile.c +++ b/src/userfile.c @@ -32,7 +32,7 @@ @@ -47,5 +47,5 @@ index 3a73836..b8ce809 100644 #include <assert.h> int snd_user_file(const char *file, char **result) -- -1.9.1 +2.6.4 diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch new file mode 100644 index 000000000..161619b27 --- /dev/null +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch @@ -0,0 +1,183 @@ +From 7dcf46969e85c881c901df4b49309e9091cad16a Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <armccurdy@gmail.com> +Date: Tue, 9 Feb 2016 14:01:18 -0800 +Subject: [PATCH] avoid including <sys/poll.h> directly + +Fixes compiler warnings when building with musl libc. + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +--- + aserver/aserver.c | 2 +- + include/asoundlib-head.h | 2 +- + include/asoundlib.h | 2 +- + include/local.h | 2 +- + src/control/control.c | 2 +- + src/control/control_shm.c | 2 +- + src/pcm/pcm_direct.c | 2 +- + src/pcm/pcm_mmap.c | 2 +- + src/pcm/pcm_share.c | 2 +- + src/pcm/pcm_shm.c | 2 +- + src/seq/seq.c | 2 +- + src/shmarea.c | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/aserver/aserver.c b/aserver/aserver.c +index 1579da7..ef64248 100644 +--- a/aserver/aserver.c ++++ b/aserver/aserver.c +@@ -20,7 +20,7 @@ + + #include <sys/shm.h> + #include <sys/socket.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/un.h> + #include <sys/uio.h> + #include <stdio.h> +diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h +index 1ec611e..21e32c6 100644 +--- a/include/asoundlib-head.h ++++ b/include/asoundlib-head.h +@@ -35,6 +35,6 @@ + #include <string.h> + #include <fcntl.h> + #include <assert.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <errno.h> + #include <stdarg.h> +diff --git a/include/asoundlib.h b/include/asoundlib.h +index 3c2766e..a546194 100644 +--- a/include/asoundlib.h ++++ b/include/asoundlib.h +@@ -35,7 +35,7 @@ + #include <string.h> + #include <fcntl.h> + #include <assert.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <errno.h> + #include <stdarg.h> + #include <endian.h> +diff --git a/include/local.h b/include/local.h +index b429f5d..e05898f 100644 +--- a/include/local.h ++++ b/include/local.h +@@ -47,7 +47,7 @@ + #error Header defining endianness not defined + #endif + #include <stdarg.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/types.h> + #include <errno.h> + #include <linux/types.h> +diff --git a/src/control/control.c b/src/control/control.c +index 4a28cf6..071c5db 100644 +--- a/src/control/control.c ++++ b/src/control/control.c +@@ -48,7 +48,7 @@ and IEC958 structure. + #include <string.h> + #include <fcntl.h> + #include <signal.h> +-#include <sys/poll.h> ++#include <poll.h> + #include "control_local.h" + + /** +diff --git a/src/control/control_shm.c b/src/control/control_shm.c +index bd07d4a..9a2e268 100644 +--- a/src/control/control_shm.c ++++ b/src/control/control_shm.c +@@ -27,7 +27,7 @@ + #include <fcntl.h> + #include <sys/shm.h> + #include <sys/socket.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/un.h> + #include <sys/uio.h> + #include <sys/mman.h> +diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c +index fd3877c..52ac093 100644 +--- a/src/pcm/pcm_direct.c ++++ b/src/pcm/pcm_direct.c +@@ -30,7 +30,7 @@ + #include <grp.h> + #include <sys/ioctl.h> + #include <sys/mman.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/shm.h> + #include <sys/sem.h> + #include <sys/wait.h> +diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c +index 5c4fbe1..2cfa7db 100644 +--- a/src/pcm/pcm_mmap.c ++++ b/src/pcm/pcm_mmap.c +@@ -22,7 +22,7 @@ + #include <stdio.h> + #include <malloc.h> + #include <string.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/mman.h> + #ifdef HAVE_SYS_SHM_H + #include <sys/shm.h> +diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c +index 5d8aaf2..21a57fc 100644 +--- a/src/pcm/pcm_share.c ++++ b/src/pcm/pcm_share.c +@@ -34,7 +34,7 @@ + #include <signal.h> + #include <math.h> + #include <sys/socket.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <pthread.h> + #include "pcm_local.h" + +diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c +index a815ac6..4ee958c 100644 +--- a/src/pcm/pcm_shm.c ++++ b/src/pcm/pcm_shm.c +@@ -36,7 +36,7 @@ + #include <sys/ioctl.h> + #include <sys/shm.h> + #include <sys/socket.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/un.h> + #include <sys/mman.h> + #include <netinet/in.h> +diff --git a/src/seq/seq.c b/src/seq/seq.c +index 620ca3f..681cef1 100644 +--- a/src/seq/seq.c ++++ b/src/seq/seq.c +@@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev) + + */ + +-#include <sys/poll.h> ++#include <poll.h> + #include "seq_local.h" + + /**************************************************************************** +diff --git a/src/shmarea.c b/src/shmarea.c +index 9843aa8..eaa71f0 100644 +--- a/src/shmarea.c ++++ b/src/shmarea.c +@@ -27,7 +27,7 @@ + #include <malloc.h> + #include <string.h> + #include <errno.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/mman.h> + #include <sys/shm.h> + #include "list.h" +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb index 730f42740..a73da2882 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb @@ -16,10 +16,11 @@ ARM_INSTRUCTION_SET = "arm" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ file://Check-if-wordexp-function-is-supported.patch \ - file://0001-build-Do-not-try-to-detect-cross-compiler.patch \ + file://avoid-including-sys-poll.h-directly.patch \ + file://0001-topology-Add-missing-include-sys-stat.h.patch \ " -SRC_URI[md5sum] = "de67e0eca72474d6b1121037dafe1024" -SRC_URI[sha256sum] = "73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0" +SRC_URI[md5sum] = "69515ca73c3c4a212ef45160dea846c1" +SRC_URI[sha256sum] = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15" inherit autotools pkgconfig @@ -32,7 +33,6 @@ EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc" FILES_${PN} += "${libdir}/${BPN}/smixer/*.so" -FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug" FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la" FILES_libasound = "${libdir}/libasound.so.*" FILES_alsa-server = "${bindir}/*" diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch deleted file mode 100644 index c70c72cb7..000000000 --- a/yocto-poky/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 <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- -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 <unistd.h> - - #include <sys/ipc.h> -+#include <sys/select.h> - #include <sys/shm.h> - #include <sys/stat.h> - #include <sys/stat.h> --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch deleted file mode 100644 index e5199fb85..000000000 --- a/yocto-poky/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 <tanu.kaskinen@linux.intel.com> -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 <tanu.kaskinen@linux.intel.com> ---- - 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/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch new file mode 100644 index 000000000..8e5b6a2a2 --- /dev/null +++ b/yocto-poky/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 <tanuk@iki.fi> +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 <tanuk@iki.fi> +--- + 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 <stdio.h> + #include <alsa/asoundlib.h> + #include <alsa/pcm_rate.h> +-- +2.7.0.rc3 + diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb index c928618c8..fec657530 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "ALSA Plugins" +SUMMARY = "ALSA Plugins" HOMEPAGE = "http://alsa-project.org" SECTION = "multimedia" @@ -8,21 +8,23 @@ SECTION = "multimedia" # 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. +# 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=19;md5=f3d3ce0b189846a486517d97a854b276 \ + file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \ " -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 = "\ + ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \ + file://0001-pph-include-config.h-from-rate_speexrate.c.patch \ " -SRC_URI[md5sum] = "a66797b4471e3cbe96575207bfbe252c" -SRC_URI[sha256sum] = "325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532" +SRC_URI[md5sum] = "b123e42ed881b9adbc99e4040f257c39" +SRC_URI[sha256sum] = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee" DEPENDS += "alsa-lib" @@ -87,8 +89,6 @@ 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" -FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" - # 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 diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch index 59391d690..319f25d27 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -20,7 +20,7 @@ diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile --- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800 +++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800 @@ -1,8 +1,8 @@ - VERSION = 1.0.29 + VERSION = 1.1.0 TOP = . -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ +SUBDIRS = as10k1 envy24control \ diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch index c95760961..9bd6848ed 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch @@ -14,7 +14,7 @@ index 2457a1c..72346d9 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ - VERSION = 1.0.29 + VERSION = 1.1.0 TOP = . -SUBDIRS = as10k1 envy24control \ - mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb index fdf396e3f..9e633f1f7 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb @@ -16,8 +16,8 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ file://0001-as10k1-Make-output_tram_line-static-inline.patch \ " -SRC_URI[md5sum] = "f339a3cd24f748c9d007bdff0e98775b" -SRC_URI[sha256sum] = "94abf0ab5a73f0710c70d4fb3dc1003af5bae2d2ed721d59d245b41ad0f2fbd1" +SRC_URI[md5sum] = "b476a5afaa3ea3230855553ad59d259d" +SRC_URI[sha256sum] = "7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51" inherit autotools-brokensep pkgconfig diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.0.bb index a98f9b90b..a98f9b90b 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.0.bb diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsabat-rename-to-avoid-naming-conflict.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsabat-rename-to-avoid-naming-conflict.patch new file mode 100644 index 000000000..b6d7d4f0d --- /dev/null +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsabat-rename-to-avoid-naming-conflict.patch @@ -0,0 +1,153 @@ +From 28c29dece6c434e7d3d01e805555ba7ddf6fba65 Mon Sep 17 00:00:00 2001 +From: "Lu, Han" <han.lu@intel.com> +Date: Wed, 3 Feb 2016 14:20:33 +0800 +Subject: [PATCH] alsabat: rename to avoid naming conflict + +alsa-utils as well as bareos-bat (as well a some Bacula packages) +all contain a program called /usr/bin/bat, which causes conflicts on +various distributions ("basic audio tester" vs "bareos administration +tool"("bacula administration tool")). +Rename to avoid conflict. + +Signed-off-by: Lu, Han <han.lu@intel.com> +Signed-off-by: Takashi Iwai <tiwai@suse.de> + +Upstream-Status: Accepted [expected in version 1.1.1] + +Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> +--- + bat/Makefile.am | 10 +++++----- + bat/{bat.1 => alsabat.1} | 43 ++++++++++++++++++++++--------------------- + bat/bat.c | 2 +- + 3 files changed, 28 insertions(+), 27 deletions(-) + rename bat/{bat.1 => alsabat.1} (72%) + +diff --git a/bat/Makefile.am b/bat/Makefile.am +index 842ae6b..985f00c 100644 +--- a/bat/Makefile.am ++++ b/bat/Makefile.am +@@ -1,9 +1,9 @@ +-bin_PROGRAMS = bat +-man_MANS = bat.1 ++bin_PROGRAMS = alsabat ++man_MANS = alsabat.1 + +-EXTRA_DIST = bat.1 ++EXTRA_DIST = alsabat.1 + +-bat_SOURCES = \ ++alsabat_SOURCES = \ + bat.c \ + common.c \ + analyze.c \ +@@ -21,4 +21,4 @@ noinst_HEADERS = \ + AM_CPPFLAGS = \ + -Wall -I$(top_srcdir)/include + +-bat_LDADD = @FFTW_LIB@ ++alsabat_LDADD = @FFTW_LIB@ +diff --git a/bat/bat.1 b/bat/alsabat.1 +similarity index 72% +rename from bat/bat.1 +rename to bat/alsabat.1 +index e00fc27..8d0b9c0 100644 +--- a/bat/bat.1 ++++ b/bat/alsabat.1 +@@ -1,23 +1,23 @@ +-.TH BAT 1 "20th October 2015" ++.TH ALSABAT 1 "20th October 2015" + .SH NAME +-bat \- command\-line sound tester for ALSA sound card driver ++alsabat \- command\-line sound tester for ALSA sound card driver + + .SH SYNOPSIS +-\fBbat\fP [\fIflags\fP] ++\fBalsabat\fP [\fIflags\fP] + + .SH DESCRIPTION +-\fBBAT(Basic Audio Tester)\fP is a simple command\-line utility intended +-to help automate audio driver and sound server testing with little human +-interaction. BAT can be used to test audio quality, stress test features +-and test audio before and after PM state changes. ++\fBALSABAT(ALSA Basic Audio Tester)\fP is a simple command\-line utility ++intended to help automate audio driver and sound server testing with little ++human interaction. ALSABAT can be used to test audio quality, stress test ++features and test audio before and after PM state changes. + +-BAT's design is relatively simple. BAT plays an audio stream and captures +-the same stream in either a digital or analog loop back. It then compares +-the captured stream using a FFT to the original to determine if the test +-case passes or fails. ++ALSABAT's design is relatively simple. ALSABAT plays an audio stream and ++captures the same stream in either a digital or analog loop back. It then ++compares the captured stream using a FFT to the original to determine if ++the test case passes or fails. + +-BAT can either run wholly on the target machine being tested (standalone +-mode) or can run as a client/server mode where by bat client runs on the ++ALSABAT can either run wholly on the target machine being tested (standalone ++mode) or can run as a client/server mode where by alsabat client runs on the + target and runs as a server on a separate tester machine. The client/server + mode still requires some manual interaction for synchronization, but this + is actively being developed for future releases. +@@ -93,8 +93,8 @@ Frequencies with amplitude larger than threshold will be recognized as a + peak, and the frequency with largest peak value will be recognized as a + detected frequency. + .br +-BAT then compares the detected frequency to target frequency, to decide +-if the detecting passes or fails. ++ALSABAT then compares the detected frequency to target frequency, to ++decide if the detecting passes or fails. + .br + The default value is 3.0. + .TP +@@ -117,18 +117,19 @@ Target WAV file to save capture test content. + .TP + \fI\-\-local\fP + Internal loopback mode. +-Playback, capture and analysis internal to BAT only. This is intended for +-developers to test new BAT features as no audio is routed outside of BAT. ++Playback, capture and analysis internal to ALSABAT only. This is intended ++for developers to test new ALSABAT features as no audio is routed outside ++of ALSABAT. + + .SH EXAMPLES + + .TP +-\fBbat \-P plughw:0,0 \-C plughw:0,0 \-c 2 \-f S32_LE \-F 250\fR ++\fBalsabat \-P plughw:0,0 \-C plughw:0,0 \-c 2 \-f S32_LE \-F 250\fR + Generate and play a sine wave of 250 Hertz with 2 channel and S32_LE format, + and then capture and analyze. + + .TP +-\fBbat \-P plughw:0,0 \-C plughw:0,0 \-\-file 500Hz.wav\fR ++\fBalsabat \-P plughw:0,0 \-C plughw:0,0 \-\-file 500Hz.wav\fR + Play the RIFF WAV file "500Hz.wav" which contains 500 Hertz waveform LPCM + data, and then capture and analyze. + +@@ -152,7 +153,7 @@ Currently only support RIFF WAV format with PCM data. Please report any bugs to + the alsa-devel mailing list. + + .SH AUTHOR +-\fBbat\fP is by Liam Girdwood <liam.r.girdwood@linux.intel.com>, Bernard Gautier +-<bernard.gautier@intel.com> and Han Lu <han.lu@intel.com>. ++\fBalsabat\fP is by Liam Girdwood <liam.r.girdwood@linux.intel.com>, Bernard ++Gautier <bernard.gautier@intel.com> and Han Lu <han.lu@intel.com>. + This document is by Liam Girdwood <liam.r.girdwood@linux.intel.com> and Han Lu + <han.lu@intel.com>. +diff --git a/bat/bat.c b/bat/bat.c +index 086b9fa..ddb60b7 100644 +--- a/bat/bat.c ++++ b/bat/bat.c +@@ -272,7 +272,7 @@ static void test_capture(struct bat *bat) + static void usage(struct bat *bat) + { + fprintf(bat->log, +-_("Usage: bat [-options]...\n" ++_("Usage: alsabat [-options]...\n" + "\n" + " -h, --help this help\n" + " -D pcm device for both playback and capture\n" +-- +2.7.0 + diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch index e99dd515f..e578dfe74 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch @@ -1,4 +1,4 @@ -From 43a56fa36a12f09ccd78b3cf5e6ae197fcab501f Mon Sep 17 00:00:00 2001 +From 8c3e0ef9625066c2bb67ee3d2b8cd37fd44eadac Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Fri, 29 Aug 2014 18:58:56 +0300 Subject: [PATCH] alsactl: don't let systemd unit restore the volume when @@ -12,16 +12,20 @@ Upstream-Status: Pending Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> + +Rebased on 1.1.0. + +Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> --- alsactl/Makefile.am | 7 ++++--- alsactl/alsa-restore.service.in | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am -index 47f06e9..b728c06 100644 +index cac8094..ff865dc 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am -@@ -43,9 +43,10 @@ install-data-hook: +@@ -38,9 +38,10 @@ install-data-hook: endif edit = \ @@ -36,17 +40,17 @@ index 47f06e9..b728c06 100644 alsa-state.service: alsa-state.service.in diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in -index 245a439..b017854 100644 +index 2884098..bac3ccc 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in -@@ -10,6 +10,7 @@ DefaultDependencies=no +@@ -8,6 +8,7 @@ Description=Save/Restore Sound Card State + ConditionPathExists=!@daemonswitch@ + ConditionPathExistsGlob=/dev/snd/control* After=alsa-state.service - Before=shutdown.target - Conflicts=shutdown.target +ConditionPathExists=@localstatedir@/lib/alsa/asound.state [Service] Type=oneshot -- -1.9.1 +2.7.0.rc3 diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch deleted file mode 100644 index 5df004aea..000000000 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch +++ /dev/null @@ -1,48 +0,0 @@ -Upstream-Status: Pending - -aplay/arecord (alsa-utils v1.0.28) cannot interrupt streaming -via CTRL-C. Fixed the issue by reverting buggy patches and -properly handling 'in_aborting' flag in appropriate functions. - -Signed-off-by: Anant Agrawal <Anant_Agrawal@mentor.com> -Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com> - ---- a/aplay/aplay.c 2014-05-19 16:25:14.000000000 +0530 -+++ b/aplay/aplay.c 2014-05-20 15:17:14.364823007 +0530 -@@ -392,14 +392,22 @@ - putchar('\n'); - if (!quiet_mode) - fprintf(stderr, _("Aborted by signal %s...\n"), strsignal(sig)); -- if (handle) -+ if (stream == SND_PCM_STREAM_CAPTURE) { -+ if (fmt_rec_table[file_type].end) { -+ fmt_rec_table[file_type].end(fd); -+ fd = -1; -+ } -+ stream = -1; -+ } -+ if (fd > 1) { -+ close(fd); -+ fd = -1; -+ } -+ if (handle && sig != SIGABRT) { - snd_pcm_abort(handle); -- if (sig == SIGABRT) { -- /* do not call snd_pcm_close() and abort immediately */ - handle = NULL; -- prg_exit(EXIT_FAILURE); - } -- signal(sig, signal_handler); -+ prg_exit(EXIT_FAILURE); - } - - /* call on SIGUSR1 signal. */ -@@ -2096,7 +2104,7 @@ - ssize_t result = count, r; - size_t size; - -- while (count > 0) { -+ while (count > 0 && !in_aborting) { - size = count; - if (size > chunk_bytes - buffer_pos) - size = chunk_bytes - buffer_pos; diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch deleted file mode 100644 index f67283db7..000000000 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch +++ /dev/null @@ -1,34 +0,0 @@ -[PATCH] assume storing is success if not sound card device - -Upstream-Statue: Pending - -Systemd will report failure when run alsa-*, if the machine has not the -sound card. To void this annoyed message, alsa-restore/alsa-state ignore -all the exit codes by prefixing "-" in ExecStart, like: - - alsa-utils-1.0.29$ grep "=-" ./ -r|grep service.in - ./alsactl/alsa-restore.service.in:ExecStart=-@sbindir@/alsactl restore - ./alsactl/alsa-state.service.in:ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon - ./alsactl/alsa-state.service.in:ExecStop=-@sbindir@/alsactl -s kill save_and_quit - lsa-utils-1.0.29$ - -But alsa-store.service.in is missing, and better solution is to ignore -the exit code 19 which means not sound card device, not all exit code - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - alsactl/alsa-store.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/alsactl/alsa-store.service.in b/alsactl/alsa-store.service.in -index f1a56bb..68ca529 100644 ---- a/alsactl/alsa-store.service.in -+++ b/alsactl/alsa-store.service.in -@@ -13,3 +13,4 @@ Before=shutdown.target - Type=oneshot - ExecStart=@sbindir@/alsactl store - StandardOutput=syslog -+SuccessExitStatus=0 19 --- -1.9.1 - diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb index 97fe4b2fe..af4048818 100644 --- a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb +++ b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb @@ -8,17 +8,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ DEPENDS = "alsa-lib ncurses libsamplerate0" PACKAGECONFIG ??= "udev" +PACKAGECONFIG[bat] = "--enable-bat,--disable-bat,fftw" PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev" PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ - file://alsa-utils-aplay-interrupt-signal-handling.patch \ - file://assume-storing-is-success-if-not-sound-card-device.patch \ + file://0001-alsabat-rename-to-avoid-naming-conflict.patch \ " -SRC_URI[md5sum] = "6b289bf874c4c9a63f4b3973093dd404" -SRC_URI[sha256sum] = "5160058f3e14483ced5de919dd473f93932059454530a9b7ef97dcabd6833e9b" +SRC_URI[md5sum] = "b9d6102fbbd0b68040bb77023ed30c0c" +SRC_URI[sha256sum] = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1" # lazy hack. needs proper fixing in gettext.m4, see # http://bugs.openembedded.org/show_bug.cgi?id=2348 @@ -32,7 +32,9 @@ inherit autotools gettext pkgconfig # ipk depends on them. ALSA_UTILS_PKGS = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'alsa-utils-alsabat', '', d)} \ alsa-utils-alsamixer \ + alsa-utils-alsatplg \ alsa-utils-midi \ alsa-utils-aplay \ alsa-utils-amixer \ @@ -50,6 +52,8 @@ PACKAGES += "${ALSA_UTILS_PKGS}" RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}" FILES_${PN} = "" +FILES_alsa-utils-alsabat = "${bindir}/alsabat" +FILES_alsa-utils-alsatplg = "${bindir}/alsatplg" FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" FILES_alsa-utils-amixer = "${bindir}/amixer" FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" @@ -63,7 +67,8 @@ FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" FILES_alsa-utils-alsaloop = "${bindir}/alsaloop" FILES_alsa-utils-alsaucm = "${bindir}/alsaucm" - +SUMMARY_alsa-utils-alsabat = "Command-line sound tester for ALSA sound card driver" +SUMMARY_alsa-utils-alsatplg = "Converts topology text files into binary format for kernel" SUMMARY_alsa-utils-aplay = "Play (and record) sound files using ALSA" SUMMARY_alsa-utils-amixer = "Command-line control for ALSA mixer and settings" SUMMARY_alsa-utils-alsamixer = "ncurses-based control for ALSA mixer and settings" |
