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-0.9.7.ebuild
Date: Sun, 30 Nov 2008 15:02:11
Message-Id: E1L6noG-0006y1-7c@stork.gentoo.org
1 aballier 08/11/30 15:02:08
2
3 Modified: metadata.xml ChangeLog
4 Added: vlc-0.9.7.ebuild
5 Log:
6 version bump
7 (Portage version: 2.2_rc16/cvs/Linux 2.6.27.7 x86_64)
8
9 Revision Changes Path
10 1.18 media-video/vlc/metadata.xml
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/metadata.xml?rev=1.18&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/metadata.xml?rev=1.18&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/metadata.xml?r1=1.17&r2=1.18
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/metadata.xml,v
19 retrieving revision 1.17
20 retrieving revision 1.18
21 diff -u -r1.17 -r1.18
22 --- metadata.xml 6 Nov 2008 00:27:11 -0000 1.17
23 +++ metadata.xml 30 Nov 2008 15:02:08 -0000 1.18
24 @@ -21,6 +21,7 @@
25 <flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
26 <flag name="libass">Enables subtitles support using libass.</flag>
27 <flag name="libgcrypt">Enables cryptography support via libgcrypt.</flag>
28 + <flag name="libsysfs">Get user key from firewire connected iPod via libsysfs.</flag>
29 <flag name="libv4l2">Enables Libv4l2 Video4Linux2 support (for conversion
30 from various video formats to standard ones, needed to use v4l2 devices
31 with strange formats).</flag>
32
33
34
35 1.411 media-video/vlc/ChangeLog
36
37 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.411&view=markup
38 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.411&content-type=text/plain
39 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.410&r2=1.411
40
41 Index: ChangeLog
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
44 retrieving revision 1.410
45 retrieving revision 1.411
46 diff -u -r1.410 -r1.411
47 --- ChangeLog 10 Nov 2008 13:48:03 -0000 1.410
48 +++ ChangeLog 30 Nov 2008 15:02:08 -0000 1.411
49 @@ -1,6 +1,12 @@
50 # ChangeLog for media-video/vlc
51 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
52 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.410 2008/11/10 13:48:03 aballier Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.411 2008/11/30 15:02:08 aballier Exp $
54 +
55 +*vlc-0.9.7 (30 Nov 2008)
56 +
57 + 30 Nov 2008; Alexis Ballier <aballier@g.o> metadata.xml,
58 + +vlc-0.9.7.ebuild:
59 + version bump
60
61 10 Nov 2008; Alexis Ballier <aballier@g.o>
62 -files/0001-Fix-build-with-x264-build-65.patch,
63
64
65
66 1.1 media-video/vlc/vlc-0.9.7.ebuild
67
68 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.7.ebuild?rev=1.1&view=markup
69 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.7.ebuild?rev=1.1&content-type=text/plain
70
71 Index: vlc-0.9.7.ebuild
72 ===================================================================
73 # Copyright 1999-2008 Gentoo Foundation
74 # Distributed under the terms of the GNU General Public License v2
75 # $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.7.ebuild,v 1.1 2008/11/30 15:02:08 aballier Exp $
76
77 EAPI="1"
78
79 WANT_AUTOMAKE=latest
80 WANT_AUTOCONF=latest
81
82 inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic
83
84 MY_PV="${PV/_/-}"
85 MY_PV="${MY_PV/-beta/-test}"
86 MY_P="${PN}-${MY_PV}"
87 VLC_SNAPSHOT_TIME="0013"
88
89 PATCHLEVEL="59"
90 M4_TARBALL_VERSION="1"
91 DESCRIPTION="VLC media player - Video player and streamer"
92 HOMEPAGE="http://www.videolan.org/vlc/"
93 if [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
94 SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
95 MY_P="${P/_alpha*/}-git"
96 elif [[ "${P}" == *_p* ]]; then # Snapshots
97 SRC_URI="mirror://gentoo/${P}.tar.bz2"
98 MY_P="${P}"
99 elif [[ "${MY_P}" == "${P}" ]]; then
100 SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
101 else
102 SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
103 fi
104
105 SRC_URI="${SRC_URI}
106 mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
107 mirror://gentoo/${PN}-m4-${M4_TARBALL_VERSION}.tar.bz2"
108
109 LICENSE="GPL-2"
110 SLOT="0"
111
112 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
113 IUSE="a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddb cdio dbus dc1394
114 debug dirac directfb dts dvb dvd esd fbcon fluidsynth +ffmpeg flac fontconfig ggi gnome gnutls hal httpd
115 id3tag jack kate libass libcaca +libgcrypt libnotify libsysfs libv4l2 lirc live lua matroska mmx modplug mp3 mpeg
116 musepack ncurses nsplugin ogg opengl optimisememory oss png pulseaudio pvr +qt4
117 remoteosd rtsp samba schroedinger sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
118 theora truetype twolame upnp v4l v4l2 vcd vcdinfo vcdx vlm vorbis win32codecs
119 X x264 xinerama xml xosd xv zvbi"
120
121 RDEPEND="
122 sys-libs/zlib
123 media-libs/libdvbpsi
124 a52? ( >=media-libs/a52dec-0.7.4-r3 )
125 aalib? ( media-libs/aalib )
126 aac? ( >=media-libs/faad2-2.6.1 )
127 alsa? ( media-libs/alsa-lib )
128 arts? ( kde-base/arts )
129 avahi? ( >=net-dns/avahi-0.6 )
130 bidi? ( >=dev-libs/fribidi-0.10.4 )
131 cdda? ( >=dev-libs/libcdio-0.72
132 cddb? ( >=media-libs/libcddb-1.2.0 ) )
133 cdio? ( >=dev-libs/libcdio-0.78.2 )
134 dbus? ( >=sys-apps/dbus-1.0.2 )
135 dc1394? ( sys-libs/libraw1394
136 <media-libs/libdc1394-1.9.99 )
137 dirac? ( >=media-video/dirac-0.10.0 )
138 directfb? ( dev-libs/DirectFB )
139 dts? ( media-libs/libdca )
140 dvd? ( media-libs/libdvdread
141 media-libs/libdvdcss
142 >=media-libs/libdvdnav-0.1.9
143 media-libs/libdvdplay )
144 esd? ( media-sound/esound )
145 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 )
146 flac? ( media-libs/libogg
147 >=media-libs/flac-1.1.2 )
148 fluidsynth? ( media-sound/fluidsynth )
149 fontconfig? ( media-libs/fontconfig )
150 ggi? ( media-libs/libggi )
151 gnome? ( gnome-base/gnome-vfs )
152 gnutls? ( >=net-libs/gnutls-1.3.3 )
153 hal? ( sys-apps/hal )
154 id3tag? ( media-libs/libid3tag
155 sys-libs/zlib )
156 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
157 kate? ( >=media-libs/libkate-0.1.1 )
158 libass? ( >=media-libs/libass-0.9.5 media-libs/fontconfig )
159 libcaca? ( media-libs/libcaca )
160 libgcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
161 libnotify? ( x11-libs/libnotify )
162 libsysfs? ( sys-fs/sysfsutils )
163 lirc? ( app-misc/lirc )
164 live? ( >=media-plugins/live-2008.07.06 )
165 lua? ( >=dev-lang/lua-5.1 )
166 matroska? (
167 >=dev-libs/libebml-0.7.6
168 >=media-libs/libmatroska-0.8.0 )
169 modplug? ( media-libs/libmodplug )
170 mp3? ( media-libs/libmad )
171 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
172 musepack? ( media-libs/libmpcdec )
173 ncurses? ( sys-libs/ncurses )
174 nsplugin? (
175 seamonkey? ( =www-client/seamonkey-1* )
176 !seamonkey? ( >=net-libs/xulrunner-1.8 )
177 )
178 ogg? ( media-libs/libogg )
179 png? ( media-libs/libpng )
180 pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
181 qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
182 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
183 samba? ( net-fs/samba )
184 schroedinger? ( >=media-libs/schroedinger-1.0 )
185 sdl? ( >=media-libs/libsdl-1.2.8
186 sdl-image? ( media-libs/sdl-image ) )
187 shout? ( media-libs/libshout )
188 skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
189 speex? ( media-libs/speex )
190 svg? ( >=gnome-base/librsvg-2.9.0 )
191 svga? ( media-libs/svgalib )
192 taglib? ( media-libs/taglib )
193 theora? ( media-libs/libtheora )
194 truetype? ( media-libs/freetype
195 media-fonts/ttf-bitstream-vera )
196 twolame? ( media-sound/twolame )
197 upnp? ( net-libs/libupnp )
198 v4l2? ( libv4l2? ( media-libs/libv4l ) )
199 vcdinfo? ( >=media-video/vcdimager-0.7.22 )
200 vorbis? ( media-libs/libvorbis )
201 win32codecs? ( media-libs/win32codecs )
202 X? (
203 x11-libs/libX11
204 x11-libs/libXext
205 xv? ( x11-libs/libXv )
206 xinerama? ( x11-libs/libXinerama )
207 opengl? ( virtual/opengl )
208 )
209 x264? ( media-libs/x264 )
210 xml? ( dev-libs/libxml2 )
211 xosd? ( x11-libs/xosd )
212 zvbi? ( >=media-libs/zvbi-0.2.25 )
213 "
214
215 # Disabled features and reasons:
216 # xvmc? ( x11-libs/libXvMC )
217 # Will probably compile only on x86
218
219 DEPEND="${RDEPEND}
220 dvb? ( sys-kernel/linux-headers )
221 v4l? ( sys-kernel/linux-headers )
222 v4l2? ( sys-kernel/linux-headers )
223 X? ( xinerama? ( x11-proto/xineramaproto ) )
224 dev-util/pkgconfig"
225
226 S="${WORKDIR}/${MY_P}"
227
228 # Dispalys a warning if the first use flag is set but not the second
229 vlc_use_needs() {
230 use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
231 }
232
233 # Notify the user that some useflag have been forced on
234 vlc_use_force() {
235 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
236 }
237
238 # Use when $2 depends strictly on $3
239 # if use $1 then enable $2 and $3, otherwise disable $2
240 vlc_use_enable_force() {
241 if use $1 ; then
242 echo "--enable-$2 --enable-$3"
243 else
244 echo "--disable-$2"
245 fi
246 }
247
248 # Prints the configure argument for the ffmpeg scaling api to use
249 vlc_ffmpeg_scaling_api() {
250 if use ffmpeg ; then
251 if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" || has_version "=media-video/ffmpeg-0.4.9_p20070616-r2" || has_version "=media-video/ffmpeg-0.4.9_p20070616-r1"; then
252 echo "--enable-swscale --disable-imgresample"
253 else
254 echo "--disable-swscale --enable-imgresample"
255 fi
256 else
257 echo "--disable-swscale --disable-imgresample"
258 fi
259 }
260
261 pkg_setup() {
262 vlc_use_needs skins truetype
263 vlc_use_force skins qt4
264 vlc_use_needs cdda cdio
265 vlc_use_needs vcdx cdio
266 vlc_use_needs vcdx vcdinfo
267 vlc_use_needs vcdinfo cdio
268 vlc_use_needs bidi truetype
269 vlc_use_force remoteosd libgcrypt
270 vlc_use_needs fontconfig truetype
271 vlc_use_needs libv4l2 v4l2
272 if ( use qt4 || use skins ) ; then
273 QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup
274 else
275 ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
276 ewarn "graphical interface. Maybe that is not what you want..."
277 fi
278 }
279
280 src_unpack() {
281 unpack ${A}
282 cd "${S}"
283
284 # Make it build with libtool 1.5
285 rm -f m4/lt* m4/libtool.m4
286
287 EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
288 AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
289 }
290
291 src_compile () {
292
293 # It would fail if -fforce-addr is used due to too few registers...
294 use x86 && filter-flags -fforce-addr
295
296 local MOZILLA_PC
297
298 if use nsplugin; then
299 if use seamonkey; then
300 MOZILLA_PC=seamonkey-plugin
301 else
302 if has_version 'net-libs/xulrunner:1.9' ; then
303 MOZILLA_PC=libxul
304 else
305 MOZILLA_PC=xulrunner-plugin
306 fi
307 fi
308 fi
309
310 econf \
311 $(use_enable a52) \
312 $(use_enable aalib aa) \
313 $(use_enable aac faad) \
314 $(use_enable alsa) \
315 $(use_enable altivec) \
316 $(use_enable arts) \
317 --disable-asademux \
318 $(use_enable atmo) \
319 $(use_enable avahi bonjour) \
320 $(use_enable bidi fribidi) \
321 $(use_enable cdda) $(use_enable cdda cddax)\
322 $(use_enable cddb libcddb) \
323 $(use_enable cdio libcdio) \
324 --disable-csri \
325 $(use_enable dbus) $(use_enable dbus dbus-control) \
326 $(use_enable dirac) \
327 $(use_enable directfb) \
328 $(use_enable dc1394) \
329 $(use_enable debug) \
330 $(use_enable dts dca) \
331 --disable-dv \
332 $(use_enable dvb) \
333 $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
334 $(use_enable esd) \
335 $(use_enable fbcon fb) \
336 $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpeg_scaling_api) $(use_enable ffmpeg postproc) \
337 $(use_enable flac) \
338 $(use_enable fluidsynth) \
339 $(use_enable fontconfig) \
340 $(use_enable ggi) \
341 $(use_enable gnome gnomevfs) \
342 $(use_enable gnutls) \
343 $(use_enable hal) \
344 $(use_enable httpd) \
345 $(use_enable id3tag) \
346 $(use_enable jack) \
347 $(use_enable kate) \
348 $(use_enable libass) \
349 $(use_enable libcaca caca) \
350 $(use_enable libgcrypt) \
351 $(use_enable libnotify notify) \
352 --disable-libproxy \
353 --disable-libtar \
354 $(use_enable libsysfs) \
355 $(use_enable libv4l2) \
356 $(use_enable lirc) \
357 $(use_enable live live555) \
358 $(use_enable lua) \
359 $(use_enable matroska mkv) \
360 $(use_enable mmx) \
361 $(use_enable modplug mod) \
362 $(use_enable mp3 mad) \
363 $(use_enable mpeg libmpeg2) \
364 $(use_enable musepack mpc) \
365 $(use_enable ncurses) \
366 $(use_enable nsplugin mozilla) --with-mozilla-pkg="${MOZILLA_PC}" \
367 $(use_enable ogg) \
368 $(use_enable opengl glx) $(use_enable opengl) $(use_enable opengl galaktos) \
369 $(use_enable optimisememory optimize-memory) \
370 $(use_enable oss) \
371 $(use_enable png) \
372 --disable-portaudio \
373 $(use_enable pulseaudio pulse) \
374 $(use_enable pvr) \
375 $(use_enable qt4) \
376 $(use_enable rtsp realrtsp) \
377 $(use_enable samba smb) \
378 $(use_enable schroedinger) \
379 $(use_enable sdl) \
380 $(use_enable sdl-image) \
381 $(use_enable shout) \
382 $(use_enable skins skins2) \
383 $(use_enable speex) \
384 $(use_enable sse) \
385 $(use_enable stream sout) \
386 $(use_enable svg) \
387 $(use_enable svga svgalib) \
388 $(use_enable taglib) \
389 $(use_enable theora) \
390 $(use_enable truetype freetype) \
391 $(use_enable twolame) \
392 $(use_enable upnp) \
393 $(use_enable v4l) \
394 $(use_enable v4l2) \
395 $(use_enable vcd) \
396 $(use_enable vcdinfo) \
397 $(use_enable vcdx) \
398 $(use_enable vorbis) \
399 $(use_enable win32codecs loader) \
400 $(use_enable X x11) $(use_enable X screen) \
401 $(use_enable x264) \
402 $(use_enable xinerama) \
403 $(use_enable xml libxml2) \
404 $(use_enable xosd) \
405 $(use_enable xv xvideo) \
406 --disable-xvmc \
407 $(use_enable zvbi) \
408 --disable-snapshot \
409 --disable-growl \
410 --disable-optimizations \
411 --enable-fast-install \
412 $(vlc_use_enable_force vlm vlm sout) \
413 $(vlc_use_enable_force skins skins2 qt4) \
414 $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
415
416 emake || die "make of VLC failed"
417 }
418
419 src_install() {
420 emake DESTDIR="${D}" install || die "make install failed"
421
422 dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
423 doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
424
425 rm -rf "${D}/usr/share/doc/vlc" \
426 "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
427
428 if use nsplugin; then
429 dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
430 mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
431 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
432 fi
433
434 use skins || rm -rf "${D}/usr/share/vlc/skins2"
435
436 for res in 16 32 48; do
437 insinto /usr/share/icons/hicolor/${res}x${res}/apps/
438 newins "${S}"/share/vlc${res}x${res}.png vlc.png
439 done
440 }