diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia')
26 files changed, 292 insertions, 697 deletions
diff --git a/meta-openembedded/meta-multimedia/README.md b/meta-openembedded/meta-multimedia/README.md index 235c34331b..b7d1248ac7 100644 --- a/meta-openembedded/meta-multimedia/README.md +++ b/meta-openembedded/meta-multimedia/README.md @@ -1,17 +1,17 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: styhead URI: git://git.openembedded.org/meta-openembedded layers: meta-oe -branch: master +branch: styhead -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia][styhead]' in the subject When sending single patches, please use something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][styhead][PATCH' You are encouraged to fork the mirror on github https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like GitLab, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.0.bb index e79bd77a54..8a506af440 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.0.bb @@ -20,7 +20,7 @@ inherit gnomebase features_check vala gobject-introspection gettext systemd # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" -SRC_URI[archive.sha256sum] = "1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f" +SRC_URI[archive.sha256sum] = "5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch new file mode 100644 index 0000000000..fbd145e6b5 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch @@ -0,0 +1,88 @@ +From 070ed35ac5cef8138ed4760582bb72e8d3e136e2 Mon Sep 17 00:00:00 2001 +From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com> +Date: Sun, 25 Aug 2024 08:42:39 +0200 +Subject: [PATCH] Fix compilation on strict POSIX platforms + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Submitted [https://github.com/arkq/bluez-alsa/commit/070ed35ac5cef8138ed4760582bb72e8d3e136e2] +--- + src/main.c | 2 +- + test/mock/mock.c | 2 +- + utils/aplay/aplay.c | 1 + + utils/cli/cli.c | 1 + + utils/rfcomm/rfcomm.c | 1 + + 5 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 96a66aee..eeb80165 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -13,13 +13,13 @@ + #endif + + #include <getopt.h> ++#include <libgen.h> + #include <sched.h> + #include <signal.h> + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> +-#include <string.h> + #include <strings.h> + #include <syslog.h> + #include <time.h> +diff --git a/test/mock/mock.c b/test/mock/mock.c +index 947211a3..0a2f6091 100644 +--- a/test/mock/mock.c ++++ b/test/mock/mock.c +@@ -20,12 +20,12 @@ + #include <assert.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + #include <signal.h> + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> +-#include <string.h> + #include <strings.h> + #include <sys/stat.h> + #include <unistd.h> +diff --git a/utils/aplay/aplay.c b/utils/aplay/aplay.c +index 3de77902..36843e95 100644 +--- a/utils/aplay/aplay.c ++++ b/utils/aplay/aplay.c +@@ -15,6 +15,7 @@ + #include <assert.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + #include <math.h> + #include <poll.h> + #include <pthread.h> +diff --git a/utils/cli/cli.c b/utils/cli/cli.c +index aeeabe58..0338b9e2 100644 +--- a/utils/cli/cli.c ++++ b/utils/cli/cli.c +@@ -13,6 +13,7 @@ + #endif + + #include <getopt.h> ++#include <libgen.h> + #include <stdarg.h> + #include <stdbool.h> + #include <stdint.h> +diff --git a/utils/rfcomm/rfcomm.c b/utils/rfcomm/rfcomm.c +index d01f0810..3dacfd67 100644 +--- a/utils/rfcomm/rfcomm.c ++++ b/utils/rfcomm/rfcomm.c +@@ -15,6 +15,7 @@ + #include <ctype.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + #include <poll.h> + #include <stdbool.h> + #include <stdint.h> diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb index 5007c88fff..f089e036e3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb @@ -1,22 +1,31 @@ SUMMARY = "Bluetooth Audio ALSA Backend" +DESCRIPTION = "\ + BlueALSA is a replacement for BlueZ >= 5, with which one can achieve the \ + same Bluetooth audio profile support as with PulseAudio, but with fewer \ + dependencies and at a lower level in the software stack. It is designed \ + specifically for use on small, low-powered, dedicated audio or audio/visual \ + systems where the high-level audio management features of PulseAudio or \ + PipeWire are not required. \ +" HOMEPAGE = "https://github.com/Arkq/bluez-alsa" +BUGTRACKER = "https://github.com/arkq/bluez-alsa/issues" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8449a4f133a93f6254b496d4fb476e83" +LIC_FILES_CHKSUM = "file://LICENSE;md5=143bc4e73f39cc5e89d6e096ac0315ba" -SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master" +DEPENDS += "alsa-lib bluez5 dbus glib-2.0-native python3-packaging-native sbc" -SRCREV = "dd05a1baa261b94da9ba977b5e3392c8b4dc7a5e" -PV = "4.0.0+git" +SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master \ + file://0001-Use-basename-implementation-from-glib-2.0.patch" -S = "${WORKDIR}/git" +SRCREV = "959573c2cccef5cf074f5b2fa7941abbd699c5f4" -DEPENDS += "alsa-lib bluez5 dbus glib-2.0 sbc" +S = "${WORKDIR}/git" PACKAGECONFIG ??= "aplay cli hcitop ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf" -PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,fdk-aac" +PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf" +PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,fdk-aac" PACKAGECONFIG[aplay] = "--enable-aplay,--disable-aplay" PACKAGECONFIG[cli] = "--enable-cli,--disable-cli" PACKAGECONFIG[coverage] = "--with-coverage,--without-coverage,lcov-native" @@ -25,8 +34,10 @@ PACKAGECONFIG[debug-time] = "--enable-debug-time,--disable-debug-time" PACKAGECONFIG[faststream] = "--enable-faststream,--disable-faststream" PACKAGECONFIG[hcitop] = "--enable-hcitop,--disable-hcitop,libbsd ncurses" PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" +PACKAGECONFIG[midi] = "--enable-midi,--disable-midi" PACKAGECONFIG[mp3lame] = "--enable-mp3lame,--disable-mp3lame,lame" PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123,mpg123" +PACKAGECONFIG[msbc] = "--enable-msbc,--disable-msbc,spandsp" PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono,ofono" PACKAGECONFIG[payloadcheck] = "--enable-payloadcheck,--disable-payloadcheck" PACKAGECONFIG[rfcomm] = "--enable-rfcomm,--disable-rfcomm" @@ -35,9 +46,10 @@ PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd PACKAGECONFIG[test] = "--enable-test,--disable-test,libcheck libsndfile1" PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,,upower" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig python3native systemd -EXTRA_OECONF = " \ +# These proprietary codecs are not available in Yocto +EXTRA_OECONF = "\ --disable-aptx \ --disable-lc3plus \ --disable-ldac \ @@ -45,10 +57,11 @@ EXTRA_OECONF = " \ " PACKAGE_BEFORE_PN = "${PN}-aplay" -RRECOMMENDS:${PN} = "${PN}-aplay" -FILES:${PN}-aplay = "${bindir}/bluealsa-aplay" -FILES:${PN} += "${libdir}/alsa-lib/*" +FILES:${PN}-aplay += "${bindir}/bluealsa-aplay" +FILES:${PN} += "${libdir}/alsa-lib/* ${datadir}/dbus-1/system.d" + +RRECOMMENDS:${PN} = "${PN}-aplay" SYSTEMD_PACKAGES += "${PN}-aplay" SYSTEMD_SERVICE:${PN} = "bluealsa.service" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.3.bb index 4e8412303b..6b7f3090a3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.3.bb @@ -6,8 +6,8 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669" -SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;branch=master" -SRCREV = "805d9e5a8ffce3ef78cebde4bfedf3642907b2d3" +SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;nobranch=1" +SRCREV = "e9986de7f4264940af6fa1df1498fd2754077de4" S = "${WORKDIR}/git" @@ -15,3 +15,6 @@ DEPENDS:append:x86 = " nasm-native" DEPENDS:append:x86-64 = " nasm-native" inherit meson pkgconfig + +# RVV assembler routines are not yet available for RISCV32 +EXTRA_OEMESON:append:riscv32 = " -Denable_asm=false" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch new file mode 100644 index 0000000000..899ef26637 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch @@ -0,0 +1,79 @@ +From c71d844f5639ea447b9f795a4db5b5d43f0de814 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Jul 2024 21:41:24 -0700 +Subject: [PATCH] Remove defining 'const' as nothing + +This is a hack to override constness of struct members +however, with modern compiler like clang with fortified +glibc ( 2.40+ ) headers this runs into compiler errors + +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:38:54: error: pass_object_size attribute only applies to constant pointer arguments +| 38 | __fortify_clang_overload_arg (char *, __restrict, __resolved))) +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:73:43: error: pass_object_size attribute only applies to constant pointer arguments +| 73 | __fortify_clang_overload_arg (char *, ,__buf), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:91:55: error: pass_object_size attribute only applies to constant pointer arguments +| 91 | __NTH (wctomb (__fortify_clang_overload_arg (char *, ,__s), wchar_t __wchar)) +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:129:71: error: pass_object_size attribute only applies to constant pointer arguments +| 129 | __NTH (mbstowcs (__fortify_clang_overload_arg (wchar_t *, __restrict, __dst), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:159:68: error: pass_object_size attribute only applies to constant pointer arguments +| 159 | __NTH (wcstombs (__fortify_clang_overload_arg (char *, __restrict, __dst), +| | ^ +| 5 errors generated. +| + +Therefore take this out, instead cast away the 'const' qualifier where needed ( equilly dangerous ) +however limited to just this file instead of apply to all headers including system headers + +Upstream-Status: Submitted [https://github.com/festvox/flite/pull/112] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/find_sts_main.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/tools/find_sts_main.c b/tools/find_sts_main.c +index 3c94449..a5bf8ef 100644 +--- a/tools/find_sts_main.c ++++ b/tools/find_sts_main.c +@@ -41,9 +41,6 @@ + #include <math.h> + #include <string.h> + +-/* To allow some normally const fields to manipulated during building */ +-#define const +- + #include "cst_args.h" + #include "cst_wave.h" + #include "cst_track.h" +@@ -132,16 +129,16 @@ cst_sts *find_sts(cst_wave *sig, cst_track *lpc) + lpc->frames[i],lpc->num_channels, + resd, + size); +- sts[i].size = size; ++ *(int *)(&sts[i].size) = size; + sts[i].frame = cst_alloc(unsigned short,lpc->num_channels-1); + for (j=1; j < lpc->num_channels; j++) +- sts[i].frame[j-1] = (unsigned short) ++ *(unsigned short *)(&sts[i].frame[j-1]) = (unsigned short) + (((lpc->frames[i][j]-lpc_min)/lpc_range)*65535); + if (cst_streq(residual_codec,"ulaw")) + { + sts[i].residual = cst_alloc(unsigned char,size); + for (j=0; j < size; j++) +- sts[i].residual[j] = cst_short_to_ulaw((short)resd[j]); ++ *(unsigned char *)(&sts[i].residual[j]) = cst_short_to_ulaw((short)resd[j]); + } + else if (cst_streq(residual_codec,"g721")) + { +@@ -189,7 +186,7 @@ cst_sts *find_sts(cst_wave *sig, cst_track *lpc) + { + sts[i].residual = cst_alloc(unsigned char,size); + for (j=0; j < size; j++) +- sts[i].residual[j] = cst_short_to_ulaw((short)resd[j]); ++ *(unsigned char *)(&sts[i].residual[j]) = cst_short_to_ulaw((short)resd[j]); + } + else /* Unvoiced frame */ + { diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb index 0a7680a8c4..bb9edfd5bf 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb @@ -9,6 +9,7 @@ inherit autotools-brokensep DEPENDS += "alsa-lib chrpath-replacement-native" SRC_URI = "git://github.com/festvox/flite.git;protocol=https;branch=master" +SRC_URI += "file://0001-Remove-defining-const-as-nothing.patch" SRCREV = "e9e2e37c329dbe98bfeb27a1828ef9a71fa84f88" @@ -25,3 +26,5 @@ do_install:append() { } # | make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop. PARALLEL_MAKE = "" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.2.0.bb index fea14fd840..da2953ef21 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.2.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master" -SRCREV = "2f26e656b16fb86132f27d1f8d47c6055041430d" +SRCREV = "821d364d611dc30b3ef8a5e9beb0bf3e71b25199" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch index c336e92548..0ca2082c03 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch @@ -1,4 +1,4 @@ -From 11cc6dbd45f0880beea64cdc514f57484b90bc39 Mon Sep 17 00:00:00 2001 +From a3e25b6aa9775c43336e30d3b350f54c085a32c8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 20 Feb 2024 18:44:23 -0800 Subject: [PATCH] rpi: Use malloc instead of variable length arrays @@ -8,16 +8,14 @@ Clang-18+ diagnoses this as error | ../git/src/ipa/rpi/controller/rpi/alsc.cpp:499:10: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] | 499 | int xLo[X], xHi[X]; | | ^ -Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040529.html] +Upstream-Status: Denied [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040536.html] Signed-off-by: Khem Raj <raj.khem@gmail.com> - -s --- src/ipa/rpi/controller/rpi/alsc.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ipa/rpi/controller/rpi/alsc.cpp b/src/ipa/rpi/controller/rpi/alsc.cpp -index 8a205c60..a7d42614 100644 +index 67029fc3..6eca9fb7 100644 --- a/src/ipa/rpi/controller/rpi/alsc.cpp +++ b/src/ipa/rpi/controller/rpi/alsc.cpp @@ -496,8 +496,8 @@ void resampleCalTable(const Array2D<double> &calTableIn, @@ -26,8 +24,8 @@ index 8a205c60..a7d42614 100644 */ - int xLo[X], xHi[X]; - double xf[X]; -+ int *xLo = (int*)malloc(X), *xHi = (int*)malloc(X); -+ double *xf = (double*)malloc(X); ++ int *xLo = (int *)malloc(X * sizeof(int)), *xHi = (int *)malloc(X * sizeof(int)); ++ double *xf = (double *)malloc(X * sizeof(double)); double scaleX = cameraMode.sensorWidth / (cameraMode.width * cameraMode.scaleX); double xOff = cameraMode.cropX / (double)cameraMode.sensorWidth; diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb index 93f29c1612..857f565fb7 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb @@ -12,7 +12,7 @@ SRC_URI = " \ git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ file://0001-media_device-Add-bool-return-type-to-unlock.patch \ file://0002-options-Replace-use-of-VLAs-in-C.patch \ - file://0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch \ + file://0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch \ " SRCREV = "aee16c06913422a0ac84ee3217f87a9795e3c2d9" @@ -24,10 +24,11 @@ S = "${WORKDIR}/git" DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" -PACKAGES =+ "${PN}-gst" +PACKAGES =+ "${PN}-gst ${PN}-pycamera" PACKAGECONFIG ??= "" PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[pycamera] = "-Dpycamera=enabled,-Dpycamera=disabled,python3 python3-pybind11" LIBCAMERA_PIPELINES ??= "auto" @@ -71,6 +72,7 @@ do_package_recalculate_ipa_signatures() { FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so" FILES:${PN}-gst = "${libdir}/gstreamer-1.0" +FILES:${PN}-pycamera = "${PYTHON_SITEPACKAGES_DIR}/libcamera" # libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to # both 32 and 64 bit file APIs. diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index aabf81dce0..170e676b24 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -11,9 +11,8 @@ inherit gettext autotools-brokensep update-rc.d systemd SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ file://minidlna-daemon.init.d \ file://minidlna.service \ - file://0001-Update-Gettext-version.patch \ file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ - file://0001-configure.ac-drop-non-standard-checks.patch \ + file://0001-Add-compatibility-with-FFMPEG-7.0.patch \ " S = "${WORKDIR}/git" @@ -22,6 +21,10 @@ S = "${WORKDIR}/git" # configure.ac:30: error: required file './ABOUT-NLS' not found EXTRA_AUTORECONF = "" +# Reproducibility: force os-name and os-version to constants to avoid host +# related build differences +EXTRA_OECONF = "--with-os-name='${DISTRO_NAME}' --with-os-version=''" + do_install:append(){ install -d ${D}${sysconfdir} install -m 0755 minidlna.conf ${D}${sysconfdir} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch new file mode 100644 index 0000000000..f9d9c694bc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch @@ -0,0 +1,49 @@ +From 92f8b94c697c225fb31062586f817c4fc3df8c2a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2024 13:22:33 -0700 +Subject: [PATCH] Add compatibility with FFMPEG 7.0 + +channel_layout has been replaced with ch_layout + +Upstream-Status: Submitted [https://sourceforge.net/p/minidlna/git/merge-requests/59/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libav.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/libav.h b/libav.h +index b69752c..a3153bd 100644 +--- a/libav.h ++++ b/libav.h +@@ -58,6 +58,7 @@ + #endif + + #define USE_CODECPAR LIBAVFORMAT_VERSION_INT >= ((57<<16)+(50<<8)+100) ++#define USE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) + + #ifndef FF_PROFILE_H264_BASELINE + #define FF_PROFILE_H264_BASELINE 66 +@@ -174,7 +175,11 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codecpar->codec_tag + #define lav_sample_rate(s) s->codecpar->sample_rate + #define lav_bit_rate(s) s->codecpar->bit_rate ++#if USE_CH_LAYOUT ++#define lav_channels(s) s->codecpar->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codecpar->channels ++#endif + #define lav_width(s) s->codecpar->width + #define lav_height(s) s->codecpar->height + #define lav_profile(s) s->codecpar->profile +@@ -186,7 +191,11 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codec->codec_tag + #define lav_sample_rate(s) s->codec->sample_rate + #define lav_bit_rate(s) s->codec->bit_rate ++#if USE_CH_LAYOUT ++#define lav_channels(s) s->codec->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codec->channels ++#endif + #define lav_width(s) s->codec->width + #define lav_height(s) s->codec->height + #define lav_profile(s) s->codec->profile diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch deleted file mode 100644 index 6100da3581..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 -From: Baptiste Durand <baptiste.durand@gmail.com> -Date: Sun, 9 Sep 2018 20:50:41 +0200 -Subject: [PATCH] Update Gettext version - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Baptiste Durand <baptiste.durand@gmail.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ - # License along with MiniDLNA; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. --AC_INIT(MiniDLNA,1.1.3,,minidlna) -+AC_INIT(MiniDLNA,1.2.1,,minidlna) - #LT_INIT - - AC_CANONICAL_TARGET -@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC - - AM_ICONV - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION(0.18) -+AM_GNU_GETTEXT_VERSION(0.20) - - # Checks for programs. - AC_PROG_AWK diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch deleted file mode 100644 index 93334b7dab..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 83425344b2d7339e8f5b0ad230c51278d330d613 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Sat, 22 Jan 2022 11:41:50 +0100 -Subject: [PATCH] configure.ac: drop non-standard checks - -Not sure what upstream is trying to do here but it does not work -with the latest autoconf. - -Upstream-Status: Inactive-Upstream -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aa7dd1c..858db52 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -418,7 +418,6 @@ for dir in "" /usr/local $SEARCH_DIR; do - AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue]) - break - done --test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag]) - AC_SUBST(LIBID3TAG_LIBS) - - LDFLAGS_SAVE="$LDFLAGS" -@@ -444,10 +443,6 @@ for dir in "" /usr/local $SEARCH_DIR; do - [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])]) - break - done --if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" && -- test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then -- AC_MSG_ERROR([Could not find libavformat - part of ffmpeg]) --fi - AC_SUBST(LIBAVFORMAT_LIBS) - - AC_CHECK_LIB(pthread, pthread_create) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb index 4238918c97..da0d90a993 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb @@ -1,4 +1,4 @@ require ${BPN}.inc -SRCREV = "109d63cb11ac207c18a784556834eb054b34b00b" +SRCREV = "1a9b32ee7a1c89e54e9f148199b73f9b33ad45ba" LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb index 2746c6bb80..2746c6bb80 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb index 93df25ee2f..93df25ee2f 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch deleted file mode 100644 index b2dea331ef..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e62fd0eefe8b475e70d87a673a7216aac3bb622f Mon Sep 17 00:00:00 2001 -From: Markus Volk <f_l_k@t-online.de> -Date: Mon, 20 Nov 2023 17:49:59 +0100 -Subject: [PATCH] patch src_decoder_plugins_FfmpegIo.cxx - -Signed-off-by: Markus Volk <f_l_k@t-online.de> -Upstream-Status: Pending [https://github.com/MusicPlayerDaemon/MPD/issues/1898] ---- - src/decoder/plugins/FfmpegIo.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx -index 572f1a86a..3e2347fec 100644 ---- a/src/decoder/plugins/FfmpegIo.cxx -+++ b/src/decoder/plugins/FfmpegIo.cxx -@@ -25,6 +25,7 @@ - #include "input/InputStream.hxx" - - extern "C" { -+#include <libavutil/error.h> - #include <libavutil/mem.h> - } - --- -2.42.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb index 33155da7d2..f066c405f1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb @@ -18,14 +18,19 @@ DEPENDS += " \ fmt \ " +PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ - file://0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch \ file://mpd.conf.in \ " -SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773" +SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3" S = "${WORKDIR}/git" -EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \ + -Dadplug=disabled \ + -Dsndio=disabled \ + -Dshine=disabled \ + -Dtremor=disabled \ +" PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ alsa ao bzip2 daemon \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 672c8abc9a..618eaa68d1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -51,7 +51,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\ openal-soft \ opusfile \ opus-tools \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ tinyalsa \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.7.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.3.bb index 0c68cc4d28..0a2088a3cd 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.7.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.3.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "59fe89d41a67f6daad086f8f3fe522935be77a3f" -SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https" +SRCREV = "e2a76824e2b112b15ae4a1a3d444696d5526f8d8" +SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.2;protocol=https" S = "${WORKDIR}/git" @@ -72,6 +72,9 @@ EXTRA_OEMESON += " \ # mode but it looks like clang still does CFLAGS:append = " -Wno-typedef-redefinition" +# Specify linking with -latomic on architectures missing 64bit atomics. +LDFLAGS += "${@bb.utils.contains_any('TUNE_FEATURES', 'riscv32 armv5 mips ppc32 m32', '-latomic', '', d)}" + # According to wireplumber documentation only one session manager should be installed at a time # Possible options are media-session, which has fewer dependencies but is very simple, # or wireplumber, which is more powerful. @@ -292,6 +295,7 @@ FILES:${PN}-tools = " \ ${bindir}/pw-cat \ ${bindir}/pw-cli \ ${bindir}/pw-config \ + ${bindir}/pw-container \ ${bindir}/pw-dot \ ${bindir}/pw-dsdplay \ ${bindir}/pw-dump \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch deleted file mode 100644 index 3f2aa60512..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 -From: Thomas Guillem <thomas@gllm.fr> -Date: Tue, 5 Dec 2023 09:23:35 +0100 -Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment - -Fixes #28441 -Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4645] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/input/input_internal.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/input/input_internal.h b/src/input/input_internal.h -index d29731edca1b..ea02f39f5add 100644 ---- a/src/input/input_internal.h -+++ b/src/input/input_internal.h -@@ -117,7 +117,7 @@ typedef struct input_thread_private_t - - /* Title infos FIXME multi-input (not easy) ? */ - int i_title; -- const input_title_t **title; -+ input_title_t * const *title; - - int i_title_offset; - int i_seekpoint_offset; --- -GitLab - - -From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 -From: Zhao Zhili <quinkblack@foxmail.com> -Date: Thu, 1 Mar 2018 14:25:59 +0800 -Subject: [PATCH 2/5] yadif: fix variable type - -Signed-off-by: Thomas Guillem <thomas@gllm.fr> -(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/video_filter/deinterlace/yadif.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h -index 4bc592ba9307..af16443d0804 100644 ---- a/modules/video_filter/deinterlace/yadif.h -+++ b/modules/video_filter/deinterlace/yadif.h -@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 - } - - static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) { -- uint8_t *dst = (uint8_t *)dst8; -- uint8_t *prev = (uint8_t *)prev8; -- uint8_t *cur = (uint8_t *)cur8; -- uint8_t *next = (uint8_t *)next8; -+ uint16_t *dst = (uint16_t *)dst8; -+ uint16_t *prev = (uint16_t *)prev8; -+ uint16_t *cur = (uint16_t *)cur8; -+ uint16_t *next = (uint16_t *)next8; - int x; - uint16_t *prev2= parity ? prev : cur ; - uint16_t *next2= parity ? cur : next; --- -GitLab - - -From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sun, 3 Mar 2019 09:59:10 +0200 -Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion - -(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/video_chroma/swscale.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c -index 8993d11ec5dd..11897527355c 100644 ---- a/modules/video_chroma/swscale.c -+++ b/modules/video_chroma/swscale.c -@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, - { - filter_sys_t *p_sys = p_filter->p_sys; - uint8_t palette[AVPALETTE_SIZE]; -- uint8_t *src[4]; int src_stride[4]; -- uint8_t *dst[4]; int dst_stride[4]; -+ uint8_t *src[4], *dst[4]; -+ const uint8_t *csrc[4]; -+ int src_stride[4], dst_stride[4]; - - GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, - p_src, i_plane_count, b_swap_uvi ); -@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, - GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, - p_dst, i_plane_count, b_swap_uvo ); - -+ for (size_t i = 0; i < ARRAY_SIZE(src); i++) -+ csrc[i] = src[i]; -+ - #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) -- sws_scale( ctx, src, src_stride, 0, i_height, -+ sws_scale( ctx, csrc, src_stride, 0, i_height, - dst, dst_stride ); - #else -- sws_scale_ordered( ctx, src, src_stride, 0, i_height, -+ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, - dst, dst_stride ); - #endif - } --- -GitLab - - -From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sun, 3 Mar 2019 17:20:04 +0200 -Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing - -(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -index a93462925e8a..a85f9aafb0b9 100644 ---- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = - void RegisterCommand( filter_t *p_filter ) - { - filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; -- size_t i_index = 0; - - p_sys->i_commands = ARRAY_SIZE(p_commands); - p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) ); - if( !p_sys->pp_commands ) return; -- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ ) -+ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ ) - { - p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) ); - if( !p_sys->pp_commands[i_index] ) return; --- -GitLab - - -From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Mon, 26 Feb 2018 20:43:03 +0200 -Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption - -Font alpha is 8-bits, not 32-bits. - -(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0) -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -index a85f9aafb0b9..7a71c6f2373a 100644 ---- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end, - skip_space( &psz_command ); - if( isdigit( (unsigned char)*psz_command ) ) - { -- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC ) -+ int32_t value; -+ -+ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC ) - return VLC_EGENERIC; -+ -+ p_params->fontstyle.i_font_alpha = value; - } - return VLC_SUCCESS; - } --- -GitLab - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch deleted file mode 100644 index c9ef33358e..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch +++ /dev/null @@ -1,377 +0,0 @@ -From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Mon, 26 Feb 2018 20:36:29 +0200 -Subject: [PATCH 1/9] chromaprint: missing cast - -(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> -Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4665] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - modules/stream_out/chromaprint.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c -index 80ec31ba2590..c76cbda3c2bb 100644 ---- a/modules/stream_out/chromaprint.c -+++ b/modules/stream_out/chromaprint.c -@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, - if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer ) - { - if(! chromaprint_feed( p_sys->p_chromaprint_ctx, -- p_buf->p_buffer, -+ (int16_t *)p_buf->p_buffer, - p_buf->i_buffer / BYTESPERSAMPLE ) ) - msg_Warn( p_stream, "feed error" ); - id->i_samples -= i_samples; --- -GitLab - - -From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sun, 14 Apr 2019 09:41:38 +0300 -Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt() - -char * can alias anything, and Winsock relies on that. Unfortunately, -the compiler still issues warnings. This works around that. - -(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> ---- - include/vlc_network.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/include/vlc_network.h b/include/vlc_network.h -index 010454a01c09..e39ffd0bacaa 100644 ---- a/include/vlc_network.h -+++ b/include/vlc_network.h -@@ -183,6 +183,22 @@ VLC_API int vlc_close(int); - - /** @} */ - -+#ifdef _WIN32 -+static inline int vlc_getsockopt(int s, int level, int name, -+ void *val, socklen_t *len) -+{ -+ return getsockopt(s, level, name, (char *)val, len); -+} -+#define getsockopt vlc_getsockopt -+ -+static inline int vlc_setsockopt(int s, int level, int name, -+ const void *val, socklen_t len) -+{ -+ return setsockopt(s, level, name, (const char *)val, len); -+} -+#define setsockopt vlc_setsockopt -+#endif -+ - /* Portable network names/addresses resolution layer */ - - #define NI_MAXNUMERICHOST 64 --- -GitLab - - -From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Thu, 7 Dec 2023 15:43:04 +0100 -Subject: [PATCH 3/9] netsync: use char for temporary local buffer - -On Windows recvfrom/revc/sendto expects a char*. ---- - modules/control/netsync.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/modules/control/netsync.c b/modules/control/netsync.c -index 2a6a1a6a2bf8..8c91034d7cf2 100644 ---- a/modules/control/netsync.c -+++ b/modules/control/netsync.c -@@ -181,7 +181,7 @@ static void *Master(void *handle) - intf_sys_t *sys = intf->p_sys; - for (;;) { - struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; -- uint64_t data[2]; -+ char data[16]; - - if (poll(&ufd, 1, -1) < 0) - continue; -@@ -198,8 +198,8 @@ static void *Master(void *handle) - if (master_system < 0) - continue; - -- data[0] = hton64(mdate()); -- data[1] = hton64(master_system); -+ SetQWBE(&data[0], mdate()); -+ SetQWBE(&data[8], master_system); - - /* Reply to the sender */ - sendto(sys->fd, data, 16, 0, -@@ -224,7 +224,7 @@ static void *Slave(void *handle) - - for (;;) { - struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; -- uint64_t data[2]; -+ char data[16]; - - vlc_tick_t system = GetPcrSystem(sys->input); - if (system < 0) -@@ -233,7 +233,7 @@ static void *Slave(void *handle) - /* Send clock request to the master */ - const vlc_tick_t send_date = mdate(); - -- data[0] = hton64(system); -+ SetQWBE(&data[0], system); - send(sys->fd, data, 8, 0); - - /* Don't block */ -@@ -244,8 +244,8 @@ static void *Slave(void *handle) - if (recv(sys->fd, data, 16, 0) < 16) - goto wait; - -- const vlc_tick_t master_date = ntoh64(data[0]); -- const vlc_tick_t master_system = ntoh64(data[1]); -+ const vlc_tick_t master_date = GetQWBE(&data[0]); -+ const vlc_tick_t master_system = GetQWBE(&data[8]); - const vlc_tick_t diff_date = receive_date - - ((receive_date - send_date) / 2 + master_date); - --- -GitLab - - -From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Tue, 3 Jan 2023 13:23:00 +0100 -Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module - -So that we don't have to include search.h each time vlc_fixups.h is used. - -The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*. - -(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> ---- - include/vlc_fixups.h | 3 +++ - modules/access/dtv/access.c | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h -index 37f788933779..861cb4cc5063 100644 ---- a/include/vlc_fixups.h -+++ b/include/vlc_fixups.h -@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void - void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); - void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); - void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); -+#ifndef _WIN32 -+/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */ - void *lfind( const void *key, const void *base, size_t *nmemb, - size_t size, int(*cmp)(const void *, const void *) ); -+#endif - #endif /* HAVE_SEARCH_H */ - #ifndef HAVE_TDESTROY - void tdestroy( void *root, void (*free_node)(void *nodep) ); -diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c -index d9756c7b4885..c6ca5005883c 100644 ---- a/modules/access/dtv/access.c -+++ b/modules/access/dtv/access.c -@@ -32,6 +32,11 @@ - #ifdef HAVE_SEARCH_H - #include <search.h> - #endif -+#if defined(_WIN32) -+/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */ -+# define lfind(a,b,c,d,e) \ -+ lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e)) -+#endif - - #include "dtv/dtv.h" - --- -GitLab - - -From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Mon, 15 Jul 2019 12:41:29 +0200 -Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use - const on source pointer - -(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> ---- - include/vlc_common.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/include/vlc_common.h b/include/vlc_common.h -index 8090b277150d..089878581763 100644 ---- a/include/vlc_common.h -+++ b/include/vlc_common.h -@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw) - # define O_NONBLOCK 0 - # endif - -+/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a -+ const void* */ -+# define swab(a,b,c) swab((char*) (a), (char*) (b), (c)) -+ -+ - # include <tchar.h> - #endif /* _WIN32 */ - --- -GitLab - - -From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Wed, 10 Jul 2019 08:23:45 +0200 -Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const - -lavc expects a pointer that it will free in avcodec_free_context(). - -(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> ---- - modules/codec/avcodec/encoder.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c -index 2b1c3604713d..4919ccf0e0e4 100644 ---- a/modules/codec/avcodec/encoder.c -+++ b/modules/codec/avcodec/encoder.c -@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this ) - - if ( p_sys->b_mpeg4_matrix ) - { -- p_context->intra_matrix = mpeg4_default_intra_matrix; -- p_context->inter_matrix = mpeg4_default_non_intra_matrix; -+ p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) ); -+ if ( p_context->intra_matrix ) -+ memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix, -+ sizeof(mpeg4_default_intra_matrix)); -+ p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) ); -+ if ( p_context->inter_matrix ) -+ memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix, -+ sizeof(mpeg4_default_non_intra_matrix)); - } - - if ( p_sys->b_pre_me ) --- -GitLab - - -From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Thu, 7 Dec 2023 14:18:22 +0100 -Subject: [PATCH 7/9] smb: fix potential string to wide string copy - -The type of net_resource depends on the UNICODE define. ---- - modules/access/smb.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/access/smb.c b/modules/access/smb.c -index 5fe56f0c9dfe..6add2a3e6278 100644 ---- a/modules/access/smb.c -+++ b/modules/access/smb.c -@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, - const char *psz_pwd, const char *psz_domain ) - { - char psz_remote[MAX_PATH]; -- NETRESOURCE net_resource; -+ NETRESOURCEA net_resource; - DWORD i_result; - VLC_UNUSED( psz_domain ); - -@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, - - net_resource.lpRemoteName = psz_remote; - -- i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); -+ i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 ); - - if( i_result != NO_ERROR ) - { --- -GitLab - - -From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Wed, 6 Dec 2023 14:45:46 +0100 -Subject: [PATCH 8/9] dxva2: add missing mask initializers - ---- - modules/codec/avcodec/dxva2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c -index 18b872fe0fe3..2e6809a05410 100644 ---- a/modules/codec/avcodec/dxva2.c -+++ b/modules/codec/avcodec/dxva2.c -@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, - - /* XXX Preferred format must come first */ - static const d3d9_format_t d3d_formats[] = { -- { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, -- { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, -- //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 }, -- { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 }, -+ { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 }, -+ { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 }, -+ //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 }, -+ { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 }, - -- { NULL, 0, 0 } -+ { NULL, 0, 0, 0,0,0 } - }; - - static const d3d9_format_t *D3dFindFormat(D3DFORMAT format) --- -GitLab - - -From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Wed, 6 Dec 2023 07:48:29 +0100 -Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function - pointers - ---- - src/text/url.c | 3 ++- - src/win32/plugin.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/text/url.c b/src/text/url.c -index b962eb31f849..2eb4b8d10817 100644 ---- a/src/text/url.c -+++ b/src/text/url.c -@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size) - int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int); - int ret = 0; - -- IdnToAsciiReal = GetProcAddress(h, "IdnToAscii"); -+ IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int)) -+ GetProcAddress(h, "IdnToAscii"); - if (IdnToAsciiReal != NULL) - ret = IdnToAsciiReal(flags, str, len, buf, size); - else -diff --git a/src/win32/plugin.c b/src/win32/plugin.c -index 1a65521fca75..b5c336eb99ca 100644 ---- a/src/win32/plugin.c -+++ b/src/win32/plugin.c -@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) - - BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *); - -- SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode"); -+ SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *)) -+ GetProcAddress(h, "SetThreadErrorMode"); - if (SetThreadErrorModeReal != NULL) - return SetThreadErrorModeReal(mode, oldmode); - --- -GitLab - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb index 2a6b27add0..2d2ecc63b9 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb @@ -25,11 +25,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \ file://0006-configure-Disable-incompatible-function-pointer-type.patch \ file://taglib-2.patch \ file://0001-taglib-Fix-build-on-x86-32-bit.patch \ - file://4645.patch \ - file://4665.patch \ " -SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" - +SRC_URI[sha256sum] = "24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0" inherit autotools-brokensep features_check gettext pkgconfig mime-xdg REQUIRED_DISTRO_FEATURES = "x11" @@ -135,3 +132,5 @@ FILES:${PN}-staticdev += "\ INSANE_SKIP:${PN} = "dev-so" EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" + +SKIP_RECIPE[vlc] = "requires porting to ffmpeg >= 7 as of ffmpeg >= 5 it requires extensive changes disabling VAAPI (only supported with vlc >= 4)" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.6.bb index c52f22aada..7c308bd485 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.6.bb @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ " -SRCREV = "65e4ae83b994616401fc5859e00d5051b72518ba" +SRCREV = "141b2d5d3f793e20f94421c554d8d9c51143ce0d" SRC_URI = " \ git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ file://90-OE-disable-session-dbus-dependent-features.lua \ diff --git a/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb b/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb index 8ffe652b22..0b90bc0db9 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb @@ -20,7 +20,8 @@ SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;b file://0001-screencast-Fix-build-with-older-mesa.patch" S = "${WORKDIR}/git" -SRCREV = "776113a4f014639c29d8de8fcb513493ef7b491f" +PV .= "+git" +SRCREV = "d9ada849aeca6137915de2df69beaef4e272cc1d" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)}" |