diff options
Diffstat (limited to 'poky/meta/recipes-multimedia')
-rw-r--r-- | poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc | 3 | ||||
-rw-r--r-- | poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc | 3 | ||||
-rw-r--r-- | poky/meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb (renamed from poky/meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 3 | ||||
-rw-r--r-- | poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch | 71 | ||||
-rw-r--r-- | poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb | 1 | ||||
-rw-r--r-- | poky/meta/recipes-multimedia/x264/x264_git.bb | 2 |
7 files changed, 78 insertions, 7 deletions
diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc index dba96e0f6..cb1c9aaec 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc @@ -45,6 +45,3 @@ EXTRA_OEMESON += " \ GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" - -# Dynamically generate packages for all enabled plugins -PACKAGES_DYNAMIC = "^${PN}-.*" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc index 9a7a1b6af..5b80a46b4 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc @@ -6,6 +6,9 @@ # This is mainly used by the gstreamer1.0-plugins-* plugin set recipes, # but can be used in any recipe that produces GStreamer plugins. +# Dynamically generate packages for all enabled plugins +PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*" + PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages " PACKAGESPLITFUNCS_append = " set_gstreamer10_metapkg_rdepends " diff --git a/poky/meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb b/poky/meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb index 143a59ba6..ebe11d413 100644 --- a/poky/meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb +++ b/poky/meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb @@ -10,7 +10,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" -SRC_URI[sha256sum] = "e49466853685026da5d113dc7ff026b1b2ad0b57d78df693a446add9db88a7d5" +SRC_URI[sha256sum] = "7eefd4b68fdac7e138d04c37efe12155a8ebf25a5bccf0fb7e775af22d21db00" UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 005cb36b8..4e226c616 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -182,8 +182,7 @@ FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" -FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" -FILES_${PN}-conf = "${sysconfdir}" +FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" FILES_${PN}-pa-info = "${bindir}/pa-info" FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch new file mode 100644 index 000000000..5d9370fb1 --- /dev/null +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch @@ -0,0 +1,71 @@ +From 09f846fbdeb19193e778ce51baa77bd03c38372e Mon Sep 17 00:00:00 2001 +From: garrison <garrison@qemu15.qemu-network> +Date: Fri, 4 Jun 2021 22:13:02 +0000 +Subject: [PATCH] build-sys: meson: check if NEON code can be compiled on arm + +When Meson SIMD module returns HAVE_NEON=1 on arm host, do extra compile check +to verify compiler can actually handle NEON code. + +Related Meson issue #6361 https://github.com/mesonbuild/meson/issues/6361 + +Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/574> + +Upstream-Status: Backport[https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/6d2a49a6a1eacc2096d0d9473a074421c181ab56] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/pulsecore/meson.build | 41 +++++++++++++++++++++++++++++---------- + 1 file changed, 31 insertions(+), 10 deletions(-) + +diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build +index 99a702e..d0b7990 100644 +--- a/src/pulsecore/meson.build ++++ b/src/pulsecore/meson.build +@@ -172,16 +172,37 @@ endif + + # FIXME: SIMD support (ORC) + simd = import('unstable-simd') +-libpulsecore_simd = simd.check('libpulsecore_simd', +- mmx : ['remap_mmx.c', 'svolume_mmx.c'], +- sse : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'], +- neon : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'], +- c_args : [pa_c_args], +- include_directories : [configinc, topinc], +- implicit_include_directories : false, +- compiler : cc) +-libpulsecore_simd_lib = libpulsecore_simd[0] +-cdata.merge_from(libpulsecore_simd[1]) ++simd_variants = [ ++ { 'mmx' : ['remap_mmx.c', 'svolume_mmx.c'] }, ++ { 'sse' : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'] }, ++ { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] }, ++] ++ ++libpulsecore_simd_lib = [] ++ ++foreach simd_kwargs : simd_variants ++ ++ if host_machine.cpu_family() == 'arm' and 'neon' in simd_kwargs ++ if not cc.compiles(''' ++ #include <arm_neon.h> ++ int main() { ++ return sizeof(uint8x8_t) + sizeof(int32x4_t) + sizeof(float32x4_t); ++ } ++ ''', name : 'neon code') ++ continue ++ endif ++ endif ++ ++ libpulsecore_simd = simd.check('libpulsecore_simd', ++ kwargs : simd_kwargs, ++ c_args : [pa_c_args], ++ include_directories : [configinc, topinc], ++ implicit_include_directories : false, ++ compiler : cc) ++ ++ libpulsecore_simd_lib += libpulsecore_simd[0] ++ cdata.merge_from(libpulsecore_simd[1]) ++endforeach + + # FIXME: Implement Windows support + #'mutex-win32.c', diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb index 9b8338a66..a7ea8cacc 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb @@ -7,6 +7,7 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-meson-Check-for-__get_cpuid.patch \ file://volatiles.04_pulse \ file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ + file://0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch \ " SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8" SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1" diff --git a/poky/meta/recipes-multimedia/x264/x264_git.bb b/poky/meta/recipes-multimedia/x264/x264_git.bb index 81354a8fd..902396e4b 100644 --- a/poky/meta/recipes-multimedia/x264/x264_git.bb +++ b/poky/meta/recipes-multimedia/x264/x264_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "55d517bc4569272a2c9a367a4106c234aba2ffbc" +SRCREV = "5db6aa6cab1b146e07b60cc1736a01f21da01154" PV = "r3039+git${SRCPV}" |