All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Andreas Müller" <schnitzeltony@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 3/5] pipewire: upgrade 0.3.24 -> 0.3.29
Date: Sat,  5 Jun 2021 14:09:40 +0200	[thread overview]
Message-ID: <20210605120942.1080733-3-schnitzeltony@gmail.com> (raw)
In-Reply-To: <20210605120942.1080733-1-schnitzeltony@gmail.com>

Due to 'stealing' from jack & pulseaudio the license was changed

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...{pipewire_0.3.24.bb => pipewire_0.3.29.bb} | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)
 rename meta-multimedia/recipes-multimedia/pipewire/{pipewire_0.3.24.bb => pipewire_0.3.29.bb} (91%)

diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.24.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.29.bb
similarity index 91%
rename from meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.24.bb
rename to meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.29.bb
index 25c87d26d..6c52674ca 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.24.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.29.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 = "1b484867eb20dbcf9ffea812834fc9142f89f652"
 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,10 @@ 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 \
+    ${datadir}/pipewire/filter-chain \
     ${systemd_user_unitdir}/pipewire.* \
     ${bindir}/pipewire \
 "
@@ -200,9 +201,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 +221,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 +238,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,9 +266,9 @@ 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 \
     "
 
 FILES_${PN}-alsa-card-profile = " \
-- 
2.31.1


  parent reply	other threads:[~2021-06-05 12:09 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-05 12:09 [PATCH 1/5] gnome-disk-utility: upgrade 3.36.3 -> 40.1 Andreas Müller
2021-06-05 12:09 ` [PATCH 2/5] gnome-font-viewer: upgrade 3.34.0 -> 40.0 Andreas Müller
2021-06-05 12:09 ` Andreas Müller [this message]
2021-06-05 12:09 ` [PATCH 4/5] libqmi: upgrade 1.28.4 -> 1.28.6 Andreas Müller
2021-06-05 12:09 ` [PATCH 5/5] ttf-noto-emoji: upgrade 20190815 -> 20200916 Andreas Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210605120942.1080733-3-schnitzeltony@gmail.com \
    --to=schnitzeltony@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.