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