main/vlc: misc cleanups and rebuild against ffmpeg-2.0

- remove unrecognized configure options
- use lua5.2
- move libGL plugin to -x11 subpackage
- enable support for:
  - udev
  - libcddb
  - libva
  - libvdpau

1 files changed, 17 insertions, 11 deletions

diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 20963f3af..d5eac3cb6 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -4,7 +4,7 @@ pkgname=vlc
 pkgver=2.1.0
 _pkgver=${pkgver/_/-}
 _ver=${_pkgver%[a-z]}
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 pkgusers="vlc"
 pkggroups="vlc"
@@ -31,6 +31,7 @@ makedepends="
 	gtk+-dev
 	libbluray-dev>=0.2.1 libbluray-dev<20100000
 	libavc1394-dev
+	libcddb-dev
 	libdc1394-dev>=2.1.0
 	libdvbpsi-dev
 	libdvdnav-dev
@@ -47,6 +48,8 @@ makedepends="
 	libshout-dev
 	libsm-dev
 	libtheora-dev
+	libva-dev
+	libvdpau-dev
 	libvorbis-dev
 	libx11-dev
 	libxext-dev
@@ -55,7 +58,7 @@ makedepends="
 	libxpm-dev
 	libxv-dev
 	live-media-dev>=2012.01.26
-	lua-dev
+	lua5.2-dev
 	ncurses-dev
 	mesa-dev
 	pkgconfig
@@ -64,10 +67,12 @@ makedepends="
 	speex-dev
 	sysfsutils-dev
 	taglib-dev
+	udev-dev
 	v4l-utils-dev
 	x264-dev
 	xcb-util-renderutil-dev
 	xcb-util-keysyms-dev
+	xdg-utils
 	"
 source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pkgver.tar.xz
 	vlc.trigger
@@ -100,6 +105,8 @@ build ()
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	export CXXFLAGS="$CXXFLAGS -fpermissive"
 
+	LUA=lua5.2 \
+	LUAC=luac5.2 \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -113,20 +120,18 @@ build ()
 		--enable-avformat \
 		--enable-bluray \
 		--enable-dbus \
-		--enable-dbus-control \
 		--enable-dc1394 \
-		--enable-dv \
 		--enable-dvbpsi \
 		--enable-dvdread \
 		--enable-dvdnav \
 		--enable-faad \
 		--enable-flac \
 		--enable-httpd \
+		--enable-libcddb \
+		--enable-libva \
 		--enable-live555 \
-		--enable-matroska \
 		--enable-merge-ffmpeg \
 		--enable-ncurses \
-		--enable-qt4 \
 		--enable-realrtsp \
 		--enable-sdl \
 		--enable-shout \
@@ -136,6 +141,7 @@ build ()
 		--enable-taglib \
 		--enable-theora \
 		--enable-v4l2 \
+		--enable-vdpau \
 		--enable-vlm \
 		--enable-vorbis \
 		--enable-wma-fixed \
@@ -169,7 +175,7 @@ _mv() {
 
 qt() {
 	pkgdesc="Qt frontend for VLC"
-	depends="vlc-xorg>=2.0.0-r1"
+	depends="vlc-xorg=$pkgver"
 	cd "$pkgdir"
 	# scan for elf files that directly or indirectly depends on
 	# libQt* libraries
@@ -183,16 +189,16 @@ qt() {
 	mv "$pkgdir"/usr/bin/qvlc \
 		"$subpkgdir"/usr/bin/
 }
-	
+
 xorg() {
 	pkgdesc="Video LAN X.org support"
-	depends="xdg-utils vlc>=2.0.0_rc1-r4"
+	depends="xdg-utils vlc=$pkgver"
 
 	# scan for elf files that directly or indirectly depends on
 	# libX* libraries
 	cd "$pkgdir"
 	for i in $(find -type f ); do
-		if ldd $i 2>/dev/null | grep -E -q "libX|x11|libxcb"; then
+		if ldd $i 2>/dev/null | grep -E -q "libX|x11|libxcb|libGL"; then
 			echo $i | grep libavcodec_plugin.so || _mv "$i" || return 1
 		fi
 	done
@@ -214,7 +220,7 @@ daemon() {
 	pkgdesc="Support for running VLC as a daemon"
 	install="vlc-daemon.pre-install"
 	arch="noarch"
-	depends="vlc>=2.0.0_rc1-r0"
+	depends="vlc=$pkgver"
 
 	mkdir -p "$subpkgdir"
 	cd "$pkgdir"