From a8cd76c466bbde2c779a8d82c5389857fed9984a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 9 Mar 2011 18:41:07 +0100
Subject: [PATCH] vlc: update for new ffmpeg version.

--HG--
branch : gnome3
---
 srcpkgs/vlc/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 59ae7ecc8eb..b2cb000db53 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=1.1.7
-revision=2
+revision=3
 distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-gme --disable-libtar --enable-snapshot
@@ -35,7 +35,6 @@ Add_dependency run libpng
 Add_dependency run zlib
 Add_dependency run SDL
 Add_dependency run x264
-Add_dependency run ffmpeg
 Add_dependency run libXxf86vm
 Add_dependency run libXinerama
 Add_dependency run libSM
@@ -94,6 +93,11 @@ Add_dependency run libtheora
 Add_dependency run libspeex
 Add_dependency run libpulseaudio
 Add_dependency run libsmbclient
+Add_dependency run libavformat
+Add_dependency run libavcodec
+Add_dependency run libavutil
+Add_dependency run libpostproc
+Add_dependency run libswscale
 
 Add_dependency build pkg-config
 Add_dependency build glibc-devel
@@ -174,11 +178,9 @@ Add_dependency full desktop-file-utils
 pre_configure()
 {
 	# hostname -s is not valid, at least in coreutils!
-	sed -i "s|hostname -s|hostname|g" ${wrksrc}/configure || return 1
-	# Use wc(1) from coreutils
-	export PATH="/usr/bin:/bin:$PATH"
+	sed -i "s|hostname -s|hostname|g" configure
 	sed -i "s|/usr/share/fonts/truetype/freefont|/usr/share/fonts/TTF|" \
-		${wrksrc}/modules/misc/freetype.c
+		modules/misc/freetype.c
 }
 
 post_install()
@@ -189,7 +191,7 @@ post_install()
 	rm -f ${DESTDIR}/usr/bin/vlc-config
 	rm -f ${DESTDIR}/usr/share/man/man1/vlc-config.1
 
-	install -d ${DESTDIR}/usr/share/pixmaps || return 1
+	install -d ${DESTDIR}/usr/share/pixmaps
 	cd ${DESTDIR}/usr/share/pixmaps && \
-		ln -sf ../vlc/vlc48x48.png vlc.png || return 1
+		ln -sf ../vlc/vlc48x48.png vlc.png
 }