main/vlc: upgrade to 2.0.0 (from testing)

1 files changed, 72 insertions, 30 deletions

diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 9b85378ed..578b085dd 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -1,8 +1,9 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vlc
-pkgver=1.1.13
-pkgrel=4
+pkgver=2.0.0
+_pkgver=${pkgver/_/-}
+pkgrel=2
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 pkgusers="vlc"
 pkggroups="vlc"
@@ -10,11 +11,11 @@ url="http://www.videolan.org/vlc/"
 arch="all"
 license="GPL-2"
 triggers="$pkgname.trigger=/usr/lib/vlc/plugins"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-xorg $pkgname-daemon"
-#depends="fluidsynth zvbi lirc-utils libdca 
-#	libproxy libdvdnav>=4.1.3 libcddb smbclient
-#	libmatroska libmpcdec
-#	qt libmodplug ttf-dejavu"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-xorg
+	$pkgname-daemon"
+#depends="fluidsynth zvbi lirc-utils libdca
+#	libproxy libcddb smbclient
+#	libmpcdec libmodplug"
 depends="ttf-dejavu"
 makedepends="
 	a52dec-dev
@@ -27,30 +28,38 @@ makedepends="
 	faad2-dev
 	ffmpeg-dev
 	flac-dev
+	freetype-dev
 	fribidi-dev
 	gtk+-dev
-	libdc1394-dev
+	libbluray-dev>=0.2.1 libbluray-dev<20100000
+	libdc1394-dev>=2.1.0
 	libdvbpsi-dev
+	libdvdnav-dev
+	libdvdread-dev
 	libgcrypt-dev
 	libice-dev
 	libiconv-dev
 	libmad-dev
+	libmatroska-dev
 	libmpeg2-dev
 	libnotify-dev
 	libogg-dev
-	libraw1394-dev
+	libraw1394-dev>=2.0.1
 	libshout-dev
 	libsm-dev
 	libtheora-dev
 	libvorbis-dev
 	libx11-dev
 	libxext-dev
+	libxinerama-dev
+	libxpm-dev
 	libxv-dev
-	live-media-dev
+	live-media-dev>=2012.01.26
 	lua-dev
 	ncurses-dev
 	mesa-dev
 	pkgconfig
+	qt-dev
 	sdl-dev
 	speex-dev
 	sysfsutils-dev
@@ -60,15 +69,16 @@ makedepends="
 	xcb-util-renderutil-dev
 	xcb-util-keysyms-dev
 	"
-source="http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
-	uclibc3.patch
-	uclibc-libcompat.patch
+source="http://download.videolan.org/pub/videolan/$pkgname/$_pkgver/$pkgname-$_pkgver.tar.xz
 	uclibc-inhibit-spawn.patch
+	uclibc-no-xscreensaver.patch
+	uclibc3.patch
 	vlc.trigger
-	vlc-1.1.7-disable-cache-gen.patch
 	"
+#	uclibc-libcompat.patch
+#	vlc-1.1.7-disable-cache-gen.patch
 
-_builddir="$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$_pkgver
 prepare() {
 	cd "$_builddir"
 	for i in $source; do
@@ -79,7 +89,7 @@ prepare() {
 			;;
 		esac;
 	done
-	sed -i -e "/^SOURCES_xscreensaver/s/^/#/" modules/misc/Modules.am
+	sed -i -e "/^libxscreensaver_plugin_la_SOURCES/s/^/#/" modules/misc/Modules.am
 	./bootstrap
 }
 
@@ -88,35 +98,42 @@ build ()
 	cd "$_builddir"
 	sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
 
+	# -fpermissive is needed due to zlib 1.2.6 changing
+	# void* to gzFile on gz*() functions
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
+	export CXXFLAGS="$CXXFLAGS -fpermissive"
 
 	./configure --prefix=/usr \
 		--disable-mmx \
 		--disable-nls \
 		--disable-optimizations \
-		--disable-qt4 --disable-skins2 \
 		--disable-rpath \
 		--enable-a52 \
 		--enable-avcodec \
 		--enable-avformat \
+		--enable-bluray \
 		--enable-dbus \
 		--enable-dbus-control \
 		--enable-dc1394 \
 		--enable-dvbpsi \
+		--enable-dvdread \
+		--enable-dvdnav \
 		--enable-faad \
 		--enable-flac \
 		--enable-httpd \
 		--enable-live555 \
+		--enable-matroska \
 		--enable-merge-ffmpeg \
 		--enable-ncurses \
+		--enable-qt4 \
 		--enable-realrtsp \
 		--enable-sdl \
 		--enable-shout \
+		--enable-skins2 \
 		--enable-speex \
 		--enable-sout \
 		--enable-taglib \
 		--enable-theora \
-		--enable-v4l \
 		--enable-v4l2 \
 		--enable-vlm \
 		--enable-vorbis \
@@ -124,10 +141,6 @@ build ()
 		--enable-xvideo \
 		|| return 1
 
-#		--enable-dvdread \
-#		--enable-dvdnav \
-#		--enable-qt4 \
-#		--enable-skins2 \
 #		--enable-dvb \
 #		--enable-snapshot \
 #		--enable-hal \
@@ -144,7 +157,11 @@ package() {
 #		install -D -m644 share/vlc${res}x${res}.png \
 #			"$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1
 #	done
+	# delete cache as it's autocreated by trigger
+	rm -rf "$pkgdir"/usr/lib/vlc/plugins/plugins.dat
+	# delete unneeded mozilla and kde support files
 	rm -rf "$pkgdir"/usr/lib/mozilla
+	rm -rf "$pkgdir"/usr/share/kde4
 	find "$pkgdir" -name '*.la' -delete
 }
 
@@ -154,28 +171,54 @@ _mv() {
 	mv "$1" "$subpkgdir"/$dir/
 }
 
+qt() {
+	pkgdesc="Qt frontend for VLC"
+	depends="vlc-xorg>=2.0.0-r1"
+	cd "$pkgdir"
+	# scan for elf files that directly or indirectly depends on
+	# libQt* libraries
+	cd "$pkgdir"
+	for i in $(find -type f ); do
+		if ldd $i 2>/dev/null | grep -q "libQt"; then
+			_mv "$i" || return 1
+		fi
+	done
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/qvlc \
+		"$subpkgdir"/usr/bin/
+}
+	
 xorg() {
 	pkgdesc="Video LAN X.org support"
+	depends="xdg-utils vlc>=2.0.0_rc1-r4"
+
 	# 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 -q libX; then
+		if ldd $i 2>/dev/null | grep -E -q "libX|x11|libxcb"; then
 			echo $i | grep libavcodec_plugin.so || _mv "$i" || return 1
 		fi
 	done
 
-	mkdir -p "$subpkgdir"/usr/share/
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/svlc \
+		"$subpkgdir"/usr/bin
+
+	mkdir -p "$subpkgdir"/usr/share/vlc
 	mv "$pkgdir"/usr/share/applications \
 		"$pkgdir"/usr/share/icons \
 		"$subpkgdir"/usr/share/
+
+	mv "$pkgdir"/usr/share/vlc/skins2 \
+		"$subpkgdir"/usr/share/vlc
 }
 
 daemon() {
 	pkgdesc="Support for running VLC as a daemon"
 	install="vlc-daemon.pre-install"
 	arch="noarch"
-	depends="vlc"
+	depends="vlc>=2.0.0_rc1-r0"
 
 	mkdir -p "$subpkgdir"
 	cd "$pkgdir"
@@ -184,9 +227,8 @@ daemon() {
 	install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc
 }
 
-md5sums="9678fb7a04808b6e0de63746d35e4bb1  vlc-1.1.13.tar.bz2
-ba24152286d98f8a367c7fd0cb8949f4  uclibc3.patch
-402d28075ff672d4f273cf8b9b1b3137  uclibc-libcompat.patch
+md5sums="8806bff2ea9c76791123d444a92f708c  vlc-2.0.0.tar.xz
 28349b8239fdd6987fbe0ca2c758517f  uclibc-inhibit-spawn.patch
-ddbd40bd72fedc1449be45588aea5d66  vlc.trigger
-e1ef2dec8e25f7ea6ba40e646c63e061  vlc-1.1.7-disable-cache-gen.patch"
+b84c5a9121440b6a1dcf28792d783eb8  uclibc-no-xscreensaver.patch
+94f11ec8394775018222781a0c875444  uclibc3.patch
+350b30698eb784def7d19446eb1d6c81  vlc.trigger"