Gentoo Archives: gentoo-commits

From: "Jason A. Donenfeld" <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio-modules-bt/
Date: Wed, 01 Apr 2020 05:33:30
Message-Id: 1585719197.b50033ecb5e30204457b16c251c7b7cf798f0673.zx2c4@gentoo
1 commit: b50033ecb5e30204457b16c251c7b7cf798f0673
2 Author: Pablo Cholaky <waltercool <AT> slash <DOT> cl>
3 AuthorDate: Mon Mar 23 05:17:28 2020 +0000
4 Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 1 05:33:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50033ec
7
8 media-sound/pulseaudio-modules-bt: add USE flags
9
10 Closes: https://bugs.gentoo.org/713878
11 Signed-off-by: Pablo Cholaky <waltercool <AT> slash.cl>
12 Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
13
14 media-sound/pulseaudio-modules-bt/metadata.xml | 29 +++++++++++++++++-----
15 ....ebuild => pulseaudio-modules-bt-1.3-r1.ebuild} | 22 ++++++++++++----
16 .../pulseaudio-modules-bt-9999.ebuild | 22 ++++++++++++----
17 3 files changed, 57 insertions(+), 16 deletions(-)
18
19 diff --git a/media-sound/pulseaudio-modules-bt/metadata.xml b/media-sound/pulseaudio-modules-bt/metadata.xml
20 index c6a40a7b9cb..ecdf5fddd6d 100644
21 --- a/media-sound/pulseaudio-modules-bt/metadata.xml
22 +++ b/media-sound/pulseaudio-modules-bt/metadata.xml
23 @@ -1,10 +1,27 @@
24 <?xml version="1.0" encoding="UTF-8"?>
25 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
26 <pkgmetadata>
27 -<maintainer type="person">
28 - <email>zx2c4@g.o</email>
29 -</maintainer>
30 -<maintainer type="person">
31 - <email>pacho@g.o</email>
32 -</maintainer>
33 + <maintainer type="person">
34 + <email>zx2c4@g.o</email>
35 + </maintainer>
36 + <maintainer type="person">
37 + <email>pacho@g.o</email>
38 + </maintainer>
39 + <use>
40 + <flag name="fdk">
41 + AAC encoding support using media-libs/fdk-aac
42 + </flag>
43 + <flag name="ffmpeg">
44 + APTX, APTX-HD encoding support
45 + </flag>
46 + <flag name="ldac">
47 + LDAC encoding support, using media-libs/libldac
48 + </flag>
49 + <flag name="native-headset">
50 + Build with native HSP (Headset Profile) headset for bluez 5
51 + </flag>
52 + <flag name="ofono-headset">
53 + Build with oFono HFP (Hands Free Profile) headset for bluez 5, requires net-misc/ofono.
54 + </flag>
55 + </use>
56 </pkgmetadata>
57
58 diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild
59 similarity index 76%
60 rename from media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3.ebuild
61 rename to media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild
62 index 72132d0bcd3..22faf22ec86 100644
63 --- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3.ebuild
64 +++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild
65 @@ -16,16 +16,16 @@ SRC_URI="
66 LICENSE="GPL-3"
67 SLOT="0"
68 KEYWORDS="~amd64"
69 -IUSE=""
70 +IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
71
72 DEPEND="
73 - media-libs/fdk-aac:0=
74 - virtual/ffmpeg
75 + fdk? ( media-libs/fdk-aac:0= )
76 + ffmpeg? ( virtual/ffmpeg )
77 media-libs/sbc
78 - media-libs/libldac
79 + ldac? ( media-libs/libldac )
80 >=net-wireless/bluez-5
81 >=sys-apps/dbus-1.0.0
82 - >=net-misc/ofono-1.13
83 + ofono-headset? ( >=net-misc/ofono-1.13 )
84 >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
85 "
86 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
87 @@ -53,6 +53,18 @@ load-module module-bluetooth-discover
88 .endif
89 "
90
91 +src_configure() {
92 + local mycmakeargs=(
93 + -DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
94 + -DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
95 + -DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
96 + -DCODEC_LDAC=$(usex ldac "ON" "OFF")
97 + -DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
98 + -DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
99 + )
100 + cmake-utils_src_configure
101 +}
102 +
103 src_prepare() {
104 cmake-utils_src_prepare
105
106
107 diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
108 index 4dbb9914396..8b8e74ca04f 100644
109 --- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
110 +++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
111 @@ -17,16 +17,16 @@ EGIT_OVERRIDE_COMMIT_PULSEAUDIO_PULSEAUDIO="v13.0"
112 LICENSE="GPL-3"
113 SLOT="0"
114 KEYWORDS=""
115 -IUSE=""
116 +IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
117
118 DEPEND="
119 - media-libs/fdk-aac:0=
120 - virtual/ffmpeg
121 + fdk? ( media-libs/fdk-aac:0= )
122 + ffmpeg? ( virtual/ffmpeg )
123 media-libs/sbc
124 - media-libs/libldac
125 + ldac? ( media-libs/libldac )
126 >=net-wireless/bluez-5
127 >=sys-apps/dbus-1.0.0
128 - >=net-misc/ofono-1.13
129 + ofono-headset? ( >=net-misc/ofono-1.13 )
130 >=media-sound/pulseaudio-13[-bluetooth]
131 "
132 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
133 @@ -55,6 +55,18 @@ load-module module-bluetooth-discover
134 .endif
135 "
136
137 +src_configure() {
138 + local mycmakeargs=(
139 + -DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
140 + -DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
141 + -DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
142 + -DCODEC_LDAC=$(usex ldac "ON" "OFF")
143 + -DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
144 + -DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
145 + )
146 + cmake-utils_src_configure
147 +}
148 +
149 src_install() {
150 cmake-utils_src_install
151 readme.gentoo_create_doc