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