| 1 |
commit: e1bb4af5c47763a0ff2feba7d48cd5d495615630 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 6 15:55:05 2021 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 6 15:55:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1bb4af5 |
| 7 |
|
| 8 |
media-video/pipewire: combine USE=aac, USE=aptx & USE=ldac in USE=bluetooth |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/795921 |
| 11 |
Package-Manager: Portage-3.0.21, Repoman-3.0.3 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
...wire-0.3.30.ebuild => pipewire-0.3.30-r1.ebuild} | 21 ++++++++------------- |
| 15 |
media-video/pipewire/pipewire-0.3.31.ebuild | 21 ++++++++------------- |
| 16 |
media-video/pipewire/pipewire-9999.ebuild | 21 ++++++++------------- |
| 17 |
3 files changed, 24 insertions(+), 39 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/pipewire/pipewire-0.3.30.ebuild b/media-video/pipewire/pipewire-0.3.30-r1.ebuild |
| 20 |
similarity index 95% |
| 21 |
rename from media-video/pipewire/pipewire-0.3.30.ebuild |
| 22 |
rename to media-video/pipewire/pipewire-0.3.30-r1.ebuild |
| 23 |
index bd2852e0b34..6e42e81459e 100644 |
| 24 |
--- a/media-video/pipewire/pipewire-0.3.30.ebuild |
| 25 |
+++ b/media-video/pipewire/pipewire-0.3.30-r1.ebuild |
| 26 |
@@ -20,7 +20,7 @@ HOMEPAGE="https://pipewire.org/" |
| 27 |
|
| 28 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 29 |
SLOT="0/0.3" |
| 30 |
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l" |
| 31 |
+IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" |
| 32 |
|
| 33 |
# Once replacing system JACK libraries is possible, it's likely that |
| 34 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 35 |
@@ -28,12 +28,7 @@ IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire- |
| 36 |
# JACK's sink - doing so is likely to yield no audio, cause a CPU |
| 37 |
# cycles consuming loop (and may even cause GUI crashes)! |
| 38 |
|
| 39 |
-REQUIRED_USE=" |
| 40 |
- aac? ( bluetooth ) |
| 41 |
- aptx? ( bluetooth ) |
| 42 |
- jack-sdk? ( !jack-client ) |
| 43 |
- ldac? ( bluetooth ) |
| 44 |
-" |
| 45 |
+REQUIRED_USE="jack-sdk? ( !jack-client )" |
| 46 |
|
| 47 |
RESTRICT="!test? ( test )" |
| 48 |
|
| 49 |
@@ -54,9 +49,9 @@ RDEPEND=" |
| 50 |
virtual/libintl[${MULTILIB_USEDEP}] |
| 51 |
virtual/libudev[${MULTILIB_USEDEP}] |
| 52 |
bluetooth? ( |
| 53 |
- aac? ( media-libs/fdk-aac ) |
| 54 |
- aptx? ( media-libs/libopenaptx ) |
| 55 |
- ldac? ( media-libs/libldac ) |
| 56 |
+ media-libs/fdk-aac |
| 57 |
+ media-libs/libldac |
| 58 |
+ media-libs/libopenaptx |
| 59 |
media-libs/sbc |
| 60 |
>=net-wireless/bluez-4.101:= |
| 61 |
) |
| 62 |
@@ -151,9 +146,9 @@ multilib_src_configure() { |
| 63 |
$(meson_native_use_feature bluetooth bluez5-backend-hfp-native) |
| 64 |
$(meson_native_use_feature bluetooth bluez5-backend-ofono) |
| 65 |
$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) |
| 66 |
- $(meson_native_use_feature aac bluez5-codec-aac) |
| 67 |
- $(meson_native_use_feature aptx bluez5-codec-aptx) |
| 68 |
- $(meson_native_use_feature ldac bluez5-codec-ldac) |
| 69 |
+ $(meson_native_use_feature bluetooth bluez5-codec-aac) |
| 70 |
+ $(meson_native_use_feature bluetooth bluez5-codec-aptx) |
| 71 |
+ $(meson_native_use_feature bluetooth bluez5-codec-ldac) |
| 72 |
-Dcontrol=enabled # Matches upstream |
| 73 |
-Daudiotestsrc=enabled # Matches upstream |
| 74 |
-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 |
| 75 |
|
| 76 |
diff --git a/media-video/pipewire/pipewire-0.3.31.ebuild b/media-video/pipewire/pipewire-0.3.31.ebuild |
| 77 |
index 000447820f4..29da21cf2dc 100644 |
| 78 |
--- a/media-video/pipewire/pipewire-0.3.31.ebuild |
| 79 |
+++ b/media-video/pipewire/pipewire-0.3.31.ebuild |
| 80 |
@@ -20,7 +20,7 @@ HOMEPAGE="https://pipewire.org/" |
| 81 |
|
| 82 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 83 |
SLOT="0/0.3" |
| 84 |
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l" |
| 85 |
+IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" |
| 86 |
|
| 87 |
# Once replacing system JACK libraries is possible, it's likely that |
| 88 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 89 |
@@ -28,12 +28,7 @@ IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire- |
| 90 |
# JACK's sink - doing so is likely to yield no audio, cause a CPU |
| 91 |
# cycles consuming loop (and may even cause GUI crashes)! |
| 92 |
|
| 93 |
-REQUIRED_USE=" |
| 94 |
- aac? ( bluetooth ) |
| 95 |
- aptx? ( bluetooth ) |
| 96 |
- jack-sdk? ( !jack-client ) |
| 97 |
- ldac? ( bluetooth ) |
| 98 |
-" |
| 99 |
+REQUIRED_USE="jack-sdk? ( !jack-client )" |
| 100 |
|
| 101 |
RESTRICT="!test? ( test )" |
| 102 |
|
| 103 |
@@ -54,9 +49,9 @@ RDEPEND=" |
| 104 |
virtual/libintl[${MULTILIB_USEDEP}] |
| 105 |
virtual/libudev[${MULTILIB_USEDEP}] |
| 106 |
bluetooth? ( |
| 107 |
- aac? ( media-libs/fdk-aac ) |
| 108 |
- aptx? ( media-libs/libopenaptx ) |
| 109 |
- ldac? ( media-libs/libldac ) |
| 110 |
+ media-libs/fdk-aac |
| 111 |
+ media-libs/libldac |
| 112 |
+ media-libs/libopenaptx |
| 113 |
media-libs/sbc |
| 114 |
>=net-wireless/bluez-4.101:= |
| 115 |
) |
| 116 |
@@ -151,9 +146,9 @@ multilib_src_configure() { |
| 117 |
$(meson_native_use_feature bluetooth bluez5-backend-hfp-native) |
| 118 |
$(meson_native_use_feature bluetooth bluez5-backend-ofono) |
| 119 |
$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) |
| 120 |
- $(meson_native_use_feature aac bluez5-codec-aac) |
| 121 |
- $(meson_native_use_feature aptx bluez5-codec-aptx) |
| 122 |
- $(meson_native_use_feature ldac bluez5-codec-ldac) |
| 123 |
+ $(meson_native_use_feature bluetooth bluez5-codec-aac) |
| 124 |
+ $(meson_native_use_feature bluetooth bluez5-codec-aptx) |
| 125 |
+ $(meson_native_use_feature bluetooth bluez5-codec-ldac) |
| 126 |
-Dcontrol=enabled # Matches upstream |
| 127 |
-Daudiotestsrc=enabled # Matches upstream |
| 128 |
-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 |
| 129 |
|
| 130 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild |
| 131 |
index 000447820f4..29da21cf2dc 100644 |
| 132 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
| 133 |
+++ b/media-video/pipewire/pipewire-9999.ebuild |
| 134 |
@@ -20,7 +20,7 @@ HOMEPAGE="https://pipewire.org/" |
| 135 |
|
| 136 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 137 |
SLOT="0/0.3" |
| 138 |
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l" |
| 139 |
+IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" |
| 140 |
|
| 141 |
# Once replacing system JACK libraries is possible, it's likely that |
| 142 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 143 |
@@ -28,12 +28,7 @@ IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire- |
| 144 |
# JACK's sink - doing so is likely to yield no audio, cause a CPU |
| 145 |
# cycles consuming loop (and may even cause GUI crashes)! |
| 146 |
|
| 147 |
-REQUIRED_USE=" |
| 148 |
- aac? ( bluetooth ) |
| 149 |
- aptx? ( bluetooth ) |
| 150 |
- jack-sdk? ( !jack-client ) |
| 151 |
- ldac? ( bluetooth ) |
| 152 |
-" |
| 153 |
+REQUIRED_USE="jack-sdk? ( !jack-client )" |
| 154 |
|
| 155 |
RESTRICT="!test? ( test )" |
| 156 |
|
| 157 |
@@ -54,9 +49,9 @@ RDEPEND=" |
| 158 |
virtual/libintl[${MULTILIB_USEDEP}] |
| 159 |
virtual/libudev[${MULTILIB_USEDEP}] |
| 160 |
bluetooth? ( |
| 161 |
- aac? ( media-libs/fdk-aac ) |
| 162 |
- aptx? ( media-libs/libopenaptx ) |
| 163 |
- ldac? ( media-libs/libldac ) |
| 164 |
+ media-libs/fdk-aac |
| 165 |
+ media-libs/libldac |
| 166 |
+ media-libs/libopenaptx |
| 167 |
media-libs/sbc |
| 168 |
>=net-wireless/bluez-4.101:= |
| 169 |
) |
| 170 |
@@ -151,9 +146,9 @@ multilib_src_configure() { |
| 171 |
$(meson_native_use_feature bluetooth bluez5-backend-hfp-native) |
| 172 |
$(meson_native_use_feature bluetooth bluez5-backend-ofono) |
| 173 |
$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) |
| 174 |
- $(meson_native_use_feature aac bluez5-codec-aac) |
| 175 |
- $(meson_native_use_feature aptx bluez5-codec-aptx) |
| 176 |
- $(meson_native_use_feature ldac bluez5-codec-ldac) |
| 177 |
+ $(meson_native_use_feature bluetooth bluez5-codec-aac) |
| 178 |
+ $(meson_native_use_feature bluetooth bluez5-codec-aptx) |
| 179 |
+ $(meson_native_use_feature bluetooth bluez5-codec-ldac) |
| 180 |
-Dcontrol=enabled # Matches upstream |
| 181 |
-Daudiotestsrc=enabled # Matches upstream |
| 182 |
-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 |
Archives