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.6e.ebuild
Date: Thu, 28 Feb 2008 18:09:20
Message-Id: E1JUnBz-000542-VQ@stork.gentoo.org
1 aballier 08/02/28 18:09:15
2
3 Modified: ChangeLog
4 Added: vlc-0.8.6e.ebuild
5 Log:
6 version bump, stable candidate for security fixes
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.297 media-video/vlc/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.297&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.297&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.296&r2=1.297
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
19 retrieving revision 1.296
20 retrieving revision 1.297
21 diff -u -r1.296 -r1.297
22 --- ChangeLog 28 Feb 2008 09:11:51 -0000 1.296
23 +++ ChangeLog 28 Feb 2008 18:09:15 -0000 1.297
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.296 2008/02/28 09:11:51 aballier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.297 2008/02/28 18:09:15 aballier Exp $
29 +
30 +*vlc-0.8.6e (28 Feb 2008)
31 +
32 + 28 Feb 2008; Alexis Ballier <aballier@g.o> +vlc-0.8.6e.ebuild:
33 + version bump, stable candidate for security fixes
34
35 *vlc-0.9.0_alpha20080228 (28 Feb 2008)
36
37
38
39
40 1.1 media-video/vlc/vlc-0.8.6e.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.8.6e.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.8.6e.ebuild?rev=1.1&content-type=text/plain
44
45 Index: vlc-0.8.6e.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.6e.ebuild,v 1.1 2008/02/28 18:09:15 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="47"
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"
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 !seamonkey? ( www-client/mozilla-firefox )
159 seamonkey? ( www-client/seamonkey )
160 )
161 libnotify? ( x11-libs/libnotify )
162 musepack? ( media-libs/libmpcdec )
163 x264? ( >=media-libs/x264-svn-20061014 )
164 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
165 dc1394? ( sys-libs/libraw1394
166 <media-libs/libdc1394-1.9.99 )"
167
168 DEPEND="${RDEPEND}
169 v4l? ( sys-kernel/linux-headers )
170 dvb? ( sys-kernel/linux-headers )
171 X? ( xinerama? ( x11-proto/xineramaproto ) )
172 dev-util/pkgconfig"
173
174 S="${WORKDIR}/${MY_P}"
175
176 pkg_setup() {
177 if use wxwindows || use skins; then
178 WX_GTK_VER="2.6"
179 need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
180 fi
181
182 if use skins && ! use truetype; then
183 ewarn "Trying to build with skins support but without truetype."
184 ewarn "Enabling truetype."
185 fi
186 if use skins && ! use wxwindows; then
187 ewarn "Trying to build with skins support but without wxwindows."
188 ewarn "Enabling wxwindows."
189 fi
190 }
191
192 src_unpack() {
193 unpack ${A}
194 cd "${S}"
195
196 has_version '>=dev-libs/libcdio-0.78' || \
197 export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
198
199 # Drop patches that have been merged
200 export EPATCH_EXCLUDE="${EPATCH_EXCLUDE}
201 340_all_format_string_injection_httpd.patch
202 350_all_stack_based_overflow_subtitles.patch
203 360_all_CVE-2008-0225.patch
204 370_all_CVE-2008-0295.patch"
205 EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
206 AT_M4DIR="m4" eautoreconf
207 }
208
209 src_compile () {
210 local XPIDL=""
211 local MOZILLA_CONFIG=""
212
213 use vlm && \
214 myconf="${myconf} --enable-vlm --enable-sout" || \
215 myconf="${myconf} --disable-vlm"
216
217 if use nsplugin; then
218 if use seamonkey; then
219 XPIDL=/usr/lib/seamonkey
220 MOZILLA_CONFIG=/usr/lib/seamonkey/seamonkey-config
221 else
222 XPIDL=/usr/lib/mozilla-firefox
223 MOZILLA_CONFIG=/usr/lib/mozilla-firefox/firefox-config
224 fi
225 fi
226
227 if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
228 myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
229 else
230 myconf="${myconf} $(use_enable live live555)"
231 fi
232
233 if use truetype || use skins; then
234 myconf="${myconf} --enable-freetype"
235 else
236 myconf="${myconf} --disable-freetype"
237 fi
238
239 if use wxwindows || use skins; then
240 myconf="${myconf} --enable-wxwidgets"
241 else
242 myconf="${myconf} --disable-wxwidgets"
243 fi
244
245 econf \
246 $(use_enable altivec) \
247 $(use_enable stream sout) \
248 $(use_enable httpd) \
249 $(use_enable gnutls) \
250 $(use_enable v4l) \
251 $(use_enable cdda) $(use_enable cdda cddax)\
252 $(use_enable cddb libcddb) \
253 $(use_enable vcd) $(use_enable vcd vcdx) \
254 $(use_enable dvb) $(use_enable dvb pvr) \
255 $(use_enable ogg) \
256 $(use_enable matroska mkv) \
257 $(use_enable flac) \
258 $(use_enable vorbis) \
259 $(use_enable theora) \
260 $(use_enable X x11) \
261 $(use_enable xv xvideo) \
262 $(use_enable xinerama) \
263 $(use_enable opengl glx) $(use_enable opengl) \
264 $(use_enable bidi fribidi) \
265 $(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
266 $(use_enable fbcon fb) \
267 $(use_enable svga svgalib) \
268 $(use_enable 3dfx glide) \
269 $(use_enable aalib aa) \
270 $(use_enable libcaca caca) \
271 $(use_enable oss) \
272 $(use_enable esd) \
273 $(use_enable arts) \
274 $(use_enable alsa) \
275 $(use_enable ncurses) \
276 $(use_enable gnome gnomevfs) \
277 $(use_enable xosd) \
278 $(use_enable lirc) \
279 $(use_enable mp3 mad) \
280 $(use_enable a52) \
281 $(use_enable dts) \
282 $(use_enable mpeg libmpeg2) \
283 $(use_enable ggi) \
284 $(use_enable 3dfx glide) \
285 $(use_enable sdl) \
286 $(use_enable sdl-image) \
287 $(use_enable png) \
288 $(use_enable xml libxml2) \
289 $(use_enable samba smb) \
290 $(use_enable daap) \
291 $(use_enable corba) \
292 $(use_enable modplug mod) \
293 $(use_enable speex) \
294 $(use_enable shout) \
295 $(use_enable rtsp) $(use_enable rtsp realrtsp) \
296 $(use_enable win32codecs loader) \
297 $(use_enable skins skins2) \
298 $(use_enable hal) \
299 $(use_enable avahi bonjour) \
300 $(use_enable upnp) \
301 $(use_enable optimisememory optimize-memory) \
302 $(use_enable libnotify notify) \
303 $(use_enable jack) \
304 $(use_enable musepack mpc) \
305 $(use_enable x264) \
306 $(use_enable dc1394) \
307 $(use_enable directfb) \
308 --enable-ffmpeg \
309 --disable-faad \
310 --disable-dv \
311 --disable-libvc1 \
312 --disable-snapshot \
313 --disable-growl \
314 --disable-pth \
315 --disable-portaudio \
316 --disable-libtar \
317 --disable-optimizations \
318 --enable-utf8 \
319 --enable-libtool \
320 $(use_enable nsplugin mozilla) \
321 XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
322 WX_CONFIG="${WX_CONFIG}" \
323 ${myconf} || die "configuration failed"
324
325 if [[ $(gcc-major-version) == 2 ]]; then
326 sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
327 fi
328
329 emake || die "make of VLC failed"
330 }
331
332 src_install() {
333 # First install the library, to avoid screwups during relinking.select
334 emake -j1 DESTDIR="${D}" install || die "make install failed"
335
336 dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
337 doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
338
339 if use nsplugin; then
340 dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
341 mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
342 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
343 fi
344
345 rm -rf "${D}/usr/share/doc/vlc" \
346 "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
347
348 use skins || rm -rf "${D}/usr/share/vlc/skins2"
349
350 for res in 16 32 48; do
351 insinto /usr/share/icons/hicolor/${res}x${res}/apps/
352 newins "${S}"/share/vlc${res}x${res}.png vlc.png
353 done
354
355 use wxwindows || use skins || rm "${D}/usr/share/applications/vlc.desktop"
356 }
357
358
359
360 --
361 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups