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.6.ebuild
Date: Thu, 06 Nov 2008 00:27:50
Message-Id: E1KxsiO-00080v-5d@stork.gentoo.org
1 aballier 08/11/06 00:27:12
2
3 Modified: metadata.xml ChangeLog
4 Added: vlc-0.9.6.ebuild
5 Log:
6 version bump
7 (Portage version: 2.2_rc13/cvs/Linux 2.6.27.4 x86_64)
8
9 Revision Changes Path
10 1.17 media-video/vlc/metadata.xml
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/metadata.xml?rev=1.17&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/metadata.xml?rev=1.17&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/metadata.xml?r1=1.16&r2=1.17
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/metadata.xml,v
19 retrieving revision 1.16
20 retrieving revision 1.17
21 diff -u -r1.16 -r1.17
22 --- metadata.xml 25 Oct 2008 00:29:53 -0000 1.16
23 +++ metadata.xml 6 Nov 2008 00:27:11 -0000 1.17
24 @@ -37,6 +37,7 @@
25 <flag name="stream">Enables vlc to stream video.</flag>
26 <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder).</flag>
27 <flag name="upnp">Enables support for Intel UPnP stack.</flag>
28 + <flag name="vcdinfo">Enables VCD information library support.</flag>
29 <flag name="vcdx">Enables VCD with navigation via libvcdinfo (depends on cdio)</flag>
30 <flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC.</flag>
31 <flag name="wxwindows" restrict="&lt;=media-video/vlc-0.8.6">Builds a <pkg>x11-libs/wxGTK</pkg> based frontend. This interface is no longer maintained.</flag>
32
33
34
35 1.405 media-video/vlc/ChangeLog
36
37 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.405&view=markup
38 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.405&content-type=text/plain
39 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.404&r2=1.405
40
41 Index: ChangeLog
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
44 retrieving revision 1.404
45 retrieving revision 1.405
46 diff -u -r1.404 -r1.405
47 --- ChangeLog 30 Oct 2008 20:50:37 -0000 1.404
48 +++ ChangeLog 6 Nov 2008 00:27:12 -0000 1.405
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.404 2008/10/30 20:50:37 dertobi123 Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.405 2008/11/06 00:27:12 aballier Exp $
54 +
55 +*vlc-0.9.6 (06 Nov 2008)
56 +
57 + 06 Nov 2008; Alexis Ballier <aballier@g.o> metadata.xml,
58 + +vlc-0.9.6.ebuild:
59 + version bump
60
61 30 Oct 2008; Tobias Scherbaum <dertobi123@g.o> vlc-0.9.5.ebuild:
62 Added ~ppc, bug #242740
63
64
65
66 1.1 media-video/vlc/vlc-0.9.6.ebuild
67
68 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.6.ebuild?rev=1.1&view=markup
69 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.6.ebuild?rev=1.1&content-type=text/plain
70
71 Index: vlc-0.9.6.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.6.ebuild,v 1.1 2008/11/06 00:27:12 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="~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 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 lirc? ( app-misc/lirc )
163 live? ( >=media-plugins/live-2008.07.06 )
164 lua? ( >=dev-lang/lua-5.1 )
165 matroska? (
166 >=dev-libs/libebml-0.7.6
167 >=media-libs/libmatroska-0.8.0 )
168 modplug? ( media-libs/libmodplug )
169 mp3? ( media-libs/libmad )
170 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
171 musepack? ( media-libs/libmpcdec )
172 ncurses? ( sys-libs/ncurses )
173 nsplugin? (
174 seamonkey? ( =www-client/seamonkey-1* )
175 !seamonkey? ( >=net-libs/xulrunner-1.8 )
176 )
177 ogg? ( media-libs/libogg )
178 png? ( media-libs/libpng )
179 pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
180 qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
181 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
182 samba? ( net-fs/samba )
183 schroedinger? ( >=media-libs/schroedinger-1.0 )
184 sdl? ( >=media-libs/libsdl-1.2.8
185 sdl-image? ( media-libs/sdl-image ) )
186 shout? ( media-libs/libshout )
187 skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
188 speex? ( media-libs/speex )
189 svg? ( >=gnome-base/librsvg-2.9.0 )
190 svga? ( media-libs/svgalib )
191 taglib? ( media-libs/taglib )
192 theora? ( media-libs/libtheora )
193 truetype? ( media-libs/freetype
194 media-fonts/ttf-bitstream-vera )
195 twolame? ( media-sound/twolame )
196 upnp? ( net-libs/libupnp )
197 v4l2? ( libv4l2? ( media-libs/libv4l ) )
198 vcdinfo? ( >=media-video/vcdimager-0.7.22 )
199 vorbis? ( media-libs/libvorbis )
200 win32codecs? ( media-libs/win32codecs )
201 X? (
202 x11-libs/libX11
203 x11-libs/libXext
204 xv? ( x11-libs/libXv )
205 xinerama? ( x11-libs/libXinerama )
206 opengl? ( virtual/opengl )
207 )
208 x264? ( media-libs/x264 )
209 xml? ( dev-libs/libxml2 )
210 xosd? ( x11-libs/xosd )
211 zvbi? ( >=media-libs/zvbi-0.2.25 )
212 "
213
214 # Disabled features and reasons:
215 # xvmc? ( x11-libs/libXvMC )
216 # Will probably compile only on x86
217
218 DEPEND="${RDEPEND}
219 dvb? ( sys-kernel/linux-headers )
220 v4l? ( sys-kernel/linux-headers )
221 v4l2? ( sys-kernel/linux-headers )
222 X? ( xinerama? ( x11-proto/xineramaproto ) )
223 dev-util/pkgconfig"
224
225 S="${WORKDIR}/${MY_P}"
226
227 # Dispalys a warning if the first use flag is set but not the second
228 vlc_use_needs() {
229 use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
230 }
231
232 # Notify the user that some useflag have been forced on
233 vlc_use_force() {
234 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
235 }
236
237 # Use when $2 depends strictly on $3
238 # if use $1 then enable $2 and $3, otherwise disable $2
239 vlc_use_enable_force() {
240 if use $1 ; then
241 echo "--enable-$2 --enable-$3"
242 else
243 echo "--disable-$2"
244 fi
245 }
246
247 # Prints the configure argument for the ffmpeg scaling api to use
248 vlc_ffmpeg_scaling_api() {
249 if use ffmpeg ; then
250 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
251 echo "--enable-swscale --disable-imgresample"
252 else
253 echo "--disable-swscale --enable-imgresample"
254 fi
255 else
256 echo "--disable-swscale --disable-imgresample"
257 fi
258 }
259
260 pkg_setup() {
261 vlc_use_needs skins truetype
262 vlc_use_force skins qt4
263 vlc_use_needs cdda cdio
264 vlc_use_needs vcdx cdio
265 vlc_use_needs vcdx vcdinfo
266 vlc_use_needs vcdinfo cdio
267 vlc_use_needs bidi truetype
268 vlc_use_force remoteosd libgcrypt
269 vlc_use_needs fontconfig truetype
270 vlc_use_needs libv4l2 v4l2
271 if ( use qt4 || use skins ) ; then
272 QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup
273 else
274 ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
275 ewarn "graphical interface. Maybe that is not what you want..."
276 fi
277 }
278
279 src_unpack() {
280 unpack ${A}
281 cd "${S}"
282
283 EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
284 AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
285 }
286
287 src_compile () {
288
289 # It would fail if -fforce-addr is used due to too few registers...
290 use x86 && filter-flags -fforce-addr
291
292 local MOZILLA_PC
293
294 if use nsplugin; then
295 if use seamonkey; then
296 MOZILLA_PC=seamonkey-plugin
297 else
298 if has_version 'net-libs/xulrunner:1.9' ; then
299 MOZILLA_PC=libxul
300 else
301 MOZILLA_PC=xulrunner-plugin
302 fi
303 fi
304 fi
305
306 econf \
307 $(use_enable a52) \
308 $(use_enable aalib aa) \
309 $(use_enable aac faad) \
310 $(use_enable alsa) \
311 $(use_enable altivec) \
312 $(use_enable arts) \
313 --disable-asademux \
314 $(use_enable atmo) \
315 $(use_enable avahi bonjour) \
316 $(use_enable bidi fribidi) \
317 $(use_enable cdda) $(use_enable cdda cddax)\
318 $(use_enable cddb libcddb) \
319 $(use_enable cdio libcdio) \
320 --disable-csri \
321 $(use_enable dbus) $(use_enable dbus dbus-control) \
322 $(use_enable dirac) \
323 $(use_enable directfb) \
324 $(use_enable dc1394) \
325 $(use_enable debug) \
326 $(use_enable dts dca) \
327 --disable-dv \
328 $(use_enable dvb) \
329 $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
330 $(use_enable esd) \
331 $(use_enable fbcon fb) \
332 $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpeg_scaling_api) $(use_enable ffmpeg postproc) \
333 $(use_enable flac) \
334 $(use_enable fluidsynth) \
335 $(use_enable fontconfig) \
336 $(use_enable ggi) \
337 $(use_enable gnome gnomevfs) \
338 $(use_enable gnutls) \
339 $(use_enable hal) \
340 $(use_enable httpd) \
341 $(use_enable id3tag) \
342 $(use_enable jack) \
343 $(use_enable kate) \
344 $(use_enable libass) \
345 $(use_enable libcaca caca) \
346 $(use_enable libgcrypt) \
347 $(use_enable libnotify notify) \
348 --disable-libproxy \
349 --disable-libtar \
350 $(use_enable libv4l2) \
351 $(use_enable lirc) \
352 $(use_enable live live555) \
353 $(use_enable lua) \
354 $(use_enable matroska mkv) \
355 $(use_enable mmx) \
356 $(use_enable modplug mod) \
357 $(use_enable mp3 mad) \
358 $(use_enable mpeg libmpeg2) \
359 $(use_enable musepack mpc) \
360 $(use_enable ncurses) \
361 $(use_enable nsplugin mozilla) --with-mozilla-pkg="${MOZILLA_PC}" \
362 $(use_enable ogg) \
363 $(use_enable opengl glx) $(use_enable opengl) $(use_enable opengl galaktos) \
364 $(use_enable optimisememory optimize-memory) \
365 $(use_enable oss) \
366 $(use_enable png) \
367 --disable-portaudio \
368 $(use_enable pulseaudio pulse) \
369 $(use_enable pvr) \
370 $(use_enable qt4) \
371 $(use_enable rtsp realrtsp) \
372 $(use_enable samba smb) \
373 $(use_enable schroedinger) \
374 $(use_enable sdl) \
375 $(use_enable sdl-image) \
376 $(use_enable shout) \
377 $(use_enable skins skins2) \
378 $(use_enable speex) \
379 $(use_enable sse) \
380 $(use_enable stream sout) \
381 $(use_enable svg) \
382 $(use_enable svga svgalib) \
383 $(use_enable taglib) \
384 $(use_enable theora) \
385 $(use_enable truetype freetype) \
386 $(use_enable twolame) \
387 $(use_enable upnp) \
388 $(use_enable v4l) \
389 $(use_enable v4l2) \
390 $(use_enable vcd) \
391 $(use_enable vcdinfo) \
392 $(use_enable vcdx) \
393 $(use_enable vorbis) \
394 $(use_enable win32codecs loader) \
395 $(use_enable X x11) $(use_enable X screen) \
396 $(use_enable x264) \
397 $(use_enable xinerama) \
398 $(use_enable xml libxml2) \
399 $(use_enable xosd) \
400 $(use_enable xv xvideo) \
401 --disable-xvmc \
402 $(use_enable zvbi) \
403 --disable-snapshot \
404 --disable-growl \
405 --disable-optimizations \
406 --enable-fast-install \
407 $(vlc_use_enable_force vlm vlm sout) \
408 $(vlc_use_enable_force skins skins2 qt4) \
409 $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
410
411 emake || die "make of VLC failed"
412 }
413
414 src_install() {
415 emake DESTDIR="${D}" install || die "make install failed"
416
417 dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
418 doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
419
420 rm -rf "${D}/usr/share/doc/vlc" \
421 "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
422
423 if use nsplugin; then
424 dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
425 mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
426 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
427 fi
428
429 use skins || rm -rf "${D}/usr/share/vlc/skins2"
430
431 for res in 16 32 48; do
432 insinto /usr/share/icons/hicolor/${res}x${res}/apps/
433 newins "${S}"/share/vlc${res}x${res}.png vlc.png
434 done
435 }