1 |
drac 07/12/10 20:25:19 |
2 |
|
3 |
Modified: ChangeLog mpg123-1.0_rc2.ebuild |
4 |
Log: |
5 |
Add USE pulseaudio, allow more than one audio output by default, can be selected runtime. |
6 |
(Portage version: 2.1.4_rc9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.128 media-sound/mpg123/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/ChangeLog?rev=1.128&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/ChangeLog?rev=1.128&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/ChangeLog?r1=1.127&r2=1.128 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v |
18 |
retrieving revision 1.127 |
19 |
retrieving revision 1.128 |
20 |
diff -u -r1.127 -r1.128 |
21 |
--- ChangeLog 10 Dec 2007 18:39:34 -0000 1.127 |
22 |
+++ ChangeLog 10 Dec 2007 20:25:18 -0000 1.128 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for media-sound/mpg123 |
25 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.127 2007/12/10 18:39:34 drac Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.128 2007/12/10 20:25:18 drac Exp $ |
28 |
+ |
29 |
+ 10 Dec 2007; Samuli Suominen <drac@g.o> mpg123-1.0_rc2.ebuild: |
30 |
+ Add USE pulseaudio, allow more than one audio output by default, can be |
31 |
+ selected runtime. |
32 |
|
33 |
*mpg123-1.0_rc2 (10 Dec 2007) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.2 media-sound/mpg123/mpg123-1.0_rc2.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/mpg123-1.0_rc2.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/mpg123-1.0_rc2.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/mpg123-1.0_rc2.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: mpg123-1.0_rc2.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.0_rc2.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- mpg123-1.0_rc2.ebuild 10 Dec 2007 18:39:34 -0000 1.1 |
51 |
+++ mpg123-1.0_rc2.ebuild 10 Dec 2007 20:25:18 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2007 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.0_rc2.ebuild,v 1.1 2007/12/10 18:39:34 drac Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.0_rc2.ebuild,v 1.2 2007/12/10 20:25:18 drac Exp $ |
57 |
|
58 |
inherit eutils autotools |
59 |
|
60 |
@@ -13,14 +13,15 @@ |
61 |
LICENSE="GPL-2 LGPL-2.1" |
62 |
SLOT="0" |
63 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
64 |
-IUSE="3dnow 3dnowext alsa altivec esd jack mmx nas oss portaudio sdl sse" |
65 |
+IUSE="3dnow 3dnowext alsa altivec esd jack mmx nas oss portaudio pulseaudio sdl sse" |
66 |
|
67 |
RDEPEND="alsa? ( media-libs/alsa-lib ) |
68 |
- sdl? ( !alsa? ( !oss? ( media-libs/libsdl ) ) ) |
69 |
- esd? ( !alsa? ( !oss? ( !sdl? ( media-sound/esound ) ) ) ) |
70 |
- nas? ( !alsa? ( !oss? ( !sdl? ( !esd? ( media-libs/nas ) ) ) ) ) |
71 |
- jack? ( !alsa? ( !oss? ( !sdl? ( !esd? ( !nas? ( media-sound/jack-audio-connection-kit ) ) ) ) ) ) |
72 |
- portaudio? ( !alsa? ( !oss? ( !sdl? ( !esd? ( !nas? ( !jack? ( media-libs/portaudio ) ) ) ) ) ) )" |
73 |
+ sdl? ( media-libs/libsdl ) |
74 |
+ esd? ( media-sound/esound ) |
75 |
+ nas? ( media-libs/nas ) |
76 |
+ jack? ( media-sound/jack-audio-connection-kit ) |
77 |
+ portaudio? ( media-libs/portaudio ) |
78 |
+ pulseaudio? ( media-sound/pulseaudio )" |
79 |
DEPEND="${RDEPEND}" |
80 |
|
81 |
S=${WORKDIR}/${MY_P} |
82 |
@@ -30,51 +31,38 @@ |
83 |
src_unpack() { |
84 |
unpack "${A}" |
85 |
cd "${S}" |
86 |
- epatch "${FILESDIR}/${PV}-no-faltivec.patch" |
87 |
+ epatch "${FILESDIR}"/${PV}-no-faltivec.patch |
88 |
eautoreconf |
89 |
} |
90 |
|
91 |
src_compile() { |
92 |
- local audiodev |
93 |
- if use alsa; then |
94 |
- audiodev="alsa" |
95 |
- elif use oss; then |
96 |
- audiodev="oss" |
97 |
- elif use sdl; then |
98 |
- audiodev="sdl" |
99 |
- elif use esd; then |
100 |
- audiodev="esd" |
101 |
- elif use nas; then |
102 |
- audiodev="nas" |
103 |
- elif use jack; then |
104 |
- audiodev="jack" |
105 |
- elif use portaudio; then |
106 |
- audiodev="portaudio"; |
107 |
- else audiodev="dummy" |
108 |
- fi |
109 |
+ local myaudio |
110 |
+ |
111 |
+ use alsa && myaudio="${myaudio} alsa" |
112 |
+ use esd && myaudio="${myaudio} esd" |
113 |
+ use jack && myaudio="${myaudio} jack" |
114 |
+ use nas && myaudio="${myaudio} nas" |
115 |
+ use oss && myaudio="${myaudio} oss" |
116 |
+ use pulseaudio && myaudio="${myaudio} pulse" |
117 |
+ use sdl && myaudio="${myaudio} sdl" |
118 |
+ |
119 |
+ local mycpu |
120 |
|
121 |
if use altivec; then |
122 |
- myconf="--with-cpu=altivec" |
123 |
+ mycpu="--with-cpu=altivec" |
124 |
elif use 3dnowext; then |
125 |
- myconf="--with-cpu=3dnowext" |
126 |
+ mycpu="--with-cpu=3dnowext" |
127 |
elif use 3dnow; then |
128 |
- myconf="--with-cpu=3dnow" |
129 |
+ mycpu="--with-cpu=3dnow" |
130 |
elif use sse; then |
131 |
- myconf="--with-cpu=sse" |
132 |
+ mycpu="--with-cpu=sse" |
133 |
elif use mmx; then |
134 |
- myconf="--with-cpu=mmx" |
135 |
+ mycpu="--with-cpu=mmx" |
136 |
fi |
137 |
|
138 |
- elog "Compiling with ${audiodev} audio output." |
139 |
- elog "If that is not what you want, then select exactly ONE" |
140 |
- elog "of the following USE flags:" |
141 |
- elog "alsa oss sdl esd nas jack portaudio" |
142 |
- elog "and recompile ${PN}." |
143 |
- epause 5 |
144 |
- |
145 |
econf --with-optimization=0 \ |
146 |
- --with-audio=${audiodev} \ |
147 |
- ${myconf} || die "econf failed." |
148 |
+ --with-audio="${myaudio}" \ |
149 |
+ ${mycpu} || die "econf failed." |
150 |
|
151 |
emake || die "emake failed." |
152 |
} |
153 |
|
154 |
|
155 |
|
156 |
-- |
157 |
gentoo-commits@g.o mailing list |