1 |
scarabeus 09/05/30 23:07:31 |
2 |
|
3 |
Modified: ChangeLog mplayer-9999.ebuild |
4 |
Log: |
5 |
Update live ebuild. Reorder the DEPS to be alphabetic and more logicaly separated. Update ebuild to work as snapshot version if properly renamed. Minor whitespace updates. Use src_prepare function. |
6 |
(Portage version: 2.2_rc33/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.636 media-video/mplayer/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.636&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.636&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.635&r2=1.636 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
18 |
retrieving revision 1.635 |
19 |
retrieving revision 1.636 |
20 |
diff -u -r1.635 -r1.636 |
21 |
--- ChangeLog 30 May 2009 21:53:39 -0000 1.635 |
22 |
+++ ChangeLog 30 May 2009 23:07:31 -0000 1.636 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for media-video/mplayer |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.635 2009/05/30 21:53:39 beandog Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.636 2009/05/30 23:07:31 scarabeus Exp $ |
28 |
+ |
29 |
+ 30 May 2009; Tomáš Chvátal <scarabeus@g.o> mplayer-9999.ebuild: |
30 |
+ Update live ebuild. Reorder the DEPS to be alphabetic and more logicaly |
31 |
+ separated. Update ebuild to work as snapshot version if properly renamed. |
32 |
+ Minor whitespace updates. Use src_prepare function. |
33 |
|
34 |
*mplayer-1.0_rc2_p20090530 (30 May 2009) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.5 media-video/mplayer/mplayer-9999.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.5&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.5&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.4&r2=1.5 |
44 |
|
45 |
Index: mplayer-9999.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
48 |
retrieving revision 1.4 |
49 |
retrieving revision 1.5 |
50 |
diff -u -r1.4 -r1.5 |
51 |
--- mplayer-9999.ebuild 30 May 2009 21:31:18 -0000 1.4 |
52 |
+++ mplayer-9999.ebuild 30 May 2009 23:07:31 -0000 1.5 |
53 |
@@ -1,21 +1,24 @@ |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.4 2009/05/30 21:31:18 beandog Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.5 2009/05/30 23:07:31 scarabeus Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" |
62 |
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS="" |
63 |
|
64 |
-inherit eutils flag-o-matic multilib subversion |
65 |
+inherit eutils flag-o-matic multilib ${SVN_ECLASS} |
66 |
|
67 |
-IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb arts +ass |
68 |
+[[ ${PV} != *9999* ]] && MPLAYER_REVISION=29330 |
69 |
+ |
70 |
+IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb +ass |
71 |
bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags |
72 |
custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3 |
73 |
+enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 jack |
74 |
joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx |
75 |
mmxext mng +mp2 +mp3 musepack nas +nemesi +network nut openal +opengl +osdmenu |
76 |
-oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba |
77 |
-+schroedinger sdl +shm +speex sse sse2 ssse3 svga teletext tga +theora +tremor |
78 |
+oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm |
79 |
++schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor |
80 |
+truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xanim |
81 |
xinerama +xscreensaver +xv +xvid xvmc zoran" |
82 |
|
83 |
@@ -28,32 +31,46 @@ |
84 |
BLUV="1.7" |
85 |
SVGV="1.9.17" |
86 |
AMR_URI="http://www.3gpp.org/ftp/Specs/archive" |
87 |
-SRC_URI="!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 |
88 |
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 |
89 |
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 ) |
90 |
- !iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 |
91 |
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 |
92 |
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 ) |
93 |
+FONT_URI=" |
94 |
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 |
95 |
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 |
96 |
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 |
97 |
+" |
98 |
+if [[ ${PV} = *9999* ]]; then |
99 |
+ RELEASE_URI="" |
100 |
+else |
101 |
+ RELEASE_URI="mirror://gentoo/${P}.tar.bz2" |
102 |
+fi |
103 |
+SRC_URI="${RELEASE_URI} |
104 |
+ !truetype? ( ${FONT_URI} ) |
105 |
gmplayer? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 ) |
106 |
- svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )" |
107 |
+ svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 ) |
108 |
+" |
109 |
|
110 |
DESCRIPTION="Media Player for Linux" |
111 |
HOMEPAGE="http://www.mplayerhq.hu/" |
112 |
|
113 |
+FONT_RDEPS=" |
114 |
+ media-libs/fontconfig |
115 |
+ media-libs/freetype:2 |
116 |
+" |
117 |
+X_RDEPS=" |
118 |
+ x11-libs/libXext |
119 |
+ x11-libs/libXxf86vm |
120 |
+" |
121 |
+# Rar: althrought -gpl version is nice, it cant do most functions normal rar can |
122 |
RDEPEND="sys-libs/ncurses |
123 |
!bindist? ( |
124 |
x86? ( |
125 |
win32codecs? ( media-libs/win32codecs ) |
126 |
- ) |
127 |
+ ) |
128 |
) |
129 |
+ X? ( ${X_RDEPS} ) |
130 |
aalib? ( media-libs/aalib ) |
131 |
alsa? ( media-libs/alsa-lib ) |
132 |
amrnb? ( media-libs/amrnb ) |
133 |
amrwb? ( media-libs/amrwb ) |
134 |
- arts? ( kde-base/arts ) |
135 |
- ass? ( media-libs/freetype:2 |
136 |
- media-libs/fontconfig ) |
137 |
- openal? ( media-libs/openal ) |
138 |
+ ass? ( ${FONT_RDEPS} ) |
139 |
bidi? ( dev-libs/fribidi ) |
140 |
cdio? ( dev-libs/libcdio ) |
141 |
cdparanoia? ( media-sound/cdparanoia ) |
142 |
@@ -64,92 +81,105 @@ |
143 |
dv? ( media-libs/libdv ) |
144 |
dvb? ( media-tv/linuxtv-dvb-headers ) |
145 |
encode? ( |
146 |
+ faac? ( media-libs/faac ) |
147 |
mp2? ( media-sound/twolame ) |
148 |
mp3? ( media-sound/lame ) |
149 |
- faac? ( media-libs/faac ) |
150 |
x264? ( >=media-libs/x264-0.0.20081006 ) |
151 |
xvid? ( media-libs/xvid ) |
152 |
- ) |
153 |
+ ) |
154 |
esd? ( media-sound/esound ) |
155 |
enca? ( app-i18n/enca ) |
156 |
faad? ( !aac? ( media-libs/faad2 ) ) |
157 |
gif? ( media-libs/giflib ) |
158 |
- ggi? ( media-libs/libggi |
159 |
- media-libs/libggiwmh ) |
160 |
- gmplayer? ( media-libs/libpng |
161 |
- x11-libs/libXxf86vm |
162 |
- x11-libs/libXext |
163 |
+ ggi? ( |
164 |
+ media-libs/libggi |
165 |
+ media-libs/libggiwmh |
166 |
+ ) |
167 |
+ gmplayer? ( |
168 |
+ media-libs/libpng |
169 |
+ x11-libs/gtk+:2 |
170 |
x11-libs/libXi |
171 |
- x11-libs/gtk+:2 ) |
172 |
+ ${X_RDEPS} |
173 |
+ ) |
174 |
jack? ( media-sound/jack-audio-connection-kit ) |
175 |
jpeg? ( media-libs/jpeg ) |
176 |
ladspa? ( media-libs/ladspa-sdk ) |
177 |
libcaca? ( media-libs/libcaca ) |
178 |
lirc? ( app-misc/lirc ) |
179 |
+ live? ( media-plugins/live ) |
180 |
lzo? ( >=dev-libs/lzo-2 ) |
181 |
mad? ( media-libs/libmad ) |
182 |
mng? ( media-libs/libmng ) |
183 |
musepack? ( >=media-libs/libmpcdec-1.2.2 ) |
184 |
nas? ( media-libs/nas ) |
185 |
nut? ( >=media-libs/libnut-661 ) |
186 |
+ openal? ( media-libs/openal ) |
187 |
opengl? ( virtual/opengl ) |
188 |
png? ( media-libs/libpng ) |
189 |
pnm? ( media-libs/netpbm ) |
190 |
pulseaudio? ( media-sound/pulseaudio ) |
191 |
- rar? ( || ( app-arch/unrar-gpl |
192 |
- app-arch/unrar |
193 |
- app-arch/rar ) ) |
194 |
+ rar? ( |
195 |
+ || ( |
196 |
+ app-arch/unrar |
197 |
+ app-arch/unrar-gpl |
198 |
+ app-arch/rar |
199 |
+ ) |
200 |
+ ) |
201 |
samba? ( net-fs/samba ) |
202 |
schroedinger? ( media-libs/schroedinger ) |
203 |
sdl? ( media-libs/libsdl ) |
204 |
speex? ( media-libs/speex ) |
205 |
svga? ( media-libs/svgalib ) |
206 |
theora? ( media-libs/libtheora ) |
207 |
- live? ( media-plugins/live ) |
208 |
- truetype? ( media-libs/freetype:2 |
209 |
- media-libs/fontconfig ) |
210 |
+ truetype? ( ${FONT_RDEPS} ) |
211 |
video_cards_nvidia? ( |
212 |
vdpau? ( >=x11-drivers/nvidia-drivers-180.51 ) |
213 |
) |
214 |
- vidix? ( x11-libs/libXxf86vm |
215 |
- x11-libs/libXext ) |
216 |
+ vidix? ( ${X_RDEPS} ) |
217 |
vorbis? ( media-libs/libvorbis ) |
218 |
xanim? ( media-video/xanim ) |
219 |
- xinerama? ( x11-libs/libXinerama |
220 |
- x11-libs/libXxf86vm |
221 |
- x11-libs/libXext ) |
222 |
+ xinerama? ( |
223 |
+ x11-libs/libXinerama |
224 |
+ ${X_RDEPS} |
225 |
+ ) |
226 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
227 |
- xv? ( x11-libs/libXv |
228 |
- x11-libs/libXxf86vm |
229 |
- x11-libs/libXext |
230 |
- xvmc? ( x11-libs/libXvMC ) ) |
231 |
- X? ( x11-libs/libXxf86vm |
232 |
- x11-libs/libXext |
233 |
- )" |
234 |
+ xv? ( |
235 |
+ ${X_RDEPS} |
236 |
+ x11-libs/libXv |
237 |
+ xvmc? ( x11-libs/libXvMC ) |
238 |
+ ) |
239 |
+" |
240 |
|
241 |
+X_DEPS=" |
242 |
+ x11-proto/videoproto |
243 |
+ x11-proto/xf86vidmodeproto |
244 |
+" |
245 |
+ASM_DEP="dev-lang/yasm" |
246 |
DEPEND="${RDEPEND} |
247 |
- amd64? ( dev-lang/yasm ) |
248 |
- doc? ( dev-libs/libxslt ) |
249 |
+ X? ( ${X_DEPS} ) |
250 |
+ amd64? ( ${ASM_DEP} ) |
251 |
dga? ( x11-proto/xf86dgaproto ) |
252 |
+ doc? ( dev-libs/libxslt ) |
253 |
dxr3? ( media-video/em8300-libraries ) |
254 |
+ gmplayer? ( ${X_DEPS} ) |
255 |
+ iconv? ( virtual/libiconv ) |
256 |
+ xv? ( ${X_DEPS} ) |
257 |
+ x86? ( ${ASM_DEP} ) |
258 |
+ x86-fbsd? ( ${ASM_DEP} ) |
259 |
xinerama? ( x11-proto/xineramaproto ) |
260 |
- xv? ( x11-proto/videoproto |
261 |
- x11-proto/xf86vidmodeproto ) |
262 |
- gmplayer? ( x11-proto/xextproto |
263 |
- x11-proto/xf86vidmodeproto ) |
264 |
- X? ( x11-proto/xextproto |
265 |
- x11-proto/xf86vidmodeproto ) |
266 |
- x86? ( dev-lang/yasm ) |
267 |
- x86-fbsd? ( dev-lang/yasm ) |
268 |
xscreensaver? ( x11-proto/scrnsaverproto ) |
269 |
- iconv? ( virtual/libiconv )" |
270 |
+ xv? ( ${X_DEPS} ) |
271 |
+" |
272 |
|
273 |
SLOT="0" |
274 |
LICENSE="GPL-2" |
275 |
-KEYWORDS="" |
276 |
+if [[ ${PV} != *9999* ]]; then |
277 |
+ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
278 |
+else |
279 |
+ KEYWORDS="" |
280 |
+fi |
281 |
|
282 |
pkg_setup() { |
283 |
- |
284 |
elog "" |
285 |
elog "This is a live ebuild which installs the latest from upstream's" |
286 |
elog "subversion repository, and is unsupported by Gentoo." |
287 |
@@ -210,26 +240,27 @@ |
288 |
} |
289 |
|
290 |
src_unpack() { |
291 |
- subversion_src_unpack |
292 |
+ [[ ${PV} = *9999* ]] && subversion_src_unpack || unpack ${A} |
293 |
|
294 |
- if ! use truetype ; then |
295 |
+ if ! use truetype; then |
296 |
unpack font-arial-iso-8859-1.tar.bz2 \ |
297 |
font-arial-iso-8859-2.tar.bz2 \ |
298 |
font-arial-cp1250.tar.bz2 |
299 |
fi |
300 |
|
301 |
- |
302 |
- cd "${WORKDIR}" |
303 |
- |
304 |
use gmplayer && unpack "Blue-${BLUV}.tar.bz2" |
305 |
- |
306 |
use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.bz2" |
307 |
+} |
308 |
|
309 |
- cd "${S}" |
310 |
- |
311 |
- # Set SVN version manually |
312 |
- subversion_wc_info |
313 |
- sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh" |
314 |
+src_prepare() { |
315 |
+ if [[ ${PV} = *9999* ]]; then |
316 |
+ # Set SVN version manually |
317 |
+ subversion_wc_info |
318 |
+ sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh" |
319 |
+ else |
320 |
+ # Set version # |
321 |
+ sed -i s/UNKNOWN/${MPLAYER_REVISION}/ "${S}/version.sh" |
322 |
+ fi |
323 |
|
324 |
if use svga; then |
325 |
echo |
326 |
@@ -243,7 +274,6 @@ |
327 |
} |
328 |
|
329 |
src_configure() { |
330 |
- |
331 |
local myconf="" |
332 |
|
333 |
# MPlayer reads in the LINGUAS variable from make.conf, and sets |
334 |
@@ -259,7 +289,10 @@ |
335 |
################ |
336 |
#Optional features# |
337 |
############### |
338 |
- myconf="${myconf} $(use_enable network)" |
339 |
+ myconf="${myconf} |
340 |
+ --disable-arts |
341 |
+ $(use_enable network) |
342 |
+ " |
343 |
use ass || myconf="${myconf} --disable-ass" |
344 |
use bidi || myconf="${myconf} --disable-fribidi" |
345 |
use bl && myconf="${myconf} --enable-bl" |
346 |
@@ -471,7 +504,7 @@ |
347 |
############# |
348 |
# Audio Output # |
349 |
############# |
350 |
- for x in alsa arts esd jack ladspa nas openal; do |
351 |
+ for x in alsa esd jack ladspa nas openal; do |
352 |
use ${x} || myconf="${myconf} --disable-${x}" |
353 |
done |
354 |
use pulseaudio || myconf="${myconf} --disable-pulse" |
355 |
@@ -523,7 +556,6 @@ |
356 |
|
357 |
#echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}" |
358 |
CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died" |
359 |
- |
360 |
} |
361 |
|
362 |
src_compile() { |
363 |
@@ -532,7 +564,6 @@ |
364 |
} |
365 |
|
366 |
src_install() { |
367 |
- |
368 |
make prefix="${D}/usr" \ |
369 |
BINDIR="${D}/usr/bin" \ |
370 |
LIBDIR="${D}/usr/$(get_libdir)" \ |
371 |
@@ -612,15 +643,11 @@ |
372 |
} |
373 |
|
374 |
pkg_preinst() { |
375 |
- |
376 |
- if [[ -d ${ROOT}/usr/share/mplayer/Skin/default ]] |
377 |
- then |
378 |
+ [[ -d ${ROOT}/usr/share/mplayer/Skin/default ]] && \ |
379 |
rm -rf "${ROOT}/usr/share/mplayer/Skin/default" |
380 |
- fi |
381 |
} |
382 |
|
383 |
pkg_postrm() { |
384 |
- |
385 |
# Cleanup stale symlinks |
386 |
if [ -L "${ROOT}/usr/share/mplayer/font" -a \ |
387 |
! -e "${ROOT}/usr/share/mplayer/font" ] |