vlc 1.1.12-2 correction port

5 files changed, 80 insertions, 96 deletions

diff --git a/extra/vlc/.footprint.i686 b/extra/vlc/.footprint.i686
index 946cbd7a9..de7739c9c 100644
--- a/extra/vlc/.footprint.i686
+++ b/extra/vlc/.footprint.i686
@@ -96,10 +96,6 @@ lrwxrwxrwx	root/root	usr/lib/libvlc.so.5 -> libvlc.so.5.2.1
 lrwxrwxrwx	root/root	usr/lib/libvlccore.so -> libvlccore.so.4.0.3
 lrwxrwxrwx	root/root	usr/lib/libvlccore.so.4 -> libvlccore.so.4.0.3
 -rwxr-xr-x	root/root	usr/lib/libvlccore.so.4.0.3
-drwxr-xr-x	root/root	usr/lib/mozilla/
-drwxr-xr-x	root/root	usr/lib/mozilla/plugins/
--rwxr-xr-x	root/root	usr/lib/mozilla/plugins/libvlcplugin.la
--rwxr-xr-x	root/root	usr/lib/mozilla/plugins/libvlcplugin.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libvlc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/vlc-plugin.pc
@@ -179,6 +175,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/access/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_fake_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_imem_plugin.la
@@ -334,6 +332,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libpng_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspudec_plugin.la
@@ -359,6 +359,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/control/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libdbus_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libgestures_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libgestures_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libhotkeys_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libhotkeys_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libmotion_plugin.la
@@ -550,6 +552,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.la
@@ -745,12 +749,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/visualization/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/vlc.desktop
-drwxr-xr-x	root/root	usr/share/apps/
-drwxr-xr-x	root/root	usr/share/apps/solid/
-drwxr-xr-x	root/root	usr/share/apps/solid/actions/
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-opencda.desktop
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-opendvd.desktop
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/doc/
 drwxr-xr-x	root/root	usr/share/doc/vlc/
 -rw-r--r--	root/root	usr/share/doc/vlc/bugreport-howto.txt
@@ -778,6 +776,13 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/vlc-christmas.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/vlc.png
+drwxr-xr-x	root/root	usr/share/kde4/
+drwxr-xr-x	root/root	usr/share/kde4/apps/
+drwxr-xr-x	root/root	usr/share/kde4/apps/solid/
+drwxr-xr-x	root/root	usr/share/kde4/apps/solid/actions/
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opencda.desktop
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opendvd.desktop
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
@@ -927,19 +932,6 @@ drwxr-xr-x	root/root	usr/share/vlc/lua/http/requests/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/style.css
 -rw-r--r--	root/root	usr/share/vlc/lua/http/vlm.html
 -rw-r--r--	root/root	usr/share/vlc/lua/http/vlm_export.html
-drwxr-xr-x	root/root	usr/share/vlc/mozilla/
--rw-r--r--	root/root	usr/share/vlc/mozilla/fullscreen.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/pause.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/play.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/skip_next.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/skip_previous.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/stop.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/time_icon.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/time_line.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_knob.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_max.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_mute.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_slider_bar.xpm
 drwxr-xr-x	root/root	usr/share/vlc/osdmenu/
 -rw-r--r--	root/root	usr/share/vlc/osdmenu/default.cfg
 drwxr-xr-x	root/root	usr/share/vlc/osdmenu/default/
diff --git a/extra/vlc/.footprint.x86_64 b/extra/vlc/.footprint.x86_64
index 946cbd7a9..de7739c9c 100644
--- a/extra/vlc/.footprint.x86_64
+++ b/extra/vlc/.footprint.x86_64
@@ -96,10 +96,6 @@ lrwxrwxrwx	root/root	usr/lib/libvlc.so.5 -> libvlc.so.5.2.1
 lrwxrwxrwx	root/root	usr/lib/libvlccore.so -> libvlccore.so.4.0.3
 lrwxrwxrwx	root/root	usr/lib/libvlccore.so.4 -> libvlccore.so.4.0.3
 -rwxr-xr-x	root/root	usr/lib/libvlccore.so.4.0.3
-drwxr-xr-x	root/root	usr/lib/mozilla/
-drwxr-xr-x	root/root	usr/lib/mozilla/plugins/
--rwxr-xr-x	root/root	usr/lib/mozilla/plugins/libvlcplugin.la
--rwxr-xr-x	root/root	usr/lib/mozilla/plugins/libvlcplugin.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libvlc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/vlc-plugin.pc
@@ -179,6 +175,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/access/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_fake_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_imem_plugin.la
@@ -334,6 +332,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libpng_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspudec_plugin.la
@@ -359,6 +359,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/control/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libdbus_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libgestures_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libgestures_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libhotkeys_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libhotkeys_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libmotion_plugin.la
@@ -550,6 +552,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.la
@@ -745,12 +749,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/visualization/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/vlc.desktop
-drwxr-xr-x	root/root	usr/share/apps/
-drwxr-xr-x	root/root	usr/share/apps/solid/
-drwxr-xr-x	root/root	usr/share/apps/solid/actions/
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-opencda.desktop
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-opendvd.desktop
--rw-r--r--	root/root	usr/share/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/doc/
 drwxr-xr-x	root/root	usr/share/doc/vlc/
 -rw-r--r--	root/root	usr/share/doc/vlc/bugreport-howto.txt
@@ -778,6 +776,13 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/vlc-christmas.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/vlc.png
+drwxr-xr-x	root/root	usr/share/kde4/
+drwxr-xr-x	root/root	usr/share/kde4/apps/
+drwxr-xr-x	root/root	usr/share/kde4/apps/solid/
+drwxr-xr-x	root/root	usr/share/kde4/apps/solid/actions/
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opencda.desktop
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opendvd.desktop
+-rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
@@ -927,19 +932,6 @@ drwxr-xr-x	root/root	usr/share/vlc/lua/http/requests/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/style.css
 -rw-r--r--	root/root	usr/share/vlc/lua/http/vlm.html
 -rw-r--r--	root/root	usr/share/vlc/lua/http/vlm_export.html
