summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCody P Schafer2017-07-24 16:01:28 -0400
committerCody P Schafer2017-07-24 16:01:28 -0400
commitf8b047b2f8cda7b54182400c5356e8fda27c74dc (patch)
tree19ca5b0f2c2e9dcb69ded5715e7a8f8f0c274ccc
parent9e896a068e150da0db58193c2d622ce4b3015c03 (diff)
downloadaur-f8b047b2f8cda7b54182400c5356e8fda27c74dc.tar.gz
use xorg 1.19
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD8
2 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 999ab95965b..2785bebf853 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = parallels12-tools
pkgdesc = Parallels virtualization integration services & drivers
pkgver = 12.2.1.41615
- pkgrel = 0
+ pkgrel = 1
url = https://parallels.com
arch = x86_64
license = custom: commercial
@@ -11,8 +11,8 @@ pkgbase = parallels12-tools
depends = sh
depends = zlib
conflicts = xorg-server<1.16
- conflicts = X-ABI-VIDEODRV_VERSION<20
- conflicts = X-ABI-VIDEODRV_VERSION>=21
+ conflicts = X-ABI-VIDEODRV_VERSION<23
+ conflicts = X-ABI-VIDEODRV_VERSION>=24
source = dir://parallels12-tools/tools/prltools.x64.tar.gz
source = dir://parallels12-tools/kmods/prl_mod.tar.gz
source = dir://parallels12-tools/tools/prlmouse.conf
@@ -40,6 +40,9 @@ pkgbase = parallels12-tools
pkgname = parallels12-tools
provides = parallels-tools
+ conflicts = xorg-server<1.16
+ conflicts = X-ABI-VIDEODRV_VERSION<23
+ conflicts = X-ABI-VIDEODRV_VERSION>=24
conflicts = parallels-tools
pkgname = parallels12-tools-dkms
diff --git a/PKGBUILD b/PKGBUILD
index ddd2ea756d6..399c8aca3f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=parallels12-tools
pkgname=(parallels12-tools parallels12-tools-dkms)
pkgver=12.2.1.41615
-pkgrel=0
+pkgrel=1
pkgdesc="Parallels virtualization integration services & drivers"
arch=('x86_64')
url="https://parallels.com"
@@ -12,11 +12,11 @@ makedepends=(dir-dlagent dkms)
checkdepends=()
optdepends=()
provides=()
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
install=
options=()
-XORG_VERSION=1.18
+XORG_VERSION=1.19
DLAGENTS+=("dir::/usr/bin/echo Install and configure dir-dlagent to specify CD-ROM location")
source=(
@@ -49,7 +49,7 @@ sha1sums=('fdd278b5caee0647f1c062512fb83e1da4d5fdb2'
package_parallels12-tools() {
provides=(parallels-tools)
- conflicts=(parallels-tools)
+ conflicts+=(parallels-tools)
install -d "${pkgdir}/usr/bin"