summaryrefslogtreecommitdiff
path: root/media-video/pipewire
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/pipewire')
-rw-r--r--media-video/pipewire/Manifest4
-rw-r--r--media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch17
-rw-r--r--media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch30
-rw-r--r--media-video/pipewire/pipewire-9999.ebuild4
4 files changed, 52 insertions, 3 deletions
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 43f5f9f0733b..78d485107ebc 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,6 +3,8 @@ AUX pipewire-0.3.25-fix-docdir-path.patch 1231 BLAKE2B 7e361262d4ccc6f21159dfce6
AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a
AUX pipewire-0.3.28-revert-openaptx-restriction.patch 955 BLAKE2B 17b6adc21205fd47a8759103d680976fff64ca4f5bb02a0ebbf5dba2115036710798dce5ca3b0964848c047eaf1790ab68e0c4e884544b9fea66cffea05aad0b SHA512 4b8e3330deac02ff5788fc26b63e19b2f6ecc82f156981321e6abc397c9b6e7111c5bff8107dc455d9246bf25fc9ed3b2d674335dda396d20c6387e1623dbcc7
AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad
+AUX pipewire-0.3.31-non-systemd-integration.patch 854 BLAKE2B 361b01278d2525768edd33881ebfa78e15006d346612422cc11817df6cc6c5079d166f3185b8d48312294a6a225ecdb607f180339f416131c7acd638b6efe3fb SHA512 495a7568a1c19e0a24edab7d0572032234efd2380fc9c0fe282a891ff316a235cdb97d5df4524233ed6d8ebfc7724ba9870393b8a5c2a192974865aa706760ab
+AUX pipewire-0.3.31-revert-openaptx-restriction.patch 1368 BLAKE2B 7f995c53ea843282ea802304365833c1464393f7e3e4edeb93cb400c1ed85d2cb7e9f3aa47565139e80ee0fae33e83f5306062e4d26c43d5d544a7f9ca4a4e17 SHA512 0ef4262d5d7c95061dbb68c998539c5a3f70084b6ecbed4b237f699df4f1fdb95539ab35fe0295acf46e729065295cb75750bd99eaa1ff565a26369116b52855
AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
@@ -19,5 +21,5 @@ EBUILD pipewire-0.3.27-r1.ebuild 9298 BLAKE2B 92e91609706d83720cd6aefd0afa5d3f06
EBUILD pipewire-0.3.28.ebuild 9370 BLAKE2B 305b012d603420eb7c6c8bd70747889a89b2321649f43d3108eb21cf8046ddc64b7884045656793a9787bcd45973698aa61351c0930d4181cdecc34ebcda3388 SHA512 904e6c09d47ee6198bfcb6c3a8d3f1edf9eb69af5676f6401e1e54509ac8d510c33d62d146c3104e5c7ff571e08db50bfc6568e8cf269b654c4fefef3330019b
EBUILD pipewire-0.3.29.ebuild 9389 BLAKE2B 3809e908b15e24a41137880a37c2e4eec2fbbb8c03387131bf3b7a57dbde220980480156843565134f29c9ae0d21a038dd9be55c681a92b689e1d6e12210f070 SHA512 822b0134c90bdb01b7019b94b5676e149fb8d6801a47ddfee831288a6e6139334308302b5654b49469dee07f1f52701a3b021aebf40d4c49acc6278955c82bf8
EBUILD pipewire-0.3.30.ebuild 9454 BLAKE2B f6a4987ff7159f3039e1bc4a1f96ab5d74eab65d15a610283e940fd4a25d4a9c95f876bfc3cf2337a8b07725304b8446715abb0f892b8d2c3cae8e11fee0bdab SHA512 fbee1686d182adb55675f02de39a6bd7a4e9213e93d7b352facea92f676535f36052db31a1c93480bc995f159290ae3608a688bacc9750eb37469b0c5af64cee
-EBUILD pipewire-9999.ebuild 9454 BLAKE2B f6a4987ff7159f3039e1bc4a1f96ab5d74eab65d15a610283e940fd4a25d4a9c95f876bfc3cf2337a8b07725304b8446715abb0f892b8d2c3cae8e11fee0bdab SHA512 fbee1686d182adb55675f02de39a6bd7a4e9213e93d7b352facea92f676535f36052db31a1c93480bc995f159290ae3608a688bacc9750eb37469b0c5af64cee
+EBUILD pipewire-9999.ebuild 9454 BLAKE2B fb9441155d5f40abbab3b0587c1732e071f4ec20bf7f2997cb7b613ac2e77b865dd547a50012357884f60f0a674529d93fefd7309315b29ae6da33cb5ee089af SHA512 3b6c5b8b27de1f5c8e0a7569a1d8b614561ff46f5ded1f79e3f9c94e9a366dbf15cc2620c6dc46321580d8646cb6fa7980c7b23da625276ec220631e80141d39
MISC metadata.xml 1600 BLAKE2B 1138c789841fae8ea509ba2becdfef8376b87525b5b1822854ca083ab49e63124cbde6d8064849e0114a0e39269f63cf76d63f49396d709f6b3da865cf539487 SHA512 5ca5105edecf2515049b61e71327236c3e0fd949a25e91a9ed9dc0a9ad5d9d66f0b99329276c824e8840352b699bb9995b9ae073b43f30f87f4a8cc4bc4237a5
diff --git a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
new file mode 100644
index 000000000000..ccc89f1310b7
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
@@ -0,0 +1,17 @@
+--- a/src/daemon/pipewire.conf.in 2021-06-30 22:22:09.520402459 +0200
++++ b/src/daemon/pipewire.conf.in 2021-06-30 22:22:30.620404999 +0200
+@@ -234,12 +234,12 @@
+ # but it is better to start it as a systemd service.
+ # Run the session manager with -h for options.
+ #
+- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
++ { path = "@session_manager_path@" args = "@session_manager_args@" }
+ #
+ # You can optionally start the pulseaudio-server here as well
+ # but it is better to start it as a systemd service.
+ # It can be interesting to start another daemon here that listens
+ # on another address with the -a option (eg. -a tcp:4713).
+ #
+- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
++ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
+ ]
diff --git a/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
new file mode 100644
index 000000000000..d8496bc5a694
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
@@ -0,0 +1,30 @@
+From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Fri, 21 May 2021 10:32:52 +0200
+Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
+
+This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
+
+Doesn't apply to us.
+
+Bug: https://bugs.gentoo.org/785634
+---
+ spa/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spa/meson.build b/spa/meson.build
+index e13802e94..885b25405 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
+ summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+ ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
+ summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+- aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
++ aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
+ summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+ fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
+ summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+--
+2.32.0
+
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index d2c5423d5e5d..4520c8074913 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -101,7 +101,7 @@ DOCS=( {README,INSTALL}.md NEWS )
PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
- "${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
+ "${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
)
# limitsdfile related code taken from =sys-auth/realtime-base-0.1
@@ -114,7 +114,7 @@ src_prepare() {
if ! use systemd; then
# This can be applied non-conditionally but would make for a
# significantly worse user experience on systemd then.
- eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+ eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
fi
einfo "Generating ${limitsdfile}"