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.1.7.ebuild ChangeLog
Date: Mon, 31 Jan 2011 23:11:36
Message-Id: 20110131231119.3116B20054@flycatcher.gentoo.org
1 aballier 11/01/31 23:11:19
2
3 Modified: ChangeLog
4 Added: vlc-1.1.7.ebuild
5 Log:
6 version bump
7
8 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.654 media-video/vlc/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.654&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.654&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.653&r2=1.654
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
20 retrieving revision 1.653
21 retrieving revision 1.654
22 diff -u -r1.653 -r1.654
23 --- ChangeLog 26 Jan 2011 13:14:16 -0000 1.653
24 +++ ChangeLog 31 Jan 2011 23:11:19 -0000 1.654
25 @@ -1,6 +1,11 @@
26 # ChangeLog for media-video/vlc
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.653 2011/01/26 13:14:16 xarthisius Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.654 2011/01/31 23:11:19 aballier Exp $
30 +
31 +*vlc-1.1.7 (31 Jan 2011)
32 +
33 + 31 Jan 2011; Alexis Ballier <aballier@g.o> +vlc-1.1.7.ebuild:
34 + version bump
35
36 26 Jan 2011; <xarth@g.o> vlc-1.1.6.ebuild:
37 ppc/ppc64 stable wrt #352206
38
39
40
41 1.1 media-video/vlc/vlc-1.1.7.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.7.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.7.ebuild?rev=1.1&content-type=text/plain
45
46 Index: vlc-1.1.7.ebuild
47 ===================================================================
48 # Copyright 1999-2011 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.7.ebuild,v 1.1 2011/01/31 23:11:19 aballier Exp $
51
52 EAPI="3"
53
54 SCM=""
55 if [ "${PV%9999}" != "${PV}" ] ; then
56 SCM=git
57 EGIT_BOOTSTRAP="bootstrap"
58 EGIT_BRANCH=master
59 EGIT_PROJECT=${P}
60 if [ "${PV%.9999}" != "${PV}" ] ; then
61 EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
62 else
63 EGIT_REPO_URI="git://git.videolan.org/vlc.git"
64 fi
65 fi
66
67 inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM}
68
69 MY_PV="${PV/_/-}"
70 MY_PV="${MY_PV/-beta/-test}"
71 MY_P="${PN}-${MY_PV}"
72 VLC_SNAPSHOT_TIME="0013"
73
74 PATCHLEVEL="88"
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
91 LICENSE="GPL-2"
92 SLOT="0"
93
94 if [ "${PV%9999}" = "${PV}" ] ; then
95 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
96 else
97 KEYWORDS=""
98 fi
99 IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
100 debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
101 +gcrypt ggi gme gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca
102 libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx
103 modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
104 png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
105 schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
106 svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
107 vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
108
109 RDEPEND="
110 sys-libs/zlib
111 >=media-libs/libdvbpsi-0.1.6
112 a52? ( >=media-libs/a52dec-0.7.4-r3 )
113 aalib? ( media-libs/aalib )
114 aac? ( >=media-libs/faad2-2.6.1 )
115 alsa? ( >=media-libs/alsa-lib-1.0.23 )
116 avahi? ( >=net-dns/avahi-0.6[dbus] )
117 bidi? ( >=dev-libs/fribidi-0.10.4 )
118 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
119 dbus? ( >=sys-apps/dbus-1.0.2 )
120 dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
121 dirac? ( >=media-video/dirac-0.10.0 )
122 directfb? ( dev-libs/DirectFB sys-libs/zlib )
123 dts? ( media-libs/libdca )
124 dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
125 elibc_glibc? ( >=sys-libs/glibc-2.8 )
126 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
127 flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
128 fluidsynth? ( media-sound/fluidsynth )
129 fontconfig? ( media-libs/fontconfig )
130 gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
131 ggi? ( media-libs/libggi )
132 gme? ( media-libs/game-music-emu )
133 gnome? ( gnome-base/gnome-vfs )
134 gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 )
135 id3tag? ( media-libs/libid3tag sys-libs/zlib )
136 ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
137 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
138 kate? ( >=media-libs/libkate-0.1.1 )
139 libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
140 libcaca? ( >=media-libs/libcaca-0.99_beta14 )
141 libnotify? ( x11-libs/libnotify )
142 libproxy? ( net-libs/libproxy )
143 libtiger? ( media-libs/libtiger )
144 lirc? ( app-misc/lirc )
145 live? ( >=media-plugins/live-2008.07.06 )
146 lua? ( >=dev-lang/lua-5.1 )
147 matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
148 modplug? ( >=media-libs/libmodplug-0.8.8.1 )
149 mp3? ( media-libs/libmad )
150 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
151 mtp? ( >=media-libs/libmtp-1.0.0 )
152 musepack? ( >=media-sound/musepack-tools-444 )
153 ncurses? ( sys-libs/ncurses )
154 nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
155 ogg? ( media-libs/libogg )
156 opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
157 png? ( media-libs/libpng sys-libs/zlib )
158 projectm? ( media-libs/libprojectm )
159 pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22
160 ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) )
161 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
162 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
163 samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
164 schroedinger? ( >=media-libs/schroedinger-1.0.6 )
165 sdl? ( >=media-libs/libsdl-1.2.8
166 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
167 shout? ( media-libs/libshout )
168 skins? (
169 x11-libs/qt-gui:4 x11-libs/qt-core:4
170 x11-libs/libXext x11-libs/libX11
171 media-libs/freetype media-fonts/dejavu
172 )
173 speex? ( media-libs/speex )
174 sqlite? ( >=dev-db/sqlite-3.6.0:3 )
175 svg? ( >=gnome-base/librsvg-2.9.0 )
176 svga? ( media-libs/svgalib )
177 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
178 theora? ( >=media-libs/libtheora-1.0_beta3 )
179 truetype? ( media-libs/freetype media-fonts/dejavu )
180 twolame? ( media-sound/twolame )
181 udev? ( >=sys-fs/udev-142 )
182 upnp? ( net-libs/libupnp )
183 v4l2? ( libv4l2? ( media-libs/libv4l ) )
184 v4l? ( libv4l? ( media-libs/libv4l ) )
185 vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
186 vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
187 vorbis? ( media-libs/libvorbis )
188 win32codecs? ( media-libs/win32codecs )
189 X? ( x11-libs/libX11 )
190 x264? ( >=media-libs/x264-0.0.20090923 )
191 xcb? ( x11-libs/libxcb x11-libs/xcb-util )
192 xml? ( dev-libs/libxml2 )
193 xosd? ( x11-libs/xosd )
194 zvbi? ( >=media-libs/zvbi-0.2.25 )
195 "
196
197 DEPEND="${RDEPEND}
198 !!<=media-video/vlc-1.0.99999
199 alsa? ( >=media-sound/alsa-headers-1.0.23 )
200 dvb? ( sys-kernel/linux-headers )
201 kde? ( >=kde-base/kdelibs-4 )
202 v4l? ( sys-kernel/linux-headers )
203 v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
204 xcb? ( x11-proto/xproto )
205 dev-util/pkgconfig"
206
207 S="${WORKDIR}/${MY_P}"
208
209 # Displays a warning if the first use flag is set but the second is not
210 vlc_use_needs() {
211 use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
212 }
213
214 # Notify the user that some useflag have been forced on
215 vlc_use_force() {
216 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
217 }
218
219 # Use when $1 depends strictly on $2
220 # if use $1 then enable $2
221 vlc_use_enable_force() {
222 use $1 && echo "--enable-$2"
223 }
224
225 pkg_setup() {
226 # Useflags we need to forcefuly enable
227 vlc_use_force remoteosd gcrypt
228 vlc_use_force gnutls gcrypt
229 vlc_use_force skins truetype
230 vlc_use_force skins qt4
231 vlc_use_force vlm stream
232 vlc_use_force vaapi ffmpeg
233 vlc_use_force nsplugin xcb
234 has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
235
236 # Useflags that will be automagically discarded if deps are not met
237 vlc_use_needs bidi truetype
238 vlc_use_needs cddb cdda
239 vlc_use_needs fontconfig truetype
240 vlc_use_needs libv4l2 v4l2
241 vlc_use_needs libv4l v4l
242 vlc_use_needs libtiger kate
243 vlc_use_needs xv xcb
244
245 if use qt4 || use skins ; then
246 qt4_pkg_setup
247 else
248 ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
249 ewarn "graphical interface. Maybe that is not what you want..."
250 fi
251 }
252
253 src_unpack() {
254 unpack ${A}
255 if [ "${PV%9999}" != "${PV}" ] ; then
256 git_src_unpack
257 fi
258 }
259
260 src_prepare() {
261 if [ "${PV%9999}" != "${PV}" ] ; then
262 git_src_prepare
263 fi
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
273 # It would fail if -fforce-addr is used due to too few registers...
274 use x86 && filter-flags -fforce-addr
275
276 econf \
277 $(use_enable a52) \
278 $(use_enable aalib aa) \
279 $(use_enable aac faad) \
280 $(use_enable alsa) \
281 $(use_enable altivec) \
282 --disable-asademux \
283 $(use_enable atmo) \
284 $(use_enable avahi bonjour) \
285 $(use_enable bidi fribidi) \
286 $(use_enable cdda vcd) \
287 $(use_enable cddb libcddb) \
288 $(use_enable dbus) $(use_enable dbus dbus-control) \
289 $(use_enable dirac) \
290 $(use_enable directfb) \
291 $(use_enable dc1394) \
292 $(use_enable debug) \
293 $(use_enable dts dca) \
294 $(use_enable dvb) \
295 $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
296 $(use_enable fbcon fb) \
297 $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
298 $(use_enable flac) \
299 $(use_enable fluidsynth) \
300 $(use_enable fontconfig) \
301 $(use_enable ggi) \
302 $(use_enable gme) \
303 $(use_enable gnome gnomevfs) \
304 $(use_enable gnutls) \
305 $(use_enable httpd) \
306 $(use_enable id3tag) \
307 $(use_enable ieee1394 dv) \
308 $(use_enable jack) \
309 $(use_enable kate) \
310 $(use_with kde kde-solid) \
311 $(use_enable libass) \
312 $(use_enable libcaca caca) \
313 $(use_enable gcrypt libgcrypt) \
314 $(use_enable libnotify notify) \
315 $(use_enable libproxy) \
316 --disable-libtar \
317 $(use_enable libtiger tiger) \
318 $(use_enable libv4l) \
319 $(use_enable libv4l2) \
320 $(use_enable lirc) \
321 $(use_enable live live555) \
322 $(use_enable lua) \
323 $(use_enable matroska mkv) \
324 $(use_enable mmx) \
325 $(use_enable modplug mod) \
326 $(use_enable mp3 mad) \
327 $(use_enable mpeg libmpeg2) \
328 $(use_enable mtp) \
329 $(use_enable musepack mpc) \
330 $(use_enable ncurses) \
331 $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
332 $(use_enable ogg) \
333 $(use_enable opengl glx) $(use_enable opengl) \
334 $(use_enable optimisememory optimize-memory) \
335 $(use_enable oss) \
336 $(use_enable png) \
337 --disable-portaudio \
338 $(use_enable projectm) \
339 $(use_enable pulseaudio pulse) \
340 $(use_enable pvr) \
341 $(use_enable qt4) \
342 $(use_enable remoteosd) \
343 $(use_enable rtsp realrtsp) \
344 $(use_enable run-as-root) \
345 $(use_enable samba smb) \
346 $(use_enable schroedinger) \
347 $(use_enable sdl) \
348 $(use_enable sdl-image) \
349 $(use_enable shine) \
350 $(use_enable shout) \
351 $(use_enable skins skins2) \
352 $(use_enable speex) \
353 $(use_enable sqlite) \
354 $(use_enable sse) \
355 $(use_enable stream sout) \
356 $(use_enable svg) \
357 $(use_enable svga svgalib) \
358 $(use_enable taglib) \
359 $(use_enable theora) \
360 $(use_enable truetype freetype) \
361 $(use_enable twolame) \
362 $(use_enable udev) \
363 $(use_enable upnp) \
364 $(use_enable v4l) \
365 $(use_enable v4l2) \
366 $(use_enable vcdx) \
367 $(use_enable vaapi libva) \
368 $(use_enable vlm) \
369 $(use_enable vorbis) \
370 $(use_enable win32codecs loader) \
371 $(use_enable wma-fixed) \
372 $(use_with X x) \
373 $(use_enable x264) \
374 $(use_enable xcb) \
375 $(use_enable xml libxml2) \
376 $(use_enable xosd) \
377 $(use_enable xv xvideo) \
378 $(use_enable zvbi) $(use_enable !zvbi telx) \
379 --disable-snapshot \
380 --disable-growl \
381 --disable-optimizations \
382 --enable-fast-install \
383 $(vlc_use_enable_force vlm sout) \
384 $(vlc_use_enable_force skins qt4) \
385 $(vlc_use_enable_force skins freetype) \
386 $(vlc_use_enable_force remoteosd libgcrypt) \
387 $(vlc_use_enable_force gnutls libgcrypt) \
388 $(vlc_use_enable_force vaapi avcodec) \
389 $(vlc_use_enable_force nsplugin xcb) \
390 $(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x')
391 }
392
393 src_install() {
394 emake DESTDIR="${D}" install || die "make install failed"
395
396 dodoc AUTHORS HACKING THANKS NEWS README \
397 doc/fortunes.txt doc/intf-vcd.txt
398
399 rm -rf "${D}/usr/share/doc/vlc" \
400 "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
401
402 if use nsplugin; then
403 dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
404 mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
405 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
406 fi
407
408 use skins || rm -rf "${D}/usr/share/vlc/skins2"
409 }
410
411 pkg_postinst() {
412 gnome2_pkg_postinst
413
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 }