-drwxr-xr-x	root/root	usr/share/vlc/mozilla/
--rw-r--r--	root/root	usr/share/vlc/mozilla/fullscreen.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/pause.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/play.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/skip_next.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/skip_previous.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/stop.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/time_icon.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/time_line.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_knob.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_max.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_mute.xpm
--rw-r--r--	root/root	usr/share/vlc/mozilla/volume_slider_bar.xpm
 drwxr-xr-x	root/root	usr/share/vlc/osdmenu/
 -rw-r--r--	root/root	usr/share/vlc/osdmenu/default.cfg
 drwxr-xr-x	root/root	usr/share/vlc/osdmenu/default/
diff --git a/extra/vlc/.md5sum.i686 b/extra/vlc/.md5sum.i686
index 3af0ce44d..7d334d4bf 100644
--- a/extra/vlc/.md5sum.i686
+++ b/extra/vlc/.md5sum.i686
@@ -1 +1 @@
-91de1ad308c947e35380f9d747ff5713  vlc-1.1.12.tar.bz2
+56cb9975725a12da8c84882bc00fdce0  vlc-1.1.12.tar.xz
diff --git a/extra/vlc/.md5sum.x86_64 b/extra/vlc/.md5sum.x86_64
index 3af0ce44d..7d334d4bf 100644
--- a/extra/vlc/.md5sum.x86_64
+++ b/extra/vlc/.md5sum.x86_64
@@ -1 +1 @@
-91de1ad308c947e35380f9d747ff5713  vlc-1.1.12.tar.bz2
+56cb9975725a12da8c84882bc00fdce0  vlc-1.1.12.tar.xz
diff --git a/extra/vlc/Pkgfile b/extra/vlc/Pkgfile
index 06dd93c06..cc1c0729a 100644
--- a/extra/vlc/Pkgfile
+++ b/extra/vlc/Pkgfile
@@ -2,66 +2,66 @@
 # URL: http://www.videolan.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# 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, librsvg, libraw1394, libavc1394, samba3, taglib, gnutls, pulseaudio, xulrunner
-# 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,librsvg,libraw1394,libavc1394,samba3,taglib,gnutls,pulseaudio
+# 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, librsvg, libraw1394, libavc1394, samba3, taglib, gnutls, pulseaudio, gnome-vfs, vdpau-video
+# 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,librsvg,libraw1394,libavc1394,samba3,taglib,gnutls,pulseaudio,gnome-vfs,vdpau-video
 
 name=vlc
 version=1.1.12
-release=1
-
-source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2 )
+release=2
+source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz)
 
 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
+	sed -i -e 's|truetype/freefont/FreeSerifBold.ttf|TTF/DejaVuSerif-Bold.ttf|' modules/misc/freetype.c
 
-  	[ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader"
-  	[ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install"
+	if [ "${CARCH}" = "i686" ]; then EXTRAFEATURES="--enable-loader"; fi
+	if [ "${CARCH}" = "x86_64" ]; then EXTRAFEATURES="--enable-fast-install"; fi
 
 	./configure --prefix=/usr \
-              --enable-libass \
-              --enable-dvdread \
-              --enable-dvdnav \
-              --disable-rpath \
-	      --disable-zvbi \
-              --enable-qt4 \
-              --enable-faad \
-              --enable-alsa \
-              --enable-skins2 \
-              --enable-dvb \
-              --enable-v4l \
-              --enable-theora \
-              --enable-flac \
-              --enable-snapshot \
-              --enable-dbus \
-              --enable-ogg \
-              --enable-dbus-control \
-              --enable-shared \
-              --enable-nls \
-              --enable-lirc \
-              --enable-shout \
-              --enable-pvr \
-              --enable-mozilla \
-              --enable-vlc \
-	      --program-suffix= \
-	      --enable-x264 \
-	      --enable-gnutls \
-	      --enable-live555 \
-	      --enable-pulse \
-	      --with-live555-tree=/usr/lib/live \
-	      --enable-realrtsp \
-              ${EXTRAFEATURES}
+		--disable-rpath \
+		--disable-zvbi \
+		--disable-mozilla \
+		--enable-gnomevfs \
+		--enable-libass \
+		--enable-dvdread \
+		--enable-dvdnav \
+		--enable-qt4 \
+		--enable-faad \
+		--enable-alsa \
+		--enable-skins2 \
+		--enable-dvb \
+		--enable-v4l \
+		--enable-theora \
+		--enable-flac \
+		--enable-snapshot \
+		--enable-dbus \
+		--enable-ogg \
+		--enable-dbus-control \
+		--enable-shared \
+		--enable-nls \
+		--enable-lirc \
+		--enable-shout \
+		--enable-pvr \
+		--enable-vlc \
+		--enable-x264 \
+		--enable-libva \
+		--enable-gnutls \
+		--enable-pulse \
+		--enable-bonjour \
+		--enable-realrtsp \
+		--enable-live555 \
+		--with-live555-tree=/usr/lib/live \
+		--with-kde-solid=/usr/share/kde4/apps/solid/actions/ \
+		--program-suffix= \
+		${EXTRAFEATURES}
 
-	export CFLAGS="-fPIC"
+	export CFLAGS="${CFLAGS} -fPIC"
 
 	make
-	make DESTDIR=$PKG/ install
-	
+	make DESTDIR=$PKG install
+
 	for res in 16 32 48 128; do
-    	    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
+		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
 }
-
-