summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2015-10-19 05:14:09 +0300
committerDet2015-10-19 05:14:09 +0300
commiteae0e90a8264c571bf4bb39e2c3ca5bfd03757c3 (patch)
tree9ec1ceaf73482027c39411dea15830d5281ddd6e
parentdf1a4229a473f1a3b51f720d5bfc8b5de4dce879 (diff)
downloadaur-eae0e90a8264c571bf4bb39e2c3ca5bfd03757c3.tar.gz
Upgpkg: 1.17.99.901.100.r15045.g4513f92
-rw-r--r--.SRCINFO11
-rwxr-xr-xPKGBUILD12
2 files changed, 13 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f74eb4810b..92a7a377e7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by makepkg 4.2.0
-# Wed Jan 14 15:33:53 UTC 2015
pkgbase = xorg-server-git
- pkgver = 1.17.0.158.r14799.gfa12f2c
- pkgrel = 3
+ pkgver = 1.17.99.901.100.r15045.g4513f92
+ pkgrel = 1
url = http://cgit.freedesktop.org/xorg/xserver/
arch = i686
arch = x86_64
@@ -80,7 +78,7 @@ pkgname = xorg-server-git
depends = xf86-input-evdev
depends = libxshmfence
depends = libgl
- provides = X-ABI-VIDEODRV_VERSION=19.0
+ provides = X-ABI-VIDEODRV_VERSION=20.0
provides = X-ABI-XINPUT_VERSION=22.1
provides = X-ABI-EXTENSION_VERSION=9.0
provides = x-server
@@ -90,6 +88,7 @@ pkgname = xorg-server-git
conflicts = xf86-video-modesetting
conflicts = xorg-server
replaces = glamor-egl
+ replaces = xf86-video-modesetting
pkgname = xorg-server-xephyr-git
pkgdesc = A nested X server that runs as an X application - Git
@@ -99,7 +98,7 @@ pkgname = xorg-server-xephyr-git
depends = libgcrypt
depends = libxv
depends = pixman
- depends = xorg-server-common-git
+ depends = xorg-server-common
depends = xcb-util-image
depends = xcb-util-renderutil
depends = xcb-util-wm
diff --git a/PKGBUILD b/PKGBUILD
index f6605fcff67..e0ab90becda 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Based on xorg-server-dev: https://aur.archlinux.org/packages/xorg-server-dev/
pkgname=('xorg-server-git' 'xorg-server-xephyr-git' 'xorg-server-xdmx-git' 'xorg-server-xvfb-git' 'xorg-server-xnest-git' 'xorg-server-xwayland-git' 'xorg-server-common-git' 'xorg-server-devel-git')
-pkgver=1.17.0.158.r14799.gfa12f2c
-pkgrel=3
+pkgver=1.17.99.901.100.r15045.g4513f92
+pkgrel=1
arch=('i686' 'x86_64')
license=('custom')
url="http://cgit.freedesktop.org/xorg/xserver/"
@@ -30,11 +30,15 @@ pkgver() {
echo $(git describe --long | cut -d "-" -f3-4 | tr - .).r$(git rev-list HEAD --count).$(git describe --long | cut -d "-" -f5)
}
-build() {
+prepare() {
cd xserver
msg2 "Starting autoreconf..."
- autoreconf -fi
+ autoreconf -fvi
+}
+
+build() {
+ cd xserver
msg2 "Starting ./configure..."
./configure --prefix=/usr \