diff options
author | jmbills <jason.m.bills@intel.com> | 2021-08-31 21:23:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-31 21:23:16 +0300 |
commit | 04cd92067d2481643df5010cb39b2134b648cf4d (patch) | |
tree | d98626c9763ad9048ac9bfd8269e12eced18d496 /meta-openembedded/meta-multimedia | |
parent | 10ad77d5bc86709d8ff7f95e7040e39f1c153903 (diff) | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
download | openbmc-04cd92067d2481643df5010cb39b2134b648cf4d.tar.xz |
Update
Diffstat (limited to 'meta-openembedded/meta-multimedia')
13 files changed, 104 insertions, 119 deletions
diff --git a/meta-openembedded/meta-multimedia/README b/meta-openembedded/meta-multimedia/README index b4c2455a1..9c649ff87 100644 --- a/meta-openembedded/meta-multimedia/README +++ b/meta-openembedded/meta-multimedia/README @@ -9,10 +9,10 @@ layers: meta-oe branch: master revision: HEAD -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]' 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][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. diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch deleted file mode 100644 index ef0c945d0..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6eba07bd195e0a1199a0fc62d7cc31ec376bc3dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 31 May 2021 17:44:29 +0200 -Subject: [PATCH] Fix build with hardened security flags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../gupnp-1.2.6/examples/get-volume.c: In function 'on_introspection': -| ../gupnp-1.2.6/examples/get-volume.c:53:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 53 | g_critical (error->message); -| | ^~~~~~~~~~ -| ../gupnp-1.2.6/examples/get-volume.c:114:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 114 | g_critical (error->message); -| | ^~~~~~~~~~ -| ../gupnp-1.2.6/examples/get-volume.c: In function 'main': -| ../gupnp-1.2.6/examples/get-volume.c:150:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 150 | g_error (error->message); -| | ^~~~~~~ - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/17] ---- - examples/get-volume.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/examples/get-volume.c b/examples/get-volume.c -index 4601014..923581c 100644 ---- a/examples/get-volume.c -+++ b/examples/get-volume.c -@@ -50,7 +50,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data) - &error); - - if (error != NULL) { -- g_critical (error->message); -+ g_critical ("%s", error->message); - g_clear_error (&error); - } - -@@ -111,7 +111,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data) - g_list_free (out_names); - - if (error != NULL) { -- g_critical (error->message); -+ g_critical ("%s", error->message); - g_clear_error (&error); - } else { - g_print ("Current volume: %s\n", -@@ -147,7 +147,7 @@ int main(int argc, char *argv[]) - GUPnPContext *context = gupnp_context_new ("wlp3s0", 0, &error); - - if (error != NULL) { -- g_error (error->message); -+ g_error ("%s", error->message); - } - - GUPnPControlPoint *cp = gupnp_control_point_new (context, CONTENT_DIR); --- -2.31.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb deleted file mode 100644 index 294c361db..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gupnp.inc - -SRC_URI = " \ - ${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz \ - file://0001-Fix-build-with-hardened-security-flags.patch \ -" -SRC_URI[sha256sum] = "00b20f1e478a72deac92c34723693a2ac55789ed1e4bb4eed99eb4d62092aafd" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb new file mode 100644 index 000000000..7ad594f02 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb @@ -0,0 +1,7 @@ +require gupnp.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "8441276f1afd0176e6f595026a3a507eed1809abfa04026bad3f21622b3523ec" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb index 3fc845051..01705a8f7 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb @@ -12,7 +12,10 @@ DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstream RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info" RRECOMMENDS_${PN} = "rygel-plugin-media-export" -inherit gnomebase vala gobject-introspection gettext systemd +inherit gnomebase vala gobject-introspection gettext systemd features_check + +# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" SRC_URI[archive.md5sum] = "7f95401903a3f855b464d5152b9d4c07" SRC_URI[archive.sha256sum] = "08c21a577f7bdad26446a75ffa32778b26842c3b1188165f0b19818559747d00" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch new file mode 100644 index 000000000..68ccb6583 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch @@ -0,0 +1,43 @@ +From 9bb962148672a3c20fb0119d7f71789b8ef3dc02 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jun 2021 19:31:34 -0700 +Subject: [PATCH] include <utility> for std::forward + +Fixes +../git/src/Log.hxx:121:42: error: no member named 'forward' in namespace 'std' + LogFormat(LogLevel::ERROR, e, fmt, std::forward<Args>(args)...); + +Upstream-Status: Submitted [https://github.com/MusicPlayerDaemon/MPD/pull/1201] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Log.hxx | 1 + + src/lib/expat/ExpatParser.hxx | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Log.hxx b/src/Log.hxx +index a295ed9f6..87097b086 100644 +--- a/src/Log.hxx ++++ b/src/Log.hxx +@@ -24,6 +24,7 @@ + #include "util/Compiler.h" + + #include <exception> ++#include <utility> + + class Domain; + +diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx +index e1723d109..4b5221e89 100644 +--- a/src/lib/expat/ExpatParser.hxx ++++ b/src/lib/expat/ExpatParser.hxx +@@ -25,6 +25,7 @@ + #include <expat.h> + + #include <stdexcept> ++#include <utility> + + class InputStream; + +-- +2.32.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb index b1fa96e1b..c112a40ce 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb @@ -19,9 +19,10 @@ DEPENDS += " \ SRC_URI = " \ git://github.com/MusicPlayerDaemon/MPD;branch=v0.22.x \ + file://0001-include-utility-for-std-forward.patch \ file://mpd.conf.in \ " -SRCREV = "938728820b11d4544a071994fe3c63c6ab710e8e" +SRCREV = "18628bf89ebfa5a806971479a71cf9b5764e500e" 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)}" 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 73b852a4a..0601cdd99 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 @@ -85,7 +85,7 @@ RDEPENDS_packagegroup-meta-multimedia-connectivity = "\ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gupnp-tools", "", d)} \ gupnp \ libupnp \ - rygel \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "rygel", "", d)} \ " RDEPENDS_packagegroup-meta-multimedia-dvb = "\ oscam \ @@ -99,8 +99,7 @@ RDEPENDS_packagegroup-meta-multimedia-mkv = "\ RDEPENDS_packagegroup-meta-multimedia-support = "\ crossguid \ - libmediaart-2.0 \ - libmediaart \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libmediaart-2.0", "", d)} \ gst-instruments \ libsrtp \ srt \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.24.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb index 25c87d26d..3e8792118 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.24.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb @@ -2,16 +2,16 @@ SUMMARY = "Multimedia processing server for Linux" DESCRIPTION = "Linux server for handling and routing audio and video streams between applications and multimedia I/O devices" HOMEPAGE = "https://pipewire.org/" BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" -LICENSE = "MIT" +LICENSE = "MIT & LGPL-2.1-or-later & GPL-2.0-only" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://LICENSE;md5=2158739e172e58dc9ab1bdd2d6ec9c72 \ file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " SECTION = "multimedia" DEPENDS = "dbus" -SRCREV = "c81d44e8a9497899d01bcc3054b6aa845e7a066e" +SRCREV = "c43dabcc96e2e072cdf08e5f094bb677d9017c6b" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -91,7 +91,7 @@ remove_unused_installed_files() { # Remove it if pipewire-jack is not built to avoid creating the # pipewire-jack package. if ${@bb.utils.contains('PACKAGECONFIG', 'pipewire-jack', 'false', 'true', d)}; then - rm -f "${D}${sysconfdir}/pipewire/jack.conf" + rm -f "${D}${datadir}/pipewire/jack.conf" fi } @@ -189,9 +189,9 @@ PACKAGES =+ "\ PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" SYSTEMD_SERVICE_${PN} = "pipewire.service" -CONFFILES_${PN} += "${sysconfdir}/pipewire/pipewire.conf" +CONFFILES_${PN} += "${datadir}/pipewire/pipewire.conf" FILES_${PN} = " \ - ${sysconfdir}/pipewire/pipewire.conf \ + ${datadir}/pipewire/pipewire.conf \ ${systemd_user_unitdir}/pipewire.* \ ${bindir}/pipewire \ " @@ -200,9 +200,9 @@ FILES_${PN}-dev += " \ ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \ " -CONFFILES_libpipewire += "${sysconfdir}/pipewire/client.conf" +CONFFILES_libpipewire += "${datadir}/pipewire/client.conf" FILES_libpipewire = " \ - ${sysconfdir}/pipewire/client.conf \ + ${datadir}/pipewire/client.conf \ ${libdir}/libpipewire-*.so.* \ " # Add the bare minimum modules and plugins required to be able @@ -220,9 +220,9 @@ FILES_${PN}-tools = " \ # This is a shim daemon that is intended to be used as a # drop-in PulseAudio replacement, providing a pulseaudio-compatible # socket that can be used by applications that use libpulse. -CONFFILES_${PN}-pulse += "${sysconfdir}/pipewire/pipewire-pulse.conf" +CONFFILES_${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf" FILES_${PN}-pulse = " \ - ${sysconfdir}/pipewire/pipewire-pulse.conf \ + ${datadir}/pipewire/pipewire-pulse.conf \ ${systemd_user_unitdir}/pipewire-pulse.* \ ${bindir}/pipewire-pulse \ " @@ -237,18 +237,18 @@ FILES_${PN}-alsa = "\ " # jack drop-in libraries to redirect audio to pipewire -CONFFILES_${PN}-jack = "${sysconfdir}/pipewire/jack.conf" +CONFFILES_${PN}-jack = "${datadir}/pipewire/jack.conf" FILES_${PN}-jack = "\ - ${sysconfdir}/pipewire/jack.conf \ + ${datadir}/pipewire/jack.conf \ ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \ " # Example session manager. Not intended for use in production. -CONFFILES_${PN}-media-session = "${sysconfdir}/pipewire/media-session.d/*" +CONFFILES_${PN}-media-session = "${datadir}/pipewire/media-session.d/*" SYSTEMD_SERVICE_${PN}-media-session = "pipewire-media-session.service" FILES_${PN}-media-session = " \ ${bindir}/pipewire-media-session \ - ${sysconfdir}/pipewire/media-session.d/* \ + ${datadir}/pipewire/media-session.d/* \ ${systemd_system_unitdir}/pipewire-media-session.service \ " RPROVIDES_${PN}-media-session = "virtual/pipewire-sessionmanager" @@ -265,11 +265,16 @@ FILES_${PN}-spa-tools = " \ FILES_${PN}-modules = "" RRECOMMENDS_${PN}-modules += "${PN}-modules-meta" -CONFFILES_${PN}-modules-rtkit = "${sysconfdir}/pipewire/client-rt.conf" +CONFFILES_${PN}-modules-rtkit = "${datadir}/pipewire/client-rt.conf" FILES_${PN}-modules-rtkit += " \ - ${sysconfdir}/pipewire/client-rt.conf \ + ${datadir}/pipewire/client-rt.conf \ " +CONFFILES_${PN}-modules-filter-chain = "${datadir}/pipewire/filter-chain/*" +FILES_${PN}-modules-filter-chain += " \ + ${datadir}/pipewire/filter-chain/* \ +" + FILES_${PN}-alsa-card-profile = " \ ${datadir}/alsa-card-profile/* \ ${nonarch_base_libdir}/udev/rules.d/90-pipewire-alsa.rules \ diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb deleted file mode 100644 index 56a7873fc..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require libmediaart.inc - -SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" -SRC_URI[md5sum] = "9b960a6a764fba38135fb57219f2e6b4" -SRC_URI[sha256sum] = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d" - -S = "${WORKDIR}/libmediaart-${PV}" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb new file mode 100644 index 000000000..31fe43bfa --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library tasked with managing, extracting and handling media art caches" + +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ + file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36 \ + file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e" + +DEPENDS = "glib-2.0 gdk-pixbuf" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection vala features_check + +SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" +SRC_URI[sha256sum] = "07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6" + +S = "${WORKDIR}/libmediaart-${PV}" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST = "introspection" + +EXTRA_OEMESON = "-Dimage_library=gdk-pixbuf" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc deleted file mode 100644 index c7b368de3..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Library tasked with managing, extracting and handling media art caches" - -LICENSE = "LGPLv2+ & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ - file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36 \ - file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e" - -DEPENDS = "glib-2.0 gdk-pixbuf" - -inherit gnomebase gtk-doc gobject-introspection - -EXTRA_OECONF = "--disable-qt --enable-gdkpixbuf" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb deleted file mode 100644 index ae95d4f69..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libmediaart.inc - -SRC_URI[archive.md5sum] = "1a44933d4cd0064e3c76d8d0ddacddc9" -SRC_URI[archive.sha256sum] = "3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3" - -EXTRA_OECONF_append = " --disable-gtk-doc" |