Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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.8.6f.ebuild
Date: Sun, 06 Apr 2008 13:20:44
Message-Id: E1JiUnX-0008DC-18@stork.gentoo.org
1 aballier 08/04/06 13:20:39
2
3 Modified: ChangeLog
4 Added: vlc-0.8.6f.ebuild
5 Log:
6 version bump for bug #214627, bug #161930 and bug #214550
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.321 media-video/vlc/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.321&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.321&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.320&r2=1.321
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
19 retrieving revision 1.320
20 retrieving revision 1.321
21 diff -u -r1.320 -r1.321
22 --- ChangeLog 27 Mar 2008 11:36:27 -0000 1.320
23 +++ ChangeLog 6 Apr 2008 13:20:38 -0000 1.321
24 @@ -1,6 +1,11 @@
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.320 2008/03/27 11:36:27 aballier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.321 2008/04/06 13:20:38 aballier Exp $
29 +
30 +*vlc-0.8.6f (06 Apr 2008)
31 +
32 + 06 Apr 2008; Alexis Ballier <aballier@g.o> +vlc-0.8.6f.ebuild:
33 + version bump for bug #214627, bug #161930 and bug #214550
34
35 27 Mar 2008; Alexis Ballier <aballier@g.o> vlc-0.8.6e-r1.ebuild:
36 Bump patchset to backport a fix from upstream to fix bug #214809
37
38
39
40 1.1 media-video/vlc/vlc-0.8.6f.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.8.6f.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.8.6f.ebuild?rev=1.1&content-type=text/plain
44
45 Index: vlc-0.8.6f.ebuild
46 ===================================================================
47 # Copyright 1999-2008 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6f.ebuild,v 1.1 2008/04/06 13:20:38 aballier Exp $
50
51 WANT_AUTOMAKE=latest
52 WANT_AUTOCONF=latest
53
54 inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins
55
56 MY_PV="${PV/_/-}"
57 MY_PV="${MY_PV/-beta/-test}"
58 MY_P="${PN}-${MY_PV}"
59
60 PATCHLEVEL="51"
61 DESCRIPTION="VLC media player - Video player and streamer"
62 HOMEPAGE="http://www.videolan.org/vlc/"
63
64 if [[ "${P}" == *_p* ]]; then # Snapshots
65 SRC_URI="mirror://gentoo/${P}.tar.bz2"
66 MY_P="${P}"
67 elif [[ "${MY_P}" == "${P}" ]]; then
68 SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
69 else
70 SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
71 fi
72
73 SRC_URI="${SRC_URI}
74 mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
75
76 LICENSE="GPL-2"
77 SLOT="0"
78
79 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
80 IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
81 dvb dvd vcd dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
82 oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
83 mp3 xv bidi sdl sdl-image png xml samba daap corba modplug speex shout rtsp
84 win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
85 optimisememory libnotify jack musepack x264 dc1394 gnome xulrunner"
86
87 RDEPEND="
88 >=media-video/ffmpeg-0.4.9_p20050226-r1
89 <media-video/ffmpeg-0.4.9_p20070616-r1
90 cdda? ( >=dev-libs/libcdio-0.71
91 cddb? ( >=media-libs/libcddb-1.2.0 ) )
92 live? ( >=media-plugins/live-2005.01.29 )
93 dvd? ( media-libs/libdvdread
94 media-libs/libdvdcss
95 >=media-libs/libdvdnav-0.1.9
96 media-libs/libdvdplay )
97 esd? ( media-sound/esound )
98 gnome? ( gnome-base/gnome-vfs )
99 ogg? ( media-libs/libogg )
100 matroska? (
101 >=dev-libs/libebml-0.7.6
102 >=media-libs/libmatroska-0.8.0 )
103 mp3? ( media-libs/libmad )
104 a52? ( >=media-libs/a52dec-0.7.4-r3 )
105 dts? ( media-libs/libdca )
106 flac? ( media-libs/libogg
107 >=media-libs/flac-1.1.2 )
108 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
109 vorbis? ( media-libs/libvorbis )
110 theora? ( media-libs/libtheora )
111 truetype? ( media-libs/freetype
112 media-fonts/ttf-bitstream-vera )
113 svga? ( media-libs/svgalib )
114 ggi? ( media-libs/libggi )
115 aalib? ( media-libs/aalib )
116 libcaca? ( media-libs/libcaca )
117 arts? ( kde-base/arts )
118 alsa? ( media-libs/alsa-lib )
119 wxwindows? ( =x11-libs/wxGTK-2.6* )
120 skins? ( =x11-libs/wxGTK-2.6*
121 media-libs/freetype
122 media-fonts/ttf-bitstream-vera )
123 ncurses? ( sys-libs/ncurses )
124 xosd? ( x11-libs/xosd )
125 lirc? ( app-misc/lirc )
126 3dfx? ( media-libs/glide-v3 )
127 bidi? ( >=dev-libs/fribidi-0.10.4 )
128 gnutls? ( >=net-libs/gnutls-1.2.9 )
129 sys-libs/zlib
130 png? ( media-libs/libpng )
131 media-libs/libdvbpsi
132 sdl? ( >=media-libs/libsdl-1.2.8
133 sdl-image? ( media-libs/sdl-image ) )
134 xml? ( dev-libs/libxml2 )
135 samba? ( net-fs/samba )
136 vcd? ( >=dev-libs/libcdio-0.72
137 >=media-video/vcdimager-0.7.21 )
138 daap? ( >=media-libs/libopendaap-0.3.0 )
139 corba? ( >=gnome-base/orbit-2.8.0
140 >=dev-libs/glib-2.3.2 )
141 modplug? ( media-libs/libmodplug )
142 speex? ( media-libs/speex )
143 svg? ( >=gnome-base/librsvg-2.5.0 )
144 shout? ( media-libs/libshout )
145 win32codecs? ( media-libs/win32codecs )
146 hal? ( sys-apps/hal )
147 avahi? ( >=net-dns/avahi-0.6 )
148 X? (
149 x11-libs/libX11
150 x11-libs/libXext
151 xv? ( x11-libs/libXv )
152 xinerama? ( x11-libs/libXinerama )
153 opengl? ( virtual/opengl )
154 )
155 directfb? ( dev-libs/DirectFB )
156 upnp? ( net-libs/libupnp )
157 nsplugin? (
158 xulrunner? ( =net-libs/xulrunner-1.8* )
159 !xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
160 !xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
161 )
162 libnotify? ( x11-libs/libnotify )
163 musepack? ( media-libs/libmpcdec )
164 x264? ( >=media-libs/x264-svn-20061014 )
165 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
166 dc1394? ( sys-libs/libraw1394
167 <media-libs/libdc1394-1.9.99 )"
168
169 DEPEND="${RDEPEND}
170 v4l? ( sys-kernel/linux-headers )
171 dvb? ( sys-kernel/linux-headers )
172 X? ( xinerama? ( x11-proto/xineramaproto ) )
173 dev-util/pkgconfig"
174
175 S="${WORKDIR}/${MY_P}"
176
177 pkg_setup() {
178 if use wxwindows || use skins; then
179 WX_GTK_VER="2.6"
180 need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
181 fi
182
183 if use skins && ! use truetype; then
184 ewarn "Trying to build with skins support but without truetype."
185 ewarn "Enabling truetype."
186 fi
187 if use skins && ! use wxwindows; then
188 ewarn "Trying to build with skins support but without wxwindows."
189 ewarn "Enabling wxwindows."
190 fi
191 }
192
193 src_unpack() {
194 unpack ${A}
195 cd "${S}"
196
197 has_version '>=dev-libs/libcdio-0.78' || \
198 export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
199
200 EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
201 AT_M4DIR="m4" eautoreconf
202 }
203
204 src_compile () {
205 local XPIDL=""
206 local MOZILLA_CONFIG=""
207
208 use vlm && \
209 myconf="${myconf} --enable-vlm --enable-sout" || \
210 myconf="${myconf} --disable-vlm"
211
212 if use nsplugin; then
213 if use xulrunner; then
214 XPIDL=/usr/$(get_libdir)/xulrunner
215 MOZILLA_CONFIG=/usr/bin/xulrunner-config
216 elif use seamonkey; then
217 XPIDL=/usr/$(get_libdir)/seamonkey
218 MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
219 else
220 XPIDL=/usr/$(get_libdir)/mozilla-firefox
221 MOZILLA_CONFIG=/usr/$(get_libdir)/mozilla-firefox/firefox-config
222 fi
223 fi
224
225 if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
226 myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
227 else
228 myconf="${myconf} $(use_enable live live555)"
229 fi
230
231 if use truetype || use skins; then
232 myconf="${myconf} --enable-freetype"
233 else
234 myconf="${myconf} --disable-freetype"
235 fi
236
237 if use wxwindows || use skins; then
238 myconf="${myconf} --enable-wxwidgets"
239 else
240 myconf="${myconf} --disable-wxwidgets"
241 fi
242
243 econf \
244 $(use_enable altivec) \
245 $(use_enable stream sout) \
246 $(use_enable httpd) \
247 $(use_enable gnutls) \
248 $(use_enable v4l) \
249 $(use_enable cdda) $(use_enable cdda cddax)\
250 $(use_enable cddb libcddb) \
251 $(use_enable vcd) $(use_enable vcd vcdx) \
252 $(use_enable dvb) $(use_enable dvb pvr) \
253 $(use_enable ogg) \
254 $(use_enable matroska mkv) \
255 $(use_enable flac) \
256 $(use_enable vorbis) \
257 $(use_enable theora) \
258 $(use_enable X x11) \
259 $(use_enable xv xvideo) \
260 $(use_enable xinerama) \
261 $(use_enable opengl glx) $(use_enable opengl) \
262 $(use_enable bidi fribidi) \
263 $(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
264 $(use_enable fbcon fb) \
265 $(use_enable svga svgalib) \
266 $(use_enable 3dfx glide) \
267 $(use_enable aalib aa) \
268 $(use_enable libcaca caca) \
269 $(use_enable oss) \
270 $(use_enable esd) \
271 $(use_enable arts) \
272 $(use_enable alsa) \
273 $(use_enable ncurses) \
274 $(use_enable gnome gnomevfs) \
275 $(use_enable xosd) \
276 $(use_enable lirc) \
277 $(use_enable mp3 mad) \
278 $(use_enable a52) \
279 $(use_enable dts) \
280 $(use_enable mpeg libmpeg2) \
281 $(use_enable ggi) \
282 $(use_enable 3dfx glide) \
283 $(use_enable sdl) \
284 $(use_enable sdl-image) \
285 $(use_enable png) \
286 $(use_enable xml libxml2) \
287 $(use_enable samba smb) \
288 $(use_enable daap) \
289 $(use_enable corba) \
290 $(use_enable modplug mod) \
291 $(use_enable speex) \
292 $(use_enable shout) \
293 $(use_enable rtsp) $(use_enable rtsp realrtsp) \
294 $(use_enable win32codecs loader) \
295 $(use_enable skins skins2) \
296 $(use_enable hal) \
297 $(use_enable avahi bonjour) \
298 $(use_enable upnp) \
299 $(use_enable optimisememory optimize-memory) \
300 $(use_enable libnotify notify) \
301 $(use_enable jack) \
302 $(use_enable musepack mpc) \
303 $(use_enable x264) \
304 $(use_enable dc1394) \
305 $(use_enable directfb) \
306 --enable-ffmpeg \
307 --disable-faad \
308 --disable-dv \
309 --disable-libvc1 \
310 --disable-snapshot \
311 --disable-growl \
312 --disable-pth \
313 --disable-portaudio \
314 --disable-libtar \
315 --disable-optimizations \
316 --enable-utf8 \
317 --enable-libtool \
318 $(use_enable nsplugin mozilla) \
319 XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
320 WX_CONFIG="${WX_CONFIG}" \
321 ${myconf} || die "configuration failed"
322
323 if [[ $(gcc-major-version) == 2 ]]; then
324 sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
325 fi
326
327 emake || die "make of VLC failed"
328 }
329
330 src_install() {
331 # First install the library, to avoid screwups during relinking.select
332 emake -j1 DESTDIR="${D}" install || die "make install failed"
333
334 dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
335 doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
336
337 if use nsplugin; then
338 dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
339 mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
340 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
341 fi
342
343 rm -rf "${D}/usr/share/doc/vlc" \
344 "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
345
346 use skins || rm -rf "${D}/usr/share/vlc/skins2"
347
348 for res in 16 32 48; do
349 insinto /usr/share/icons/hicolor/${res}x${res}/apps/
350 newins "${S}"/share/vlc${res}x${res}.png vlc.png
351 done
352
353 use wxwindows || use skins || rm "${D}/usr/share/applications/vlc.desktop"
354 }
355
356
357
358 --
359 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups