Merge branch 'testing'

9 files changed, 116 insertions, 68 deletions

diff --git a/abs/extra/libglvnd/PKGBUILD b/abs/extra/libglvnd/PKGBUILD
index 12011ec..a667e63 100644
--- a/abs/extra/libglvnd/PKGBUILD
+++ b/abs/extra/libglvnd/PKGBUILD
@@ -2,31 +2,20 @@
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 
 pkgname=libglvnd
-pkgver=0.1.1.20161028
-_commit=470fc824a38521a52707c6c0f59d827aa5e0f45a
-pkgrel=1
+pkgver=0.2.999+g4ba53457
+_commit=4ba5345742d6c98b528ac28fb7127006d2cc3f75
+pkgrel=2
 pkgdesc="The GL Vendor-Neutral Dispatch library"
 arch=('i686' 'x86_64')
 url="https://github.com/NVIDIA/libglvnd"
 license=('custom:BSD-like')
-depends=('libxext')
-makedepends=('libx11' 'glproto' 'git' 'python2')
+makedepends=('libxext' 'libx11' 'glproto' 'git' 'python2')
+provides=('libgl' 'libegl' 'libgles')
 #source=("git+https://github.com/NVIDIA/libglvnd.git#tag=v$pkgver"
 source=("git+https://github.com/NVIDIA/libglvnd.git#commit=$_commit"
-        LICENSE
-        https://patch-diff.githubusercontent.com/raw/NVIDIA/libglvnd/pull/110.patch
-        https://patch-diff.githubusercontent.com/raw/NVIDIA/libglvnd/pull/97.patch)
-sha1sums=('SKIP'
-          'c88e07f333fcf8dcdbef370b85372b4d88ad8a66'
-          '048e89dbdd0a6ca33441a6273208e4126d9828fc'
-          '48fac1b1248f1a6766ebae66432269c5147b5815')
-
-prepare() {
-  cd $pkgname
-  # FS#51527
-  patch -p1 -i ../97.patch
-  patch -p1 -i ../110.patch
-}
+        LICENSE)
+sha256sums=('SKIP'
+            '1a99f7487849c41fc3520e0af3dfcf28a0df05e78956d9ec58c2c52b1f20a77d')
 
 build() {
   cd $pkgname
@@ -36,15 +25,10 @@ build() {
 }
 
 package() {
+  # libglvnd needs mesa for indirect rendering
+  depends=('libxext' 'mesa' 'opengl-driver')
   cd $pkgname
   make DESTDIR="${pkgdir}" install
 
-  # For compatibility with older nvidia drivers for bumblebee
-  # Symlinks to /usr/lib will be in nvidia-libgl
-  mkdir "$pkgdir/usr/lib/nvidia"
-  for _lib in libGL.so libGLESv1_CM.so libGLESv2.so libEGL.so; do
-    mv "$pkgdir"/usr/lib/$_lib* "$pkgdir"/usr/lib/nvidia/
-  done
-
   install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/abs/extra/libinput/PKGBUILD b/abs/extra/libinput/PKGBUILD
index 1d39dd9..1fa4d70 100644
--- a/abs/extra/libinput/PKGBUILD
+++ b/abs/extra/libinput/PKGBUILD
@@ -3,24 +3,21 @@
 # Maintainer: Jan de Groot
 
 pkgname=libinput
-pkgver=1.1.4
+pkgver=1.7.0
 pkgrel=1
-pkgdesc="library that handles input devices for display servers and other applications that need to directly deal with input devices."
+pkgdesc="Input device management and event handling library"
 arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/libinput/"
+url="https://www.freedesktop.org/wiki/Software/libinput/"
 license=(custom:X11)
-depends=('mtdev' 'systemd' 'libevdev')
-install=libinput.install
-options=('!libtool')
-source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6'
+depends=('mtdev' 'systemd' 'libevdev' 'libwacom')
+# currently no doc files to install
+makedepends=('doxygen' 'graphviz' 'gtk3')
+#checkdepends=('check' 'libunwind')
+source=(https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+sha512sums=('9058eab813ea3de230835155ca843f248127cbafaf1aecc9a2e209a0215b090beef0468cc863a24320f8d0db1f2863baba680e2416e9e409e958b2c1d18e43a1'
             'SKIP')
 validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
 
-prepare() {
-  cd $pkgname-$pkgver
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
@@ -29,11 +26,16 @@ build() {
 
 check() {
   cd $pkgname-$pkgver
-  make check
+# disabled for now:
+# https://github.com/libcheck/check/issues/18
+#  make check
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  # install doc - no Makefile target
+  install -v -dm755 ${pkgdir}/usr/share/doc/libinput
+  cp -rv doc/html/* ${pkgdir}/usr/share/doc/libinput
 }
diff --git a/abs/extra/libinput/libinput.install b/abs/extra/libinput/libinput.install
deleted file mode 100644
index b9d5d0e..0000000
--- a/abs/extra/libinput/libinput.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  udevadm hwdb --update >/dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/abs/extra/libwacom/PKGBUILD b/abs/extra/libwacom/PKGBUILD
new file mode 100644
index 0000000..f8b9cf6
--- /dev/null
+++ b/abs/extra/libwacom/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=libwacom
+pkgver=0.24
+pkgrel=1
+pkgdesc="Library to identify Wacom tablets and their features"
+arch=('x86_64' 'i686')
+url="https://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
+license=('MIT')
+depends=('glib2' 'systemd' 'libgudev')
+source=(https://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
+sha1sums=('74d38e416fc7b91bbf3e163d40fe6ff688e6da51')
+sha256sums=('2905a0ee5cc85eceb9f5bd06109e66a051b0ed18102c3e6798717c259c8d66c3')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -m755 -d ${pkgdir}/usr/lib/udev/rules.d
+  cd tools
+  ./generate-udev-rules > ${pkgdir}/usr/lib/udev/rules.d/65-libwacom.rules
+  
+}
diff --git a/abs/extra/libxshmfence/PKGBUILD b/abs/extra/libxshmfence/PKGBUILD
index eed460e..ec3012f 100644
--- a/abs/extra/libxshmfence/PKGBUILD
+++ b/abs/extra/libxshmfence/PKGBUILD
@@ -2,17 +2,19 @@
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libxshmfence
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
 pkgdesc="a library that exposes a event API on top of Linux futexes"
 arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 license=('GPL')
 #groups=()
 depends=('glibc')
 makedepends=('xorg-util-macros' 'xproto')
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe')
+source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha256sums=('d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c'
+            'SKIP')
+validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # Keith Packard <keithp@keithp.com>
 
 build() {
 	cd $pkgname-$pkgver
diff --git a/abs/extra/nvidia-settings/PKGBUILD b/abs/extra/nvidia-settings/PKGBUILD
index 798993e..5fd0ac9 100644
--- a/abs/extra/nvidia-settings/PKGBUILD
+++ b/abs/extra/nvidia-settings/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=nvidia-settings
 pkgname=('nvidia-settings' 'libxnvctrl')
-pkgver=375.26
+pkgver=378.13
 pkgrel=1
 pkgdesc="Tool for configuring the NVIDIA graphics driver"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidi
 options=('staticlibs')
 source=(ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2
         libxnvctrl_so.patch)
-sha512sums=('e575670ccf7e3ef0089ee6a969f107f6f43d742a60cc325c6d95efc4773f34a6e013fd2c4e38b5f90054e24146a05c2300c0cf6a9b7013b556bacc1402956f49'
+sha512sums=('a12352c92fd4f56002bda2b07e8cddd5573af98521ec3495cd428b784eb368c9f2cb40f9b4372400ba1ea67c9349c6a9b4f7c218ede2d0d5dabb08325eda9844'
             'ed4b609de9691fbb4421eea340399331e7a5c5f47b9de8eade40ca8f78ac39a6f76cc106928cd0d79825f248a3a0eb563a10f68b7b6991cf3e28db0dde2a0f8d')
 
 prepare() {
diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD
index d16cf65..6d14e83 100644
--- a/abs/extra/plex-media-server/PKGBUILD
+++ b/abs/extra/plex-media-server/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: Praekon <praekon@googlemail.com>
 
 pkgname=plex-media-server
-pkgver=1.4.4.3495
-_pkgsum=edef59192
+pkgver=1.5.5.3634
+_pkgsum=995f1dead
 pkgrel=1
 pkgdesc='Plex Media Server'
 arch=('armv7h' 'i686' 'x86_64')
@@ -57,6 +57,6 @@ md5sums=('dfd6778f5c0d3d64c2c3a71dca02b7cc'
          '97241861f2c0b7c82d1945a6c5de8e35'
          '506ec15815bba749a743780edd2323c8'
          'bd703bc750b989a27edd590eb8c8e9d7')
-md5sums_armv7h=('82b879522ce1227958593d502800ee20')
-md5sums_i686=('e18d15d12fcb2b55a77c2e5667d48b4e')
-md5sums_x86_64=('948530557edd831ea86d0557b58f8eeb')
+md5sums_armv7h=('ecddf56daadc88b2f985ea73c837cd1b')
+md5sums_i686=('154e67a62134d735e91842e78d087871')
+md5sums_x86_64=('47d2026555372b7fa0508ce615e512a6')
diff --git a/abs/extra/wayland-protocols/PKGBUILD b/abs/extra/wayland-protocols/PKGBUILD
new file mode 100644
index 0000000..15e4059
--- /dev/null
+++ b/abs/extra/wayland-protocols/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu@seblu.net>
+
+pkgname=wayland-protocols
+pkgver=1.7
+pkgrel=1
+pkgdesc='Specifications of extended Wayland protocols'
+arch=('any')
+url='https://wayland.freedesktop.org/'
+license=('MIT')
+makedepends=('wayland')
+validpgpkeys=('8307C0A224BABDA1BABD0EB9A6EEEC9E0136164A') # Jonas Ådahl
+source=("https://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"{,.sig})
+sha1sums=('c4726694daf5feb1437f5f4f13c3b2a9b94b8118'
+          'SKIP')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/wayland/PKGBUILD b/abs/extra/wayland/PKGBUILD
index 63bef97..2bb1829 100644
--- a/abs/extra/wayland/PKGBUILD
+++ b/abs/extra/wayland/PKGBUILD
@@ -4,21 +4,24 @@
 # Contributor: Joel Teichroeb <joel@teichroeb.net>
 
 pkgname=wayland
-pkgver=1.6.0
+pkgver=1.13.0
 pkgrel=1
 pkgdesc='A computer display server protocol'
 arch=('i686' 'x86_64')
-url='http://wayland.freedesktop.org'
+url='https://wayland.freedesktop.org/'
 license=('MIT')
-depends=('libffi' 'expat')
-makedepends=('doxygen')
-source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
-sha1sums=('6183108a3bffb204c05b7f37b763b6278760572d')
+depends=('glibc' 'libffi' 'expat' 'libxml2')
+validpgpkeys=('C7223EBE4EF66513B892598911A30156E0E67611') # Bryce Harrington
+source=("https://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"{,.sig})
+sha1sums=('a8575325ed2885948624043c71629310df928312'
+          'SKIP')
 
 build() {
   cd $pkgname-$pkgver
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
+    --disable-documentation \
     --disable-static
   make
 }
@@ -29,3 +32,5 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+# vim:set ts=2 sw=2 et: