diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia')
13 files changed, 137 insertions, 21 deletions
diff --git a/meta-openembedded/meta-multimedia/README.md b/meta-openembedded/meta-multimedia/README.md index 235c34331b..66c139ac9c 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: scarthgap URI: git://git.openembedded.org/meta-openembedded layers: meta-oe -branch: master +branch: scarthgap -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][scarthgap]' 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][scarthgap][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/conf/include/non-repro-meta-multimedia.inc b/meta-openembedded/meta-multimedia/conf/include/non-repro-meta-multimedia.inc new file mode 100755 index 0000000000..b02de42eb9 --- /dev/null +++ b/meta-openembedded/meta-multimedia/conf/include/non-repro-meta-multimedia.inc @@ -0,0 +1,15 @@ +# List of known non-reproducible package of the meta-multimedia layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_MULTIMEDIA = " \ + crossguid \ + libcamera \ + libcamera-dbg \ + libcamera-src \ + libgssdp-1.6-src \ + libgupnp-1.6-src \ + libsquish-staticdev \ + oscam \ + oscam-dbg \ + oscam-src \ + rtmpdump-staticdev \ +" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch new file mode 100644 index 0000000000..63126520e9 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch @@ -0,0 +1,32 @@ +From 78270f9159a9ec7284ca39a2fbb1774347942de1 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Wed, 24 Apr 2024 19:08:43 +0200 +Subject: [PATCH] gssdp-enums.c.template: use basename instead of filename + +This would prevent the build path from leaking into the source code. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/13] +--- + libgssdp/gssdp-enums.c.template | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgssdp/gssdp-enums.c.template b/libgssdp/gssdp-enums.c.template +index 600d426..2dfb859 100644 +--- a/libgssdp/gssdp-enums.c.template ++++ b/libgssdp/gssdp-enums.c.template +@@ -3,8 +3,8 @@ + + /*** END file-header ***/ + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + /*** END file-production ***/ + /*** BEGIN value-header ***/ + GType +-- +2.44.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb index f2e27622cc..e6ea472709 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb @@ -6,6 +6,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/gssdp/-/issues" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +SRC_URI:append = " file://0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch" SRC_URI[archive.sha256sum] = "2fedb5afdb22cf14d5498a39a773ca89788a250fcf70118783df821e1f3f3446" GTKDOC_MESON_OPTION = 'gtk_doc' diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch new file mode 100644 index 0000000000..373eb4548e --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch @@ -0,0 +1,32 @@ +From f875a0afe24fdebdefc46d132f6722dfcb55115a Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Wed, 24 Apr 2024 18:52:45 +0200 +Subject: [PATCH] gupnp-enums.c.template: use @basename@ instead of @filename@ + +This would prevent the build path from leaking into the source code. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/36] +--- + libgupnp/gupnp-enums.c.template | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgupnp/gupnp-enums.c.template b/libgupnp/gupnp-enums.c.template +index 3ce5fa4..a7ff89c 100644 +--- a/libgupnp/gupnp-enums.c.template ++++ b/libgupnp/gupnp-enums.c.template +@@ -3,8 +3,8 @@ + + /*** END file-header ***/ + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + /*** END file-production ***/ + /*** BEGIN value-header ***/ + GType +-- +2.44.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb index f1628d82ee..7d9b8a477f 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb @@ -8,6 +8,8 @@ DEPENDS = "e2fsprogs gssdp libsoup-3.0 libxml2" inherit gnomebase pkgconfig vala gobject-introspection SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f" +SRC_URI += "file://0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch" + SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb index 4fbdce0867..e79bd77a54 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.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] = "6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7" +SRC_URI[archive.sha256sum] = "1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' @@ -28,7 +28,7 @@ GIR_MESON_DISABLE_FLAG = 'disabled' EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}" PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" -PACKAGECONFIG ?= "external mpris ruih gst-launch" +PACKAGECONFIG ?= "external mpris ruih gst-launch media-export" PACKAGECONFIG[external] = "" PACKAGECONFIG[mpris] = "" @@ -60,16 +60,9 @@ do_install:append() { # Remove .la files for loadable modules rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la - if [ -e ${D}${nonarch_libdir}/systemd/user/rygel.service ]; then - mkdir -p ${D}${systemd_unitdir}/system - mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \ - ${D}${nonarch_libdir}/systemd \ - ${D}${nonarch_libdir} - fi } -FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" +FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${systemd_user_unitdir} ${datadir}/dbus-1 ${datadir}/icons" FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" PACKAGES += "${PN}-meta" @@ -77,8 +70,6 @@ ALLOW_EMPTY:${PN}-meta = "1" PACKAGES_DYNAMIC = "${PN}-plugin-*" -SYSTEMD_SERVICE:${PN} = "rygel.service" - python populate_packages:prepend () { rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') postinst = d.getVar('plugin_postinst') diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb new file mode 100644 index 0000000000..a4386e809c --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb @@ -0,0 +1,40 @@ +SUMMARY = "A vision library for genicam based cameras" +DESCRIPTION = "\ + Aravis is a glib/gobject based library for video acquisition using Genicam cameras.\ + It currently implements the gigabit ethernet and USB3 protocols used by industrial cameras.\ + It also provides a basic ethernet camera simulator and a simple video viewer.\ +" +AUTHOR = "Emmanuel Pacaud" +HOMEPAGE = "https://github.com/AravisProject/aravis" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS += "\ + glib-2.0 \ + glib-2.0-native \ + libxml2 \ + zlib \ +" + +SRC_URI = "https://github.com/AravisProject/aravis/releases/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "9c4ebe6273ed3abe466cb6ed8fa5c132bdd7e9a9298ca43fa0212c4311a084da" + +EXTRA_OEMESON += "-Dtests=false" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GIDOCGEN_MESON_OPTION = "documentation" +GIDOCGEN_MESON_ENABLE_FLAG = "enabled" +GIDOCGEN_MESON_DISABLE_FLAG = "disabled" + +inherit meson pkgconfig gi-docgen gobject-introspection + +PACKAGECONFIG ?= "gstreamer usb ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'viewer', '', d)}" +PACKAGECONFIG[gstreamer] = "-Dgst-plugin=enabled, -Dgst-plugin=disabled,gstreamer1.0 gstreamer1.0-plugins-base," +PACKAGECONFIG[usb] = "-Dusb=enabled, -Dusb=disabled, libusb1," +PACKAGECONFIG[viewer] = "-Dviewer=enabled, -Dviewer=disabled, gtk+3 gstreamer1.0-plugins-base," + +FILES:${PN} += "\ + ${datadir} \ + ${libdir}/gstreamer-1.0/libgstaravis.0.8.so \ +" 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.14.bb index a762fc8322..f30fffebeb 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.14.bb @@ -100,3 +100,6 @@ USERADD_PARAM:${PN} = " \ --home ${localstatedir}/lib/mpd \ --groups audio \ --user-group mpd" + +CVE_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." +CVE_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-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.4.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.5.bb index e9c83dd236..c8ac04d59a 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.4.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.5.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "f2874ad1c2f7f0b9a1da05cc4f402b3ea3761ee6" +SRCREV = "a2287be601710eea0d073261223ec34b92384c8a" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https" S = "${WORKDIR}/git" 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.20.bb index d25a20ae01..21bc408f6d 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.20.bb @@ -9,7 +9,7 @@ DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native bison-nat dbus libxml2 gnutls \ tremor faad2 ffmpeg flac alsa-lib \ lua-native lua libidn \ - avahi jpeg xz libmodplug mpeg2dec \ + avahi jpeg xz libmodplug \ libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ tiff" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.1.bb index 8aa95a3e97..9115076a24 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.1.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 = "59d190a2bd400f3b093f99b16fc0fb06f6cb2cfe" +SRCREV = "961450b2ac700e8c9c85a0beb2426b875fa08bff" 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/gst-instruments/gst-instruments_git.bb b/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb index df688bbcda..04d16ffe11 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb @@ -19,5 +19,5 @@ FILES:${PN} += "${libdir}/*" INSANE_SKIP:${PN}-dev = "dev-elf" -PACKAGECONFIG ??= "ui" +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'ui', '', d)}" PACKAGECONFIG[ui] = "-Dui=enabled,-Dui=disabled,gtk+3" |