Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/mfs/PKGBUILD
	core/procps-ng/PKGBUILD
	extra/nx/PKGBUILD

13 files changed, 90 insertions, 125 deletions

diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 3c78bc2cf..ea2a865cc 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177825 2013-02-09 17:43:46Z andyrtr $
+# $Id: PKGBUILD 180907 2013-03-27 23:06:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.42
+pkgver=2.4.43
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,8 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         no-pthread-stubs.patch
         COPYING)
-sha256sums=('e0671082a77871c8474d3c0f09dbf5ff82d2429cd248088a691f7b484cbc76e1'
+        #git_fixes.diff
+sha256sums=('7fb8cd89df06e236a66a1a6a9f6d058271c1b1ec92631e08c66dc9e12abd4975'
             '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
@@ -24,12 +25,16 @@ build() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../no-pthread-stubs.patch
 
+  # git_commits
+  #patch -Np1 -i ${srcdir}/git_fixes.diff
+
   #libtoolize --force
   autoreconf --force --install
   ./configure --prefix=/usr \
       --enable-udev \
       --enable-omap-experimental-api \
-      --enable-exynos-experimental-api
+     # --enable-exynos-experimental-api \
+     # --enable-freedreno-experimental-api 
   make
 }
 
diff --git a/extra/libdrm/buildfix.diff b/extra/libdrm/buildfix.diff
deleted file mode 100644
index 879fbf1b8..000000000
--- a/extra/libdrm/buildfix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 10cc9a4..1776610 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -348,7 +348,6 @@ AC_CONFIG_FILES([
- 	tests/vbltest/Makefile
- 	include/Makefile
- 	include/drm/Makefile
--	man/Makefile
- 	libdrm.pc])
- AC_OUTPUT
diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff
new file mode 100644
index 000000000..fe0bb5649
--- /dev/null
+++ b/extra/libdrm/git_fixes.diff
@@ -0,0 +1,49 @@
+From 99105e765c31b598746b849e66e7a9106dcefa24 Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Wed, 27 Mar 2013 13:06:43 +0000
+Subject: makefiles: Add missing headers.
+
+I even compile time tested this on a panda with make dist!
+
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+---
+diff --git a/exynos/Makefile.am b/exynos/Makefile.am
+index 539aea0..0a2663a 100644
+--- a/exynos/Makefile.am
++++ b/exynos/Makefile.am
+@@ -10,7 +10,11 @@ libdrm_exynos_ladir = $(libdir)
+ libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+ 
+-libdrm_exynos_la_SOURCES = exynos_drm.c exynos_fimg2d.c
++libdrm_exynos_la_SOURCES = \
++	exynos_drm.c \
++	exynos_fimg2d.c \
++	fimg2d.h \
++	fimg2d_reg.h
+ 
+ libdrm_exynoscommonincludedir = ${includedir}/exynos
+ libdrm_exynoscommoninclude_HEADERS = exynos_drm.h
+diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
+index f46a780..ba9bd68 100644
+--- a/freedreno/Makefile.am
++++ b/freedreno/Makefile.am
+@@ -10,7 +10,15 @@ libdrm_freedreno_ladir = $(libdir)
+ libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
+ 
+-libdrm_freedreno_la_SOURCES = freedreno_device.c freedreno_pipe.c freedreno_ringbuffer.c freedreno_bo.c
++libdrm_freedreno_la_SOURCES = \
++	freedreno_device.c \
++	freedreno_pipe.c \
++	freedreno_priv.h \
++	freedreno_ringbuffer.c \
++	freedreno_bo.c \
++	kgsl_drm.h \
++	list.h \
++	msm_kgsl.h
+ 
+ libdrm_freedrenocommonincludedir = ${includedir}/freedreno
+ libdrm_freedrenocommoninclude_HEADERS = freedreno_drmif.h freedreno_ringbuffer.h
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 065d4180d..9fc4f3a74 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178762 2013-02-26 18:22:51Z ioni $
+# $Id: PKGBUILD 180922 2013-03-28 12:43:45Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.8
+pkgver=0.16.9
 pkgrel=1
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
@@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('483689787cb64e7cf4abefda4058b912ec406709')
+sha1sums=('4335c8b275f041d6d34a493b21f2d7234ffca34b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 3d9b8a78f..a35a04d74 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180598 2013-03-24 10:41:11Z andyrtr $
+# $Id: PKGBUILD 180939 2013-03-28 18:40:16Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
-pkgver=3.5.0.18
-pkgrel=2
+pkgver=3.5.0.19
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.x2go.org/"
 license=('GPL')
@@ -14,7 +14,7 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime dependen
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
         keyboard_rule.diff)
-md5sums=('cb321b520c3e157619e4ed5315c9e44c'
+md5sums=('6343c8bfee72e9b0bc2686c7785d1b0f'
          'f681bc66827cd7ddff4b81b983c20401')
 
 build() {
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 1e6c90882..8157c6e7c 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 179558 2013-03-07 08:18:46Z andrea $
+# $Id: PKGBUILD 180919 2013-03-28 06:14:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14.4
+pkgver=4.14.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('ae2d73ef43b8b0f7a9913561e9651706')
+md5sums=('51757771c204e9fbad359f372a0b8256')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD
index f33028ba7..97a5dea9b 100644
--- a/extra/xf86-input-keyboard/PKGBUILD
+++ b/extra/xf86-input-keyboard/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180184 2013-03-18 16:08:54Z andyrtr $
+# $Id: PKGBUILD 180909 2013-03-27 23:09:53Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-keyboard
-pkgver=1.6.2
-pkgrel=3
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="X.Org keyboard input driver"
 arch=(i686 x86_64)
 license=('custom')
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a')
+sha256sums=('0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index e8d4a4b64..585b3a69b 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180185 2013-03-18 16:08:55Z andyrtr $
+# $Id: PKGBUILD 180912 2013-03-27 23:12:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
-pkgver=1.8.1
-pkgrel=3
+pkgver=1.9.0
+pkgrel=1
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8')
+sha256sums=('5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD
index ecb124e44..7f55ea4f5 100644
--- a/extra/xf86-video-modesetting/PKGBUILD
+++ b/extra/xf86-video-modesetting/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180204 2013-03-18 16:09:12Z andyrtr $
+# $Id: PKGBUILD 180914 2013-03-27 23:14:30Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=xf86-video-modesetting
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="X.org generic modesetting video driver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('852f9ddb213913f75e1e65ad7ce9c6b5bc7f43a93d8087b6e59666ea4eb3d0d6')
+sha256sums=('2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 23a61f013..5de63e725 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180206 2013-03-18 16:09:13Z andyrtr $
+# $Id: PKGBUILD 180916 2013-03-27 23:16:59Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="Open Source 2D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 install=$pkgname.install
 source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('e3e1522d08134da74cb1796e8863fd3ad3caad9eb5e9d27f4cee3dfa7c75341f')
+sha256sums=('d187c658e1823ca829c941f3f601f8e7220d427e079c3e52b94ecff45bc2e131')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index af8e1756c..4a2d01826 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,33 +1,25 @@
-# $Id: PKGBUILD 180257 2013-03-18 23:41:34Z jgc $
+# $Id: PKGBUILD 180937 2013-03-28 18:10:47Z andyrtr $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
 
 pkgname=xf86-video-openchrome
-pkgver=0.3.1
-pkgrel=5
+pkgver=0.3.2
+pkgrel=1
 pkgdesc="X.Org Openchrome drivers"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.openchrome.org"
-depends=('libdrm' 'libxvmc')
+depends=('libdrm' 'libxvmc' 'systemd')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
 replaces=('openchrome' 'xf86-video-via')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        fix_system_lock.diff
-        no-mibstore.patch)
-sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83'
-          '539ba65df1755af97799f49410e4091b8d222eca'
-          'af0d7cace699b105e4405e48abc2f433032a7483')
+source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('e5be9a8200410b3e3e66349bab4c8acd1ead4402')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # https://bugs.freedesktop.org/show_bug.cgi?id=53307
-  patch -Np1 -i ${srcdir}/fix_system_lock.diff
-  # https://bugs.freedesktop.org/show_bug.cgi?id=62112
-  patch -Np1 -i ../no-mibstore.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-openchrome/fix_system_lock.diff b/extra/xf86-video-openchrome/fix_system_lock.diff
deleted file mode 100644
index a72369340..000000000
--- a/extra/xf86-video-openchrome/fix_system_lock.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From 76515c8a369346d76864e55610a6a747d9b152d8 Mon Sep 17 00:00:00 2001
-From: James Simmons <jsimmons@infradead.org>
-Date: Sat, 12 Jan 2013 21:02:12 +0000
-Subject: As the comment suggested in via_outputs.c probing the 3rd i2c bug locks up the P4M900. So we re-enable the via_card_id handling of what outputs to test for to get around this problem.
-
----
-diff --git a/src/via_display.c b/src/via_display.c
-index 97473f0..aaf4267 100644
---- a/src/via_display.c
-+++ b/src/via_display.c
-@@ -395,7 +395,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     hwp->writeCrtc(hwp, 0x18, 0xFF);
-     ViaCrtcMask(hwp, 0x07, 0x10, 0x10);
-     ViaCrtcMask(hwp, 0x09, 0x40, 0x40);
--    ViaCrtcMask(hwp, 0x33, 0x07, 0x06);
-+    ViaCrtcMask(hwp, 0x33, 0x06, 0x07);
-     ViaCrtcMask(hwp, 0x35, 0x10, 0x10);
- 
-     /* zero Maximum scan line */
-diff --git a/src/via_id.c b/src/via_id.c
-index 7764782..7321b26 100644
---- a/src/via_id.c
-+++ b/src/via_id.c
-@@ -297,6 +297,7 @@ ViaCheckCardId(ScrnInfoPtr pScrn)
-             (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) &&
-             (Id->Device == SUBSYS_ID(pVia->PciInfo))) {
-             xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s. Card-Ids (%4X|%4X)\n", Id->String, SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo));
-+            pVia->ActiveDevice = Id->Outputs;
-             pVia->Id = Id;
-             return;
-         }
-diff --git a/src/via_outputs.c b/src/via_outputs.c
-index 808e570..c07b1d2 100644
---- a/src/via_outputs.c
-+++ b/src/via_outputs.c
-@@ -873,10 +873,10 @@ ViaOutputsDetect(ScrnInfoPtr pScrn)
-     /*
-      * FIXME: xf86I2CProbeAddress(pVia->pI2CBus3, 0x40)
-      * disables the panel on P4M900
--     * See via_tv_detect.
-      */
-     /* TV encoder */
--    via_tv_init(pScrn);
-+    if (pVia->ActiveDevice & VIA_DEVICE_TV)
-+        via_tv_init(pScrn);
- 
-     if (pVia->ActiveDevice & VIA_DEVICE_DFP) {
-         switch (pVia->Chipset) {
-@@ -1195,7 +1195,7 @@ ViaModePrimaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode)
-     /* Enable MMIO & PCI burst (1 wait state) */
-     ViaSeqMask(hwp, 0x1A, 0x06, 0x06);
- 
--	if (pBIOSInfo->analog->status == XF86OutputStatusConnected)
-+    if (pBIOSInfo->analog->status == XF86OutputStatusConnected)
-         ViaCrtcMask(hwp, 0x36, 0x30, 0x30);
-     else
-         ViaSeqMask(hwp, 0x16, 0x00, 0x40);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-openchrome/no-mibstore.patch b/extra/xf86-video-openchrome/no-mibstore.patch
deleted file mode 100644
index e223babb7..000000000
--- a/extra/xf86-video-openchrome/no-mibstore.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rup a/src/via_driver.c b/src/via_driver.c
---- a/src/via_driver.c	2013-03-10 16:11:57.614059200 +0100
-+++ b/src/via_driver.c	2013-03-10 16:12:46.374062244 +0100
-@@ -1873,7 +1873,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
-     if (!pVia->NoAccel && !viaInitExa(pScreen))
-         return FALSE;
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
- #if 0
-     xf86SetSilkenMouse(pScreen);
\ No newline at end of file