1 |
commit: 69e184dd4ff12b9f4d0df8d7db5187dd6d630c42 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 5 11:50:04 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 5 11:50:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e184dd |
7 |
|
8 |
media-libs/alsa-lib: Revbump to add python3 support. |
9 |
|
10 |
Also fixed build with USE="alisp" |
11 |
|
12 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
13 |
|
14 |
...a-lib-1.1.6.ebuild => alsa-lib-1.1.6-r1.ebuild} | 7 +- |
15 |
.../files/alsa-lib-1.1.6-missing_files.patch | 196 +++++++++++++++++++++ |
16 |
2 files changed, 201 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild |
19 |
similarity index 95% |
20 |
rename from media-libs/alsa-lib/alsa-lib-1.1.6.ebuild |
21 |
rename to media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild |
22 |
index d707b7888ae..f03ea3f74da 100644 |
23 |
--- a/media-libs/alsa-lib/alsa-lib-1.1.6.ebuild |
24 |
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild |
25 |
@@ -3,8 +3,7 @@ |
26 |
|
27 |
EAPI=6 |
28 |
|
29 |
-# no support for python3_2 or above yet wrt #471326 |
30 |
-PYTHON_COMPAT=( python2_7 ) |
31 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
32 |
|
33 |
inherit autotools multilib multilib-minimal python-single-r1 |
34 |
|
35 |
@@ -23,6 +22,10 @@ DEPEND="${RDEPEND} |
36 |
|
37 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
38 |
|
39 |
+PATCHES=( |
40 |
+ "${FILESDIR}/${P}-missing_files.patch" #652422 |
41 |
+) |
42 |
+ |
43 |
pkg_setup() { |
44 |
use python && python-single-r1_pkg_setup |
45 |
} |
46 |
|
47 |
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch b/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch |
48 |
new file mode 100644 |
49 |
index 00000000000..909a00b985b |
50 |
--- /dev/null |
51 |
+++ b/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch |
52 |
@@ -0,0 +1,196 @@ |
53 |
+https://bugs.gentoo.org/652422 |
54 |
+ |
55 |
+--- alsa-lib-1.1.6/src/conf/cards/aliases.alisp |
56 |
++++ alsa-lib-1.1.6/src/conf/cards/aliases.alisp |
57 |
+@@ -0,0 +1,29 @@ |
58 |
++(setq snd_card_aliases_array |
59 |
++ ( |
60 |
++ ("YMF724" . "YMF744") |
61 |
++ ("YMF724F" . "YMF744") |
62 |
++ ("YMF740" . "YMF744") |
63 |
++ ("YMF740C" . "YMF744") |
64 |
++ ("YMF754" . "YMF744") |
65 |
++ ("CMIPCI" . "CMI8338") |
66 |
++ ("CMI8738" . "CMI8338") |
67 |
++ ("CMI8738-MC4" . "CMI8738-MC6") |
68 |
++ ("E-mu APS" . "EMU10K1") |
69 |
++ ("GUS Max" . "GUS") |
70 |
++ ("GUS ACE" . "GUS") |
71 |
++ ("GUS Extreme" . "GUS") |
72 |
++ ("AMD InterWave" . "GUS") |
73 |
++ ("Dynasonic 3-D" . "GUS") |
74 |
++ ("InterWave STB" . "GUS") |
75 |
++ ) |
76 |
++) |
77 |
++ |
78 |
++(defun snd_card_alias (cardname) |
79 |
++ (setq r (assq cardname snd_card_aliases_array)) |
80 |
++ (setq r (if (null r) cardname r)) |
81 |
++ (unsetq r) |
82 |
++) |
83 |
++ |
84 |
++(defun snd_card_alias_unset () |
85 |
++ (unsetq snd_card_aliases_array snd_card_alias) |
86 |
++) |
87 |
+--- alsa-lib-1.1.6/src/conf/cards/SI7018/sndoc-mixer.alisp |
88 |
++++ alsa-lib-1.1.6/src/conf/cards/SI7018/sndoc-mixer.alisp |
89 |
+@@ -0,0 +1,11 @@ |
90 |
++; |
91 |
++; SiS SI7018 mixer abstract layer |
92 |
++; |
93 |
++; Copyright (c) 2003 Jaroslav Kysela <perex@×××××.cz> |
94 |
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html) |
95 |
++; |
96 |
++ |
97 |
++(defun sndoc_mixer_open (hctl pcm) |
98 |
++ (princ "sndoc_mixer_open: hctl=" hctl " pcm=" pcm "\n") |
99 |
++ 0 |
100 |
++) |
101 |
+--- alsa-lib-1.1.6/src/conf/cards/SI7018/sndop-mixer.alisp |
102 |
++++ alsa-lib-1.1.6/src/conf/cards/SI7018/sndop-mixer.alisp |
103 |
+@@ -0,0 +1,11 @@ |
104 |
++; |
105 |
++; SiS SI7018 mixer abstract layer |
106 |
++; |
107 |
++; Copyright (c) 2003 Jaroslav Kysela <perex@×××××.cz> |
108 |
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html) |
109 |
++; |
110 |
++ |
111 |
++(defun sndop_mixer_open (hctl pcm) |
112 |
++ (princ "sndop_mixer_open: hctl=" hctl " pcm=" pcm "\n") |
113 |
++ 0 |
114 |
++) |
115 |
+--- alsa-lib-1.1.6/src/conf/smixer.conf |
116 |
++++ alsa-lib-1.1.6/src/conf/smixer.conf |
117 |
+@@ -0,0 +1,13 @@ |
118 |
++_full smixer-python.so |
119 |
++usb { |
120 |
++ searchl "USB" |
121 |
++ lib smixer-usb.so |
122 |
++} |
123 |
++ac97 { |
124 |
++ searchl "AC97a:" |
125 |
++ lib smixer-ac97.so |
126 |
++} |
127 |
++hda { |
128 |
++ searchl "HDA:" |
129 |
++ lib smixer-hda.so |
130 |
++} |
131 |
+--- alsa-lib-1.1.6/src/conf/sndo-mixer.alisp |
132 |
++++ alsa-lib-1.1.6/src/conf/sndo-mixer.alisp |
133 |
+@@ -0,0 +1,115 @@ |
134 |
++; |
135 |
++; Toplevel configuration for the ALSA Ordinary Mixer Interface |
136 |
++; |
137 |
++; Copyright (c) 2003 Jaroslav Kysela <perex@×××××.cz> |
138 |
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html) |
139 |
++; |
140 |
++ |
141 |
++(defun sndo_include (hctl stream) |
142 |
++ (setq info (Acall "ctl_card_info" (Acall "hctl_ctl" hctl))) |
143 |
++ (if (= (Aerror info) 0) |
144 |
++ (progn |
145 |
++ (setq info (Aresult info)) |
146 |
++ (setq driver (cdr (assq "driver" (unsetq info)))) |
147 |
++ (setq file (concat (path "data") "/alsa/cards/" (snd_card_alias driver) "/sndo" stream "-mixer.alisp")) |
148 |
++ (setq r (include file)) |
149 |
++ (when (= r -2) (Asyserr "unable to find file " file)) |
150 |
++ ) |
151 |
++ (setq r (Aerror info)) |
152 |
++ ) |
153 |
++ (unsetq info driver file r) |
154 |
++) |
155 |
++ |
156 |
++(defun sndo_mixer_open_fcn (hctl stream pcm) |
157 |
++ (setq fcn (concat "sndo" stream "_mixer_open")) |
158 |
++ (setq r (if (exfun fcn) (funcall fcn hctl pcm) 0)) |
159 |
++ (when (= r 0) |
160 |
++ (setq hctls (if hctls (cons hctls (cons hctl)) hctl)) |
161 |
++ ) |
162 |
++ (unsetq fcn r) |
163 |
++) |
164 |
++ |
165 |
++(defun sndo_mixer_open_hctl (name stream pcm) |
166 |
++ (setq hctl (Acall "hctl_open" name nil)) |
167 |
++ (setq r (Aerror hctl)) |
168 |
++ (when (= r 0) |
169 |
++ (setq hctl (Aresult hctl)) |
170 |
++ (setq r (sndo_include hctl stream)) |
171 |
++ (if (= r 0) |
172 |
++ (setq r (sndo_mixer_open_fcn hctl stream pcm)) |
173 |
++ (Acall "hctl_close" hctl) |
174 |
++ ) |
175 |
++ ) |
176 |
++ (unsetq hctl r) |
177 |
++) |
178 |
++ |
179 |
++(defun sndo_mixer_open_virtual (name stream pcm) |
180 |
++ (setq file (concat (path "data") "/alsa/virtual/" name "/sndo" stream "-mixer.alisp")) |
181 |
++ (setq r (include file)) |
182 |
++ (when (= r -2) (Asyserr "unable to find file " file)) |
183 |
++ (when (= r 0) (setq r (sndo_mixer_open_fcn nil stream pcm))) |
184 |
++ (unsetq file r) |
185 |
++) |
186 |
++ |
187 |
++(defun sndo_mixer_open1 (name stream) |
188 |
++ (if (compare-strings name 0 2 "hw:" 0 2) |
189 |
++ (sndo_mixer_open_hctl name stream nil) |
190 |
++ (sndo_mixer_open_virtual name stream nil) |
191 |
++ ) |
192 |
++) |
193 |
++ |
194 |
++(defun sndo_mixer_open (pname cname) |
195 |
++ (setq r (sndo_mixer_open1 pname "p")) |
196 |
++ (when (= r 0) (setq r (sndo_mixer_open1 cname "c"))) |
197 |
++ (when (!= r 0) (sndo_mixer_close)) |
198 |
++ (unsetq sndo_mixer_open |
199 |
++ sndo_mixer_open_pcm sndo_mixer_open_pcm1 |
200 |
++ sndo_mixer_open_virtual sndo_mixer_open_fcn |
201 |
++ sndo_include r) |
202 |
++) |
203 |
++ |
204 |
++(defun sndo_mixer_open_pcm1 (pcm stream) |
205 |
++ (setq info (Acall "pcm_info" pcm)) |
206 |
++ (setq r (Aerror info)) |
207 |
++ (when (= r 0) |
208 |
++ (setq info (Aresult info)) |
209 |
++ (setq card (cdr (assq "card" info))) |
210 |
++ (setq r |
211 |
++ (if (< card 0) |
212 |
++ (sndo_mixer_open_virtual (Acall "pcm_name" pcm) stream pcm) |
213 |
++ (sndo_mixer_open_hctl (format "hw:%i" card) stream pcm) |
214 |
++ ) |
215 |
++ ) |
216 |
++ ) |
217 |
++ (unsetq info card r) |
218 |
++) |
219 |
++ |
220 |
++(defun sndo_mixer_open_pcm (ppcm cpcm) |
221 |
++ (setq r (sndo_mixer_open_pcm1 ppcm "p")) |
222 |
++ (when (= r 0) (setq r (sndo_mixer_open_pcm1 cpcm "c"))) |
223 |
++ (when (!= r 0) (sndo_mixer_close)) |
224 |
++ (unsetq sndo_mixer_open |
225 |
++ sndo_mixer_open_pcm sndo_mixer_open_pcm1 |
226 |
++ sndo_mixer_open_virtual sndo_mixer_open_fcn |
227 |
++ sndo_include r) |
228 |
++) |
229 |
++ |
230 |
++(defun sndo_mixer_close1 (hctl stream) |
231 |
++ (when hctl |
232 |
++ (progn |
233 |
++ (setq fcn (concat "sndo" stream "_mixer_close")) |
234 |
++ (when (exfun fcn) (funcall fcn hctl)) |
235 |
++ (unsetq fcn) |
236 |
++ (Acall "hctl_close" hctl) |
237 |
++ ) |
238 |
++ ) |
239 |
++) |
240 |
++ |
241 |
++(defun sndo_mixer_close nil |
242 |
++ (sndo_mixer_close1 (nth 1 hctls) "c") |
243 |
++ (sndo_mixer_close1 (nth 0 hctls) "p") |
244 |
++ (snd_card_alias_unset) |
245 |
++ (unsetq hctls) |
246 |
++) |
247 |
++ |
248 |
++(include (concat (path "data") "/alsa/cards/aliases.alisp")) |