Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

21 files changed, 242 insertions, 25 deletions

diff --git a/acompiler/acerhk/.footprint b/acompiler/acerhk/.footprint
new file mode 100644
index 000000000..f8afdadff
--- /dev/null
+++ b/acompiler/acerhk/.footprint
@@ -0,0 +1,28 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/rc.d/
+drwxr-xr-x	root/root	etc/rc.d/init.d/
+-rwxr-xr-x	root/root	etc/rc.d/init.d/acerhk
+drwxr-xr-x	root/root	etc/rc.d/rc0.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K85acerhk -> ../init.d/acerk
+drwxr-xr-x	root/root	etc/rc.d/rc1.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K85acerhk -> ../init.d/acerk
+drwxr-xr-x	root/root	etc/rc.d/rc2.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S25acerhk -> ../init.d/acerhk
+drwxr-xr-x	root/root	etc/rc.d/rc3.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S25acerhk -> ../init.d/acerhk
+drwxr-xr-x	root/root	etc/rc.d/rc4.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S25acerhk -> ../init.d/acerhk
+drwxr-xr-x	root/root	etc/rc.d/rc5.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S25acerhk -> ../init.d/acerhk
+drwxr-xr-x	root/root	etc/rc.d/rc6.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K85acerhk -> ../init.d/acerk
+drwxr-xr-x	root/root	lib/
+drwxr-xr-x	root/root	lib/firmware/
+-rw-r--r--	root/root	lib/firmware/1.0.4.3.arm
+lrwxrwxrwx	root/root	lib/firmware/isl3890 -> 1.0.4.3.arm
+drwxr-xr-x	root/root	lib/modules/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/block/
+-rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/drivers/block/acerhk.ko
diff --git a/acompiler/acerhk/.md5sum b/acompiler/acerhk/.md5sum
new file mode 100644
index 000000000..2fae638ea
--- /dev/null
+++ b/acompiler/acerhk/.md5sum
@@ -0,0 +1,5 @@
+8bd4310971772a486b9784c77f8a6df9  1.0.4.3.arm
+801b5bd8afa559b7909ce57a30b18b19  acerhk
+2a0bc99e5b12e25096441df4d53d7df7  acerhk-0.5.35-kernel-2.6.30.patch
+fd2ef062ecbc9d670e1b42aa5866d32d  acerhk-0.5.35-kernelversion-01.patch
+05255919f312cb76af473a760c284433  acerhk-0.5.35.tgz
diff --git a/acompiler/acerhk/Pkgfile b/acompiler/acerhk/Pkgfile
new file mode 100644
index 000000000..61e5133b8
--- /dev/null
+++ b/acompiler/acerhk/Pkgfile
@@ -0,0 +1,47 @@
+# Description: Pilote hotkey pour Acer
+# URL: "http://www.cakey.de/acerhk/index.html"
+# Maintainer: nutyx core team
+# Packager: geantbrun
+# Depends on:
+name=acerhk
+version=0.5.35
+release=1
+source=(http://www.cakey.de/acerhk/archives/$name-$version.tgz \
+	http://nutyx.meticul.eu/files/patch/$name/1.0.4.3.arm \
+        $name $name-$version-kernel-2.6.30.patch $name-$version-kernelversion-01.patch)
+
+_kernver=`uname -r`
+
+build() {
+
+  # firmware
+  mkdir -p $PKG/lib/firmware
+  cp $SRC/1.0.4.3.arm $PKG/lib/firmware/
+  ln -s 1.0.4.3.arm $PKG/lib/firmware/isl3890
+
+  # module kernel
+  cd $SRC/$name-$version
+  sed -i 's/CFLAGS/EXTRA_CFLAGS/' Makefile
+  patch -Np1 -i $SRC/acerhk-0.5.35-kernel-2.6.30.patch
+  patch -N -p1 < $SRC/acerhk-0.5.35-kernelversion-01.patch
+
+  # Set KERNELSRC.  The makefile tries to autodetect it with uname,
+  # but that is unreliable.
+
+  make KERNELSRC="/lib/modules/${_kernver}/build" acerhk.ko
+
+  install -Dm644 "$SRC/$name-$version/acerhk.ko" \
+        $PKG/lib/modules/${_kernver}/kernel/drivers/block/acerhk.ko
+
+  # Service
+  install -Dm755 $SRC/acerhk $PKG/etc/rc.d/init.d/acerhk
+  mkdir -p $PKG/etc/rc.d/rc{0,1,2,3,4,5,6}.d
+  for i in 2 3 4 5
+	do
+		ln -s ../init.d/acerhk $PKG/etc/rc.d/rc$i.d/S25acerhk
+  done
+  for i in 0 1 6
+	do
+		ln -s ../init.d/acerk $PKG/etc/rc.d/rc$i.d/K85acerhk
+  done
+}
diff --git a/acompiler/acerhk/acerhk b/acompiler/acerhk/acerhk
new file mode 100755
index 000000000..b54018f84
--- /dev/null
+++ b/acompiler/acerhk/acerhk
@@ -0,0 +1,50 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/acerhk
+#
+# Description : Lance le service pour les acer hotkey
+#
+# Authors     : geantbrun
+#
+# Version     : 00.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+	start)
+		boot_mesg "Starting Acer Hotkey Wireless LED..."
+		if [ ! -f /proc/driver/acerhk/wirelessled ]; then
+			echo_failure
+		else
+			echo 1 > /proc/driver/acerhk/wirelessled
+			echo_ok
+		fi;;
+
+	stop)
+		boot_mesg "Stopping Acer Hotkey Wireless LED..."
+		if [ ! -f /proc/driver/acerhk/wirelessled ]; then
+			echo_failure
+		else
+			echo 0 > /proc/driver/acerhk/wirelessled
+			echo_ok
+		fi;;
+
+	restart)
+		${0} stop
+		sleep 1
+		${0} start
+		;;
+
+
+	*)
+		echo "Usage: ${0} {start|stop|restart}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/acerhk
diff --git a/acompiler/acerhk/acerhk#0.5.35-1.pkg.tar.xz b/acompiler/acerhk/acerhk#0.5.35-1.pkg.tar.xz
new file mode 100644
index 000000000..c3f3bf86a
--- /dev/null
+++ b/acompiler/acerhk/acerhk#0.5.35-1.pkg.tar.xz
diff --git a/acompiler/acerhk/acerhk-0.5.35-kernel-2.6.30.patch b/acompiler/acerhk/acerhk-0.5.35-kernel-2.6.30.patch
new file mode 100644
index 000000000..eec5a5cf3
--- /dev/null
+++ b/acompiler/acerhk/acerhk-0.5.35-kernel-2.6.30.patch
@@ -0,0 +1,72 @@
+--- a/acerhk.c
++++ b/acerhk.c
+@@ -2668,7 +2668,9 @@ static int acerhk_proc_init(void)
+     printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n");
+   }
+   else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+     proc_acer_dir->owner = THIS_MODULE;
++#endif
+     /* now create several files, first general info ... */
+     entry = create_proc_read_entry("info",
+                                    0444, proc_acer_dir, acerhk_proc_info, NULL);
+@@ -2677,7 +2679,9 @@ static int acerhk_proc_init(void)
+       remove_proc_entry("driver/acerhk", NULL);
+       retval = 0;
+     } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+       entry->owner = THIS_MODULE;
++#endif
+       /* ... last pressed key ... */
+       entry = create_proc_read_entry("key",
+                                      0444, proc_acer_dir, acerhk_proc_key, NULL);
+@@ -2687,7 +2691,9 @@ static int acerhk_proc_init(void)
+         remove_proc_entry("driver/acerhk", NULL);
+         retval = 0;
+       } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+         entry->owner = THIS_MODULE;
++#endif
+         /* ... and led control file */
+         entry = create_proc_entry("led", 0222, proc_acer_dir);
+         if (entry == NULL) {
+@@ -2699,7 +2705,9 @@ static int acerhk_proc_init(void)
+         }
+         else {
+           entry->write_proc = acerhk_proc_led;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+           entry->owner = THIS_MODULE;
++#endif
+           /* ... and wireless led controll file */
+           entry = create_proc_entry("wirelessled", 0222, proc_acer_dir);
+           if (entry == NULL) {
+@@ -2712,7 +2720,9 @@ static int acerhk_proc_init(void)
+           }
+           else {
+             entry->write_proc = acerhk_proc_wirelessled;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+             entry->owner = THIS_MODULE;
++#endif
+             /* ... and bluetooth led controll file */
+             entry = create_proc_entry("blueled", 0222, proc_acer_dir);
+             if (entry == NULL) {
+@@ -2725,7 +2735,9 @@ static int acerhk_proc_init(void)
+               retval = 0;
+             } else {
+               entry->write_proc = acerhk_proc_blueled;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+               entry->owner = THIS_MODULE;
++#endif
+               retval = 1;
+ #ifdef ACERDEBUG
+               /* add extra file for debugging purposes */
+@@ -2742,7 +2754,9 @@ static int acerhk_proc_init(void)
+               }
+               else {
+                 entry->write_proc = acerhk_proc_debug;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+                 entry->owner = THIS_MODULE;
++#endif
+                 retval = 1;
+               }
+ #endif
diff --git a/acompiler/acerhk/acerhk-0.5.35-kernelversion-01.patch b/acompiler/acerhk/acerhk-0.5.35-kernelversion-01.patch
new file mode 100644
index 000000000..033c94989
--- /dev/null
+++ b/acompiler/acerhk/acerhk-0.5.35-kernelversion-01.patch
@@ -0,0 +1,12 @@
+diff -Naur acerhk-0.5.35/Makefile acerhk-0.5.35-new/Makefile
+--- acerhk-0.5.35/Makefile	2006-08-16 11:11:08.000000000 -0500
++++ acerhk-0.5.35-new/Makefile	2010-04-09 15:59:40.000000000 -0500
+@@ -3,7 +3,7 @@
+ #KERNELSRC=/usr/src/linux
+ KERNELSRC?=/lib/modules/`uname -r`/build
+ # Starting with 2.6.18, the kernel version is in utsrelease.h instead of version.h, accomodate both cases
+-KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h))
++KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/generated/utsrelease.h))
+ KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3)
+ 
+ # next line is for kernel 2.6, if you integrate the driver in the kernel tree
diff --git a/acompiler/acerhk/post-install b/acompiler/acerhk/post-install
new file mode 100644
index 000000000..26f40bf12
--- /dev/null
+++ b/acompiler/acerhk/post-install
@@ -0,0 +1,6 @@
+cat << EOM
+>>> PLEASE ADD PROPER OPTIONS IN /etc/modprobe.d/modprobe.conf IF NEEDED
+>>> e.g. for Series 290:
+>>> echo "options acerhk force_series=290 usedritek=1 verbose=0" >> /etc/modprobe.conf
+EOM
+depmod -a
diff --git a/base/glib1/Pkgfile b/base/glib1/Pkgfile
index 540c3406d..7543ccda9 100755
--- a/base/glib1/Pkgfile
+++ b/base/glib1/Pkgfile
@@ -8,7 +8,7 @@ version=1.2.10
 release=1
 localname=glib
 source=( http://gd.tuwien.ac.at/graphics/gimp/gtk/v1.2/$localname-$version.tar.gz\
-	http://nutyx.meticul.eu/files/patchs/{config.patch,gcc340.patch} )
+	http://nutyx.meticul.eu/files/patchs/$name/{config.patch,gcc340.patch} )
 
 
 build() {
diff --git a/extra/apache/.md5sum b/extra/apache/.md5sum
index a6755ed9c..2e2a7dbea 100644
--- a/extra/apache/.md5sum
+++ b/extra/apache/.md5sum
@@ -1,3 +1,3 @@
 cf00908a82321dabc331c7efdc194a8b  apache
 e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.15-config-1.patch
-016cec97337eccead2aad6a7c27f2e14  httpd-2.2.15.tar.bz2
+16eadc59ea6b38af33874d300973202e  httpd-2.2.17.tar.bz2
diff --git a/extra/apache/Pkgfile b/extra/apache/Pkgfile
index d4b59a216..caa2d71f8 100644
--- a/extra/apache/Pkgfile
+++ b/extra/apache/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  apr, sqlite3
 
 name=apache
-version=2.2.15
+version=2.2.17
 release=1
 source=(http://archive.apache.org/dist/httpd/httpd-$version.tar.bz2 \
 	http://www.linuxfromscratch.org/patches/blfs/svn/httpd-2.2.15-config-1.patch
diff --git a/extra/cups/.footprint b/extra/cups/.footprint
index c6dc2b010..ea3abfacb 100644
--- a/extra/cups/.footprint
+++ b/extra/cups/.footprint
@@ -877,7 +877,6 @@ drwxr-xr-x	root/root	usr/share/doc/cups/help/
 -r--r--r--	root/root	usr/share/doc/cups/help/man-cupsenable.html
 -r--r--r--	root/root	usr/share/doc/cups/help/man-cupstestdsc.html
 -r--r--r--	root/root	usr/share/doc/cups/help/man-cupstestppd.html
--r--r--r--	root/root	usr/share/doc/cups/help/man-drv.html
 -r--r--r--	root/root	usr/share/doc/cups/help/man-filter.html
 -r--r--r--	root/root	usr/share/doc/cups/help/man-lp.html
 -r--r--r--	root/root	usr/share/doc/cups/help/man-lpadmin.html
@@ -942,6 +941,7 @@ drwxr-xr-x	root/root	usr/share/doc/cups/images/
 -r--r--r--	root/root	usr/share/doc/cups/images/cups-postscript-chain.png
 -r--r--r--	root/root	usr/share/doc/cups/images/cups-raster-chain.png
 -r--r--r--	root/root	usr/share/doc/cups/images/cups.png
+-r--r--r--	root/root	usr/share/doc/cups/images/generic.png
 -r--r--r--	root/root	usr/share/doc/cups/images/left.gif
 -r--r--r--	root/root	usr/share/doc/cups/images/raster.png
 -r--r--r--	root/root	usr/share/doc/cups/images/right.gif
@@ -1007,7 +1007,6 @@ drwxr-xr-x	root/root	usr/share/man/man5/
 -r--r--r--	root/root	usr/share/man/man5/subscriptions.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man7/
 -r--r--r--	root/root	usr/share/man/man7/backend.7.gz
--r--r--r--	root/root	usr/share/man/man7/drv.7.gz
 -r--r--r--	root/root	usr/share/man/man7/filter.7.gz
 -r--r--r--	root/root	usr/share/man/man7/notifier.7.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
diff --git a/extra/cups/.md5sum b/extra/cups/.md5sum
index 6892ae6ff..7f5e9c5d2 100644
--- a/extra/cups/.md5sum
+++ b/extra/cups/.md5sum
@@ -1,2 +1,2 @@
 01820c3d0b6cbe798bab94dfc962e8ef  cups
-8776403ad60fea9e85eab9c04d88560d  cups-1.4.4-source.tar.bz2
+50729f6fc46ba54223e0eaf5009f3419  cups-1.4.5-source.tar.bz2
diff --git a/extra/cups/Pkgfile b/extra/cups/Pkgfile
index e4c87ac00..ffdf4a7d2 100755
--- a/extra/cups/Pkgfile
+++ b/extra/cups/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libcups, dbus-glib, libusb, hicolor-icon-theme
 
 name=cups
-version=1.4.4
+version=1.4.5
 release=1
 source=( http://ftp.easysw.com/pub/$name/$version/$name-$version-source.tar.bz2\
        cups)
diff --git a/extra/libcups/.md5sum b/extra/libcups/.md5sum
index 3e65467fe..c1c206e85 100644
--- a/extra/libcups/.md5sum
+++ b/extra/libcups/.md5sum
@@ -1 +1 @@
-8776403ad60fea9e85eab9c04d88560d  cups-1.4.4-source.tar.bz2
+50729f6fc46ba54223e0eaf5009f3419  cups-1.4.5-source.tar.bz2
diff --git a/extra/libcups/Pkgfile b/extra/libcups/Pkgfile
index 03c165fdf..95986cd35 100755
--- a/extra/libcups/Pkgfile
+++ b/extra/libcups/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libjpeg, libpng, libtiff, poppler, xdg-utils, dbus, hicolor-icon-theme, linux-pam, libldap
 
 name=libcups
-version=1.4.4
+version=1.4.5
 release=1
 source=( http://ftp.easysw.com/pub/cups/$version/cups-$version-source.tar.bz2)
 
diff --git a/extra/vlc-plugin/.md5sum b/extra/vlc-plugin/.md5sum
index 806ec3aec..ece67c072 100644
--- a/extra/vlc-plugin/.md5sum
+++ b/extra/vlc-plugin/.md5sum
@@ -1 +1 @@
-b71aacaa242f8050a64c6ffe09d6f067  vlc-1.1.4.tar.bz2
+fdc23693351ed57af9f4c85ea885b536  vlc-1.1.5.tar.bz2
diff --git a/extra/vlc-plugin/Pkgfile b/extra/vlc-plugin/Pkgfile
index 9435620d4..6778db194 100644
--- a/extra/vlc-plugin/Pkgfile
+++ b/extra/vlc-plugin/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libshout, lua, xulrunner, ffmpeg, flac, freetype, fribidi, goom, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, lame, vcdimager, x264, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, sdl_image, qt, libnotify, libmpcdec
 
 name=vlc-plugin
-version=1.1.4
+version=1.1.5
 release=1
 
 source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2 )
diff --git a/extra/vlc/.footprint b/extra/vlc/.footprint
index b87038a06..7f3315621 100644
--- a/extra/vlc/.footprint
+++ b/extra/vlc/.footprint
@@ -89,13 +89,13 @@ drwxr-xr-x	root/root	usr/include/vlc/plugins/
 -rw-r--r--	root/root	usr/include/vlc/vlc.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libvlc.la
-lrwxrwxrwx	root/root	usr/lib/libvlc.so -> libvlc.so.5.1.0
-lrwxrwxrwx	root/root	usr/lib/libvlc.so.5 -> libvlc.so.5.1.0
--rwxr-xr-x	root/root	usr/lib/libvlc.so.5.1.0
+lrwxrwxrwx	root/root	usr/lib/libvlc.so -> libvlc.so.5.2.0
+lrwxrwxrwx	root/root	usr/lib/libvlc.so.5 -> libvlc.so.5.2.0
+-rwxr-xr-x	root/root	usr/lib/libvlc.so.5.2.0
 -rwxr-xr-x	root/root	usr/lib/libvlccore.la
-lrwxrwxrwx	root/root	usr/lib/libvlccore.so -> libvlccore.so.4.0.0
-lrwxrwxrwx	root/root	usr/lib/libvlccore.so.4 -> libvlccore.so.4.0.0
--rwxr-xr-x	root/root	usr/lib/libvlccore.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/libvlccore.so -> libvlccore.so.4.0.1
+lrwxrwxrwx	root/root	usr/lib/libvlccore.so.4 -> libvlccore.so.4.0.1
+-rwxr-xr-x	root/root	usr/lib/libvlccore.so.4.0.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libvlc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/vlc-plugin.pc
@@ -144,6 +144,7 @@ drwxr-xr-x	root/root	usr/lib/vlc/lua/playlist/
 -rw-r--r--	root/root	usr/lib/vlc/lua/playlist/lelombrik.luac
 -rw-r--r--	root/root	usr/lib/vlc/lua/playlist/megavideo.luac
 -rw-r--r--	root/root	usr/lib/vlc/lua/playlist/metacafe.luac
+-rw-r--r--	root/root	usr/lib/vlc/lua/playlist/metachannels.luac
 -rw-r--r--	root/root	usr/lib/vlc/lua/playlist/mpora.luac
 -rw-r--r--	root/root	usr/lib/vlc/lua/playlist/pinkbike.luac
 -rw-r--r--	root/root	usr/lib/vlc/lua/playlist/rockbox_fm_presets.luac
@@ -154,6 +155,7 @@ drwxr-xr-x	root/root	usr/lib/vlc/lua/sd/
 -rw-r--r--	root/root	usr/lib/vlc/lua/sd/freebox.luac
 -rw-r--r--	root/root	usr/lib/vlc/lua/sd/icecast.luac
 -rw-r--r--	root/root	usr/lib/vlc/lua/sd/jamendo.luac
+-rw-r--r--	root/root	usr/lib/vlc/lua/sd/metachannels.luac
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/3dnow/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/3dnow/libmemcpy3dn_plugin.la
@@ -171,8 +173,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/access/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_fake_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_ftp_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_gnomevfs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_http_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_imem_plugin.la
@@ -467,8 +467,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libexport_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libfreetype_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libfreetype_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libgnutls_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libgnutls_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libinhibit_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libinhibit_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/liblogger_plugin.la
@@ -491,6 +489,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libxdg_screensaver_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libxml_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libxml_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libxscreensaver_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libxscreensaver_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libxtag_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/misc/libxtag_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/mmx/
@@ -544,8 +544,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.la
diff --git a/extra/vlc/.md5sum b/extra/vlc/.md5sum
index 806ec3aec..ece67c072 100644
--- a/extra/vlc/.md5sum
+++ b/extra/vlc/.md5sum
@@ -1 +1 @@
-b71aacaa242f8050a64c6ffe09d6f067  vlc-1.1.4.tar.bz2
+fdc23693351ed57af9f4c85ea885b536  vlc-1.1.5.tar.bz2
diff --git a/extra/vlc/Pkgfile b/extra/vlc/Pkgfile
index 9b89bf86f..4eaef0705 100644
--- a/extra/vlc/Pkgfile
+++ b/extra/vlc/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: lua, libshout, sysfsutils, ffmpeg, flac, freetype, fribidi, goom, lame, libcdio, libdvbpsi, libdvdcss, libdvdread, libdvdnav, libebml, libiconv, libid3tag, libmad, libmatroska, libogg, libpng, speex, libtheora, libvorbis, libxml2, libmpeg2, openslp, portaudio, lame, vcdimager, x264, aalib, libcaca, libmpeg2, libopendaap, libmp4v2, live, libdca, sdl_image, qt, libnotify, libmpcdec, hal, taglib, samba3
 
 name=vlc
-version=1.1.4
+version=1.1.5
 release=1
 source=(http://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.bz2)