commit: 422e7ff15be8fcb48d90dea3d7dca0c2833938fc Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jan 6 20:33:53 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 6 20:53:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422e7ff1
media-video/pipewire: add 0.3.43 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/pipewire/Manifest | 1 + .../pipewire-0.3.43-systemd-user-unit-dir.patch | 30 ++++++++++++++++++++++ media-video/pipewire/metadata.xml | 1 + ...pipewire-9999.ebuild => pipewire-0.3.43.ebuild} | 21 ++++++++++++--- media-video/pipewire/pipewire-9999.ebuild | 21 ++++++++++++--- 5 files changed, 66 insertions(+), 8 deletions(-) diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index a1d886e79e61..6bba82bf0703 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -1,3 +1,4 @@ DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14 DIST pipewire-0.3.42.tar.gz 1705295 BLAKE2B afd397e75be4f776b9d3042258e8091d6e1722f374e62417274238e5017e268c986ac7624e1b91ec8a97fc9078e8aa6d46a22f30c0834f99e5cd3112a096aded SHA512 bbf00ad5cee8ac872d8c2ef6b9499233100dba04c127b435894cf16c349188ae11edf918479a58039becc1b493c6f53a318d8fb483043dde074dc21ec32984c1 +DIST pipewire-0.3.43.tar.gz 1713131 BLAKE2B 3fa167d74e6104685760a9eac721bc359f1245897e1a5f9b09b4b9591fc459d19549e209990ca478a10ad6c2a4dfaecc3546d996ab7f7d64fe880fb0c1c1dfca SHA512 d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0 diff --git a/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch new file mode 100644 index 000000000000..93c3ffe3e053 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch @@ -0,0 +1,30 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/814d409501aca3e044ad53063eb3f433b8aff6f9.patch + +From 814d409501aca3e044ad53063eb3f433b8aff6f9 Mon Sep 17 00:00:00 2001 +From: Timo Gurr <[email protected]> +Date: Thu, 6 Jan 2022 12:17:10 +0000 +Subject: [PATCH] systemd: Add systemd-system-unit-dir override + +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -179,6 +179,9 @@ option('udev', + option('udevrulesdir', + type : 'string', + description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') ++option('systemd-system-unit-dir', ++ type : 'string', ++ description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') + option('systemd-user-unit-dir', + type : 'string', + description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)') +--- a/src/daemon/systemd/system/meson.build ++++ b/src/daemon/systemd/system/meson.build +@@ -1,4 +1,7 @@ + systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix]) ++if get_option('systemd-system-unit-dir') != '' ++ systemd_system_services_dir = get_option('systemd-system-unit-dir') ++endif + + install_data(sources : 'pipewire.socket', + install_dir : systemd_system_services_dir) +GitLab diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml index dfdfec054d9e..0629898f6956 100644 --- a/media-video/pipewire/metadata.xml +++ b/media-video/pipewire/metadata.xml @@ -28,5 +28,6 @@ <flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag> <flag name="jack-sdk">Use PipeWire as JACK replacement</flag> <flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag> + <flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag> </use> </pkgmetadata> diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-0.3.43.ebuild similarity index 95% copy from media-video/pipewire/pipewire-9999.ebuild copy to media-video/pipewire/pipewire-0.3.43.ebuild index e74fc97557fb..35187723a20e 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-0.3.43.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Multimedia processing graphs" @@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/"; LICENSE="MIT LGPL-2.1+ GPL-2" # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 SLOT="0/0.4" -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa ssl systemd test usb v4l zeroconf" # Once replacing system JACK libraries is possible, it's likely that # jack-client IUSE will need blocking to avoid users accidentally @@ -77,8 +77,11 @@ RDEPEND=" !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) + usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) + zeroconf? ( net-dns/avahi ) " DEPEND="${RDEPEND}" @@ -101,6 +104,9 @@ DOCS=( {README,INSTALL}.md NEWS ) PATCHES=( "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch + + # Upstream patches/backports + "${FILESDIR}"/${P}-systemd-user-unit-dir.patch ) # limitsdfile related code taken from =sys-auth/realtime-base-0.1 @@ -127,6 +133,7 @@ src_prepare() { multilib_src_configure() { local emesonargs=( -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + $(meson_native_use_feature zeroconf avahi) $(meson_native_use_feature doc docs) $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone $(meson_native_enabled man) @@ -135,7 +142,11 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer) $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature systemd) + -Dsystemd-system-service=disabled # Matches upstream + -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" + -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" + $(meson_native_use_feature systemd systemd-user-service) $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph -Dspa-plugins=enabled @@ -163,6 +174,8 @@ multilib_src_configure() { -Dtest=disabled # fakesink and fakesource plugins $(meson_native_use_feature v4l v4l2) -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature ssl raop) + $(meson_native_use_feature usb libusb) -Dvideoconvert=enabled # Matches upstream -Dvideotestsrc=enabled # Matches upstream -Dvolume=enabled # Matches upstream diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index e74fc97557fb..321e1eecdb7d 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Multimedia processing graphs" @@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/"; LICENSE="MIT LGPL-2.1+ GPL-2" # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 SLOT="0/0.4" -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk libusb pipewire-alsa ssl systemd test v4l zeroconf" # Once replacing system JACK libraries is possible, it's likely that # jack-client IUSE will need blocking to avoid users accidentally @@ -72,13 +72,16 @@ RDEPEND=" !media-sound/jack-audio-connection-kit !media-sound/jack2 ) + libusb? ( virtual/libusb:1 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l ) + zeroconf? ( net-dns/avahi ) " DEPEND="${RDEPEND}" @@ -101,6 +104,9 @@ DOCS=( {README,INSTALL}.md NEWS ) PATCHES=( "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch + + # Upstream patches/backports + "${FILESDIR}"/${P}-systemd-user-unit-dir.patch ) # limitsdfile related code taken from =sys-auth/realtime-base-0.1 @@ -127,6 +133,7 @@ src_prepare() { multilib_src_configure() { local emesonargs=( -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + $(meson_native_use_feature zeroconf avahi) $(meson_native_use_feature doc docs) $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone $(meson_native_enabled man) @@ -135,7 +142,11 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer) $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature systemd) + -Dsystemd-system-service=disabled # Matches upstream + -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" + -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" + $(meson_native_use_feature systemd systemd-user-service) $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph -Dspa-plugins=enabled @@ -163,6 +174,8 @@ multilib_src_configure() { -Dtest=disabled # fakesink and fakesource plugins $(meson_native_use_feature v4l v4l2) -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature ssl raop) + $(meson_native_use_feature libusb) -Dvideoconvert=enabled # Matches upstream -Dvideotestsrc=enabled # Matches upstream -Dvolume=enabled # Matches upstream
