diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia')
| -rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch | 43 | ||||
| -rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb (renamed from meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb) | 3 | ||||
| -rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb | 5 | ||||
| -rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb (renamed from meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.24.bb) | 37 |
4 files changed, 68 insertions, 20 deletions
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 \ |