Merge branch 'master' of ssh://piernov.org/srv/git/nutyx-extra

46 files changed, 103 insertions, 220 deletions

diff --git a/avahi-gtk/.md5sum.i686 b/avahi-gtk/.md5sum.i686
index 8ff790cfd..90045187f 100644
--- a/avahi-gtk/.md5sum.i686
+++ b/avahi-gtk/.md5sum.i686
@@ -1 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
diff --git a/avahi-gtk/.md5sum.x86_64 b/avahi-gtk/.md5sum.x86_64
index 8ff790cfd..90045187f 100644
--- a/avahi-gtk/.md5sum.x86_64
+++ b/avahi-gtk/.md5sum.x86_64
@@ -1 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
diff --git a/avahi-gtk/Pkgfile b/avahi-gtk/Pkgfile
index 0aff4b382..2476dd18d 100644
--- a/avahi-gtk/Pkgfile
+++ b/avahi-gtk/Pkgfile
@@ -6,8 +6,8 @@
 # Run on: avahi,gtk3,pygtk
 
 name=avahi-gtk
-version=0.6.30
-release=2
+version=0.6.31
+release=1
 source=(http://www.avahi.org/download/avahi-$version.tar.gz)
 
 build() {
diff --git a/avahi-qt4/.md5sum.i686 b/avahi-qt4/.md5sum.i686
index 8ff790cfd..90045187f 100644
--- a/avahi-qt4/.md5sum.i686
+++ b/avahi-qt4/.md5sum.i686
@@ -1 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
diff --git a/avahi-qt4/.md5sum.x86_64 b/avahi-qt4/.md5sum.x86_64
index 8ff790cfd..90045187f 100644
--- a/avahi-qt4/.md5sum.x86_64
+++ b/avahi-qt4/.md5sum.x86_64
@@ -1 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
diff --git a/avahi-qt4/Pkgfile b/avahi-qt4/Pkgfile
index 25b83985e..d2e31f377 100644
--- a/avahi-qt4/Pkgfile
+++ b/avahi-qt4/Pkgfile
@@ -6,8 +6,8 @@
 # Run on: avahi,qt
 
 name=avahi-qt4
-version=0.6.30
-release=2
+version=0.6.31
+release=1
 source=(http://www.avahi.org/download/avahi-$version.tar.gz)
 
 build() {
diff --git a/avahi-server/.footprint.i686 b/avahi-server/.footprint.i686
index 37c10e0dc..d8875ae7b 100644
--- a/avahi-server/.footprint.i686
+++ b/avahi-server/.footprint.i686
@@ -9,21 +9,23 @@ drwxr-xr-x	root/root	etc/avahi/services/
 -rw-r--r--	root/root	etc/avahi/services/ssh.service
 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/avahid
+-rwxr-xr--	root/root	etc/rc.d/init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K28avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K28avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K28avahi -> ../init.d/avahi
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
+drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/avahi-autoipd
diff --git a/avahi-server/.footprint.x86_64 b/avahi-server/.footprint.x86_64
index 37c10e0dc..d8875ae7b 100644
--- a/avahi-server/.footprint.x86_64
+++ b/avahi-server/.footprint.x86_64
@@ -9,21 +9,23 @@ drwxr-xr-x	root/root	etc/avahi/services/
 -rw-r--r--	root/root	etc/avahi/services/ssh.service
 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/avahid
+-rwxr-xr--	root/root	etc/rc.d/init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K28avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K28avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K28avahi -> ../init.d/avahi
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
+drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/avahi-autoipd
diff --git a/avahi-server/.md5sum.i686 b/avahi-server/.md5sum.i686
index fd08362a3..90045187f 100644
--- a/avahi-server/.md5sum.i686
+++ b/avahi-server/.md5sum.i686
@@ -1,2 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
-09877d8619de924d02bc018bcef21150  avahid
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
diff --git a/avahi-server/.md5sum.x86_64 b/avahi-server/.md5sum.x86_64
index fd08362a3..90045187f 100644
--- a/avahi-server/.md5sum.x86_64
+++ b/avahi-server/.md5sum.x86_64
@@ -1,2 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
-09877d8619de924d02bc018bcef21150  avahid
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
diff --git a/avahi-server/Pkgfile b/avahi-server/Pkgfile
index b35710acb..899ee6860 100644
--- a/avahi-server/Pkgfile
+++ b/avahi-server/Pkgfile
@@ -2,17 +2,22 @@
 # URL: http://www.avahi.org/
 # Maintainer: NuTyX core team 
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libdaemon,intltool,dbus,dbus-python
-# Run on: libdaemon,dbus,dbus-python
+# Depends on: libdaemon, intltool, dbus, dbus-python, avahi
+# Run on: libdaemon,dbus,dbus-python,avahi
 
 name=avahi-server
-version=0.6.30
-release=3
-source=(http://www.avahi.org/download/avahi-$version.tar.gz
-	avahid)
+version=0.6.31
+release=1
+source=(http://www.avahi.org/download/avahi-$version.tar.gz)
 
 build() {
-	cd avahi-$version
+	source /etc/blfs-bootscripts
+	wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+	tar xf $scripts-$scriptsversion.tar.bz2
+	cd $scripts-$scriptsversion
+	make DESTDIR=$PKG install-avahi
+
+	cd ../avahi-$version
 	PYTHON=python2 ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -41,15 +46,5 @@ build() {
 		make -C $i
 		make -C $i DESTDIR=$PKG install
 	done
-
-	mkdir -p $PKG/etc/rc.d/{init.d,rc{0,1,2,3,4,5,6}.d}
-        install -D -m755 ../avahid $PKG/etc/rc.d/init.d/avahid
-
-	for i in 3 4 5; do
-		ln -svf ../init.d/avahid $PKG/etc/rc.d/rc$i.d/S43avahid
-	done
-	for i in 0 1 2 6; do
-		ln -svf ../init.d/avahid $PKG/etc/rc.d/rc$i.d/K13avahid
-	done
 	rm -rf $PKG/{lib,etc/dbus-1,usr/share/{avahi,dbus-1,man/man{1,5}}}
 }
diff --git a/avahi-server/avahid b/avahi-server/avahid
deleted file mode 100644
index 3ab580e5f..000000000
--- a/avahi-server/avahid
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/avahid
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-# Add create user and Groups - thierryn1@hispeed.ch
-
-# $Id: $
-
-. /etc/sysconfig/rc
-. $rc_functions
-newgroup=avahi
-newuser=avahi
-newid=85
-getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup
-getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \
--u $newid -s /bin/false -c "Avahi Daemon" $newuser
-
-
-case "$1" in
-    start)
-        boot_mesg "Starting Avahi Daemon..."
-        loadproc /usr/sbin/avahi-daemon -D
-        ;;
-
-    stop)
-        boot_mesg "Stopping Avahi Daemon..."
-        killproc /usr/sbin/avahi-daemon
-        ;;
-
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-
-    status)
-        statusproc /usr/sbin/avahi-daemon
-        ;;
-
-    *)
-        echo "Usage: $0 {start|stop|restart|status}"
-        exit 1
-        ;;
-esac
-
-# End $rc_base/init.d/avahid
diff --git a/avahi/.footprint.i686 b/avahi/.footprint.i686
index 46ea5403d..ce048befe 100644
--- a/avahi/.footprint.i686
+++ b/avahi/.footprint.i686
@@ -2,15 +2,6 @@ drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/dbus-1/
 drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/avahi-dbus.conf
-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/avahi
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/systemd/
-drwxr-xr-x	root/root	lib/systemd/system/
--rw-r--r--	root/root	lib/systemd/system/avahi-daemon.service
--rw-r--r--	root/root	lib/systemd/system/avahi-daemon.socket
--rw-r--r--	root/root	lib/systemd/system/avahi-dnsconfd.service
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/avahi-bookmarks
@@ -160,7 +151,6 @@ drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
 drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
--rw-r--r--	root/root	usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
 drwxr-xr-x	root/root	usr/share/gir-1.0/
 -rw-r--r--	root/root	usr/share/gir-1.0/Avahi-0.6.gir
 -rw-r--r--	root/root	usr/share/gir-1.0/AvahiCore-0.6.gir
diff --git a/avahi/.footprint.x86_64 b/avahi/.footprint.x86_64
index 46ea5403d..ce048befe 100644
--- a/avahi/.footprint.x86_64
+++ b/avahi/.footprint.x86_64
@@ -2,15 +2,6 @@ drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/dbus-1/
 drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/avahi-dbus.conf
-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/avahi
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/systemd/
-drwxr-xr-x	root/root	lib/systemd/system/
--rw-r--r--	root/root	lib/systemd/system/avahi-daemon.service
--rw-r--r--	root/root	lib/systemd/system/avahi-daemon.socket
--rw-r--r--	root/root	lib/systemd/system/avahi-dnsconfd.service
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/avahi-bookmarks
@@ -160,7 +151,6 @@ drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
 drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
--rw-r--r--	root/root	usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
 drwxr-xr-x	root/root	usr/share/gir-1.0/
 -rw-r--r--	root/root	usr/share/gir-1.0/Avahi-0.6.gir
 -rw-r--r--	root/root	usr/share/gir-1.0/AvahiCore-0.6.gir
diff --git a/avahi/.md5sum.i686 b/avahi/.md5sum.i686
index a0ca94cca..770bda565 100644
--- a/avahi/.md5sum.i686
+++ b/avahi/.md5sum.i686
@@ -1,2 +1,2 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
 42c2905307c7a5dc6ac4b75f4c3d65a3  network-wired.png
diff --git a/avahi/.md5sum.x86_64 b/avahi/.md5sum.x86_64
index a0ca94cca..770bda565 100644
--- a/avahi/.md5sum.x86_64
+++ b/avahi/.md5sum.x86_64
@@ -1,2 +1,2 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
 42c2905307c7a5dc6ac4b75f4c3d65a3  network-wired.png
diff --git a/avahi/Pkgfile b/avahi/Pkgfile
index 2a8479b80..4aea7b115 100644
--- a/avahi/Pkgfile
+++ b/avahi/Pkgfile
@@ -6,8 +6,8 @@
 # Run on: libdaemon,dbus,dbus-python,libglade
 
 name=avahi
-version=0.6.30
-release=2
+version=0.6.31
+release=1
 source=(http://www.avahi.org/download/avahi-$version.tar.gz
 	network-wired.png)
 
@@ -33,13 +33,13 @@ build() {
     		--with-avahi-priv-access-group=network \
     		--with-autoipd-user=avahi \
     		--with-autoipd-group=avahi \
-    		--with-systemdsystemunitdir=/lib/systemd/system
+    		--with-systemdsystemunitdir=no
 	make
 	make DESTDIR=$PKG install
 
 	sed -i -e 's/netdev/network/g' $PKG/etc/dbus-1/system.d/avahi-dbus.conf
 	mkdir -v -p $PKG/usr/share/pixmaps
 	install -m 644 ../network-wired.png $PKG/usr/share/pixmaps/network-wired.png
-	rm -r $PKG/{etc/avahi,var,usr/share/man/man8,usr/sbin}
+	rm -r $PKG/{etc/avahi,etc/rc.d,var,usr/share/man/man8,usr/sbin}
 	sed -i '1c #!/usr/bin/python2' $PKG/usr/bin/avahi-bookmarks
 }
diff --git a/git/.footprint.i686 b/git/.footprint.i686
index 5ddea17df..a05253ea5 100644
--- a/git/.footprint.i686
+++ b/git/.footprint.i686
@@ -174,6 +174,7 @@ drwxr-xr-x	root/root	usr/lib/git-core/mergetools/
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/araxis
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/bc3
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/defaults
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/deltawalker
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/diffuse
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/ecmerge
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/emerge
diff --git a/git/.footprint.x86_64 b/git/.footprint.x86_64
index 5ddea17df..a05253ea5 100644
--- a/git/.footprint.x86_64
+++ b/git/.footprint.x86_64
@@ -174,6 +174,7 @@ drwxr-xr-x	root/root	usr/lib/git-core/mergetools/
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/araxis
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/bc3
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/defaults
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/deltawalker
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/diffuse
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/ecmerge
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/emerge
diff --git a/git/.md5sum.i686 b/git/.md5sum.i686
index 383ae774f..2c93b83be 100644
--- a/git/.md5sum.i686
+++ b/git/.md5sum.i686
@@ -1,2 +1,2 @@
-f1e32b2ec841219e442db9c9ef21c252  git-1.7.9.4.tar.gz
-24d6a551c344af67d93ea2d52f36ef78  git-manpages-1.7.9.4.tar.gz
+ab2716db51580037c7ebda4c8e9d56eb  git-1.7.10.tar.gz
+5066600fe67986acd36c008c876e9489  git-manpages-1.7.10.tar.gz
diff --git a/git/.md5sum.x86_64 b/git/.md5sum.x86_64
index 383ae774f..2c93b83be 100644
--- a/git/.md5sum.x86_64
+++ b/git/.md5sum.x86_64
@@ -1,2 +1,2 @@
-f1e32b2ec841219e442db9c9ef21c252  git-1.7.9.4.tar.gz
-24d6a551c344af67d93ea2d52f36ef78  git-manpages-1.7.9.4.tar.gz
+ab2716db51580037c7ebda4c8e9d56eb  git-1.7.10.tar.gz
+5066600fe67986acd36c008c876e9489  git-manpages-1.7.10.tar.gz
diff --git a/git/Pkgfile b/git/Pkgfile
index b5b6e167e..e53321a0a 100644
--- a/git/Pkgfile
+++ b/git/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: curl,libidn,expat
 
 name=git
-version=1.7.9.4
+version=1.7.10
 release=1
 source=(http://git-core.googlecode.com/files/$name-{,manpages-}$version.tar.gz)
 
diff --git a/live/.footprint.i686 b/live/.footprint.i686
index 4f2bc5736..f497e288f 100644
--- a/live/.footprint.i686
+++ b/live/.footprint.i686
@@ -110,7 +110,6 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/MP3ADUinterleaving.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3AudioFileServerMediaSubsession.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3FileSource.hh
--r--r--r--	root/root	usr/include/liveMedia/MP3HTTPSource.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3Transcoder.hh
 -r--r--r--	root/root	usr/include/liveMedia/MPEG1or2AudioRTPSink.hh
 -r--r--r--	root/root	usr/include/liveMedia/MPEG1or2AudioRTPSource.hh
@@ -154,6 +153,7 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/OnDemandServerMediaSubsession.hh
 -r--r--r--	root/root	usr/include/liveMedia/OutputFile.hh
 -r--r--r--	root/root	usr/include/liveMedia/PassiveServerMediaSubsession.hh
+-r--r--r--	root/root	usr/include/liveMedia/ProxyServerMediaSession.hh
 -r--r--r--	root/root	usr/include/liveMedia/QCELPAudioRTPSource.hh
 -r--r--r--	root/root	usr/include/liveMedia/QuickTimeFileSink.hh
 -r--r--r--	root/root	usr/include/liveMedia/QuickTimeGenericRTPSource.hh
@@ -185,16 +185,9 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/liveMedia_version.hh
 -r--r--r--	root/root	usr/include/liveMedia/uLawAudioFilter.hh
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libliveMedia.so -> libliveMedia.so.2012.02.29
-lrwxrwxrwx	root/root	usr/lib/libliveMedia.so.2012.02.29 -> live/libliveMedia.so.2012.02.29
-drwxr-xr-x	root/root	usr/lib/live/
-drwxr-xr-x	root/root	usr/lib/live/BasicUsageEnvironment/
--rw-r--r--	root/root	usr/lib/live/BasicUsageEnvironment/libBasicUsageEnvironment.a
-drwxr-xr-x	root/root	usr/lib/live/UsageEnvironment/
--rw-r--r--	root/root	usr/lib/live/UsageEnvironment/libUsageEnvironment.a
-drwxr-xr-x	root/root	usr/lib/live/groupsock/
--rw-r--r--	root/root	usr/lib/live/groupsock/libgroupsock.a
-lrwxrwxrwx	root/root	usr/lib/live/libliveMedia.so -> libliveMedia.so.2012.02.29
--rwxr-xr-x	root/root	usr/lib/live/libliveMedia.so.2012.02.29
-drwxr-xr-x	root/root	usr/lib/live/liveMedia/
--rw-r--r--	root/root	usr/lib/live/liveMedia/libliveMedia.a
+-rw-r--r--	root/root	usr/lib/libBasicUsageEnvironment.a
+-rw-r--r--	root/root	usr/lib/libUsageEnvironment.a
+-rw-r--r--	root/root	usr/lib/libgroupsock.a
+-rw-r--r--	root/root	usr/lib/libliveMedia.a
+lrwxrwxrwx	root/root	usr/lib/libliveMedia.so -> libliveMedia.so.2012.04.26
+-rwxr-xr-x	root/root	usr/lib/libliveMedia.so.2012.04.26
diff --git a/live/.footprint.x86_64 b/live/.footprint.x86_64
index 4f2bc5736..f497e288f 100644
--- a/live/.footprint.x86_64
+++ b/live/.footprint.x86_64
@@ -110,7 +110,6 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/MP3ADUinterleaving.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3AudioFileServerMediaSubsession.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3FileSource.hh
--r--r--r--	root/root	usr/include/liveMedia/MP3HTTPSource.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3Transcoder.hh
 -r--r--r--	root/root	usr/include/liveMedia/MPEG1or2AudioRTPSink.hh
 -r--r--r--	root/root	usr/include/liveMedia/MPEG1or2AudioRTPSource.hh
@@ -154,6 +153,7 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/OnDemandServerMediaSubsession.hh
 -r--r--r--	root/root	usr/include/liveMedia/OutputFile.hh
 -r--r--r--	root/root	usr/include/liveMedia/PassiveServerMediaSubsession.hh
+-r--r--r--	root/root	usr/include/liveMedia/ProxyServerMediaSession.hh
 -r--r--r--	root/root	usr/include/liveMedia/QCELPAudioRTPSource.hh
 -r--r--r--	root/root	usr/include/liveMedia/QuickTimeFileSink.hh
 -r--r--r--	root/root	usr/include/liveMedia/QuickTimeGenericRTPSource.hh
@@ -185,16 +185,9 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/liveMedia_version.hh
 -r--r--r--	root/root	usr/include/liveMedia/uLawAudioFilter.hh
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libliveMedia.so -> libliveMedia.so.2012.02.29
-lrwxrwxrwx	root/root	usr/lib/libliveMedia.so.2012.02.29 -> live/libliveMedia.so.2012.02.29
-drwxr-xr-x	root/root	usr/lib/live/
-drwxr-xr-x	root/root	usr/lib/live/BasicUsageEnvironment/
--rw-r--r--	root/root	usr/lib/live/BasicUsageEnvironment/libBasicUsageEnvironment.a
-drwxr-xr-x	root/root	usr/lib/live/UsageEnvironment/
--rw-r--r--	root/root	usr/lib/live/UsageEnvironment/libUsageEnvironment.a
-drwxr-xr-x	root/root	usr/lib/live/groupsock/
--rw-r--r--	root/root	usr/lib/live/groupsock/libgroupsock.a
-lrwxrwxrwx	root/root	usr/lib/live/libliveMedia.so -> libliveMedia.so.2012.02.29
--rwxr-xr-x	root/root	usr/lib/live/libliveMedia.so.2012.02.29
-drwxr-xr-x	root/root	usr/lib/live/liveMedia/
--rw-r--r--	root/root	usr/lib/live/liveMedia/libliveMedia.a
+-rw-r--r--	root/root	usr/lib/libBasicUsageEnvironment.a
+-rw-r--r--	root/root	usr/lib/libUsageEnvironment.a
+-rw-r--r--	root/root	usr/lib/libgroupsock.a
+-rw-r--r--	root/root	usr/lib/libliveMedia.a
+lrwxrwxrwx	root/root	usr/lib/libliveMedia.so -> libliveMedia.so.2012.04.26
+-rwxr-xr-x	root/root	usr/lib/libliveMedia.so.2012.04.26
diff --git a/live/.md5sum.i686 b/live/.md5sum.i686
index fc2de55c4..be918be5a 100644
--- a/live/.md5sum.i686
+++ b/live/.md5sum.i686
@@ -1 +1 @@
-ee00b4f9ca4efaa1aeaf47b5c185fe93  live.2012.02.29.tar.gz
+4c7202e0611951998325b0e41ae63041  live.2012.04.26.tar.gz
diff --git a/live/.md5sum.x86_64 b/live/.md5sum.x86_64
index fc2de55c4..be918be5a 100644
--- a/live/.md5sum.x86_64
+++ b/live/.md5sum.x86_64
@@ -1 +1 @@
-ee00b4f9ca4efaa1aeaf47b5c185fe93  live.2012.02.29.tar.gz
+4c7202e0611951998325b0e41ae63041  live.2012.04.26.tar.gz
diff --git a/live/Pkgfile b/live/Pkgfile
index 1d4e037bb..6339b8835 100644
--- a/live/Pkgfile
+++ b/live/Pkgfile
@@ -6,7 +6,7 @@
 # Run on:
 
 name=live
-version=2012.02.29
+version=2012.04.26
 release=1
 source=(http://www.live555.com/liveMedia/public/${name}.$version.tar.gz)
 
@@ -16,6 +16,7 @@ build() {
 	cd $name
 
 	sed \
+		-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
 		-e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
 		-e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
 		-i config.linux -i config.linux-64bit
@@ -27,8 +28,8 @@ build() {
 	gcc -shared -o libliveMedia.so.$version */*.a
 
 	for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
-		mkdir -p $PKG/usr/{lib/live,include}/$dir
-		cp -r $dir/*.a $PKG/usr/lib/live/$dir
+		mkdir -p $PKG/usr/{lib,include/$dir}
+		cp -r $dir/*.a $PKG/usr/lib/
 		cp -r $dir/include/* $PKG/usr/include/$dir
 	done
 
@@ -38,9 +39,6 @@ build() {
 	done
 	install -m755 mediaServer/live555MediaServer $PKG/usr/bin
 
-	cp libliveMedia.so.$version $PKG/usr/lib/live/
-	ln -s libliveMedia.so.$version $PKG/usr/lib/live/libliveMedia.so
-	ln -s live/libliveMedia.so.$version $PKG/usr/lib/libliveMedia.so.$version
+	cp libliveMedia.so.$version $PKG/usr/lib
 	ln -s libliveMedia.so.$version $PKG/usr/lib/libliveMedia.so
-
 }
diff --git a/samba3-server/.footprint.i686 b/samba3-server/.footprint.i686
index 49f07515f..580ce8296 100755
--- a/samba3-server/.footprint.i686
+++ b/samba3-server/.footprint.i686
@@ -2,28 +2,20 @@ 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--	root/root	etc/rc.d/init.d/samba
--rwxr-xr--	root/root	etc/rc.d/init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K48samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K49winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K48samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K49winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K48samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K49winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S45samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S50winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S45samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S50winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S45samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S50winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K48samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K49winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rcS.d/
 drwxr-xr-x	root/root	etc/samba/
 drwxr-xr-x	root/root	etc/samba/private/
diff --git a/samba3-server/.footprint.x86_64 b/samba3-server/.footprint.x86_64
index 49f07515f..580ce8296 100755
--- a/samba3-server/.footprint.x86_64
+++ b/samba3-server/.footprint.x86_64
@@ -2,28 +2,20 @@ 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--	root/root	etc/rc.d/init.d/samba
--rwxr-xr--	root/root	etc/rc.d/init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K48samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K49winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K48samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K49winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K48samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K49winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S45samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S50winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S45samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S50winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S45samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S50winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K48samba -> ../init.d/samba
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K49winbind -> ../init.d/winbind
 drwxr-xr-x	root/root	etc/rc.d/rcS.d/
 drwxr-xr-x	root/root	etc/samba/
 drwxr-xr-x	root/root	etc/samba/private/
diff --git a/samba3-server/.md5sum.i686 b/samba3-server/.md5sum.i686
index 6e79759a8..12d7ee58b 100755
--- a/samba3-server/.md5sum.i686
+++ b/samba3-server/.md5sum.i686
@@ -1,2 +1,2 @@
-98ac9db9f4b6ebfc3f013aa193ffb0d1  samba-3.6.3.tar.gz
+d8e070e2a3b12f202f347e4427469bc2  samba-3.6.4.tar.gz
 27c2f98d1ffe671d2d9237e72fe6c8fa  smb.conf
diff --git a/samba3-server/.md5sum.x86_64 b/samba3-server/.md5sum.x86_64
index 6e79759a8..12d7ee58b 100755
--- a/samba3-server/.md5sum.x86_64
+++ b/samba3-server/.md5sum.x86_64
@@ -1,2 +1,2 @@
-98ac9db9f4b6ebfc3f013aa193ffb0d1  samba-3.6.3.tar.gz
+d8e070e2a3b12f202f347e4427469bc2  samba-3.6.4.tar.gz
 27c2f98d1ffe671d2d9237e72fe6c8fa  smb.conf
diff --git a/samba3-server/Pkgfile b/samba3-server/Pkgfile
index 6e64cceda..ca7fc2d45 100755
--- a/samba3-server/Pkgfile
+++ b/samba3-server/Pkgfile
@@ -6,8 +6,8 @@
 # Run on: samba3
 
 name=samba3-server
-version=3.6.3
-release=2
+version=3.6.4
+release=1
 source=(http://us6.samba.org/samba/ftp/stable/samba-$version.tar.gz
 	smb.conf)
 
@@ -17,7 +17,6 @@ build() {
 	tar xf $scripts-$scriptsversion.tar.bz2
 	cd $scripts-$scriptsversion
 	make DESTDIR=$PKG install-samba
-	make DESTDIR=$PKG install-winbind
 	cd ../samba-$version/source3
 	PYTHON_VER=2.7 ./configure --prefix=/usr \
 		--localstatedir=/var \
diff --git a/samba3/.md5sum.i686 b/samba3/.md5sum.i686
index 8f45366d5..2a6e4602e 100755
--- a/samba3/.md5sum.i686
+++ b/samba3/.md5sum.i686
@@ -1 +1 @@
-98ac9db9f4b6ebfc3f013aa193ffb0d1  samba-3.6.3.tar.gz
+d8e070e2a3b12f202f347e4427469bc2  samba-3.6.4.tar.gz
diff --git a/samba3/.md5sum.x86_64 b/samba3/.md5sum.x86_64
index 8f45366d5..2a6e4602e 100755
--- a/samba3/.md5sum.x86_64
+++ b/samba3/.md5sum.x86_64
@@ -1 +1 @@
-98ac9db9f4b6ebfc3f013aa193ffb0d1  samba-3.6.3.tar.gz
+d8e070e2a3b12f202f347e4427469bc2  samba-3.6.4.tar.gz
diff --git a/samba3/Pkgfile b/samba3/Pkgfile
index de925cfd3..5f27a8555 100755
--- a/samba3/Pkgfile
+++ b/samba3/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: talloc,libcups,gamin,kerberos,libcap,tdb
 
 name=samba3
-version=3.6.3
+version=3.6.4
 release=1
 localname=samba
 source=( http://ftp.samba.org/pub/samba/stable/$localname-$version.tar.gz)
diff --git a/vlc/.footprint.i686 b/vlc/.footprint.i686
index 6f009d19a..9d298f687 100644
--- a/vlc/.footprint.i686
+++ b/vlc/.footprint.i686
@@ -350,8 +350,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libddummy_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libddummy_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdmo_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdmo_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdts_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdts_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdvbsub_plugin.la
@@ -446,6 +444,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libh264_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/liblive555_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/liblive555_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmkv_plugin.la
@@ -883,6 +883,7 @@ drwxr-xr-x	root/root	usr/share/vlc/lua/http/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/.hosts
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/css/main.css
+-rw-r--r--	root/root	usr/share/vlc/lua/http/css/mobile.css
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/ui-lightness/
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/ui-lightness/images/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/vlc/.footprint.x86_64 b/vlc/.footprint.x86_64
index 6f009d19a..9d298f687 100644
--- a/vlc/.footprint.x86_64
+++ b/vlc/.footprint.x86_64
@@ -350,8 +350,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libddummy_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libddummy_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdmo_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdmo_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdts_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdts_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdvbsub_plugin.la
@@ -446,6 +444,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libh264_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/liblive555_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/liblive555_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmkv_plugin.la
@@ -883,6 +883,7 @@ drwxr-xr-x	root/root	usr/share/vlc/lua/http/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/.hosts
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/css/main.css
+-rw-r--r--	root/root	usr/share/vlc/lua/http/css/mobile.css
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/ui-lightness/
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/ui-lightness/images/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/vlc/.md5sum.i686 b/vlc/.md5sum.i686
index 76887c6c4..ac4f07488 100644
--- a/vlc/.md5sum.i686
+++ b/vlc/.md5sum.i686
@@ -1,2 +1 @@
-975f8f9fe9b187512ed8dabb0b8aa6b8  access_smb_link_to_smbclient.patch
-8806bff2ea9c76791123d444a92f708c  vlc-2.0.0.tar.xz
+5ad114755670e4881a2b35354e2f79bc  vlc-2.0.1.tar.xz
diff --git a/vlc/.md5sum.x86_64 b/vlc/.md5sum.x86_64
index 76887c6c4..ac4f07488 100644
--- a/vlc/.md5sum.x86_64
+++ b/vlc/.md5sum.x86_64
@@ -1,2 +1 @@
-975f8f9fe9b187512ed8dabb0b8aa6b8  access_smb_link_to_smbclient.patch
-8806bff2ea9c76791123d444a92f708c  vlc-2.0.0.tar.xz
+5ad114755670e4881a2b35354e2f79bc  vlc-2.0.1.tar.xz
diff --git a/vlc/Pkgfile b/vlc/Pkgfile
index 9c8e747cb..d4bae86db 100644
--- a/vlc/Pkgfile
+++ b/vlc/Pkgfile
@@ -6,16 +6,14 @@
 # Run on: libshout,lua,ffmpeg,flac,freetype,fribidi,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,librsvg,libraw1394,libavc1394,samba3,taglib,gnutls,pulseaudio,gnome-vfs,vdpau-video,sdl_image
 
 name=vlc
-version=2.0.0
+version=2.0.1
 release=1
-source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz
-	access_smb_link_to_smbclient.patch)
+source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz)
 
 build() {
 	cd vlc-$version
 
 	sed -i -e 's|truetype/freefont/FreeSerifBold.ttf|TTF/DejaVuSerif-Bold.ttf|' modules/text_renderer/freetype.c
-	patch -p1 < ../access_smb_link_to_smbclient.patch
 
 	case `uname -m` in
 		x86_64)
diff --git a/vlc/access_smb_link_to_smbclient.patch b/vlc/access_smb_link_to_smbclient.patch
deleted file mode 100644
index 7cd6ea7b9..000000000
--- a/vlc/access_smb_link_to_smbclient.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd
-
-diff --git a/modules/access/Modules.am b/modules/access/Modules.am
-index 81d8e78..be8c47b 100644
---- a/modules/access/Modules.am
-+++ b/modules/access/Modules.am
-@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES =
-
- libaccess_smb_plugin_la_SOURCES = smb.c
- libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
--libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD)
-+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
- if HAVE_WIN32
- libaccess_smb_plugin_la_LIBADD += -lmpr
- endif
diff --git a/x264/.footprint.i686 b/x264/.footprint.i686
index f12e3a834..d578dafae 100644
--- a/x264/.footprint.i686
+++ b/x264/.footprint.i686
@@ -6,7 +6,7 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/x264_config.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libx264.a
-lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.122
--rw-r--r--	root/root	usr/lib/libx264.so.122
+lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.124
+-rw-r--r--	root/root	usr/lib/libx264.so.124
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/x264.pc
diff --git a/x264/.footprint.x86_64 b/x264/.footprint.x86_64
index f12e3a834..d578dafae 100644
--- a/x264/.footprint.x86_64
+++ b/x264/.footprint.x86_64
@@ -6,7 +6,7 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/x264_config.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libx264.a
-lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.122
--rw-r--r--	root/root	usr/lib/libx264.so.122
+lrwxrwxrwx	root/root	usr/lib/libx264.so -> libx264.so.124
+-rw-r--r--	root/root	usr/lib/libx264.so.124
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/x264.pc
diff --git a/x264/.md5sum.i686 b/x264/.md5sum.i686
index f670b5b39..77926a1e1 100644
--- a/x264/.md5sum.i686
+++ b/x264/.md5sum.i686
@@ -1 +1 @@
-641b5f034a44c872281281f83f9e8583  x264-snapshot-20120316-2245.tar.bz2
+259197f232652b878e4ec5db40fad033  x264-snapshot-20120425-2245.tar.bz2
diff --git a/x264/.md5sum.x86_64 b/x264/.md5sum.x86_64
index f670b5b39..77926a1e1 100644
--- a/x264/.md5sum.x86_64
+++ b/x264/.md5sum.x86_64
@@ -1 +1 @@
-641b5f034a44c872281281f83f9e8583  x264-snapshot-20120316-2245.tar.bz2
+259197f232652b878e4ec5db40fad033  x264-snapshot-20120425-2245.tar.bz2
diff --git a/x264/Pkgfile b/x264/Pkgfile
index 0a8c59a69..80f9259cc 100644
--- a/x264/Pkgfile
+++ b/x264/Pkgfile
@@ -6,19 +6,20 @@
 # Run on: yasm
 
 name=x264
-version=20120316
+version=20120425
 release=1
 source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$version-2245.tar.bz2)
 
 build() {
 	cd x264-snapshot-$version-2245
-
 	./configure \
 		--prefix=/usr \
 		--enable-pic \
 		--enable-shared \
 		--enable-static \
-		--enable-visualize
+		--enable-visualize \
+		--bit-depth=8 \
+		--chroma-format=all
 	make
 	make DESTDIR=$PKG install
 	chmod a-x $PKG/usr/lib/*.so