Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

1 files changed, 16 insertions, 15 deletions

diff --git a/extra/vlc/Pkgfile b/extra/vlc/Pkgfile
index 9b77cc09c..84d8f3434 100644
--- a/extra/vlc/Pkgfile
+++ b/extra/vlc/Pkgfile
@@ -1,14 +1,13 @@
-# Description: Plugin vlc pour firefox
+# Description: Lecteur multimédia VLC
 # URL: http://www.videolan.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libshout, xulrunner, lua, ffmpeg, flac, freetype, fribidi, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, vcdimager, x264, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, qt, libnotify, libmpcdec
-
-# Run on: libshout,lua,xulrunner,ffmpeg,flac,freetype,fribidi,goom,lame,libcdio,libdvbpsi,libdvdcss,libdvdread,libdvdnav,libebml,libiconv,libid3tag,libmad,libmatroska,libogg,libpng,speex,libtheora,libvorbis,libxml2,libmpeg2,openslp,portaudio,lame,vcdimager,x264,aalib,libcaca,libmpeg2,libopendaap,libmp4v2,live,libdca,sdl_image,qt,libnotify,libmpcdec
+# Depends on: libshout, lua, ffmpeg, flac, freetype, fribidi, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, vcdimager, x264, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, qt, libnotify, libmpcdec, pulseaudio, librsvg, libraw1394, libavc1394, samba3, taglib, gnutls
+# Run on: libshout,lua,ffmpeg,flac,freetype,fribidi,lame,libcdio,libdvbpsi,libdvdcss,libdvdread,libdvdnav,libebml,libiconv,libid3tag,libmad,libmatroska,libogg,libpng,speex,libtheora,libvorbis,libxml2,libmpeg2,openslp,portaudio,lame,vcdimager,x264,aalib,libcaca,libmpeg2,libopendaap,libmp4v2,live,libdca,sdl_image,qt,libnotify,libmpcdec,pulseaudio,librsvg,libraw1394,libavc1394,samba3,taglib,gnutls
 
 name=vlc
-version=1.1.9
-release=1
+version=1.1.11
+release=2
 
 source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2 )
 
@@ -16,8 +15,9 @@ build() {
 	cd vlc-$version
 
 	sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
-  	[ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --enable-live555 --with-live555-tree=/usr/lib/live-media"
-  	[ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install --enable-live555 --with-live555-tree=/usr/lib/live-media"
+
+  	[ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader"
+  	[ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install"
 
 	./configure --prefix=/usr \
               --enable-libass \
@@ -34,7 +34,6 @@ build() {
               --enable-theora \
               --enable-flac \
               --enable-snapshot \
-              --enable-hal \
               --enable-dbus \
               --enable-ogg \
               --enable-dbus-control \
@@ -43,12 +42,16 @@ build() {
               --enable-lirc \
               --enable-shout \
               --enable-pvr \
-              --enable-release \
-              --enable-mozilla \
+              --disable-mozilla \
               --enable-vlc \
 	      --program-suffix= \
-	      --enable-realrtsp ${EXTRAFEATURES}
-	CFLAGS="-fPIC"
+	      --enable-x264 \
+	      --enable-live555 \
+	      --with-live555-tree=/usr/lib/live \
+	      --enable-realrtsp \
+              ${EXTRAFEATURES}
+
+	export CFLAGS="-fPIC"
 
 	make
 	make DESTDIR=$PKG/ install
@@ -57,8 +60,6 @@ build() {
     	    install -D -m644 $SRC/vlc-$version/share/icons/${res}x${res}/vlc.png \
         		     $PKG/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png
   	done
-
-  	rm -rf $PKG/usr/lib/mozilla
 }