commit:     571b578fc333a9bbdd176cc8ae1ee84a9492b196
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 05:39:00 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 05:39:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571b578f

media-video/pipewire: add 0.3.65

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/pipewire/Manifest                         |  1 +
 .../{pipewire-9999.ebuild => pipewire-0.3.65.ebuild}  | 19 ++++++++++++-------
 media-video/pipewire/pipewire-9999.ebuild             | 19 ++++++++++++-------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index efc0b7003e96..e51e22391355 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,2 +1,3 @@
 DIST pipewire-0.3.63.tar.bz2 1485423 BLAKE2B 
8629bce6d11959d4b3930d7db4e0ad201981002d52c6b73b3ee2b0ac141518f553f7b0e47aef4157b3c3ef71c6b544889f60f4be0fadb01b8a35c1d457edb1aa
 SHA512 
0a45e9017bbcd74f21c6a1f388c5b58123deec083bbc9a9e695948ea95e67b6384acfff6e5ab685ea7287b4696e01176e257b73286ecd03c2d2e43d80fd60805
 DIST pipewire-0.3.64.tar.bz2 1490475 BLAKE2B 
9a4d9e23a5d60da7c5788ce5145ce083f13fe771f3f5bcb3dfd1e9560d982f20415f32f756b875081464e1b175ef80af56d7babb3bbbd7a5eaf034c9c43b810a
 SHA512 
4dff77cf1ab9fefffad1b6f7182115dbb5e4f0339f052dcfcc34b62687b461d25a6f891d1ad0246dab5a8cb80ca190d97d358a6494da8c6a8cc64e0b38452093
+DIST pipewire-0.3.65.tar.bz2 1522095 BLAKE2B 
d991820e8780773ccf1cd68baa3156428eb099703b82c3e3ad24a86bc634ad43fb474fe362de5e5704ee8b35832b75995fd56096b6539835e8b1f31710450d08
 SHA512 
0c2402044a04ab6ba724b0808279498e2126dd567920f3241d7d3d5e13ea676e353fc85a73634cf4cae5429454250dfce5cd18ba4a5444a7ed1a5ca2e0ae1eef

diff --git a/media-video/pipewire/pipewire-9999.ebuild 
b/media-video/pipewire/pipewire-0.3.65.ebuild
similarity index 94%
copy from media-video/pipewire/pipewire-9999.ebuild
copy to media-video/pipewire/pipewire-0.3.65.ebuild
index ec34788a440c..98b07dfac614 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-0.3.65.ebuild
@@ -38,7 +38,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 dbus doc echo-cancel extra flatpak gstreamer gsettings 
jack-client jack-sdk lv2
+IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings 
jack-client jack-sdk lv2
 modemmanager pipewire-alsa readline sound-server ssl system-service systemd 
test v4l X zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
@@ -47,12 +47,14 @@ modemmanager pipewire-alsa readline sound-server ssl 
system-service systemd test
 # JACK's sink - doing so is likely to yield no audio, cause a CPU
 # cycles consuming loop (and may even cause GUI crashes)!
 
-# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
-# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
-# which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
-# If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
-# When pipewire-alsa will be able to perform similar check, pipewire-alsa can 
be enabled unconditionally.
+# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
+# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
+#   which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
+#   If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
+#   When pipewire-alsa will be able to perform similar check, pipewire-alsa 
can be enabled unconditionally.
+# - ffmpeg is only used for pw-cat. We don't build the spa plugin which 
receives barely any activity.
 REQUIRED_USE="
+       ffmpeg? ( extra )
        bluetooth? ( dbus )
        jack-sdk? ( !jack-client )
        modemmanager? ( bluetooth )
@@ -82,6 +84,7 @@ RDEPEND="
        virtual/libintl[${MULTILIB_USEDEP}]
        virtual/libudev[${MULTILIB_USEDEP}]
        bluetooth? (
+               dev-libs/glib
                media-libs/fdk-aac
                media-libs/libldac
                media-libs/libfreeaptx
@@ -95,6 +98,7 @@ RDEPEND="
        extra? (
                >=media-libs/libsndfile-1.0.20
        )
+       ffmpeg? ( media-video/ffmpeg:= )
        flatpak? (
                dev-libs/glib
        )
@@ -145,7 +149,6 @@ PDEPEND=">=media-video/wireplumber-0.4.8-r3"
 # Present RDEPEND that are currently always disabled due to the PW
 # code using them being required to be disabled by Gentoo guidelines
 # (i.e. developer binaries not meant for users) and unready code
-#      media-video/ffmpeg:=
 #      media-libs/libsdl2
 #      >=media-libs/vulkan-loader-1.1.69
 #
@@ -215,6 +218,7 @@ multilib_src_configure() {
                $(meson_feature pipewire-alsa) # Allows integrating ALSA apps 
into PW graph
                -Dspa-plugins=enabled
                -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: 
media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+               -Dcompress-offload=disabled # Matches upstream, tinycompress 
unpackaged too
                -Daudiomixer=enabled # Matches upstream
                -Daudioconvert=enabled # Matches upstream
                $(meson_native_use_feature bluetooth bluez5)
@@ -236,6 +240,7 @@ multilib_src_configure() {
                -Dcontrol=enabled # Matches upstream
                -Daudiotestsrc=enabled # Matches upstream
                -Dffmpeg=disabled # Disabled by upstream and no major 
developments to spa/plugins/ffmpeg/ since May 2020
+               $(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
                $(meson_native_use_feature flatpak)
                -Dpipewire-jack=enabled # Allows integrating JACK apps into PW 
graph
                $(meson_native_use_feature jack-client jack) # Allows PW to act 
as a JACK client

diff --git a/media-video/pipewire/pipewire-9999.ebuild 
b/media-video/pipewire/pipewire-9999.ebuild
index ec34788a440c..98b07dfac614 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -38,7 +38,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 dbus doc echo-cancel extra flatpak gstreamer gsettings 
jack-client jack-sdk lv2
+IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings 
jack-client jack-sdk lv2
 modemmanager pipewire-alsa readline sound-server ssl system-service systemd 
test v4l X zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
@@ -47,12 +47,14 @@ modemmanager pipewire-alsa readline sound-server ssl 
system-service systemd test
 # JACK's sink - doing so is likely to yield no audio, cause a CPU
 # cycles consuming loop (and may even cause GUI crashes)!
 
-# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
-# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
-# which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
-# If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
-# When pipewire-alsa will be able to perform similar check, pipewire-alsa can 
be enabled unconditionally.
+# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but 
ALSA is always enabled
+# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server 
connection will work
+#   which provides adequate guarantee that alsa-lib will be able to provide 
audio services.
+#   If that works, pulseaudio defaults are loaded into alsa-lib runtime 
replacing default PCM and CTL.
+#   When pipewire-alsa will be able to perform similar check, pipewire-alsa 
can be enabled unconditionally.
+# - ffmpeg is only used for pw-cat. We don't build the spa plugin which 
receives barely any activity.
 REQUIRED_USE="
+       ffmpeg? ( extra )
        bluetooth? ( dbus )
        jack-sdk? ( !jack-client )
        modemmanager? ( bluetooth )
@@ -82,6 +84,7 @@ RDEPEND="
        virtual/libintl[${MULTILIB_USEDEP}]
        virtual/libudev[${MULTILIB_USEDEP}]
        bluetooth? (
+               dev-libs/glib
                media-libs/fdk-aac
                media-libs/libldac
                media-libs/libfreeaptx
@@ -95,6 +98,7 @@ RDEPEND="
        extra? (
                >=media-libs/libsndfile-1.0.20
        )
+       ffmpeg? ( media-video/ffmpeg:= )
        flatpak? (
                dev-libs/glib
        )
@@ -145,7 +149,6 @@ PDEPEND=">=media-video/wireplumber-0.4.8-r3"
 # Present RDEPEND that are currently always disabled due to the PW
 # code using them being required to be disabled by Gentoo guidelines
 # (i.e. developer binaries not meant for users) and unready code
-#      media-video/ffmpeg:=
 #      media-libs/libsdl2
 #      >=media-libs/vulkan-loader-1.1.69
 #
@@ -215,6 +218,7 @@ multilib_src_configure() {
                $(meson_feature pipewire-alsa) # Allows integrating ALSA apps 
into PW graph
                -Dspa-plugins=enabled
                -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: 
media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+               -Dcompress-offload=disabled # Matches upstream, tinycompress 
unpackaged too
                -Daudiomixer=enabled # Matches upstream
                -Daudioconvert=enabled # Matches upstream
                $(meson_native_use_feature bluetooth bluez5)
@@ -236,6 +240,7 @@ multilib_src_configure() {
                -Dcontrol=enabled # Matches upstream
                -Daudiotestsrc=enabled # Matches upstream
                -Dffmpeg=disabled # Disabled by upstream and no major 
developments to spa/plugins/ffmpeg/ since May 2020
+               $(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
                $(meson_native_use_feature flatpak)
                -Dpipewire-jack=enabled # Allows integrating JACK apps into PW 
graph
                $(meson_native_use_feature jack-client jack) # Allows PW to act 
as a JACK client

Reply via email to