Wed Jul 4 00:01:59 UTC 2012

12 files changed, 79 insertions, 56 deletions

diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 5347acf40..60740c4fb 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160652 2012-06-03 08:11:02Z giovanni $
+# $Id: PKGBUILD 162864 2012-07-02 14:49:26Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('9f59b5d71969cbb2671702cd2a7a5a11'
+md5sums=('f4c70af3892d964b83b2718bde44c2f8'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD
index 9ee9d9e0b..1ff26992c 100644
--- a/extra/opennx/PKGBUILD
+++ b/extra/opennx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162243 2012-06-24 08:25:53Z andyrtr $
+# $Id: PKGBUILD 162885 2012-07-02 16:49:28Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Armin Luntzer
 # Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk
 
 pkgname=opennx
-pkgver=0.16.0.712
+pkgver=0.16.0.713
 pkgrel=1
 pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser"
 url="http://opennx.sf.net/"
@@ -14,7 +14,7 @@ depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl')
 makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat')
 #optdepends=('cups: for full local printing support')
 source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz)
-md5sums=('f9cf99a9dc13de9ef6d219db83dec344')
+md5sums=('9699fd2d9b19b8d0fb37959ace846666')
 
 build() {
   cd $srcdir/opennx*
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 023c1c0d2..2cad7f16b 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154469 2012-03-28 22:33:23Z eric $
+# $Id: PKGBUILD 162858 2012-07-02 13:06:22Z giovanni $
 # Maintainer:
 
 pkgname=('python-lxml' 'python2-lxml')
 pkgver=2.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64')
 license=('BSD' 'custom')
@@ -21,7 +21,7 @@ check() {
 
 package_python2-lxml() {
   depends=('python2' 'libxslt')
-  optdepends=('python-beautifulsoup: support for parsing not well formed HTML')
+  optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML')
 
   cd "${srcdir}"/lxml-$pkgver
   python2 setup.py install --root="${pkgdir}" --optimize=1
diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD
index 76025dea9..0a876c8a7 100644
--- a/extra/xf86-video-ast/PKGBUILD
+++ b/extra/xf86-video-ast/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154223 2012-03-24 10:34:56Z jgc $
+# $Id: PKGBUILD 162869 2012-07-02 16:09:01Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-ast
-pkgver=0.93.10
+pkgver=0.96.0
 pkgrel=1
 pkgdesc="X.org ASPEED AST Graphics video driver"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c9d466fef391bdf960f79b82f1f776a1c1ab870e93475c3d1b3d028531fac4e0')
+sha256sums=('73ac2bc3999add5a77c9d5d38d3651d5e50ab7bbac81d710912ab3125fc1ab3c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD
index 036da6db8..af708a937 100644
--- a/extra/xf86-video-cirrus/PKGBUILD
+++ b/extra/xf86-video-cirrus/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154221 2012-03-24 10:34:01Z jgc $
+# $Id: PKGBUILD 162871 2012-07-02 16:11:19Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-cirrus
-pkgver=1.4.0
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="X.org Cirrus Logic video driver"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2b07fa5d4a86acb277d72c7ae35566ae21b08836645c6a88e7662422af5e962e')
+sha256sums=('e506a97cce667d71971e8fcc163285b791ca508365593f3dc1e191f3411fdfed')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD
index a42599a23..f4d70a393 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153333 2012-03-12 20:53:25Z andyrtr $
+# $Id: PKGBUILD 162873 2012-07-02 16:14:07Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-fbdev
-pkgver=0.4.2
-pkgrel=6
+pkgver=0.4.3
+pkgrel=1
 pkgdesc="X.org framebuffer video driver"
 arch=(i686 x86_64)
 license=('custom')
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.903')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c8562f997d56c9fec50df6ca9892f39f43ff4c2c')
+sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index eaa97b02d..f83c7c6ba 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,30 +1,57 @@
-# $Id: PKGBUILD 160623 2012-06-02 21:15:09Z andyrtr $
+# $Id: PKGBUILD 162867 2012-07-02 14:58:51Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=xf86-video-intel
+pkgbase=xf86-video-intel
+pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 pkgver=2.19.0
-pkgrel=3
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+pkgrel=6
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'udev>=183')
+depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools')
 makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
-conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+source=(${url}/archive/individual/driver/${pkgbase}-${pkgver}.tar.bz2)
 sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  mkdir build-{UXA,SNA}
+
+  pushd build-UXA
+  ../configure --prefix=/usr --enable-dri --enable-uxa
+  make
+  popd
+
+  pushd build-SNA
+  ../configure --prefix=/usr --enable-dri --enable-sna --enable-vmap
   make
+  popd
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+package_xf86-video-intel-uxa() {
+	
+  pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration"
+  provides=('xf86-video-intel')
+  replaces=('xf86-video-intel')
+  conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel')
+  
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C build-UXA
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
+
+package_xf86-video-intel-sna() {
+
+  pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration"
+  provides=('xf86-video-intel')
+  conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C build-SNA
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD
index 08486fd5a..b2ac34779 100644
--- a/extra/xf86-video-mach64/PKGBUILD
+++ b/extra/xf86-video-mach64/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 162821 2012-07-01 07:42:19Z andyrtr $
+# $Id: PKGBUILD 162875 2012-07-02 16:16:24Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mach64
-pkgver=6.9.1
-pkgrel=2
+pkgver=6.9.2
+pkgrel=1
 pkgdesc="X.org mach64 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.12.0')
 makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
 optdepends=('mach64-dri: DRI1 support from community repo')
 conflicts=('xorg-server<1.12.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9f6ad49f07c8785a64caac6f4aaf58fc7746a24b718491d047c45bc1ee9e834e')
+sha256sums=('e3967d6ee953cd907c6a9e38b132b90db8173565198f6a65fe1e8c398dc06293')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD
index f9787f09d..7207a02a6 100644
--- a/extra/xf86-video-mga/PKGBUILD
+++ b/extra/xf86-video-mga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162826 2012-07-01 07:47:12Z andyrtr $
+# $Id: PKGBUILD 162877 2012-07-02 16:18:31Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mga
-pkgver=1.5.0
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="X.org mga video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ca983d780dd90115c0599980a7a83425b5e4eeb16f2e8c7fed15823fcbe7830e')
+sha256sums=('f0894fd8ddb1984d9212880544b7a7c30294e374df52bcce0c2acc93d434ce15')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index c47d3cb10..acde9d1b2 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162828 2012-07-01 07:49:03Z andyrtr $
+# $Id: PKGBUILD 162879 2012-07-02 16:20:25Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-r128
-pkgver=6.8.2
-pkgrel=2
+pkgver=6.8.3
+pkgrel=1
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7b41135c3d177e61644573e5c16e35fd9eff98b4d6685c9c6de9e33401e904b1')
+sha256sums=('855e8cf72c3a7704e12f331fe8a4b354518753c6ff3aa61ed156cf6e7530f02b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index c87813a25..588cc3213 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162830 2012-07-01 07:51:56Z andyrtr $
+# $Id: PKGBUILD 162881 2012-07-02 16:22:29Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
-pkgver=2.3.4
-pkgrel=2
+pkgver=2.3.5
+pkgrel=1
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3a666a66339686ad4dd85b0665cc300e8a7fc6d38b49a9e8e8d48f393627be49')
+sha256sums=('4b5b52aad9413a9d8717ff0aa3290d110dd5cdb5c93eebda4a5fff1c5ccf63e4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD
index 57339c20f..2bc90e5d3 100644
--- a/extra/xf86-video-sisusb/PKGBUILD
+++ b/extra/xf86-video-sisusb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153370 2012-03-12 20:54:32Z andyrtr $
+# $Id: PKGBUILD 162883 2012-07-02 16:26:42Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisusb
-pkgver=0.9.4
-pkgrel=6
+pkgver=0.9.5
+pkgrel=1
 pkgdesc="X.org SiS USB video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,14 +13,11 @@ makedepends=('xorg-server-devel>=1.11.99.903')
 conflicts=('xorg-server<1.11.99.903')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        sisusb-0.9.4-git.patch)
-sha1sums=('600fd49dffe00121f9042555fea55948653d1a7e'
-          'd74ce7732889c7a00d9d2dcd2bfc8be05c6eb912')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('6508f0edcbbca978f97665953135fb564e988fed437a7c56611f8355bb4daa6b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/sisusb-0.9.4-git.patch
   ./configure --prefix=/usr
   make
 }