Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/vlc: metadata.xml ChangeLog vlc-1.2.0_pre3.ebuild vlc-1.2.0_pre1.ebuild
Date: Sat, 31 Dec 2011 11:37:35
Message-Id: 20111231113724.8DF452004B@flycatcher.gentoo.org
1 aballier 11/12/31 11:37:24
2
3 Modified: metadata.xml ChangeLog
4 Added: vlc-1.2.0_pre3.ebuild
5 Removed: vlc-1.2.0_pre1.ebuild
6 Log:
7 bump to pre3
8
9 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.61 media-video/vlc/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?rev=1.61&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?rev=1.61&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?r1=1.60&r2=1.61
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/metadata.xml,v
21 retrieving revision 1.60
22 retrieving revision 1.61
23 diff -u -r1.60 -r1.61
24 --- metadata.xml 6 Dec 2011 13:32:21 -0000 1.60
25 +++ metadata.xml 31 Dec 2011 11:37:24 -0000 1.61
26 @@ -44,7 +44,6 @@
27 <flag name="macosx-dialog-provider">Enables Mac OS X dialog module.</flag>
28 <flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner) module.</flag>
29 <flag name="macosx-quartztext">Enables Mac OS X quartz text module.</flag>
30 - <flag name="macosx-qtcapture">Enables Mac OS X qtcapture (iSight) module.</flag>
31 <flag name="macosx-qtkit">Enables Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module.</flag>
32 <flag name="macosx-vout">Enables Mac OS X video output module.</flag>
33 <flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
34
35
36
37 1.766 media-video/vlc/ChangeLog
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.766&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.766&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.765&r2=1.766
42
43 Index: ChangeLog
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
46 retrieving revision 1.765
47 retrieving revision 1.766
48 diff -u -r1.765 -r1.766
49 --- ChangeLog 27 Dec 2011 17:17:29 -0000 1.765
50 +++ ChangeLog 31 Dec 2011 11:37:24 -0000 1.766
51 @@ -1,6 +1,12 @@
52 # ChangeLog for media-video/vlc
53 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
54 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.765 2011/12/27 17:17:29 halcy0n Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.766 2011/12/31 11:37:24 aballier Exp $
56 +
57 +*vlc-1.2.0_pre3 (31 Dec 2011)
58 +
59 + 31 Dec 2011; Alexis Ballier <aballier@g.o> -vlc-1.2.0_pre1.ebuild,
60 + +vlc-1.2.0_pre3.ebuild:
61 + bump to pre3
62
63 27 Dec 2011; Mark Loeser <halcy0n@g.o> vlc-1.1.13.ebuild:
64 Stable for ppc/ppc64; bug #395543
65
66
67
68 1.1 media-video/vlc/vlc-1.2.0_pre3.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.2.0_pre3.ebuild?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.2.0_pre3.ebuild?rev=1.1&content-type=text/plain
72
73 Index: vlc-1.2.0_pre3.ebuild
74 ===================================================================
75 # Copyright 1999-2011 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 # $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.2.0_pre3.ebuild,v 1.1 2011/12/31 11:37:24 aballier Exp $
78
79 EAPI="4"
80
81 SCM=""
82 if [ "${PV%9999}" != "${PV}" ] ; then
83 SCM=git-2
84 EGIT_BOOTSTRAP="bootstrap"
85 if [ "${PV%.9999}" != "${PV}" ] ; then
86 EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
87 else
88 EGIT_REPO_URI="git://git.videolan.org/vlc.git"
89 fi
90 fi
91
92 inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
93
94 MY_PV="${PV/_/-}"
95 MY_PV="${MY_PV/-beta/-test}"
96 MY_P="${PN}-${MY_PV}"
97
98 PATCHLEVEL="101"
99 DESCRIPTION="VLC media player - Video player and streamer"
100 HOMEPAGE="http://www.videolan.org/vlc/"
101 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
102 SRC_URI=""
103 elif [[ "${MY_P}" == "${P}" ]]; then
104 SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
105 else
106 SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
107 fi
108
109 SRC_URI="${SRC_URI}
110 mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
111
112 LICENSE="GPL-2"
113 SLOT="0"
114
115 if [ "${PV%9999}" = "${PV}" ] ; then
116 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
117 else
118 KEYWORDS=""
119 fi
120 IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
121 +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
122 directfb directx dshow dts dvb dvd dxva2 elibc_glibc egl +encode
123 fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
124 growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
125 libproxy libsamplerate libtiger libv4l2 linsys libtar lirc live lua +macosx
126 +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
127 +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
128 mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio
129 +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger
130 sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher
131 taglib theora truetype twolame udev upnp vaapi vcdx vlm vorbis waveout
132 win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi"
133
134 RDEPEND="
135 >=sys-libs/zlib-1.2.5.1-r2[minizip]
136 a52? ( >=media-libs/a52dec-0.7.4-r3 )
137 aalib? ( media-libs/aalib )
138 aac? ( >=media-libs/faad2-2.6.1 )
139 alsa? ( >=media-libs/alsa-lib-1.0.23 )
140 avahi? ( >=net-dns/avahi-0.6[dbus] )
141 avcodec? ( virtual/ffmpeg )
142 avformat? ( virtual/ffmpeg )
143 bidi? ( >=dev-libs/fribidi-0.10.4 )
144 bluray? ( >=media-libs/libbluray-0.2.1 )
145 cddb? ( >=media-libs/libcddb-1.2.0 )
146 dbus? ( >=sys-apps/dbus-1.0.2 )
147 dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
148 dirac? ( >=media-video/dirac-0.10.0 )
149 directfb? ( dev-libs/DirectFB sys-libs/zlib )
150 dts? ( media-libs/libdca )
151 dvb? ( >=media-libs/libdvbpsi-0.1.6 )
152 dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
153 egl? ( virtual/opengl )
154 elibc_glibc? ( >=sys-libs/glibc-2.8 )
155 flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
156 fluidsynth? ( media-sound/fluidsynth )
157 fontconfig? ( media-libs/fontconfig )
158 gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
159 gme? ( media-libs/game-music-emu )
160 gnome? ( gnome-base/gnome-vfs )
161 gnutls? ( >=net-libs/gnutls-2.0.0 )
162 ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
163 ios-vout? ( virtual/opengl )
164 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
165 kate? ( >=media-libs/libkate-0.1.1 )
166 libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig )
167 libcaca? ( >=media-libs/libcaca-0.99_beta14 )
168 libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
169 libproxy? ( net-libs/libproxy )
170 libsamplerate? ( media-libs/libsamplerate )
171 libtar? ( >=dev-libs/libtar-1.2.11-r3 )
172 libtiger? ( media-libs/libtiger )
173 linsys? ( >=media-libs/zvbi-0.2.28 )
174 lirc? ( app-misc/lirc )
175 live? ( >=media-plugins/live-2011.12.02 )
176 lua? ( >=dev-lang/lua-5.1 )
177 macosx-vout? ( virtual/opengl )
178 matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 )
179 modplug? ( >=media-libs/libmodplug-0.8.8.1 )
180 mp3? ( media-libs/libmad )
181 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
182 mtp? ( >=media-libs/libmtp-1.0.0 )
183 musepack? ( >=media-sound/musepack-tools-444 )
184 ncurses? ( sys-libs/ncurses )
185 ogg? ( media-libs/libogg )
186 opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
187 png? ( media-libs/libpng sys-libs/zlib )
188 portaudio? ( >=media-libs/portaudio-19_pre )
189 postproc? ( virtual/ffmpeg )
190 projectm? ( media-libs/libprojectm )
191 pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
192 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
193 samba? ( >=net-fs/samba-3.4.6[smbclient] )
194 schroedinger? ( >=media-libs/schroedinger-1.0.10 )
195 sdl? ( >=media-libs/libsdl-1.2.8
196 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
197 shout? ( media-libs/libshout )
198 sid? ( media-libs/libsidplay:2 )
199 skins? ( x11-libs/libXext x11-libs/libXpm )
200 speex? ( media-libs/speex )
201 sqlite? ( >=dev-db/sqlite-3.6.0:3 )
202 svg? ( >=gnome-base/librsvg-2.9.0 )
203 swscale? ( virtual/ffmpeg )
204 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
205 theora? ( >=media-libs/libtheora-1.0_beta3 )
206 truetype? ( media-libs/freetype virtual/ttf-fonts
207 !fontconfig? ( media-fonts/dejavu ) )
208 twolame? ( media-sound/twolame )
209 udev? ( >=sys-fs/udev-142 )
210 upnp? ( net-libs/libupnp )
211 libv4l2? ( media-libs/libv4l )
212 vaapi? ( x11-libs/libva )
213 vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
214 vorbis? ( media-libs/libvorbis )
215 win32codecs? ( media-libs/win32codecs )
216 X? ( x11-libs/libX11 )
217 x264? ( >=media-libs/x264-0.0.20090923 )
218 xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
219 xml? ( dev-libs/libxml2 )
220 xosd? ( x11-libs/xosd )
221 zvbi? ( >=media-libs/zvbi-0.2.25 )
222 "
223
224 DEPEND="${RDEPEND}
225 alsa? ( >=media-sound/alsa-headers-1.0.23 )
226 fbosd? ( sys-kernel/linux-headers )
227 kde? ( >=kde-base/kdelibs-4 )
228 xcb? ( x11-proto/xproto )
229 app-arch/xz-utils
230 dev-util/pkgconfig"
231
232 REQUIRED_USE="
233 aalib? ( X )
234 bidi? ( truetype )
235 cddb? ( cdda )
236 dxva2? ( avcodec )
237 egl? ( X )
238 ffmpeg? ( avcodec avformat postproc swscale )
239 fontconfig? ( truetype )
240 gnutls? ( gcrypt )
241 libtar? ( skins )
242 libtiger? ( kate )
243 media-library? ( sqlite )
244 qt4? ( X )
245 sdl? ( X )
246 skins? ( truetype qt4 X )
247 switcher? ( avcodec )
248 vaapi? ( avcodec X )
249 vlm? ( encode )
250 xosd? ( X )
251 xv? ( xcb )
252 "
253
254 S="${WORKDIR}/${MY_P}"
255
256 src_unpack() {
257 unpack ${A}
258 if [ "${PV%9999}" != "${PV}" ] ; then
259 git-2_src_unpack
260 fi
261 }
262
263 src_prepare() {
264 # Make it build with libtool 1.5
265 rm -f m4/lt* m4/libtool.m4
266
267 EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
268 eautoreconf
269 }
270
271 src_configure() {
272 # needs libresid-builder from libsidplay:2 which is in another directory...
273 # FIXME!
274 use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
275
276 econf \
277 --docdir=/usr/share/doc/${PF} \
278 $(use_enable a52) \
279 $(use_enable aalib aa) \
280 $(use_enable aac faad) \
281 $(use_enable alsa) \
282 $(use_enable altivec) \
283 $(use_enable atmo) \
284 $(use_enable audioqueue) \
285 $(use_enable avahi bonjour) \
286 $(use_enable avcodec) \
287 $(use_enable avformat) \
288 $(use_enable bidi fribidi) \
289 $(use_enable bluray) \
290 $(use_enable cdda vcd) \
291 $(use_enable cddb libcddb) \
292 $(use_enable dbus) $(use_enable dbus dbus-control) \
293 $(use_enable dirac) \
294 $(use_enable direct2d) \
295 $(use_enable directfb) \
296 $(use_enable directx) \
297 $(use_enable dc1394) \
298 $(use_enable debug) \
299 $(use_enable dshow) \
300 $(use_enable dts dca) \
301 $(use_enable dvb dvbpsi) \
302 $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
303 $(use_enable dxva2) \
304 $(use_enable egl) \
305 $(use_enable encode sout) \
306 $(use_enable fbosd) \
307 $(use_enable flac) \
308 $(use_enable fluidsynth) \
309 $(use_enable fontconfig) \
310 $(use_enable gcrypt libgcrypt) \
311 $(use_enable gme) \
312 $(use_enable gnome gnomevfs) \
313 $(use_enable gnutls) \
314 $(use_enable growl) \
315 $(use_enable httpd) \
316 $(use_enable ieee1394 dv) \
317 $(use_enable ios-vout) \
318 $(use_enable jack) \
319 $(use_enable kate) \
320 $(use_with kde kde-solid) \
321 $(use_enable libass) \
322 $(use_enable libcaca caca) \
323 $(use_enable libnotify notify) \
324 $(use_enable libproxy) \
325 $(use_enable libsamplerate samplerate) \
326 $(use_enable libtar) \
327 $(use_enable libtiger tiger) \
328 $(use_enable libv4l2) \
329 $(use_enable linsys) \
330 $(use_enable lirc) \
331 $(use_enable live live555) \
332 $(use_enable lua) \
333 $(use_enable macosx-audio) \
334 $(use_enable macosx-dialog-provider) \
335 $(use_enable macosx-eyetv) \
336 $(use_enable macosx-qtkit) \
337 $(use_enable macosx-quartztext) \
338 $(use_enable macosx-vout) \
339 $(use_enable matroska mkv) \
340 $(use_enable media-library) \
341 $(use_enable mmx) \
342 $(use_enable modplug mod) \
343 $(use_enable mp3 mad) \
344 $(use_enable mpeg libmpeg2) \
345 $(use_enable mtp) \
346 $(use_enable musepack mpc) \
347 $(use_enable ncurses) \
348 $(use_enable neon) \
349 $(use_enable ogg) \
350 $(use_enable omxil) \
351 $(use_enable opengl glx) \
352 $(use_enable optimisememory optimize-memory) \
353 $(use_enable oss) \
354 $(use_enable png) \
355 $(use_enable portaudio) \
356 $(use_enable postproc) \
357 $(use_enable projectm) \
358 $(use_enable pulseaudio pulse) \
359 $(use_enable pvr) \
360 $(use_enable qt4) \
361 $(use_enable rtsp realrtsp) \
362 $(use_enable run-as-root) \
363 $(use_enable samba smb) \
364 $(use_enable schroedinger) \
365 $(use_enable sdl) \
366 $(use_enable sdl-image) \
367 $(use_enable shine) \
368 $(use_enable sid) \
369 $(use_enable shout) \
370 $(use_enable skins skins2) \
371 $(use_enable speex) \
372 $(use_enable sqlite) \
373 $(use_enable sse) \
374 $(use_enable svg) \
375 $(use_enable switcher) \
376 $(use_enable swscale) \
377 $(use_enable taglib) \
378 $(use_enable theora) \
379 $(use_enable truetype freetype) \
380 $(use_enable twolame) \
381 $(use_enable udev) \
382 $(use_enable upnp) \
383 $(use_enable vcdx) \
384 $(use_enable vaapi libva) \
385 $(use_enable vlm) \
386 $(use_enable vorbis) \
387 $(use_enable waveout) \
388 $(use_enable win32codecs loader) \
389 $(use_enable wingdi) \
390 $(use_enable wma-fixed) \
391 $(use_with X x) \
392 $(use_enable x264) \
393 $(use_enable xcb) \
394 $(use_enable xml libxml2) \
395 $(use_enable xosd) \
396 $(use_enable xv xvideo) \
397 $(use_enable zvbi) $(use_enable !zvbi telx) \
398 --disable-optimizations \
399 --without-tuning \
400 --enable-fast-install
401 }
402
403 src_install() {
404 emake DESTDIR="${D}" install || die "make install failed"
405
406 dodoc AUTHORS THANKS NEWS README \
407 doc/fortunes.txt doc/intf-vcd.txt
408
409 # Punt useless libtool's .la files
410 find "${D}" -name '*.la' -delete
411 }
412
413 pkg_postinst() {
414 if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
415 einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
416 "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
417 else
418 ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
419 ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
420 ewarn "If you do not do it, vlc will take a long time to load."
421 fi
422 }