Wed Jan 11 23:14:45 UTC 2012

19 files changed, 254 insertions, 101 deletions

diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD
index 29a5da889..529b49642 100644
--- a/extra/bluez-hcidump/PKGBUILD
+++ b/extra/bluez-hcidump/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 127665 2011-06-17 17:18:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 146410 2012-01-10 21:40:52Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy carrier <geoffroy@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=bluez-hcidump
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc="Bluetooth HCI package analyzer"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('glibc' 'bluez')
+depends=('bluez')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b160f0672276398344eebe9df1b37a2c')
+md5sums=('3c298a8be67099fe227f3e4d9de539d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 920c6437a..3d3f31c46 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 145250 2011-12-20 08:51:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 146412 2012-01-10 21:47:26Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
-pkgver=4.96
-pkgrel=3
+pkgver=4.97
+pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
@@ -24,17 +25,21 @@ replaces=('bluez-libs' 'bluez-utils')
 options=('!libtool' 'emptydirs')
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-#source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
         'bluetooth.conf.d'
-        'rc.bluetooth')
-md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f'
+        'rc.bluetooth'
+        'make-libcheck-optional.patch')
+md5sums=('b302cee7f9b9527d29775449d7e1dfe6'
          '7412982b440f29fa7f76a41a87fef985'
-         '8f9498707f809506928b2e480d3b6789')
+         '8f9498707f809506928b2e480d3b6789'
+         'f112fc5bcaeecc7b6ea994f14786e235')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -p1 -i "${srcdir}"/make-libcheck-optional.patch
+  autoreconf -i -f
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -50,7 +55,8 @@ build() {
     --enable-pand \
     --enable-dund \
     --enable-cups \
-    --enable-wiimote
+    --enable-wiimote \
+    --disable-test
   make
 }
 
diff --git a/extra/bluez/make-libcheck-optional.patch b/extra/bluez/make-libcheck-optional.patch
new file mode 100644
index 000000000..a315a3898
--- /dev/null
+++ b/extra/bluez/make-libcheck-optional.patch
@@ -0,0 +1,79 @@
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Wed, 28 Dec 2011 04:09:56 +0000 (-0800)
+Subject: build: Move libcheck under TEST conditional
+X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7;hp=ec632165d6707bece074dbba43d704e26346ab0a
+
+build: Move libcheck under TEST conditional
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 9112483..5cf287c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -449,6 +449,7 @@ endif
+ 
+ unit_objects =
+ 
++if TEST
+ unit_tests = unit/test-eir
+ 
+ noinst_PROGRAMS += $(unit_tests)
+@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests)
+ unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
+ unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
+ unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
+-unit_test_eir_SHORTNAME = unit
+ unit_objects += $(unit_test_eir_OBJECTS)
++else
++unit_tests =
++endif
+ 
+ TESTS = $(unit_tests)
+ 
+diff --git a/acinclude.m4 b/acinclude.m4
+index 2097d77..753b994 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [
+ 		[])
+ ])
+ 
++AC_DEFUN([AC_PATH_CHECK], [
++	PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no)
++	AC_SUBST(CHECK_CFLAGS)
++	AC_SUBST(CHECK_LIBS)
++])
++
+ AC_DEFUN([AC_PATH_OUI], [
+ 	AC_ARG_WITH(ouifile,
+ 		    AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
+@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
+ 	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
+ 	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
+-	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
++	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
+ 	AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
+ 	AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
+ 	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
+diff --git a/configure.ac b/configure.ac
+index 3a5dfde..a7670da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,8 +24,6 @@ AC_PROG_YACC
+ AM_PROG_LEX
+ AM_PROG_MKDIR_P
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+-
+ m4_define([_LT_AC_TAGCONFIG], [])
+ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
+ 
+@@ -50,6 +48,7 @@ AC_PATH_UDEV
+ AC_PATH_SNDFILE
+ AC_PATH_OUI
+ AC_PATH_READLINE
++AC_PATH_CHECK
+ 
+ AC_ARG_BLUEZ
+ 
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index 942c64b29..67107f3bc 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141206 2011-10-26 08:04:28Z eric $
+# $Id: PKGBUILD 146432 2012-01-11 00:54:52Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.11
+pkgver=9.12
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('lcms' 'jasper')
 source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz
         license.txt)
-sha1sums=('79dc403d6b629df6dac3218ad33dc89c4a86c234'
+sha1sums=('b0110f83692b14940a8e43759d7ccefa77103cc6'
           '502c8f0ac7434d48f5dcb2eefe7599627cb69454')
 
 build() {
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 6d15fa99e..24489add5 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 144952 2011-12-11 23:12:10Z ibiru $
+# $Id: PKGBUILD 146396 2012-01-10 13:06:16Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20111211
+pkgver=20120110
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
 license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvdpau libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-makedepends=('yasm' 'git')
+depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+makedepends=('yasm' 'git' 'libvdpau')
 #git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('75d512bf5137d0b055e54313702ef5fc')
+source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
+md5sums=('a8121ae2fbe83044ac27501e3f58780d')
 
 build() {
   cd "$srcdir/$pkgname"
diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD
index dc547f447..de2d2944c 100644
--- a/extra/k9copy/PKGBUILD
+++ b/extra/k9copy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145676 2011-12-26 22:21:16Z giovanni $
+# $Id: PKGBUILD 146416 2012-01-10 23:37:32Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=k9copy
 pkgver=2.3.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A small utility which allows the copy of DVD under Linux"
 arch=('i686' 'x86_64')
 url="http://k9copy.sourceforge.net"
diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD
index 84a710827..cad29ec16 100644
--- a/extra/kaffeine/PKGBUILD
+++ b/extra/kaffeine/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 122312 2011-05-03 18:56:11Z tpowa $
+# $Id: PKGBUILD 146418 2012-01-10 23:37:34Z eric $
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kaffeine
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE media player'
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://kaffeine.kde.org"
 depends=('kdelibs' 'kdebase-runtime' 'xine-lib')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
+makedepends=('pkg-config' 'cmake' 'automoc4')
+install=kaffeine.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
 
 build() {
-	cd $srcdir
+	cd "$srcdir"
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -24,7 +26,6 @@ build() {
 }
 
 package() {
-        cd $srcdir/build
-	make DESTDIR=$pkgdir install
+        cd "$srcdir/build"
+	make DESTDIR="$pkgdir" install
 }
-md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
diff --git a/extra/kaffeine/kaffeine.install b/extra/kaffeine/kaffeine.install
new file mode 100644
index 000000000..5c501dc49
--- /dev/null
+++ b/extra/kaffeine/kaffeine.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index 3828fa1d7..fed053273 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145651 2011-12-26 11:44:37Z andrea $
+# $Id: PKGBUILD 146420 2012-01-10 23:37:38Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
 pkgver=4.7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index cba95a38d..019a971bf 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.7.4
-pkgrel=4
+pkgrel=5
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -19,11 +19,12 @@ replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'fix-knotify-filepath.patch')
+        'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch')
 sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
+          '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
+          '9cb83cb7f6394549354c6837977f9e9529127041')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -36,6 +37,8 @@ build() {
        # https://bugs.kde.org/show_bug.cgi?id=285028
        patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
 
+       patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch
+
        cd "${srcdir}"
        mkdir build
        cd build
diff --git a/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch
new file mode 100644
index 000000000..bdcd39a6c
--- /dev/null
+++ b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch
@@ -0,0 +1,32 @@
+From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 5 Jan 2012 10:06:05 +0100
+Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
+
+---
+ cmake/modules/FindXine.cmake |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
+index 37c58c6..d71969a 100644
+--- a/cmake/modules/FindXine.cmake
++++ b/cmake/modules/FindXine.cmake
+@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
+   ${PC_LIBXINE_LIBRARY_DIRS}
+  )
+ 
+-find_program(XINECONFIG_EXECUTABLE NAMES xine-config 
++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
+    HINTS
+    ${PC_LIBXINE_PREFIX}/bin
+ )
+ 
+ if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+-   exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
++   exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
+    if("${XINE_VERSION}" VERSION_GREATER "1.1.0")   #if (... VERSION_GREATER) is new since cmake 2.6.2
+       set(XINE_VERSION_OK TRUE)
+       string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
+-- 
+1.7.8.2
+
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
index fc7af1d72..962bf7591 100644
--- a/extra/obexd/PKGBUILD
+++ b/extra/obexd/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 131909 2011-07-17 09:27:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 146408 2012-01-10 21:28:35Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=obexd
 pkgname=('obexd-client' 'obexd-server')
-pkgver=0.42
+pkgver=0.43
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('openobex' 'libical')
+makedepends=('glib2' 'openobex' 'libical')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('39a85d219dba37d83f5a07a74d1fa563')
+md5sums=('7490dc8536d8ac56afb884c87f24bd08')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index c18cbde3b..b4265766c 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145287 2011-12-21 06:58:54Z schiv $
+# $Id: PKGBUILD 146424 2012-01-10 23:37:44Z eric $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -7,7 +7,7 @@ pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.3.1_a
 _realver=2.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -94,6 +94,10 @@ package_opencv-docs() {
 
   mkdir -p "$pkgdir/usr/share/doc"
   cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
+
+  # install license file
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_opencv-samples() {
@@ -106,6 +110,10 @@ package_opencv-samples() {
 
   mkdir -p "$pkgdir/usr/share/opencv"
   cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
+
+  # install license file
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD
index e3dc227bc..4736fcceb 100644
--- a/extra/oxine/PKGBUILD
+++ b/extra/oxine/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137856 2011-09-12 03:56:43Z eric $
+# $Id: PKGBUILD 146426 2012-01-10 23:37:48Z eric $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=oxine
 pkgver=0.7.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems"
 arch=('i686' 'x86_64')
 url="http://oxine.sourceforge.net/"
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
index 07f51ce8b..b839f0b83 100644
--- a/extra/rdesktop/PKGBUILD
+++ b/extra/rdesktop/PKGBUILD
@@ -1,35 +1,35 @@
-# $Id: PKGBUILD 129462 2011-06-28 03:34:32Z heftig $
+# $Id: PKGBUILD 146436 2012-01-11 05:01:01Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=rdesktop
-pkgver=1.7.0
-pkgrel=2
-depends=('libx11' 'openssl' 'libao' 'libsamplerate')
+pkgver=1.7.1
+pkgrel=1
 pkgdesc="An open source client for Windows Remote Desktop Services"
-url="http://www.rdesktop.org/"
-license=('GPL')
 arch=('i686' 'x86_64')
+url="http://www.rdesktop.org/"
+license=('GPL3')
+depends=('libx11' 'openssl' 'libao' 'libsamplerate')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch')
-md5sums=('77fa93b21aa38837a85e81c00e757228'
+md5sums=('c4b39115951c4a6d74f511c99b18fcf9'
          '880d3aeac67b901e6bf44d1323374768'
          'bd2c9bc68bddcc2652c668753d787df7')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # FS#15113
-  patch -i ${srcdir}/rdesktop-send_physical_buttons.diff
+  patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
 
   # Fix libao segfault, from Fedora
-  patch -i ${srcdir}/rdesktop-libao.patch
+  patch -i "${srcdir}/rdesktop-libao.patch"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/tidyhtml/PKGBUILD b/extra/tidyhtml/PKGBUILD
index 031234da6..aaca30008 100644
--- a/extra/tidyhtml/PKGBUILD
+++ b/extra/tidyhtml/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 69561 2010-02-21 04:47:38Z allan $
-# Maintainer: eric <eric@archlinux.org>
-# Contributor : Markus Meissner <markus@meissna.de>
+# $Id: PKGBUILD 146404 2012-01-10 21:14:26Z andrea $
+# Maintainer:
+# Contributor: eric <eric@archlinux.org>
+# Contributor: Markus Meissner <markus@meissna.de>
 
 pkgname=tidyhtml
 # obtain pkgver from http://tidy.cvs.sourceforge.net/tidy/tidy/src/version.h?view=markup
 pkgver=1.46
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to tidy down your HTML code to a clean style"
 arch=('i686' 'x86_64')
 url="http://tidy.sourceforge.net/"
 license=('custom')
+depends=('glibc')
 options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/tidyhtml/${pkgname}-${pkgver}.tar.bz2)
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('3d970d54be83c5ec985687e9976a2832')
 
 mksource() {
-  mkdir tidyhtml-${pkgver}
-  cd tidyhtml-${pkgver}
+  mkdir ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   cvs -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy login   #hit enter for password
   cvs -z3 -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy co -P tidy
   cd ..
-  tar -cvjf tidyhtml-${pkgver}.tar.bz2 tidyhtml-${pkgver}/*
+  tar -cvjf ${pkgname}-${pkgver}.tar.bz2 ${pkgname}-${pkgver}/*
 }
 
 build(){
@@ -28,9 +30,13 @@ build(){
   source build/gnuauto/setup.sh
   
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd $srcdir/${pkgname}-${pkgver}/tidy
   make DESTDIR=$pkgdir install
   
   install -Dm644 htmldoc/license.html \
-    ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/wavpack/PKGBUILD b/extra/wavpack/PKGBUILD
index 389bd0721..c27e4dccb 100644
--- a/extra/wavpack/PKGBUILD
+++ b/extra/wavpack/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 69147 2010-02-18 00:38:05Z dgriffiths $
-# Maintainer: François Charette <firmicus ατ gmx δοτ net> 
+# $Id: PKGBUILD 146400 2012-01-10 20:33:06Z andrea $
+# Maintainer:
+# Contributor: François Charette <firmicus ατ gmx δοτ net> 
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 # Contributor: Michal Hybner <dta081@gmail.com>
+
 pkgname=wavpack
 pkgver=4.60.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes"
 arch=('i686' 'x86_64')
 url="http://www.wavpack.com/"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2)
+source=("http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('7bb1528f910e4d0003426c02db856063')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	./configure --prefix=/usr --enable-mmx --disable-static || return 1
-	make || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --enable-mmx \
+    --disable-static
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install || return 1
-	install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-	install -m644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-	rm -f ${pkgdir}/usr/lib/*.a
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 license.txt \
+    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 50c250b72..7447852b0 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,39 +1,40 @@
-# $Id: PKGBUILD 142780 2011-11-15 05:34:03Z eric $
+# $Id: PKGBUILD 146428 2012-01-10 23:37:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
-pkgver=1.1.20
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64')
 url="http://www.xine-project.org"
 license=('LGPL' 'GPL')
-depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
-             'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
+depends=('libxvmc' 'ffmpeg' 'libxinerama')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
+             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
+             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
 optdepends=('imagemagick: for using the imagemagick plugin' \
-            'smbclient: for using the smb plugin' \
             'jack: for using the jack plugin' \
             'vcdimager: for using the vcd plugin' \
-            'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
             'mesa: for using the opengl plugin' \
-            'libpulse: for using the pulseaudio plugin' \
-            'speex: for using the speex plugin' \
-            'v4l-utils: for using the v4l plugin' \
             'wavpack: for using the wavpack plugin' \
             'faad2: for using the faad plugin' \
             'libmng: for using the mng plugin' \
-            'aalib: for using the aalib plugin')
+            'aalib: for using the aalib plugin' \
+            'libmodplug: for using the modplug plugin' \
+            'libdca: for using the dca plugin' \
+            'a52dec: for using the a52 plugin' \
+            'libmad: for using the mp3 plugin' \
+            'libmpcdec: for using the musepack plugin' \
+            'libcaca: for using the caca plugin' \
+            'libbluray: for using the bluray plugin' \
+            'gnome-vfs: for using the gnome-vfs plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('1dbd48e14113739101429391d45f65ebbf6519fc')
+sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
-    configure src/input/input_v4l.c src/video_out/video_out_syncfb.h
-  ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad \
-    --disable-optimizations
+  ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations
   make
 }
 
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index f0563b8b3..d5ca4e7ee 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 144037 2011-12-02 17:33:46Z eric $
+# $Id: PKGBUILD 146430 2012-01-10 23:37:56Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-ui
 pkgver=0.99.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libxtst'  'libpng' 'libxft' 'libxxf86vm'
+depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm'
 	 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
 	 'desktop-file-utils' 'lirc-utils')
 makedepends=('libxt')