Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre

5 files changed, 9 insertions, 9 deletions

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index ca5650c6a..63188c620 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -29,7 +29,7 @@ _pkgver=2.72b
 _depver=${_pkgver%[a-z]}
 [[ $_git == no  ]] && pkgver=$_pkgver
 [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit
-pkgrel=1.parabola2
+pkgrel=2.parabola1
 epoch=15
 _jpgver=1.5
 _llvmver=3.5
diff --git a/libre/luxrender/PKGBUILD b/libre/luxrender/PKGBUILD
index 6a1fd5082..86228ff8c 100644
--- a/libre/luxrender/PKGBUILD
+++ b/libre/luxrender/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=luxrender
 pkgver=1.3.1
 _pkgver=d0b0e20c47cc
-pkgrel=10.parabola2
+pkgrel=11.parabola1
 pkgdesc='Rendering system for physically correct, unbiased image synthesis, without nonfree opencl-nvidia, amdapp-sdk and intel-opencl-runtime recommendation'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.$pkgname.net/"
diff --git a/libre/ogre/PKGBUILD b/libre/ogre/PKGBUILD
index ecf1e5ed7..b866eee04 100644
--- a/libre/ogre/PKGBUILD
+++ b/libre/ogre/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=(
   #$_bldname-addon-$pkgbase # package unstable
 )
 pkgver=1.9.0
-pkgrel=7.parabola2
+pkgrel=8.parabola1
 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files'
 arch=(
   mips64el
diff --git a/libre/povray/PKGBUILD b/libre/povray/PKGBUILD
index 4b9e2c34a..04002ce1a 100644
--- a/libre/povray/PKGBUILD
+++ b/libre/povray/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 117242 2014-08-12 04:56:48Z fyan $
+# $Id: PKGBUILD 121933 2014-11-05 06:43:10Z fyan $
 # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
 # Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor (Arch): tobias <tobias@archlinux.org>
@@ -11,7 +11,7 @@
 _pkgname=povray-libre
 pkgname=povray
 pkgver=3.7
-pkgrel=5.parabola1
+pkgrel=6.parabola1
 epoch=1
 pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation'
 arch=('x86_64' 'i686' 'mips64el')
diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD
index f27dda732..b99ae0d28 100644
--- a/libre/xorg-server/PKGBUILD
+++ b/libre/xorg-server/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 222536 2014-09-21 11:07:21Z lcarlier $
+# $Id: PKGBUILD 225889 2014-11-10 18:57:26Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgbase=xorg-server
 pkgname=('xorg-server')
-pkgver=1.16.1
+pkgver=1.16.2
 pkgrel=1.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -21,7 +21,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         autoconfig-sis.patch
         xvfb-run
         xvfb-run.1)
-sha256sums=('f4677c6ec9fb7b59648321737087aeb9963b60bcea50ee3773fe46be1a37e060'
+sha256sums=('446e0c3ebd556aced78ec0000ba9ae73f1e5317117d497f827afba48b787ce64'
             'SKIP'
             'eca387a72345ac9cce866a8ca3b31e6ef696f298be4863196da75009c6673363'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
@@ -111,7 +111,7 @@ build() {
 
 package_xorg-server() {
   pkgdesc="Xorg X server, without nonfree nvidia driver support"
-  depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence libgl)
+  depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau "xorg-server-common=$pkgver" xf86-input-evdev libxshmfence libgl)
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
   provides=('X-ABI-VIDEODRV_VERSION=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server')