# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1284905110 0
# Node ID 616304472444200120dfcf890c9cbdd8f03b6d51
# Parent  a16b5a11ef01de6234ac0e9dbd02169738dd5cd8
Fixed vlc. Using ffmpeg instead of ffmpeg-svn since ffmpeg-svn can't be build.

diff -r a16b5a11ef01 -r 616304472444 libvlc-dev/receipt
--- a/libvlc-dev/receipt	Sun Sep 19 14:11:56 2010 +0200
+++ b/libvlc-dev/receipt	Sun Sep 19 14:05:10 2010 +0000
@@ -18,5 +18,5 @@
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib/
 	cp -a $_pkg/usr/include/vlc $fs/usr/include
 	cp -a $_pkg/usr/lib/vlc $fs/usr/lib/
-	rm $fs/usr/lib/vlc/*/*.so
+	rm $fs/usr/lib/vlc/plugins/*/*.so
 }
diff -r a16b5a11ef01 -r 616304472444 libvlc/receipt
--- a/libvlc/receipt	Sun Sep 19 14:11:56 2010 +0200
+++ b/libvlc/receipt	Sun Sep 19 14:05:10 2010 +0000
@@ -8,7 +8,7 @@
 WEB_SITE="http://www.videolan.org/vlc/" 
 WANTED="vlc"
 DEPENDS="hal dbus libnotify atk libgio pango cairo gnutls fribidi speex \
-ffmpeg-svn libmpeg2 libvorbis libsdl-image libdvdread libproxy libcddb libv4l \
+ffmpeg libmpeg2 libvorbis libsdl-image libdvdread libproxy libcddb libv4l \
 taglib libmad libQtGui sysfsutils libmodplug libupnp libavc1394"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -18,5 +18,5 @@
 	cp -a $_pkg/usr/lib/*so* $fs/usr/lib/
 	cp -a $_pkg/usr/lib/vlc $fs/usr/lib/
 	# Remove libtool archives
-	rm $fs/usr/lib/vlc/*/*.la
+	rm $fs/usr/lib/vlc/plugins/*/*.la
 }
diff -r a16b5a11ef01 -r 616304472444 vlc/receipt
--- a/vlc/receipt	Sun Sep 19 14:11:56 2010 +0200
+++ b/vlc/receipt	Sun Sep 19 14:05:10 2010 +0000
@@ -5,14 +5,14 @@
 CATEGORY="multimedia"
 SHORT_DESC="MPEG, VCD/DVD, and DivX player"
 MAINTAINER="jozee@slitaz.org"
-DEPENDS="libvlc libmad libxml2 ffmpeg-svn libdvdread libcddb libproxy taglib \
+DEPENDS="libvlc libmad libxml2 ffmpeg libdvdread libcddb libproxy taglib \
 libQtCore libQtGui alsa-lib hal dbus \
 fribidi speex libraw1394 libmodplug flac libavc1394 libupnp \
 libmpeg2 libnotify libsdl-image libvorbis libgl libglu sysfsutils xorg-libXv faad2 glibc-locale"
-BUILD_DEPENDS="libmad-dev libxml2-dev ffmpeg-svn-dev libavc1394-dev libdvdread-dev libcddb-dev taglib-dev libproxy-dev Qt4-dev \
- hal-dev dbus-dev alsa-lib-dev libgcrypt-dev libupnp-dev libproxy expat-dev xorg-dev-proto zlib-dev \
-taglib fribidi fribidi-dev speex speex-dev libraw1394 libraw1394-dev libmodplug libmodplug-dev flac flac-dev \
-libmpeg2 libmpeg2-dev libogg-dev faad2 faad2-dev glibc-locale util-linux-ng-uuid-dev libsdl-image xorg-libXv-dev "
+BUILD_DEPENDS="libmad libmad-dev libxml2 libxml2-dev ffmpeg-dev libavc1394 libavc1394-dev libdvdread libdvdread-dev libcddb libcddb-dev taglib taglib-dev libproxy-dev Qt4-dev \
+ hal-dev dbus-dev alsa-lib-dev libgcrypt-dev libupnp libupnp-dev libproxy expat expat-dev xorg-dev-proto zlib zlib-dev \
+fribidi fribidi-dev speex speex-dev libraw1394 libraw1394-dev libmodplug libmodplug-dev flac flac-dev \
+libmpeg2 libmpeg2-dev libogg libogg-dev faad2 faad2-dev glibc-locale util-linux-ng-uuid-dev libsdl-image libsdl-image-dev xorg-libXv-dev pkg-config libxcb-dev"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.videolan.org/vlc/" 
 WGET_URL="http://download.videolan.org/pub/videolan/$PACKAGE/$VERSION/$TARBALL"
@@ -51,12 +51,11 @@
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/share/$PACKAGE $fs/usr/share
 	#Remove extra icons	
-	rm $fs/usr/share/$PACKAGE/*.png
-	rm $fs/usr/share/$PACKAGE/*.xpm
+	#rm $fs/usr/share/$PACKAGE/*.png
+	#rm $fs/usr/share/$PACKAGE/*.xpm
 	rm $fs/usr/share/$PACKAGE/*.ico
 	#copy vlc icon
-	cp -a $_pkg/usr/share/$PACKAGE/vlc16x16.png $fs/usr/share/pixmaps
-	mv $fs/usr/share/pixmaps/vlc16x16.png $fs/usr/share/pixmaps/vlc.png
+	cp -a $_pkg/usr/share/icons/hicolor/16x16/apps/vlc.png $fs/usr/share/pixmaps
 	#Remove unnecessary fonts
 	rm $fs/usr/share/$PACKAGE/skins2/fonts/*