| 1 |
commit: 422e7ff15be8fcb48d90dea3d7dca0c2833938fc |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 6 20:33:53 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 20:53:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422e7ff1 |
| 7 |
|
| 8 |
media-video/pipewire: add 0.3.43 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
media-video/pipewire/Manifest | 1 + |
| 13 |
.../pipewire-0.3.43-systemd-user-unit-dir.patch | 30 ++++++++++++++++++++++ |
| 14 |
media-video/pipewire/metadata.xml | 1 + |
| 15 |
...pipewire-9999.ebuild => pipewire-0.3.43.ebuild} | 21 ++++++++++++--- |
| 16 |
media-video/pipewire/pipewire-9999.ebuild | 21 ++++++++++++--- |
| 17 |
5 files changed, 66 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest |
| 20 |
index a1d886e79e61..6bba82bf0703 100644 |
| 21 |
--- a/media-video/pipewire/Manifest |
| 22 |
+++ b/media-video/pipewire/Manifest |
| 23 |
@@ -1,3 +1,4 @@ |
| 24 |
DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3 |
| 25 |
DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14 |
| 26 |
DIST pipewire-0.3.42.tar.gz 1705295 BLAKE2B afd397e75be4f776b9d3042258e8091d6e1722f374e62417274238e5017e268c986ac7624e1b91ec8a97fc9078e8aa6d46a22f30c0834f99e5cd3112a096aded SHA512 bbf00ad5cee8ac872d8c2ef6b9499233100dba04c127b435894cf16c349188ae11edf918479a58039becc1b493c6f53a318d8fb483043dde074dc21ec32984c1 |
| 27 |
+DIST pipewire-0.3.43.tar.gz 1713131 BLAKE2B 3fa167d74e6104685760a9eac721bc359f1245897e1a5f9b09b4b9591fc459d19549e209990ca478a10ad6c2a4dfaecc3546d996ab7f7d64fe880fb0c1c1dfca SHA512 d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0 |
| 28 |
|
| 29 |
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 |
| 30 |
new file mode 100644 |
| 31 |
index 000000000000..93c3ffe3e053 |
| 32 |
--- /dev/null |
| 33 |
+++ b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch |
| 34 |
@@ -0,0 +1,30 @@ |
| 35 |
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/814d409501aca3e044ad53063eb3f433b8aff6f9.patch |
| 36 |
+ |
| 37 |
+From 814d409501aca3e044ad53063eb3f433b8aff6f9 Mon Sep 17 00:00:00 2001 |
| 38 |
+From: Timo Gurr <timo.gurr@×××××.com> |
| 39 |
+Date: Thu, 6 Jan 2022 12:17:10 +0000 |
| 40 |
+Subject: [PATCH] systemd: Add systemd-system-unit-dir override |
| 41 |
+ |
| 42 |
+--- a/meson_options.txt |
| 43 |
++++ b/meson_options.txt |
| 44 |
+@@ -179,6 +179,9 @@ option('udev', |
| 45 |
+ option('udevrulesdir', |
| 46 |
+ type : 'string', |
| 47 |
+ description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') |
| 48 |
++option('systemd-system-unit-dir', |
| 49 |
++ type : 'string', |
| 50 |
++ description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') |
| 51 |
+ option('systemd-user-unit-dir', |
| 52 |
+ type : 'string', |
| 53 |
+ description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)') |
| 54 |
+--- a/src/daemon/systemd/system/meson.build |
| 55 |
++++ b/src/daemon/systemd/system/meson.build |
| 56 |
+@@ -1,4 +1,7 @@ |
| 57 |
+ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix]) |
| 58 |
++if get_option('systemd-system-unit-dir') != '' |
| 59 |
++ systemd_system_services_dir = get_option('systemd-system-unit-dir') |
| 60 |
++endif |
| 61 |
+ |
| 62 |
+ install_data(sources : 'pipewire.socket', |
| 63 |
+ install_dir : systemd_system_services_dir) |
| 64 |
+GitLab |
| 65 |
|
| 66 |
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml |
| 67 |
index dfdfec054d9e..0629898f6956 100644 |
| 68 |
--- a/media-video/pipewire/metadata.xml |
| 69 |
+++ b/media-video/pipewire/metadata.xml |
| 70 |
@@ -28,5 +28,6 @@ |
| 71 |
<flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag> |
| 72 |
<flag name="jack-sdk">Use PipeWire as JACK replacement</flag> |
| 73 |
<flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag> |
| 74 |
+ <flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag> |
| 75 |
</use> |
| 76 |
</pkgmetadata> |
| 77 |
|
| 78 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-0.3.43.ebuild |
| 79 |
similarity index 95% |
| 80 |
copy from media-video/pipewire/pipewire-9999.ebuild |
| 81 |
copy to media-video/pipewire/pipewire-0.3.43.ebuild |
| 82 |
index e74fc97557fb..35187723a20e 100644 |
| 83 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
| 84 |
+++ b/media-video/pipewire/pipewire-0.3.43.ebuild |
| 85 |
@@ -1,7 +1,7 @@ |
| 86 |
-# Copyright 1999-2021 Gentoo Authors |
| 87 |
+# Copyright 1999-2022 Gentoo Authors |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
|
| 90 |
-EAPI="7" |
| 91 |
+EAPI=8 |
| 92 |
|
| 93 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 94 |
|
| 95 |
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then |
| 96 |
inherit git-r3 |
| 97 |
else |
| 98 |
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" |
| 99 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" |
| 100 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" |
| 101 |
fi |
| 102 |
|
| 103 |
DESCRIPTION="Multimedia processing graphs" |
| 104 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/" |
| 105 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 106 |
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 |
| 107 |
SLOT="0/0.4" |
| 108 |
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" |
| 109 |
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa ssl systemd test usb v4l zeroconf" |
| 110 |
|
| 111 |
# Once replacing system JACK libraries is possible, it's likely that |
| 112 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 113 |
@@ -77,8 +77,11 @@ RDEPEND=" |
| 114 |
!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] |
| 115 |
) |
| 116 |
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) |
| 117 |
+ ssl? ( dev-libs/openssl:= ) |
| 118 |
systemd? ( sys-apps/systemd ) |
| 119 |
+ usb? ( virtual/libusb:1 ) |
| 120 |
v4l? ( media-libs/libv4l ) |
| 121 |
+ zeroconf? ( net-dns/avahi ) |
| 122 |
" |
| 123 |
|
| 124 |
DEPEND="${RDEPEND}" |
| 125 |
@@ -101,6 +104,9 @@ DOCS=( {README,INSTALL}.md NEWS ) |
| 126 |
|
| 127 |
PATCHES=( |
| 128 |
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch |
| 129 |
+ |
| 130 |
+ # Upstream patches/backports |
| 131 |
+ "${FILESDIR}"/${P}-systemd-user-unit-dir.patch |
| 132 |
) |
| 133 |
|
| 134 |
# limitsdfile related code taken from =sys-auth/realtime-base-0.1 |
| 135 |
@@ -127,6 +133,7 @@ src_prepare() { |
| 136 |
multilib_src_configure() { |
| 137 |
local emesonargs=( |
| 138 |
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF} |
| 139 |
+ $(meson_native_use_feature zeroconf avahi) |
| 140 |
$(meson_native_use_feature doc docs) |
| 141 |
$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone |
| 142 |
$(meson_native_enabled man) |
| 143 |
@@ -135,7 +142,11 @@ multilib_src_configure() { |
| 144 |
$(meson_native_use_feature gstreamer) |
| 145 |
$(meson_native_use_feature gstreamer gstreamer-device-provider) |
| 146 |
$(meson_native_use_feature systemd) |
| 147 |
+ |
| 148 |
-Dsystemd-system-service=disabled # Matches upstream |
| 149 |
+ -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" |
| 150 |
+ -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" |
| 151 |
+ |
| 152 |
$(meson_native_use_feature systemd systemd-user-service) |
| 153 |
$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph |
| 154 |
-Dspa-plugins=enabled |
| 155 |
@@ -163,6 +174,8 @@ multilib_src_configure() { |
| 156 |
-Dtest=disabled # fakesink and fakesource plugins |
| 157 |
$(meson_native_use_feature v4l v4l2) |
| 158 |
-Dlibcamera=disabled # libcamera is not in Portage tree |
| 159 |
+ $(meson_native_use_feature ssl raop) |
| 160 |
+ $(meson_native_use_feature usb libusb) |
| 161 |
-Dvideoconvert=enabled # Matches upstream |
| 162 |
-Dvideotestsrc=enabled # Matches upstream |
| 163 |
-Dvolume=enabled # Matches upstream |
| 164 |
|
| 165 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild |
| 166 |
index e74fc97557fb..321e1eecdb7d 100644 |
| 167 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
| 168 |
+++ b/media-video/pipewire/pipewire-9999.ebuild |
| 169 |
@@ -1,7 +1,7 @@ |
| 170 |
-# Copyright 1999-2021 Gentoo Authors |
| 171 |
+# Copyright 1999-2022 Gentoo Authors |
| 172 |
# Distributed under the terms of the GNU General Public License v2 |
| 173 |
|
| 174 |
-EAPI="7" |
| 175 |
+EAPI=8 |
| 176 |
|
| 177 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 178 |
|
| 179 |
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then |
| 180 |
inherit git-r3 |
| 181 |
else |
| 182 |
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" |
| 183 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" |
| 184 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" |
| 185 |
fi |
| 186 |
|
| 187 |
DESCRIPTION="Multimedia processing graphs" |
| 188 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/" |
| 189 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 190 |
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 |
| 191 |
SLOT="0/0.4" |
| 192 |
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" |
| 193 |
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk libusb pipewire-alsa ssl systemd test v4l zeroconf" |
| 194 |
|
| 195 |
# Once replacing system JACK libraries is possible, it's likely that |
| 196 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 197 |
@@ -72,13 +72,16 @@ RDEPEND=" |
| 198 |
!media-sound/jack-audio-connection-kit |
| 199 |
!media-sound/jack2 |
| 200 |
) |
| 201 |
+ libusb? ( virtual/libusb:1 ) |
| 202 |
pipewire-alsa? ( |
| 203 |
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] |
| 204 |
!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] |
| 205 |
) |
| 206 |
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) |
| 207 |
+ ssl? ( dev-libs/openssl:= ) |
| 208 |
systemd? ( sys-apps/systemd ) |
| 209 |
v4l? ( media-libs/libv4l ) |
| 210 |
+ zeroconf? ( net-dns/avahi ) |
| 211 |
" |
| 212 |
|
| 213 |
DEPEND="${RDEPEND}" |
| 214 |
@@ -101,6 +104,9 @@ DOCS=( {README,INSTALL}.md NEWS ) |
| 215 |
|
| 216 |
PATCHES=( |
| 217 |
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch |
| 218 |
+ |
| 219 |
+ # Upstream patches/backports |
| 220 |
+ "${FILESDIR}"/${P}-systemd-user-unit-dir.patch |
| 221 |
) |
| 222 |
|
| 223 |
# limitsdfile related code taken from =sys-auth/realtime-base-0.1 |
| 224 |
@@ -127,6 +133,7 @@ src_prepare() { |
| 225 |
multilib_src_configure() { |
| 226 |
local emesonargs=( |
| 227 |
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF} |
| 228 |
+ $(meson_native_use_feature zeroconf avahi) |
| 229 |
$(meson_native_use_feature doc docs) |
| 230 |
$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone |
| 231 |
$(meson_native_enabled man) |
| 232 |
@@ -135,7 +142,11 @@ multilib_src_configure() { |
| 233 |
$(meson_native_use_feature gstreamer) |
| 234 |
$(meson_native_use_feature gstreamer gstreamer-device-provider) |
| 235 |
$(meson_native_use_feature systemd) |
| 236 |
+ |
| 237 |
-Dsystemd-system-service=disabled # Matches upstream |
| 238 |
+ -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" |
| 239 |
+ -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" |
| 240 |
+ |
| 241 |
$(meson_native_use_feature systemd systemd-user-service) |
| 242 |
$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph |
| 243 |
-Dspa-plugins=enabled |
| 244 |
@@ -163,6 +174,8 @@ multilib_src_configure() { |
| 245 |
-Dtest=disabled # fakesink and fakesource plugins |
| 246 |
$(meson_native_use_feature v4l v4l2) |
| 247 |
-Dlibcamera=disabled # libcamera is not in Portage tree |
| 248 |
+ $(meson_native_use_feature ssl raop) |
| 249 |
+ $(meson_native_use_feature libusb) |
| 250 |
-Dvideoconvert=enabled # Matches upstream |
| 251 |
-Dvideotestsrc=enabled # Matches upstream |
| 252 |
-Dvolume=enabled # Matches upstream |
Archives