From a327c58243be592dd77739fc7ad34685a16df2b7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 27 Jan 2012 12:16:09 +0100
Subject: [PATCH] vlc: revbump due to x264/ffmpeg SONAME bumps.

---
 srcpkgs/vlc/template    | 40 ++++++++--------------------------------
 srcpkgs/vlc/vlc.rshlibs |  6 +++---
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 06d7874b8f7..e13c5c83d4c 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -7,6 +7,7 @@ configure_args="--disable-gme --disable-libtar --enable-snapshot
 --disable-telepathy --disable-lua --disable-live555
 --enable-dvdread --enable-flac --disable-gnomevfs --enable-v4l
 --disable-jack --disable-fluidsynth --disable-portaudio"
+revision=1
 short_desc="VideoLan Client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/vlc/"
@@ -30,24 +31,18 @@ Add_dependency run freefont-ttf
 Add_dependency run hicolor-icon-theme
 Add_dependency run desktop-file-utils
 
+Add_dependency build coreutils
 Add_dependency build pkg-config
 Add_dependency build videoproto
-Add_dependency build libvorbis-devel
 Add_dependency build libogg-devel
-Add_dependency build SDL_image-devel
-Add_dependency build tiff-devel
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build zlib-devel
+Add_dependency build libvorbis-devel
 Add_dependency build SDL-devel
+Add_dependency build SDL_image-devel
 Add_dependency build x264-devel
 Add_dependency build ffmpeg-devel
+Add_dependency build xcb-util-devel
 Add_dependency build libXxf86vm-devel
 Add_dependency build libXinerama-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
 Add_dependency build libXpm-devel
 Add_dependency build libXvMC-devel
 Add_dependency build libXv-devel
@@ -55,39 +50,23 @@ Add_dependency build libmpeg2-devel
 Add_dependency build libflac-devel
 Add_dependency build fribidi-devel
 Add_dependency build freetype-devel
-Add_dependency build libstdc++-devel
 Add_dependency build qt-devel
 Add_dependency build avahi-libs-devel
 Add_dependency build MesaLib-devel
 Add_dependency build libmad-devel
 Add_dependency build liba52-devel
 Add_dependency build libdca-devel
-Add_dependency build libudev-devel
 Add_dependency build libdvbpsi-devel
 Add_dependency build libgcrypt-devel
-Add_dependency build libgpg-error-devel
-Add_dependency build dbus-devel
-Add_dependency build xcb-util-devel
-Add_dependency build libxcb-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libnotify-devel
 Add_dependency build gtk+-devel
+Add_dependency build libnotify-devel
 Add_dependency build dbus-glib-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build libxml2-devel
 Add_dependency build gnutls-devel
 Add_dependency build taglib-devel
 Add_dependency build libmatroska-devel
-Add_dependency build libebml-devel
 Add_dependency build libmpcdec-devel
-Add_dependency build alsa-lib-devel
 Add_dependency build libproxy-devel
-Add_dependency build libcddb-devel
 Add_dependency build libcdio-devel
-Add_dependency build libdvdread-devel
 Add_dependency build libdvdnav-devel
 Add_dependency build libsysfs-devel
 Add_dependency build libusb-compat-devel
@@ -95,7 +74,6 @@ Add_dependency build libmtp-devel
 Add_dependency build sqlite-devel
 Add_dependency build librsvg-devel
 Add_dependency build libtheora-devel
-Add_dependency build coreutils
 Add_dependency build speex-devel
 Add_dependency build pulseaudio-devel
 Add_dependency build samba-devel
@@ -103,16 +81,14 @@ Add_dependency build libmodplug-devel
 Add_dependency build libva-devel
 Add_dependency build v4l-utils-devel
 
-pre_configure()
-{
+pre_configure() {
 	# hostname -s is not valid, at least in coreutils!
 	sed -i "s|hostname -s|hostname|g" configure
 	sed -i "s|/usr/share/fonts/truetype/freefont|/usr/share/fonts/TTF|" \
 		modules/misc/freetype.c
 }
 
-post_install()
-{
+post_install() {
 	# Remove unused stuff
 	rm -rf ${DESTDIR}/usr/include
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
diff --git a/srcpkgs/vlc/vlc.rshlibs b/srcpkgs/vlc/vlc.rshlibs
index d220b2d606e..6e7926b2e6d 100644
--- a/srcpkgs/vlc/vlc.rshlibs
+++ b/srcpkgs/vlc/vlc.rshlibs
@@ -16,7 +16,6 @@ libmtp.so.8
 libusb-0.1.so.4
 libsmbclient.so.0
 libcddb.so.2
-libdvdnav.so.4
 libdvdread.so.4
 libv4l2.so.0
 libproxy.so.1
@@ -40,7 +39,6 @@ libspeex.so.1
 libtheora.so.0
 libvorbisenc.so.2
 libvorbis.so.0
-libx264.so.115
 libxcb-keysyms.so.1
 libmatroska.so.5
 libebml.so.3
@@ -78,9 +76,11 @@ libavahi-common.so.3
 libavahi-client.so.3
 libudev.so.0
 libxcb-randr.so.0
-libpostproc.so.51
 libswscale.so.2
 libxcb-shm.so.0
 libxcb-xv.so.0
 libX11-xcb.so.1
 libGL.so.1
+libx264.so.120
+libpostproc.so.52
+libdvdnav.so.4