summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta-multimedia')
-rwxr-xr-xmeta-multimedia/conf/include/non-repro-meta-multimedia.inc15
-rw-r--r--meta-multimedia/conf/layer.conf2
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch32
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb1
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch32
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb2
-rw-r--r--meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb (renamed from meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb)15
-rw-r--r--meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb (renamed from meta-multimedia/recipes-dvb/oscam/oscam_svn.bb)8
-rw-r--r--meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb (renamed from meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.1.bb)2
-rw-r--r--meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb2
-rw-r--r--meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb2
-rw-r--r--meta-multimedia/recipes-multimedia/minidlna/minidlna.inc4
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb5
-rw-r--r--meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb6
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch43
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.6.bb (renamed from meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.5.bb)2
-rw-r--r--meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb5
-rw-r--r--meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb5
-rw-r--r--meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb5
-rw-r--r--meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb5
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch33
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb1
-rw-r--r--meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb11
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch179
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch377
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.2.bb (renamed from meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.1.bb)4
-rw-r--r--meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb2
30 files changed, 767 insertions, 45 deletions
diff --git a/meta-multimedia/conf/include/non-repro-meta-multimedia.inc b/meta-multimedia/conf/include/non-repro-meta-multimedia.inc
new file mode 100755
index 000000000..b02de42eb
--- /dev/null
+++ b/meta-multimedia/conf/include/non-repro-meta-multimedia.inc
@@ -0,0 +1,15 @@
1# List of known non-reproducible package of the meta-multimedia layer
2# Please keep this list sorted
3KNOWN_NON_REPRO_META_MULTIMEDIA = " \
4 crossguid \
5 libcamera \
6 libcamera-dbg \
7 libcamera-src \
8 libgssdp-1.6-src \
9 libgupnp-1.6-src \
10 libsquish-staticdev \
11 oscam \
12 oscam-dbg \
13 oscam-src \
14 rtmpdump-staticdev \
15"
diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf
index 82e6f3629..0442a57a9 100644
--- a/meta-multimedia/conf/layer.conf
+++ b/meta-multimedia/conf/layer.conf
@@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1"
31 31
32LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" 32LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python"
33 33
34LAYERSERIES_COMPAT_multimedia-layer = "scarthgap" 34LAYERSERIES_COMPAT_multimedia-layer = "styhead"
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch b/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch
new file mode 100644
index 000000000..63126520e
--- /dev/null
+++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch
@@ -0,0 +1,32 @@
1From 78270f9159a9ec7284ca39a2fbb1774347942de1 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Wed, 24 Apr 2024 19:08:43 +0200
4Subject: [PATCH] gssdp-enums.c.template: use basename instead of filename
5
6This would prevent the build path from leaking into the source code.
7
8Signed-off-by: Markus Volk <f_l_k@t-online.de>
9
10Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/13]
11---
12 libgssdp/gssdp-enums.c.template | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/libgssdp/gssdp-enums.c.template b/libgssdp/gssdp-enums.c.template
16index 600d426..2dfb859 100644
17--- a/libgssdp/gssdp-enums.c.template
18+++ b/libgssdp/gssdp-enums.c.template
19@@ -3,8 +3,8 @@
20
21 /*** END file-header ***/
22 /*** BEGIN file-production ***/
23-/* enumerations from "@filename@" */
24-#include "@filename@"
25+/* enumerations from "@basename@" */
26+#include "@basename@"
27 /*** END file-production ***/
28 /*** BEGIN value-header ***/
29 GType
30--
312.44.0
32
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
index f2e27622c..e6ea47270 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb
@@ -6,6 +6,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/gssdp/-/issues"
6LICENSE = "LGPL-2.1-only" 6LICENSE = "LGPL-2.1-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 7LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
8 8
9SRC_URI:append = " file://0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch"
9SRC_URI[archive.sha256sum] = "2fedb5afdb22cf14d5498a39a773ca89788a250fcf70118783df821e1f3f3446" 10SRC_URI[archive.sha256sum] = "2fedb5afdb22cf14d5498a39a773ca89788a250fcf70118783df821e1f3f3446"
10 11
11GTKDOC_MESON_OPTION = 'gtk_doc' 12GTKDOC_MESON_OPTION = 'gtk_doc'
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch
new file mode 100644
index 000000000..373eb4548
--- /dev/null
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch
@@ -0,0 +1,32 @@
1From f875a0afe24fdebdefc46d132f6722dfcb55115a Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Wed, 24 Apr 2024 18:52:45 +0200
4Subject: [PATCH] gupnp-enums.c.template: use @basename@ instead of @filename@
5
6This would prevent the build path from leaking into the source code.
7
8Signed-off-by: Markus Volk <f_l_k@t-online.de>
9
10Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/36]
11---
12 libgupnp/gupnp-enums.c.template | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/libgupnp/gupnp-enums.c.template b/libgupnp/gupnp-enums.c.template
16index 3ce5fa4..a7ff89c 100644
17--- a/libgupnp/gupnp-enums.c.template
18+++ b/libgupnp/gupnp-enums.c.template
19@@ -3,8 +3,8 @@
20
21 /*** END file-header ***/
22 /*** BEGIN file-production ***/
23-/* enumerations from "@filename@" */
24-#include "@filename@"
25+/* enumerations from "@basename@" */
26+#include "@basename@"
27 /*** END file-production ***/
28 /*** BEGIN value-header ***/
29 GType
30--
312.44.0
32
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
index f1628d82e..7d9b8a477 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
@@ -8,6 +8,8 @@ DEPENDS = "e2fsprogs gssdp libsoup-3.0 libxml2"
8inherit gnomebase pkgconfig vala gobject-introspection 8inherit gnomebase pkgconfig vala gobject-introspection
9 9
10SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f" 10SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f"
11SRC_URI += "file://0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch"
12
11 13
12SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" 14SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess"
13 15
diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb
index 4fbdce086..e79bd77a5 100644
--- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb
+++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb
@@ -20,7 +20,7 @@ inherit gnomebase features_check vala gobject-introspection gettext systemd
20# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured 20# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured
21REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" 21REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11"
22 22
23SRC_URI[archive.sha256sum] = "6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7" 23SRC_URI[archive.sha256sum] = "1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f"
24 24
25GIR_MESON_ENABLE_FLAG = 'enabled' 25GIR_MESON_ENABLE_FLAG = 'enabled'
26GIR_MESON_DISABLE_FLAG = 'disabled' 26GIR_MESON_DISABLE_FLAG = 'disabled'
@@ -28,7 +28,7 @@ GIR_MESON_DISABLE_FLAG = 'disabled'
28EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}" 28EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}"
29PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" 29PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}"
30 30
31PACKAGECONFIG ?= "external mpris ruih gst-launch" 31PACKAGECONFIG ?= "external mpris ruih gst-launch media-export"
32 32
33PACKAGECONFIG[external] = "" 33PACKAGECONFIG[external] = ""
34PACKAGECONFIG[mpris] = "" 34PACKAGECONFIG[mpris] = ""
@@ -60,16 +60,9 @@ do_install:append() {
60 # Remove .la files for loadable modules 60 # Remove .la files for loadable modules
61 rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la 61 rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la
62 rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la 62 rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la
63 if [ -e ${D}${nonarch_libdir}/systemd/user/rygel.service ]; then
64 mkdir -p ${D}${systemd_unitdir}/system
65 mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system
66 rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \
67 ${D}${nonarch_libdir}/systemd \
68 ${D}${nonarch_libdir}
69 fi
70} 63}
71 64
72FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" 65FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${systemd_user_unitdir} ${datadir}/dbus-1 ${datadir}/icons"
73FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" 66FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug"
74 67
75PACKAGES += "${PN}-meta" 68PACKAGES += "${PN}-meta"
@@ -77,8 +70,6 @@ ALLOW_EMPTY:${PN}-meta = "1"
77 70
78PACKAGES_DYNAMIC = "${PN}-plugin-*" 71PACKAGES_DYNAMIC = "${PN}-plugin-*"
79 72
80SYSTEMD_SERVICE:${PN} = "rygel.service"
81
82python populate_packages:prepend () { 73python populate_packages:prepend () {
83 rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') 74 rygel_libdir = d.expand('${libdir}/rygel-${LIBV}')
84 postinst = d.getVar('plugin_postinst') 75 postinst = d.getVar('plugin_postinst')
diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb
index 8fbf9ab2c..e20358955 100644
--- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
+++ b/meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb
@@ -6,12 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6 6
7DEPENDS = "libusb1 openssl pcsc-lite" 7DEPENDS = "libusb1 openssl pcsc-lite"
8 8
9SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ 9SRCREV = "190d6dee96ca70f8b614932b1498332b1504632b"
10 " 10SRC_URI = "git://repo.or.cz/oscam.git;protocol=https;nobranch=1"
11SRCREV = "11718"
12PV = "1.10+"
13 11
14S = "${WORKDIR}/trunk" 12S = "${UNPACKDIR}/git"
15 13
16inherit cmake 14inherit cmake
17 15
diff --git a/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb
index b5d7772e7..a4386e809 100644
--- a/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb
+++ b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "\
6" 6"
7AUTHOR = "Emmanuel Pacaud" 7AUTHOR = "Emmanuel Pacaud"
8HOMEPAGE = "https://github.com/AravisProject/aravis" 8HOMEPAGE = "https://github.com/AravisProject/aravis"
9LICENSE = "LGPL-2.1" 9LICENSE = "LGPL-2.1-only"
10LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 10LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
11 11
12DEPENDS += "\ 12DEPENDS += "\
@@ -29,7 +29,7 @@ GIDOCGEN_MESON_DISABLE_FLAG = "disabled"
29 29
30inherit meson pkgconfig gi-docgen gobject-introspection 30inherit meson pkgconfig gi-docgen gobject-introspection
31 31
32PACKAGECONFIG ?= "gstreamer usb viewer" 32PACKAGECONFIG ?= "gstreamer usb ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'viewer', '', d)}"
33PACKAGECONFIG[gstreamer] = "-Dgst-plugin=enabled, -Dgst-plugin=disabled,gstreamer1.0 gstreamer1.0-plugins-base," 33PACKAGECONFIG[gstreamer] = "-Dgst-plugin=enabled, -Dgst-plugin=disabled,gstreamer1.0 gstreamer1.0-plugins-base,"
34PACKAGECONFIG[usb] = "-Dusb=enabled, -Dusb=disabled, libusb1," 34PACKAGECONFIG[usb] = "-Dusb=enabled, -Dusb=disabled, libusb1,"
35PACKAGECONFIG[viewer] = "-Dviewer=enabled, -Dviewer=disabled, gtk+3 gstreamer1.0-plugins-base," 35PACKAGECONFIG[viewer] = "-Dviewer=enabled, -Dviewer=disabled, gtk+3 gstreamer1.0-plugins-base,"
diff --git a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.1.bb b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb
index 08607acd8..4e8412303 100644
--- a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.1.bb
+++ b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD-2-Clause"
7LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669" 7LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669"
8 8
9SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;branch=master" 9SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;branch=master"
10SRCREV = "872e470ebf3e65b0b956f3a70329e885a2df1c2a" 10SRCREV = "805d9e5a8ffce3ef78cebde4bfedf3642907b2d3"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb
index 542ad3487..f9115d819 100644
--- a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb
+++ b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb
@@ -33,7 +33,7 @@ do_install() {
33 chmod a+rx ${D}/${libdir}/*.so* 33 chmod a+rx ${D}/${libdir}/*.so*
34 cp -R --no-dereference --preserve=mode,links ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ 34 cp -R --no-dereference --preserve=mode,links ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/
35 cp -R --no-dereference --preserve=mode,links ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ 35 cp -R --no-dereference --preserve=mode,links ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/
36 cp -R --no-dereference --preserve=mode,links ${WORKDIR}/dvb-scan-table/* ${D}/usr/share/dvb 36 cp -R --no-dereference --preserve=mode,links ${UNPACKDIR}/dvb-scan-table/* ${D}/usr/share/dvb
37} 37}
38 38
39PACKAGES =+ "dvb-evtest dvb-evtest-dbg \ 39PACKAGES =+ "dvb-evtest dvb-evtest-dbg \
diff --git a/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb b/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb
index 5de717c28..1e5381bb2 100644
--- a/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb
+++ b/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb
@@ -15,5 +15,5 @@ inherit autotools lib_package pkgconfig
15 15
16do_install:append() { 16do_install:append() {
17 install -D -m 0644 ${S}/src/dvbcsa/dvbcsa.h ${D}${includedir}/dvbcsa/dvbcsa.h 17 install -D -m 0644 ${S}/src/dvbcsa/dvbcsa.h ${D}${includedir}/dvbcsa/dvbcsa.h
18 install -D -m 0644 ${WORKDIR}/libdvbcsa.pc ${D}${libdir}/pkgconfig/libdvbcsa.pc 18 install -D -m 0644 ${UNPACKDIR}/libdvbcsa.pc ${D}${libdir}/pkgconfig/libdvbcsa.pc
19} 19}
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
index 4959a3c8d..aabf81dce 100644
--- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
@@ -28,11 +28,11 @@ do_install:append(){
28 28
29# Systemd script 29# Systemd script
30 install -d ${D}${nonarch_base_libdir}/systemd/system 30 install -d ${D}${nonarch_base_libdir}/systemd/system
31 install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system 31 install -m 0755 ${UNPACKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system
32 32
33# Sysvinit script 33# Sysvinit script
34 install -d ${D}${sysconfdir}/init.d 34 install -d ${D}${sysconfdir}/init.d
35 install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna 35 install -m 0755 ${UNPACKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna
36 36
37} 37}
38 38
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
index a762fc832..33155da7d 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
@@ -76,7 +76,7 @@ do_install:append() {
76 ${D}/${localstatedir}/lib/mpd/music 76 ${D}/${localstatedir}/lib/mpd/music
77 77
78 install -d ${D}/${sysconfdir} 78 install -d ${D}/${sysconfdir}
79 install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf 79 install -m 644 ${UNPACKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf
80 sed -i \ 80 sed -i \
81 -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ 81 -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \
82 -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ 82 -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \
@@ -100,3 +100,6 @@ USERADD_PARAM:${PN} = " \
100 --home ${localstatedir}/lib/mpd \ 100 --home ${localstatedir}/lib/mpd \
101 --groups audio \ 101 --groups audio \
102 --user-group mpd" 102 --user-group mpd"
103
104CVE_STATUS[CVE-2020-7465] = "cpe-incorrect: The recipe used in the meta-openembedded is a different mpd package compared to the one which has the CVE issue."
105CVE_STATUS[CVE-2020-7466] = "cpe-incorrect: The recipe used in the meta-openembedded is a different mpd package compared to the one which has the CVE issue."
diff --git a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
index 444bc1cf3..8bedc693b 100644
--- a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
+++ b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
@@ -33,17 +33,17 @@ do_install() {
33 rm -r ${D}${libdir}/mycroft/.git 33 rm -r ${D}${libdir}/mycroft/.git
34 34
35 # Install the dev opts so it doesn't ask us on initial setup. 35 # Install the dev opts so it doesn't ask us on initial setup.
36 install -m 644 ${WORKDIR}/dev_opts.json ${D}${libdir}/mycroft/.dev_opts.json 36 install -m 644 ${UNPACKDIR}/dev_opts.json ${D}${libdir}/mycroft/.dev_opts.json
37 37
38 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 38 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
39 install -d ${D}${systemd_unitdir}/system 39 install -d ${D}${systemd_unitdir}/system
40 install -m 644 ${WORKDIR}/mycroft-setup.service ${D}${systemd_unitdir}/system 40 install -m 644 ${UNPACKDIR}/mycroft-setup.service ${D}${systemd_unitdir}/system
41 sed -i -e 's,@LIBDIR@,${libdir},g' ${D}${systemd_unitdir}/system/mycroft-setup.service 41 sed -i -e 's,@LIBDIR@,${libdir},g' ${D}${systemd_unitdir}/system/mycroft-setup.service
42 fi 42 fi
43 43
44 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 44 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
45 install -d ${D}${systemd_unitdir}/system 45 install -d ${D}${systemd_unitdir}/system
46 install -m 644 ${WORKDIR}/mycroft.service ${D}${systemd_unitdir}/system 46 install -m 644 ${UNPACKDIR}/mycroft.service ${D}${systemd_unitdir}/system
47 sed -i -e 's,@LIBDIR@,${libdir},g' ${D}${systemd_unitdir}/system/mycroft.service 47 sed -i -e 's,@LIBDIR@,${libdir},g' ${D}${systemd_unitdir}/system/mycroft.service
48 fi 48 fi
49} 49}
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch
new file mode 100644
index 000000000..ce381a78b
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch
@@ -0,0 +1,43 @@
1From b1d911fdab4a583f276d18395037d90bfc305109 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 20 May 2024 18:12:23 -0700
4Subject: [PATCH] module-suspend-on-idle: Include time.h for struct timespec
5 decl
6
7This is flagged as error with gcc-14 on musl targets
8
9In file included from ../git/src/pipewire/loop.h:27,
10 from ../git/src/pipewire/core.h:44,
11 from ../git/src/modules/module-suspend-on-idle.c:26:
12../git/spa/include/spa/support/loop.h:184:37: warning: 'struct timespec' declared inside parameter list will not be visible outside of this definition or declaration
13 184 | struct timespec *value,
14 | ^~~~~~~~
15../git/src/modules/module-suspend-on-idle.c: In function 'node_state_changed':
16../git/src/modules/module-suspend-on-idle.c:110:69: error: passing argument 2 of 'main_loop->utils->update_timer' from incompatible pointer type [-Wincompatible-pointer-types]
17 110 | pw_loop_update_timer(main_loop, info->idle_timeout, &value, NULL, false);
18 | ^~~~~~
19 | |
20 | struct timespec *
21
22Upstream-Status: Inappropriate [Fixed in latest pipewire differently]
23
24Signed-off-by: Khem Raj <raj.khem@gmail.com>
25---
26 src/modules/module-suspend-on-idle.c | 1 +
27 1 file changed, 1 insertion(+)
28
29diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
30index e5c1fcb30..4dba3be71 100644
31--- a/src/modules/module-suspend-on-idle.c
32+++ b/src/modules/module-suspend-on-idle.c
33@@ -20,6 +20,7 @@
34 #include <string.h>
35 #include <stdio.h>
36 #include <errno.h>
37+#include <time.h>
38
39 #include "config.h"
40
41--
422.45.1
43
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb
index 9895e8976..7c8afd3d5 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb
@@ -10,7 +10,9 @@ DEPENDS = "alsa-lib dbus udev"
10SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" 10SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d"
11PV = "0.2.7" 11PV = "0.2.7"
12 12
13SRC_URI = "git://github.com/PipeWire/pipewire;branch=master;protocol=https" 13SRC_URI = "git://github.com/PipeWire/pipewire;branch=master;protocol=https \
14 file://0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch \
15 "
14 16
15S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
16 18
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.5.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.6.bb
index c8ac04d59..f60ede537 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.5.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.6.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS = "dbus ncurses" 13DEPENDS = "dbus ncurses"
14 14
15SRCREV = "a2287be601710eea0d073261223ec34b92384c8a" 15SRCREV = "1b8b683a6d7ee9f1c5dcef3fce5f93069f1357c4"
16SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https" 16SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
index cb919d79e..5eba4da20 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
@@ -9,9 +9,12 @@ SRC_URI[sha256sum] = "69fe2cfe7154a6e752688e3a0d7d6b07b1605bbaf75b56f6470dc7b4c2
9 9
10inherit allarch 10inherit allarch
11 11
12S = "${WORKDIR}/sources"
13UNPACKDIR = "${S}"
14
12do_install() { 15do_install() {
13 install -d ${D}${datadir}/movies 16 install -d ${D}${datadir}/movies
14 install -m 0644 ${WORKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/ 17 install -m 0644 ${UNPACKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/
15} 18}
16 19
17FILES:${PN} += "${datadir}/movies" 20FILES:${PN} += "${datadir}/movies"
diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
index 40dc2aacb..29e60cb0a 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
@@ -9,9 +9,12 @@ SRC_URI[sha256sum] = "40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db0
9 9
10inherit allarch 10inherit allarch
11 11
12S = "${WORKDIR}/sources"
13UNPACKDIR = "${S}"
14
12do_install() { 15do_install() {
13 install -d ${D}${datadir}/movies 16 install -d ${D}${datadir}/movies
14 install -m 0644 ${WORKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/ 17 install -m 0644 ${UNPACKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/
15} 18}
16 19
17FILES:${PN} += "${datadir}/movies" 20FILES:${PN} += "${datadir}/movies"
diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
index ed1d027b4..50ea2e3c8 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
@@ -9,9 +9,12 @@ SRC_URI[sha256sum] = "b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06ed
9 9
10inherit allarch 10inherit allarch
11 11
12S = "${WORKDIR}/sources"
13UNPACKDIR = "${S}"
14
12do_install() { 15do_install() {
13 install -d ${D}${datadir}/movies 16 install -d ${D}${datadir}/movies
14 install -m 0644 ${WORKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/ 17 install -m 0644 ${UNPACKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/
15} 18}
16 19
17FILES:${PN} += "${datadir}/movies" 20FILES:${PN} += "${datadir}/movies"
diff --git a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
index 78f15f143..ed3ff75ac 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
@@ -8,9 +8,12 @@ SRC_URI[sha256sum] = "bd2b5bc6c16d4085034f47ef7e4b3938afe86b4eec4ac3cf2685367d3b
8 8
9inherit allarch 9inherit allarch
10 10
11S = "${WORKDIR}/sources"
12UNPACKDIR = "${S}"
13
11do_install() { 14do_install() {
12 install -d ${D}${datadir}/movies 15 install -d ${D}${datadir}/movies
13 install -m 0644 ${WORKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/ 16 install -m 0644 ${UNPACKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/
14} 17}
15 18
16FILES:${PN} += "${datadir}/movies" 19FILES:${PN} += "${datadir}/movies"
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch
new file mode 100644
index 000000000..5f9135a0e
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch
@@ -0,0 +1,33 @@
1From afe336ab63ff9b64ef759255de6b03b897dc4453 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 19 May 2024 09:09:46 -0700
4Subject: [PATCH] tests: Include math.h for fabs() definition
5
6Fixes build with gcc-14
7
8../../sox-14.4.2/src/sox_sample_test.h:190:3: error: implicit declaration of function 'fabs' [-Wimplicit-function-declaration]
9 190 | assert(fabs(d - 1) < 1e-9 && clips == 0);
10 | ^~~~~~
11 ../../sox-14.4.2/src/sox_sample_test.h:23:1: note: include '<math.h>' or provide a declaration of 'fabs'
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/sox_sample_test.h | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/src/sox_sample_test.h b/src/sox_sample_test.h
20index 62b55e4..17f0069 100644
21--- a/src/sox_sample_test.h
22+++ b/src/sox_sample_test.h
23@@ -19,6 +19,7 @@
24 #undef NDEBUG /* Must undef above assert.h or other that might include it. */
25 #endif
26 #include <assert.h>
27+#include <math.h>
28 #include "sox.h"
29
30 #define TEST_UINT(bits) \
31--
322.45.1
33
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
index 011cbc2a9..800fcad2c 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
@@ -30,6 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \
30SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ 30SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \
31 file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ 31 file://0001-remove-the-error-line-and-live-without-file-type-det.patch \
32 file://0001-Update-exported-symbol-list.patch \ 32 file://0001-Update-exported-symbol-list.patch \
33 file://0001-tests-Include-math.h-for-fabs-definition.patch \
33 " 34 "
34SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33" 35SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33"
35SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c" 36SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c"
diff --git a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb
index e261611af..b513e959d 100644
--- a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb
+++ b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb
@@ -4,16 +4,15 @@ HOMEPAGE = "https://github.com/tinyalsa/tinyalsa"
4SECTION = "libs/multimedia" 4SECTION = "libs/multimedia"
5 5
6LICENSE = "BSD-3-Clause" 6LICENSE = "BSD-3-Clause"
7LIC_FILES_CHKSUM = "file://NOTICE;md5=e04cd6fa58488e016f7fb648ebea1db4" 7LIC_FILES_CHKSUM = "file://NOTICE;md5=d2918795d9185efcbf430b9ad5cda46d"
8 8
9SRCREV = "1c5fb68ced57d838f2b7ecd0c00bc1fefc9ab60d" 9PV .= "+git"
10SRC_URI = "git://github.com/tinyalsa/tinyalsa;branch=master;protocol=https \ 10SRCREV = "f78ed25aced2dfea743867b8205a787bfb091340"
11 file://0001-fixed-compilation-error-caused-by-strncpy.patch \ 11SRC_URI = "git://github.com/tinyalsa/tinyalsa;branch=master;protocol=https"
12 "
13 12
14S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
15 14
16inherit cmake 15inherit meson
17 16
18# tinyalsa is built as a static library. Enable PIC to avoid relocation 17# tinyalsa is built as a static library. Enable PIC to avoid relocation
19# errors like these: 18# errors like these:
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch
new file mode 100644
index 000000000..3f2aa6051
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch
@@ -0,0 +1,179 @@
1From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001
2From: Thomas Guillem <thomas@gllm.fr>
3Date: Tue, 5 Dec 2023 09:23:35 +0100
4Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment
5
6Fixes #28441
7Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4645]
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 src/input/input_internal.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/input/input_internal.h b/src/input/input_internal.h
14index d29731edca1b..ea02f39f5add 100644
15--- a/src/input/input_internal.h
16+++ b/src/input/input_internal.h
17@@ -117,7 +117,7 @@ typedef struct input_thread_private_t
18
19 /* Title infos FIXME multi-input (not easy) ? */
20 int i_title;
21- const input_title_t **title;
22+ input_title_t * const *title;
23
24 int i_title_offset;
25 int i_seekpoint_offset;
26--
27GitLab
28
29
30From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001
31From: Zhao Zhili <quinkblack@foxmail.com>
32Date: Thu, 1 Mar 2018 14:25:59 +0800
33Subject: [PATCH 2/5] yadif: fix variable type
34
35Signed-off-by: Thomas Guillem <thomas@gllm.fr>
36(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60)
37Signed-off-by: Thomas Guillem <thomas@gllm.fr>
38---
39 modules/video_filter/deinterlace/yadif.h | 8 ++++----
40 1 file changed, 4 insertions(+), 4 deletions(-)
41
42diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h
43index 4bc592ba9307..af16443d0804 100644
44--- a/modules/video_filter/deinterlace/yadif.h
45+++ b/modules/video_filter/deinterlace/yadif.h
46@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8
47 }
48
49 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) {
50- uint8_t *dst = (uint8_t *)dst8;
51- uint8_t *prev = (uint8_t *)prev8;
52- uint8_t *cur = (uint8_t *)cur8;
53- uint8_t *next = (uint8_t *)next8;
54+ uint16_t *dst = (uint16_t *)dst8;
55+ uint16_t *prev = (uint16_t *)prev8;
56+ uint16_t *cur = (uint16_t *)cur8;
57+ uint16_t *next = (uint16_t *)next8;
58 int x;
59 uint16_t *prev2= parity ? prev : cur ;
60 uint16_t *next2= parity ? cur : next;
61--
62GitLab
63
64
65From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001
66From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
67Date: Sun, 3 Mar 2019 09:59:10 +0200
68Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion
69
70(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058)
71Signed-off-by: Thomas Guillem <thomas@gllm.fr>
72---
73 modules/video_chroma/swscale.c | 12 ++++++++----
74 1 file changed, 8 insertions(+), 4 deletions(-)
75
76diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
77index 8993d11ec5dd..11897527355c 100644
78--- a/modules/video_chroma/swscale.c
79+++ b/modules/video_chroma/swscale.c
80@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
81 {
82 filter_sys_t *p_sys = p_filter->p_sys;
83 uint8_t palette[AVPALETTE_SIZE];
84- uint8_t *src[4]; int src_stride[4];
85- uint8_t *dst[4]; int dst_stride[4];
86+ uint8_t *src[4], *dst[4];
87+ const uint8_t *csrc[4];
88+ int src_stride[4], dst_stride[4];
89
90 GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video,
91 p_src, i_plane_count, b_swap_uvi );
92@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
93 GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video,
94 p_dst, i_plane_count, b_swap_uvo );
95
96+ for (size_t i = 0; i < ARRAY_SIZE(src); i++)
97+ csrc[i] = src[i];
98+
99 #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
100- sws_scale( ctx, src, src_stride, 0, i_height,
101+ sws_scale( ctx, csrc, src_stride, 0, i_height,
102 dst, dst_stride );
103 #else
104- sws_scale_ordered( ctx, src, src_stride, 0, i_height,
105+ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height,
106 dst, dst_stride );
107 #endif
108 }
109--
110GitLab
111
112
113From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001
114From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
115Date: Sun, 3 Mar 2019 17:20:04 +0200
116Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing
117
118(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35)
119Signed-off-by: Thomas Guillem <thomas@gllm.fr>
120---
121 modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +--
122 1 file changed, 1 insertion(+), 2 deletions(-)
123
124diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
125index a93462925e8a..a85f9aafb0b9 100644
126--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
127+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
128@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] =
129 void RegisterCommand( filter_t *p_filter )
130 {
131 filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
132- size_t i_index = 0;
133
134 p_sys->i_commands = ARRAY_SIZE(p_commands);
135 p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) );
136 if( !p_sys->pp_commands ) return;
137- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ )
138+ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ )
139 {
140 p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) );
141 if( !p_sys->pp_commands[i_index] ) return;
142--
143GitLab
144
145
146From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001
147From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
148Date: Mon, 26 Feb 2018 20:43:03 +0200
149Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption
150
151Font alpha is 8-bits, not 32-bits.
152
153(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0)
154Signed-off-by: Thomas Guillem <thomas@gllm.fr>
155---
156 modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++-
157 1 file changed, 5 insertions(+), 1 deletion(-)
158
159diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
160index a85f9aafb0b9..7a71c6f2373a 100644
161--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
162+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
163@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end,
164 skip_space( &psz_command );
165 if( isdigit( (unsigned char)*psz_command ) )
166 {
167- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC )
168+ int32_t value;
169+
170+ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC )
171 return VLC_EGENERIC;
172+
173+ p_params->fontstyle.i_font_alpha = value;
174 }
175 return VLC_SUCCESS;
176 }
177--
178GitLab
179
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch
new file mode 100644
index 000000000..c9ef33358
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch
@@ -0,0 +1,377 @@
1From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
3Date: Mon, 26 Feb 2018 20:36:29 +0200
4Subject: [PATCH 1/9] chromaprint: missing cast
5
6(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547)
7Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
8Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4665]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 modules/stream_out/chromaprint.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c
15index 80ec31ba2590..c76cbda3c2bb 100644
16--- a/modules/stream_out/chromaprint.c
17+++ b/modules/stream_out/chromaprint.c
18@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
19 if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer )
20 {
21 if(! chromaprint_feed( p_sys->p_chromaprint_ctx,
22- p_buf->p_buffer,
23+ (int16_t *)p_buf->p_buffer,
24 p_buf->i_buffer / BYTESPERSAMPLE ) )
25 msg_Warn( p_stream, "feed error" );
26 id->i_samples -= i_samples;
27--
28GitLab
29
30
31From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001
32From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
33Date: Sun, 14 Apr 2019 09:41:38 +0300
34Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt()
35
36char * can alias anything, and Winsock relies on that. Unfortunately,
37the compiler still issues warnings. This works around that.
38
39(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46)
40Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
41---
42 include/vlc_network.h | 16 ++++++++++++++++
43 1 file changed, 16 insertions(+)
44
45diff --git a/include/vlc_network.h b/include/vlc_network.h
46index 010454a01c09..e39ffd0bacaa 100644
47--- a/include/vlc_network.h
48+++ b/include/vlc_network.h
49@@ -183,6 +183,22 @@ VLC_API int vlc_close(int);
50
51 /** @} */
52
53+#ifdef _WIN32
54+static inline int vlc_getsockopt(int s, int level, int name,
55+ void *val, socklen_t *len)
56+{
57+ return getsockopt(s, level, name, (char *)val, len);
58+}
59+#define getsockopt vlc_getsockopt
60+
61+static inline int vlc_setsockopt(int s, int level, int name,
62+ const void *val, socklen_t len)
63+{
64+ return setsockopt(s, level, name, (const char *)val, len);
65+}
66+#define setsockopt vlc_setsockopt
67+#endif
68+
69 /* Portable network names/addresses resolution layer */
70
71 #define NI_MAXNUMERICHOST 64
72--
73GitLab
74
75
76From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001
77From: Steve Lhomme <robux4@ycbcr.xyz>
78Date: Thu, 7 Dec 2023 15:43:04 +0100
79Subject: [PATCH 3/9] netsync: use char for temporary local buffer
80
81On Windows recvfrom/revc/sendto expects a char*.
82---
83 modules/control/netsync.c | 14 +++++++-------
84 1 file changed, 7 insertions(+), 7 deletions(-)
85
86diff --git a/modules/control/netsync.c b/modules/control/netsync.c
87index 2a6a1a6a2bf8..8c91034d7cf2 100644
88--- a/modules/control/netsync.c
89+++ b/modules/control/netsync.c
90@@ -181,7 +181,7 @@ static void *Master(void *handle)
91 intf_sys_t *sys = intf->p_sys;
92 for (;;) {
93 struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, };
94- uint64_t data[2];
95+ char data[16];
96
97 if (poll(&ufd, 1, -1) < 0)
98 continue;
99@@ -198,8 +198,8 @@ static void *Master(void *handle)
100 if (master_system < 0)
101 continue;
102
103- data[0] = hton64(mdate());
104- data[1] = hton64(master_system);
105+ SetQWBE(&data[0], mdate());
106+ SetQWBE(&data[8], master_system);
107
108 /* Reply to the sender */
109 sendto(sys->fd, data, 16, 0,
110@@ -224,7 +224,7 @@ static void *Slave(void *handle)
111
112 for (;;) {
113 struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, };
114- uint64_t data[2];
115+ char data[16];
116
117 vlc_tick_t system = GetPcrSystem(sys->input);
118 if (system < 0)
119@@ -233,7 +233,7 @@ static void *Slave(void *handle)
120 /* Send clock request to the master */
121 const vlc_tick_t send_date = mdate();
122
123- data[0] = hton64(system);
124+ SetQWBE(&data[0], system);
125 send(sys->fd, data, 8, 0);
126
127 /* Don't block */
128@@ -244,8 +244,8 @@ static void *Slave(void *handle)
129 if (recv(sys->fd, data, 16, 0) < 16)
130 goto wait;
131
132- const vlc_tick_t master_date = ntoh64(data[0]);
133- const vlc_tick_t master_system = ntoh64(data[1]);
134+ const vlc_tick_t master_date = GetQWBE(&data[0]);
135+ const vlc_tick_t master_system = GetQWBE(&data[8]);
136 const vlc_tick_t diff_date = receive_date -
137 ((receive_date - send_date) / 2 + master_date);
138
139--
140GitLab
141
142
143From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001
144From: Steve Lhomme <robux4@ycbcr.xyz>
145Date: Tue, 3 Jan 2023 13:23:00 +0100
146Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module
147
148So that we don't have to include search.h each time vlc_fixups.h is used.
149
150The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*.
151
152(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8)
153Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
154---
155 include/vlc_fixups.h | 3 +++
156 modules/access/dtv/access.c | 5 +++++
157 2 files changed, 8 insertions(+)
158
159diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
160index 37f788933779..861cb4cc5063 100644
161--- a/include/vlc_fixups.h
162+++ b/include/vlc_fixups.h
163@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void
164 void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) );
165 void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) );
166 void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
167+#ifndef _WIN32
168+/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */
169 void *lfind( const void *key, const void *base, size_t *nmemb,
170 size_t size, int(*cmp)(const void *, const void *) );
171+#endif
172 #endif /* HAVE_SEARCH_H */
173 #ifndef HAVE_TDESTROY
174 void tdestroy( void *root, void (*free_node)(void *nodep) );
175diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
176index d9756c7b4885..c6ca5005883c 100644
177--- a/modules/access/dtv/access.c
178+++ b/modules/access/dtv/access.c
179@@ -32,6 +32,11 @@
180 #ifdef HAVE_SEARCH_H
181 #include <search.h>
182 #endif
183+#if defined(_WIN32)
184+/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */
185+# define lfind(a,b,c,d,e) \
186+ lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e))
187+#endif
188
189 #include "dtv/dtv.h"
190
191--
192GitLab
193
194
195From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001
196From: Steve Lhomme <robux4@ycbcr.xyz>
197Date: Mon, 15 Jul 2019 12:41:29 +0200
198Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use
199 const on source pointer
200
201(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410)
202Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
203---
204 include/vlc_common.h | 5 +++++
205 1 file changed, 5 insertions(+)
206
207diff --git a/include/vlc_common.h b/include/vlc_common.h
208index 8090b277150d..089878581763 100644
209--- a/include/vlc_common.h
210+++ b/include/vlc_common.h
211@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw)
212 # define O_NONBLOCK 0
213 # endif
214
215+/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a
216+ const void* */
217+# define swab(a,b,c) swab((char*) (a), (char*) (b), (c))
218+
219+
220 # include <tchar.h>
221 #endif /* _WIN32 */
222
223--
224GitLab
225
226
227From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001
228From: Steve Lhomme <robux4@ycbcr.xyz>
229Date: Wed, 10 Jul 2019 08:23:45 +0200
230Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const
231
232lavc expects a pointer that it will free in avcodec_free_context().
233
234(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327)
235Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
236---
237 modules/codec/avcodec/encoder.c | 10 ++++++++--
238 1 file changed, 8 insertions(+), 2 deletions(-)
239
240diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
241index 2b1c3604713d..4919ccf0e0e4 100644
242--- a/modules/codec/avcodec/encoder.c
243+++ b/modules/codec/avcodec/encoder.c
244@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this )
245
246 if ( p_sys->b_mpeg4_matrix )
247 {
248- p_context->intra_matrix = mpeg4_default_intra_matrix;
249- p_context->inter_matrix = mpeg4_default_non_intra_matrix;
250+ p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) );
251+ if ( p_context->intra_matrix )
252+ memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix,
253+ sizeof(mpeg4_default_intra_matrix));
254+ p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) );
255+ if ( p_context->inter_matrix )
256+ memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix,
257+ sizeof(mpeg4_default_non_intra_matrix));
258 }
259
260 if ( p_sys->b_pre_me )
261--
262GitLab
263
264
265From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001
266From: Steve Lhomme <robux4@ycbcr.xyz>
267Date: Thu, 7 Dec 2023 14:18:22 +0100
268Subject: [PATCH 7/9] smb: fix potential string to wide string copy
269
270The type of net_resource depends on the UNICODE define.
271---
272 modules/access/smb.c | 4 ++--
273 1 file changed, 2 insertions(+), 2 deletions(-)
274
275diff --git a/modules/access/smb.c b/modules/access/smb.c
276index 5fe56f0c9dfe..6add2a3e6278 100644
277--- a/modules/access/smb.c
278+++ b/modules/access/smb.c
279@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server,
280 const char *psz_pwd, const char *psz_domain )
281 {
282 char psz_remote[MAX_PATH];
283- NETRESOURCE net_resource;
284+ NETRESOURCEA net_resource;
285 DWORD i_result;
286 VLC_UNUSED( psz_domain );
287
288@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server,
289
290 net_resource.lpRemoteName = psz_remote;
291
292- i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 );
293+ i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 );
294
295 if( i_result != NO_ERROR )
296 {
297--
298GitLab
299
300
301From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001
302From: Steve Lhomme <robux4@ycbcr.xyz>
303Date: Wed, 6 Dec 2023 14:45:46 +0100
304Subject: [PATCH 8/9] dxva2: add missing mask initializers
305
306---
307 modules/codec/avcodec/dxva2.c | 10 +++++-----
308 1 file changed, 5 insertions(+), 5 deletions(-)
309
310diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
311index 18b872fe0fe3..2e6809a05410 100644
312--- a/modules/codec/avcodec/dxva2.c
313+++ b/modules/codec/avcodec/dxva2.c
314@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54,
315
316 /* XXX Preferred format must come first */
317 static const d3d9_format_t d3d_formats[] = {
318- { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 },
319- { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 },
320- //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 },
321- { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 },
322+ { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 },
323+ { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 },
324+ //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 },
325+ { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 },
326
327- { NULL, 0, 0 }
328+ { NULL, 0, 0, 0,0,0 }
329 };
330
331 static const d3d9_format_t *D3dFindFormat(D3DFORMAT format)
332--
333GitLab
334
335
336From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001
337From: Steve Lhomme <robux4@ycbcr.xyz>
338Date: Wed, 6 Dec 2023 07:48:29 +0100
339Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function
340 pointers
341
342---
343 src/text/url.c | 3 ++-
344 src/win32/plugin.c | 3 ++-
345 2 files changed, 4 insertions(+), 2 deletions(-)
346
347diff --git a/src/text/url.c b/src/text/url.c
348index b962eb31f849..2eb4b8d10817 100644
349--- a/src/text/url.c
350+++ b/src/text/url.c
351@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size)
352 int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int);
353 int ret = 0;
354
355- IdnToAsciiReal = GetProcAddress(h, "IdnToAscii");
356+ IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int))
357+ GetProcAddress(h, "IdnToAscii");
358 if (IdnToAsciiReal != NULL)
359 ret = IdnToAsciiReal(flags, str, len, buf, size);
360 else
361diff --git a/src/win32/plugin.c b/src/win32/plugin.c
362index 1a65521fca75..b5c336eb99ca 100644
363--- a/src/win32/plugin.c
364+++ b/src/win32/plugin.c
365@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode)
366
367 BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *);
368
369- SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode");
370+ SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *))
371+ GetProcAddress(h, "SetThreadErrorMode");
372 if (SetThreadErrorModeReal != NULL)
373 return SetThreadErrorModeReal(mode, oldmode);
374
375--
376GitLab
377
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb
index d25a20ae0..2a6b27add 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb
@@ -9,7 +9,7 @@ DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native bison-nat
9 dbus libxml2 gnutls \ 9 dbus libxml2 gnutls \
10 tremor faad2 ffmpeg flac alsa-lib \ 10 tremor faad2 ffmpeg flac alsa-lib \
11 lua-native lua libidn \ 11 lua-native lua libidn \
12 avahi jpeg xz libmodplug mpeg2dec \ 12 avahi jpeg xz libmodplug \
13 libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ 13 libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
14 tiff" 14 tiff"
15 15
@@ -25,6 +25,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \
25 file://0006-configure-Disable-incompatible-function-pointer-type.patch \ 25 file://0006-configure-Disable-incompatible-function-pointer-type.patch \
26 file://taglib-2.patch \ 26 file://taglib-2.patch \
27 file://0001-taglib-Fix-build-on-x86-32-bit.patch \ 27 file://0001-taglib-Fix-build-on-x86-32-bit.patch \
28 file://4645.patch \
29 file://4665.patch \
28" 30"
29SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" 31SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5"
30 32
diff --git a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.1.bb b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.2.bb
index 9115076a2..6ab48285c 100644
--- a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.1.bb
+++ b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.2.bb
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \
10 ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ 10 ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \
11" 11"
12 12
13SRCREV = "961450b2ac700e8c9c85a0beb2426b875fa08bff" 13SRCREV = "b302ebd6ab66fd538191d22db4ebe02bcef87a91"
14SRC_URI = " \ 14SRC_URI = " \
15 git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ 15 git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \
16 file://90-OE-disable-session-dbus-dependent-features.lua \ 16 file://90-OE-disable-session-dbus-dependent-features.lua \
@@ -54,7 +54,7 @@ WP_MODULE_SUBDIR = "wireplumber-0.5"
54 54
55do_install:append() { 55do_install:append() {
56 if ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'false', 'true', d)}; then 56 if ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'false', 'true', d)}; then
57 install -m 0644 ${WORKDIR}/90-OE-disable-session-dbus-dependent-features.lua ${D}${datadir}/wireplumber/main.lua.d 57 install -m 0644 ${UNPACKDIR}/90-OE-disable-session-dbus-dependent-features.lua ${D}${datadir}/wireplumber/main.lua.d
58 fi 58 fi
59} 59}
60 60
diff --git a/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb b/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb
index df688bbcd..04d16ffe1 100644
--- a/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb
+++ b/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb
@@ -19,5 +19,5 @@ FILES:${PN} += "${libdir}/*"
19 19
20INSANE_SKIP:${PN}-dev = "dev-elf" 20INSANE_SKIP:${PN}-dev = "dev-elf"
21 21
22PACKAGECONFIG ??= "ui" 22PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'ui', '', d)}"
23PACKAGECONFIG[ui] = "-Dui=enabled,-Dui=disabled,gtk+3" 23PACKAGECONFIG[ui] = "-Dui=enabled,-Dui=disabled,gtk+3"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-02 05:26:01 +0000