From 278df4e2877c4a51b88aa69de53f53bdb2953f81 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Jun 2010 00:23:18 +0200
Subject: [PATCH] vlc: update to 1.1.0.

---
 srcpkgs/vlc/INSTALL                  | 14 ++++++++++++++
 srcpkgs/vlc/REMOVE                   |  9 +++++++++
 srcpkgs/vlc/patches/libpng-1.4.patch | 20 --------------------
 srcpkgs/vlc/template                 | 16 ++++++++++------
 4 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 srcpkgs/vlc/INSTALL
 create mode 100644 srcpkgs/vlc/REMOVE
 delete mode 100644 srcpkgs/vlc/patches/libpng-1.4.patch

diff --git a/srcpkgs/vlc/INSTALL b/srcpkgs/vlc/INSTALL
new file mode 100644
index 00000000000..0566b490eb6
--- /dev/null
+++ b/srcpkgs/vlc/INSTALL
@@ -0,0 +1,14 @@
+#
+# This script rebuilds the vlc plugins cache.
+#
+
+_vlccachegen=usr/lib/vlc/vlc-cache-gen
+
+case "${ACTION}" in
+post)
+	if [ -x "${_vlccachegen}" ]; then
+		echo "Rebuilding VLC plugins cache file..."
+		${_vlccachegen} -f usr/lib/vlc/plugins
+	fi
+	;;
+esac
diff --git a/srcpkgs/vlc/REMOVE b/srcpkgs/vlc/REMOVE
new file mode 100644
index 00000000000..c1d0fb16cde
--- /dev/null
+++ b/srcpkgs/vlc/REMOVE
@@ -0,0 +1,9 @@
+#
+# This script remove the vlc plugins cache files.
+#
+
+case "${ACTION}" in
+pre)
+	rm -f usr/lib/vlc/plugins/*.dat
+	;;
+esac
diff --git a/srcpkgs/vlc/patches/libpng-1.4.patch b/srcpkgs/vlc/patches/libpng-1.4.patch
deleted file mode 100644
index 7245a746899..00000000000
--- a/srcpkgs/vlc/patches/libpng-1.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/codec/png.c~	2010-01-19 02:31:45.575326077 +0100
-+++ modules/codec/png.c	2010-01-19 02:32:21.465321175 +0100
-@@ -155,7 +155,7 @@
-     p_info = png_create_info_struct( p_png );
-     if( p_info == NULL )
-     {
--        png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
-+        png_destroy_read_struct( &p_png, NULL, NULL );
-         block_Release( p_block ); *pp_block = NULL;
-         return NULL;
-     }
-@@ -163,7 +163,7 @@
-     p_end_info = png_create_info_struct( p_png );
-     if( p_end_info == NULL )
-     {
--        png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
-+        png_destroy_read_struct( &p_png, &p_info, NULL );
-         block_Release( p_block ); *pp_block = NULL;
-         return NULL;
-     }
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 3e58b01f4f9..48430d3ba73 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,16 +1,14 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=1.0.6
-revision=2
+version=1.1.0
 distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-hal --disable-gme --disable-libtar
+configure_args="--disable-gme --disable-libtar --enable-snapshot
 --disable-telepathy --disable-lua --disable-live555 --disable-pulse
---enable-dvdread --disable-smb --disable-vcdinfo --enable-cddax
---enable-flac --enable-xvmc --enable-snapshot"
+--enable-dvdread --disable-smb --enable-flac --disable-gnomevfs"
 short_desc="VideoLan Client"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842
+checksum=a9fb2c5cc400464bbb53ba6feb94f14884f3c76d52eac1ee4c2953a1ce63f1c8
 long_desc="
  VLC media player is a highly portable multimedia player supporting most
  audio and video formats (H.264, Ogg, DivX, MKV, TS, MPEG-2, mp3, MPEG-4,
@@ -85,6 +83,9 @@ Add_dependency run libdvdnav
 Add_dependency run libsysfs
 Add_dependency run libusb-compat
 Add_dependency run libmtp
+Add_dependency run sqlite
+Add_dependency run librsvg
+Add_dependency run libtheora
 
 Add_dependency build pkg-config
 Add_dependency build glibc-devel
@@ -148,6 +149,9 @@ Add_dependency build libdvdnav-devel
 Add_dependency build libsysfs-devel
 Add_dependency build libusb-compat-devel
 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 full freefont-ttf