1 |
chainsaw 08/01/31 16:51:05 |
2 |
|
3 |
Modified: alsa-tools-1.0.14.ebuild ChangeLog |
4 |
alsa-tools-1.0.15.ebuild |
5 |
Added: alsa-tools-1.0.16_rc1.ebuild |
6 |
Log: |
7 |
Version bump, for bug #207427. Quote a few variables now that we're at it. |
8 |
(Portage version: 2.1.4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.7 media-sound/alsa-tools/alsa-tools-1.0.14.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild?rev=1.7&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild?rev=1.7&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild?r1=1.6&r2=1.7 |
16 |
|
17 |
Index: alsa-tools-1.0.14.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild,v |
20 |
retrieving revision 1.6 |
21 |
retrieving revision 1.7 |
22 |
diff -u -r1.6 -r1.7 |
23 |
--- alsa-tools-1.0.14.ebuild 22 Oct 2007 20:32:58 -0000 1.6 |
24 |
+++ alsa-tools-1.0.14.ebuild 31 Jan 2008 16:51:04 -0000 1.7 |
25 |
@@ -1,6 +1,6 @@ |
26 |
-# Copyright 1999-2007 Gentoo Foundation |
27 |
+# Copyright 1999-2008 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild,v 1.6 2007/10/22 20:32:58 armin76 Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild,v 1.7 2008/01/31 16:51:04 chainsaw Exp $ |
31 |
|
32 |
WANT_AUTOMAKE="1.9" |
33 |
WANT_AUTOCONF="2.5" |
34 |
@@ -106,7 +106,7 @@ |
35 |
fi |
36 |
|
37 |
# hdspmixer is missing depconf - copy from the hdsploader directory |
38 |
- cp ${S}/hdsploader/depcomp ${S}/hdspmixer/ |
39 |
+ cp "${S}/hdsploader/depcomp" "${S}/hdspmixer/" |
40 |
|
41 |
local f |
42 |
for f in ${ALSA_TOOLS} |
43 |
|
44 |
|
45 |
|
46 |
1.154 media-sound/alsa-tools/ChangeLog |
47 |
|
48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/ChangeLog?rev=1.154&view=markup |
49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/ChangeLog?rev=1.154&content-type=text/plain |
50 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/ChangeLog?r1=1.153&r2=1.154 |
51 |
|
52 |
Index: ChangeLog |
53 |
=================================================================== |
54 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v |
55 |
retrieving revision 1.153 |
56 |
retrieving revision 1.154 |
57 |
diff -u -r1.153 -r1.154 |
58 |
--- ChangeLog 24 Oct 2007 19:50:24 -0000 1.153 |
59 |
+++ ChangeLog 31 Jan 2008 16:51:04 -0000 1.154 |
60 |
@@ -1,6 +1,12 @@ |
61 |
# ChangeLog for media-sound/alsa-tools |
62 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
63 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.153 2007/10/24 19:50:24 phreak Exp $ |
64 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
65 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.154 2008/01/31 16:51:04 chainsaw Exp $ |
66 |
+ |
67 |
+*alsa-tools-1.0.16_rc1 (31 Jan 2008) |
68 |
+ |
69 |
+ 31 Jan 2008; Tony Vroon <chainsaw@g.o> alsa-tools-1.0.14.ebuild, |
70 |
+ alsa-tools-1.0.15.ebuild, +alsa-tools-1.0.16_rc1.ebuild: |
71 |
+ Version bump, for bug #207427. Quote a few variables now that we're at it. |
72 |
|
73 |
24 Oct 2007; Christian Heim <phreak@g.o> -alsa-tools-1.0.13.ebuild, |
74 |
-alsa-tools-1.0.14_rc1.ebuild, -alsa-tools-1.0.14_rc1-r1.ebuild, |
75 |
|
76 |
|
77 |
|
78 |
1.3 media-sound/alsa-tools/alsa-tools-1.0.15.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild?rev=1.3&view=markup |
81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild?rev=1.3&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild?r1=1.2&r2=1.3 |
83 |
|
84 |
Index: alsa-tools-1.0.15.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild,v |
87 |
retrieving revision 1.2 |
88 |
retrieving revision 1.3 |
89 |
diff -u -r1.2 -r1.3 |
90 |
--- alsa-tools-1.0.15.ebuild 22 Oct 2007 20:32:58 -0000 1.2 |
91 |
+++ alsa-tools-1.0.15.ebuild 31 Jan 2008 16:51:04 -0000 1.3 |
92 |
@@ -1,6 +1,6 @@ |
93 |
-# Copyright 1999-2007 Gentoo Foundation |
94 |
+# Copyright 1999-2008 Gentoo Foundation |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild,v 1.2 2007/10/22 20:32:58 armin76 Exp $ |
97 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild,v 1.3 2008/01/31 16:51:04 chainsaw Exp $ |
98 |
|
99 |
WANT_AUTOMAKE="1.9" |
100 |
WANT_AUTOCONF="2.5" |
101 |
@@ -105,7 +105,7 @@ |
102 |
fi |
103 |
|
104 |
# hdspmixer is missing depconf - copy from the hdsploader directory |
105 |
- cp ${S}/hdsploader/depcomp ${S}/hdspmixer/ |
106 |
+ cp "${S}/hdsploader/depcomp" "${S}/hdspmixer/" |
107 |
|
108 |
local f |
109 |
for f in ${ALSA_TOOLS} |
110 |
|
111 |
|
112 |
|
113 |
1.1 media-sound/alsa-tools/alsa-tools-1.0.16_rc1.ebuild |
114 |
|
115 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.16_rc1.ebuild?rev=1.1&view=markup |
116 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.16_rc1.ebuild?rev=1.1&content-type=text/plain |
117 |
|
118 |
Index: alsa-tools-1.0.16_rc1.ebuild |
119 |
=================================================================== |
120 |
# Copyright 1999-2008 Gentoo Foundation |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.16_rc1.ebuild,v 1.1 2008/01/31 16:51:04 chainsaw Exp $ |
123 |
|
124 |
WANT_AUTOMAKE="1.9" |
125 |
WANT_AUTOCONF="2.5" |
126 |
|
127 |
inherit eutils flag-o-matic autotools |
128 |
|
129 |
MY_P="${P/_rc/rc}" |
130 |
|
131 |
DESCRIPTION="Advanced Linux Sound Architecture tools" |
132 |
HOMEPAGE="http://www.alsa-project.org" |
133 |
SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2" |
134 |
|
135 |
LICENSE="GPL-2" |
136 |
SLOT="0.9" |
137 |
KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
138 |
|
139 |
ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20 |
140 |
alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24 |
141 |
alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo |
142 |
alsa_cards_indigoio" |
143 |
|
144 |
IUSE="fltk gtk midi alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart |
145 |
alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe |
146 |
alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 |
147 |
alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr |
148 |
${ECHOAUDIO_CARDS}" |
149 |
|
150 |
RDEPEND=">=media-libs/alsa-lib-${PV} |
151 |
fltk? ( =x11-libs/fltk-1.1* ) |
152 |
gtk? ( =x11-libs/gtk+-2* )" |
153 |
DEPEND="${RDEPEND}" |
154 |
|
155 |
S="${WORKDIR}/${MY_P}" |
156 |
|
157 |
pkg_setup() { |
158 |
if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then |
159 |
eerror "" |
160 |
eerror "To be able to build ${CATEGORY}/${PN} with midi support you" |
161 |
eerror "need to have built media-libs/alsa-lib with midi USE flag." |
162 |
die "Missing midi USE flag on media-libs/alsa-lib" |
163 |
fi |
164 |
|
165 |
ALSA_TOOLS="ac3dec" |
166 |
|
167 |
use midi && ALSA_TOOLS="${ALSA_TOOLS} seq/sbiload us428control" |
168 |
|
169 |
if use gtk; then |
170 |
use midi && use alsa_cards_ice1712 && \ |
171 |
ALSA_TOOLS="${ALSA_TOOLS} envy24control" |
172 |
use alsa_cards_rme32 && use alsa_cards_rme96 && \ |
173 |
ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol" |
174 |
fi |
175 |
|
176 |
if use alsa_cards_hdsp || use alsa_cards_hdspm; then |
177 |
ALSA_TOOLS="${ALSA_TOOLS} hdsploader" |
178 |
use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer" |
179 |
fi |
180 |
|
181 |
use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader" |
182 |
use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader" |
183 |
use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader" |
184 |
use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr" |
185 |
use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl" |
186 |
|
187 |
{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \ |
188 |
ALSA_TOOLS="${ALSA_TOOLS} sb16_csp" |
189 |
|
190 |
if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then |
191 |
ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1" |
192 |
fi |
193 |
|
194 |
if use gtk; then |
195 |
for card in ${ECHOAUDIO_CARDS}; do |
196 |
if use ${card}; then |
197 |
ALSA_TOOLS="${ALSA_TOOLS} echomixer" |
198 |
fi |
199 |
done |
200 |
fi |
201 |
} |
202 |
|
203 |
src_unpack() { |
204 |
unpack ${A} |
205 |
cd "${S}" |
206 |
|
207 |
epatch "${FILESDIR}/${PN}-1.0.11-asneeded.patch" |
208 |
|
209 |
for dir in echomixer envy24control rmedigicontrol; do |
210 |
pushd ${dir} &> /dev/null |
211 |
sed -i -e '/AM_PATH_GTK/d' configure.in |
212 |
eautomake |
213 |
popd &> /dev/null |
214 |
done |
215 |
|
216 |
elibtoolize |
217 |
} |
218 |
|
219 |
src_compile() { |
220 |
if use fltk; then |
221 |
# hdspmixer requires fltk |
222 |
append-ldflags "-L/usr/$(get_libdir)/fltk-1.1" |
223 |
append-flags "-I/usr/include/fltk-1.1" |
224 |
fi |
225 |
|
226 |
# hdspmixer is missing depconf - copy from the hdsploader directory |
227 |
cp "${S}/hdsploader/depcomp" "${S}/hdspmixer/" |
228 |
|
229 |
local f |
230 |
for f in ${ALSA_TOOLS} |
231 |
do |
232 |
cd "${S}/${f}" |
233 |
econf --with-gtk2 || die "econf ${f} failed" |
234 |
emake || die "emake ${f} failed" |
235 |
done |
236 |
} |
237 |
|
238 |
src_install() { |
239 |
local f |
240 |
for f in ${ALSA_TOOLS} |
241 |
do |
242 |
# Install the main stuff |
243 |
cd "${S}/${f}" |
244 |
emake DESTDIR="${D}" install || die |
245 |
|
246 |
# Install the text documentation |
247 |
local doc |
248 |
for doc in README TODO ChangeLog AUTHORS |
249 |
do |
250 |
if [ -f "${doc}" ] |
251 |
then |
252 |
mv "${doc}" "${doc}.`basename ${f}`" |
253 |
dodoc "${doc}.`basename ${f}`" |
254 |
fi |
255 |
done |
256 |
done |
257 |
} |
258 |
|
259 |
|
260 |
|
261 |
-- |
262 |
gentoo-commits@l.g.o mailing list |