aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2010-09-27 20:19:15 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-09-29 06:27:00 +0000
commit01741c6f4368ecdbaaf089c6c065448803de4e95 (patch)
tree77d0f9a35380bf46c9a9da36785ca03d62dfc385
parent7ca0494aa1dc23119d1870098fd74c02e6dad682 (diff)
downloadaports-01741c6f4368ecdbaaf089c6c065448803de4e95.tar.gz
aports-01741c6f4368ecdbaaf089c6c065448803de4e95.tar.bz2
aports-01741c6f4368ecdbaaf089c6c065448803de4e95.tar.xz
main/xorg-server + xf86-*: upgrade to 1.9.0
build drivers against new 1.9.0 xorg-server (cherry picked from commit 5640f1c42f62e0acbede764b303b70c859e0ba77)
-rw-r--r--main/xf86-input-evdev/APKBUILD2
-rw-r--r--main/xf86-input-keyboard/APKBUILD2
-rw-r--r--main/xf86-input-mouse/APKBUILD2
-rw-r--r--main/xf86-input-synaptics/APKBUILD2
-rw-r--r--main/xf86-video-apm/APKBUILD6
-rw-r--r--main/xf86-video-ark/APKBUILD2
-rw-r--r--main/xf86-video-ast/APKBUILD2
-rw-r--r--main/xf86-video-ati/APKBUILD2
-rw-r--r--main/xf86-video-chips/APKBUILD2
-rw-r--r--main/xf86-video-cirrus/APKBUILD2
-rw-r--r--main/xf86-video-dummy/APKBUILD2
-rw-r--r--main/xf86-video-fbdev/APKBUILD2
-rw-r--r--main/xf86-video-geode/APKBUILD2
-rw-r--r--main/xf86-video-glint/APKBUILD2
-rw-r--r--main/xf86-video-i128/APKBUILD2
-rw-r--r--main/xf86-video-i740/APKBUILD2
-rw-r--r--main/xf86-video-intel/APKBUILD2
-rw-r--r--main/xf86-video-mach64/APKBUILD2
-rw-r--r--main/xf86-video-newport/APKBUILD2
-rw-r--r--main/xf86-video-nv/APKBUILD2
-rw-r--r--main/xf86-video-openchrome/APKBUILD2
-rw-r--r--main/xf86-video-r128/APKBUILD2
-rw-r--r--main/xf86-video-radeonhd/APKBUILD2
-rw-r--r--main/xf86-video-rendition/APKBUILD2
-rw-r--r--main/xf86-video-s3/APKBUILD2
-rw-r--r--main/xf86-video-s3virge/APKBUILD2
-rw-r--r--main/xf86-video-savage/APKBUILD2
-rw-r--r--main/xf86-video-siliconmotion/APKBUILD2
-rw-r--r--main/xf86-video-sis/APKBUILD2
-rw-r--r--main/xf86-video-sunffb/APKBUILD2
-rw-r--r--main/xf86-video-sunleo/APKBUILD2
-rw-r--r--main/xf86-video-tdfx/APKBUILD2
-rw-r--r--main/xf86-video-tseng/APKBUILD2
-rw-r--r--main/xf86-video-v4l/APKBUILD2
-rw-r--r--main/xf86-video-vesa/APKBUILD2
-rw-r--r--main/xf86-video-vmware/APKBUILD2
-rw-r--r--main/xorg-server/APKBUILD61
37 files changed, 72 insertions, 65 deletions
diff --git a/main/xf86-input-evdev/APKBUILD b/main/xf86-input-evdev/APKBUILD
index d0946ebf70..2c0e2df11c 100644
--- a/main/xf86-input-evdev/APKBUILD
+++ b/main/xf86-input-evdev/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-input-evdev
pkgver=2.4.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.org evdev input driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-input-keyboard/APKBUILD b/main/xf86-input-keyboard/APKBUILD
index 5315b173ae..440b4e180d 100644
--- a/main/xf86-input-keyboard/APKBUILD
+++ b/main/xf86-input-keyboard/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-input-keyboard
pkgver=1.4.0
-pkgrel=2
+pkgrel=3
pkgdesc="X.org keyboard input driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-input-mouse/APKBUILD b/main/xf86-input-mouse/APKBUILD
index 78eb5b4c38..f1b54c09df 100644
--- a/main/xf86-input-mouse/APKBUILD
+++ b/main/xf86-input-mouse/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-input-mouse
pkgver=1.5.0
-pkgrel=3
+pkgrel=4
pkgdesc="X.org mouse input driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-input-synaptics/APKBUILD b/main/xf86-input-synaptics/APKBUILD
index 8ec7ca59b3..5294823f81 100644
--- a/main/xf86-input-synaptics/APKBUILD
+++ b/main/xf86-input-synaptics/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-input-synaptics
pkgver=1.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="X.org synaptics input driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD
index 20eec3e3c3..2fe0a003c3 100644
--- a/main/xf86-video-apm/APKBUILD
+++ b/main/xf86-video-apm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-apm
-pkgver=1.2.2
-pkgrel=2
+pkgver=1.2.3
+pkgrel=0
pkgdesc="Alliance ProMotion video driver"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -25,4 +25,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="48441a19aaf015570b267f2a8e67d8ab xf86-video-apm-1.2.2.tar.bz2"
+md5sums="a3743a971b3acb7de3d2eefc8b1a4834 xf86-video-apm-1.2.3.tar.bz2"
diff --git a/main/xf86-video-ark/APKBUILD b/main/xf86-video-ark/APKBUILD
index 6f4683f969..eda1331880 100644
--- a/main/xf86-video-ark/APKBUILD
+++ b/main/xf86-video-ark/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-ark
pkgver=0.7.2
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org driver for ark cards"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-ast/APKBUILD b/main/xf86-video-ast/APKBUILD
index 6bebdeec1d..ece394465c 100644
--- a/main/xf86-video-ast/APKBUILD
+++ b/main/xf86-video-ast/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-ast
pkgver=0.89.9
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org driver for ASpeedTech cards"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD
index f004aa019f..1fdcad61a3 100644
--- a/main/xf86-video-ati/APKBUILD
+++ b/main/xf86-video-ati/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-ati
pkgver=6.13.1
-pkgrel=0
+pkgrel=1
pkgdesc="ATI video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-chips/APKBUILD b/main/xf86-video-chips/APKBUILD
index ba6ef00ddc..1d243aa691 100644
--- a/main/xf86-video-chips/APKBUILD
+++ b/main/xf86-video-chips/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-chips
pkgver=1.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="Chips and Technologies video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-cirrus/APKBUILD b/main/xf86-video-cirrus/APKBUILD
index c2412a6a8a..3d122600be 100644
--- a/main/xf86-video-cirrus/APKBUILD
+++ b/main/xf86-video-cirrus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-cirrus
pkgver=1.3.2
-pkgrel=3
+pkgrel=4
pkgdesc="Cirrus Logic video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-dummy/APKBUILD b/main/xf86-video-dummy/APKBUILD
index 6cf6774ba7..dfc8cc0557 100644
--- a/main/xf86-video-dummy/APKBUILD
+++ b/main/xf86-video-dummy/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-dummy
pkgver=0.3.4
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org driver for dummy cards"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-fbdev/APKBUILD b/main/xf86-video-fbdev/APKBUILD
index ebd7b04d4a..0b8242e30a 100644
--- a/main/xf86-video-fbdev/APKBUILD
+++ b/main/xf86-video-fbdev/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-fbdev
pkgver=0.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="video driver for framebuffer device"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD
index 9e0d240bfd..30ca0ea61c 100644
--- a/main/xf86-video-geode/APKBUILD
+++ b/main/xf86-video-geode/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-geode
pkgver=2.11.6
-pkgrel=2
+pkgrel=3
pkgdesc="AMD Geode GX and LX video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD
index 554fda2620..eff6e13c4e 100644
--- a/main/xf86-video-glint/APKBUILD
+++ b/main/xf86-video-glint/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-glint
pkgver=1.2.4
-pkgrel=2
+pkgrel=3
pkgdesc="GLINT/Permedia video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-i128/APKBUILD b/main/xf86-video-i128/APKBUILD
index 2ec4d300ce..243db1f2fe 100644
--- a/main/xf86-video-i128/APKBUILD
+++ b/main/xf86-video-i128/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-i128
pkgver=1.3.3
-pkgrel=2
+pkgrel=3
pkgdesc="Number 9 I128 video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-i740/APKBUILD b/main/xf86-video-i740/APKBUILD
index 43771f60da..b7a42ee6d1 100644
--- a/main/xf86-video-i740/APKBUILD
+++ b/main/xf86-video-i740/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-i740
pkgver=1.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="Intel i740 video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD
index ff710c00b9..1683bbbc4c 100644
--- a/main/xf86-video-intel/APKBUILD
+++ b/main/xf86-video-intel/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-intel
pkgver=2.12.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org driver for Intel cards"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-mach64/APKBUILD b/main/xf86-video-mach64/APKBUILD
index 948c053ac3..f7ee07880e 100644
--- a/main/xf86-video-mach64/APKBUILD
+++ b/main/xf86-video-mach64/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-mach64
pkgver=6.8.2
-pkgrel=2
+pkgrel=3
pkgdesc="ATI Mach64 video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-newport/APKBUILD b/main/xf86-video-newport/APKBUILD
index 4aac546584..4a100c73fe 100644
--- a/main/xf86-video-newport/APKBUILD
+++ b/main/xf86-video-newport/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-newport
pkgver=0.2.3
-pkgrel=1
+pkgrel=2
pkgdesc="Newport video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-nv/APKBUILD b/main/xf86-video-nv/APKBUILD
index 49cc7b53d6..a41210658b 100644
--- a/main/xf86-video-nv/APKBUILD
+++ b/main/xf86-video-nv/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-nv
pkgver=2.1.17
-pkgrel=1
+pkgrel=2
pkgdesc="Nvidia video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD
index 5260923146..1411c8d966 100644
--- a/main/xf86-video-openchrome/APKBUILD
+++ b/main/xf86-video-openchrome/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-openchrome
pkgver=0.2.904
-pkgrel=3
+pkgrel=4
pkgdesc="X.Org driver for VIA/S3G cards"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-r128/APKBUILD b/main/xf86-video-r128/APKBUILD
index 691331b7c6..953f1e696f 100644
--- a/main/xf86-video-r128/APKBUILD
+++ b/main/xf86-video-r128/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-r128
pkgver=6.8.1
-pkgrel=3
+pkgrel=4
pkgdesc="ATI Rage128 video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-radeonhd/APKBUILD b/main/xf86-video-radeonhd/APKBUILD
index 546512c0d7..1440679e6d 100644
--- a/main/xf86-video-radeonhd/APKBUILD
+++ b/main/xf86-video-radeonhd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-radeonhd
pkgver=1.3.0
-pkgrel=2
+pkgrel=3
pkgdesc="Experimental Radeon HD video driver."
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-rendition/APKBUILD b/main/xf86-video-rendition/APKBUILD
index c2d677bfe6..909acb3f13 100644
--- a/main/xf86-video-rendition/APKBUILD
+++ b/main/xf86-video-rendition/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-rendition
pkgver=4.2.4
-pkgrel=0
+pkgrel=1
pkgdesc="Rendition video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-s3/APKBUILD b/main/xf86-video-s3/APKBUILD
index bb48034b4a..5e7fb39a9e 100644
--- a/main/xf86-video-s3/APKBUILD
+++ b/main/xf86-video-s3/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-s3
pkgver=0.6.3
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org driver for s3 cards"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD
index e2a62b3c77..c24794741d 100644
--- a/main/xf86-video-s3virge/APKBUILD
+++ b/main/xf86-video-s3virge/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-s3virge
pkgver=1.10.4
-pkgrel=1
+pkgrel=2
pkgdesc="S3 ViRGE video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD
index 6572053d78..91eabf810b 100644
--- a/main/xf86-video-savage/APKBUILD
+++ b/main/xf86-video-savage/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-savage
pkgver=2.3.1
-pkgrel=2
+pkgrel=3
pkgdesc="S3 Savage video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-siliconmotion/APKBUILD b/main/xf86-video-siliconmotion/APKBUILD
index 39a34827d8..32deaac880 100644
--- a/main/xf86-video-siliconmotion/APKBUILD
+++ b/main/xf86-video-siliconmotion/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-siliconmotion
pkgver=1.7.4
-pkgrel=0
+pkgrel=1
pkgdesc="Silicon Motion video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD
index d8bd028f29..2c438dff91 100644
--- a/main/xf86-video-sis/APKBUILD
+++ b/main/xf86-video-sis/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-sis
pkgver=0.10.3
-pkgrel=0
+pkgrel=1
pkgdesc="X.org SiS video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-sunffb/APKBUILD b/main/xf86-video-sunffb/APKBUILD
index 003415417e..835ba4fc27 100644
--- a/main/xf86-video-sunffb/APKBUILD
+++ b/main/xf86-video-sunffb/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-sunffb
pkgver=1.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="SUNFFB video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-sunleo/APKBUILD b/main/xf86-video-sunleo/APKBUILD
index ac930235b2..780c67b479 100644
--- a/main/xf86-video-sunleo/APKBUILD
+++ b/main/xf86-video-sunleo/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-sunleo
pkgver=1.2.0
-pkgrel=3
+pkgrel=4
pkgdesc="Leo video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD
index 6804918933..c59815c898 100644
--- a/main/xf86-video-tdfx/APKBUILD
+++ b/main/xf86-video-tdfx/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-tdfx
pkgver=1.4.3
-pkgrel=2
+pkgrel=3
pkgdesc="3Dfx video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-tseng/APKBUILD b/main/xf86-video-tseng/APKBUILD
index 7a68a22d59..5123b02175 100644
--- a/main/xf86-video-tseng/APKBUILD
+++ b/main/xf86-video-tseng/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-tseng
pkgver=1.2.4
-pkgrel=0
+pkgrel=1
pkgdesc="Tseng Labs video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-v4l/APKBUILD b/main/xf86-video-v4l/APKBUILD
index 4be24ebef6..fc9223ebb2 100644
--- a/main/xf86-video-v4l/APKBUILD
+++ b/main/xf86-video-v4l/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-v4l
pkgver=0.2.0
-pkgrel=3
+pkgrel=4
pkgdesc="video4linux driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD
index b73c82ffca..23d8c36bf8 100644
--- a/main/xf86-video-vesa/APKBUILD
+++ b/main/xf86-video-vesa/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-vesa
pkgver=2.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="X.org vesa video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xf86-video-vmware/APKBUILD b/main/xf86-video-vmware/APKBUILD
index e01ed3493c..e60a3a564e 100644
--- a/main/xf86-video-vmware/APKBUILD
+++ b/main/xf86-video-vmware/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-vmware
pkgver=11.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="X.org VMWare video driver"
url="http://xorg.freedesktop.org/"
license="custom"
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 8f22a6b2f2..30435e72fe 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xorg-server
-pkgver=1.7.7
-pkgrel=1
+pkgver=1.9.0
+pkgrel=0
pkgdesc="X.Org X servers"
url="http://xorg.freedesktop.org"
license="custom"
@@ -14,44 +14,46 @@ depends="
xinit
"
makedepends="
+ autoconf
+ automake
+ bigreqsproto
+ compositeproto
+ damageproto
+ dbus-dev
+ fixesproto
+ glproto
+ inputproto
+ libdrm-dev
libpciaccess-dev
+ libtool
libx11-dev
libxdamage-dev
libxfont-dev
+ libxinerama-dev
libxkbfile-dev
libxkbui-dev
libxv-dev
libxxf86dga-dev
libxxf86misc-dev
+ mesa-dev
openssl-dev
+ perl
pixman-dev
- zlib-dev
-
- bigreqsproto
- compositeproto
- damageproto
- dbus-dev
- fixesproto
- inputproto
pkgconfig
randrproto
+ recordproto
renderproto
resourceproto
+ scrnsaverproto
+ udev-dev
+ util-macros
xcmiscproto
xextproto
- xtrans
xf86driproto
- glproto
- mesa-dev
- libdrm-dev
- perl
- scrnsaverproto
xineramaproto
- libxinerama-dev
- libtool
- automake
- autoconf
- util-macros
+ xproto
+ xtrans
+ zlib-dev
"
# hal>=0.5.11 xcursor-themes xkeyboard-config>=1.3
# xorg-server-utils xorg-utils xorg-fonts-misc xbitmaps libdrm>=2.3.1
@@ -61,7 +63,8 @@ source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver
xorg-redhat-die-ugly-pattern-die-die-die.patch
"
-depends_dev="pixman-dev libpciaccess-dev"
+depends_dev="pixman-dev libpciaccess-dev xproto randrproto renderproto
+ xextproto inputproto kbproto fontsproto videoproto xineramaproto"
prepare() {
cd "$srcdir"/$pkgname-$pkgver
@@ -80,16 +83,18 @@ build() {
# cannot pass over the linker flag to .so files. so we tweak the
# gcc specs.
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+ _fontroot="/usr/share/fonts"
./configure --prefix=/usr \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
- --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/100dpi:unscaled,/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+ --with-fontrootdir=$_fontroot \
+ --with-default-font-path=${_fontroot}/misc,${_fontroot}/100dpi:unscaled,${_fontroot}/75dpi:unscaled,${_fontroot}/TTF,${_fontroot}/Type1 \
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
--with-dri-driver-path=/usr/lib/xorg/modules/dri \
--enable-composite \
- --enable-config-dbus \
+ --enable-config-udev \
--enable-dri \
--enable-ipv6 \
--enable-xfbdev \
@@ -97,6 +102,7 @@ build() {
--enable-xorg \
--enable-xv \
--enable-xres \
+ --enable-xace \
--disable-xephyr \
--disable-config-hal \
--disable-dmx \
@@ -104,10 +110,11 @@ build() {
--disable-xnest \
--disable-xsdl \
--disable-aiglx \
- --disable-xace \
+ --disable-config-dbus \
+ --enable-config-udev \
|| return 1
- make
+ make || return 1
}
package() {
@@ -141,5 +148,5 @@ xephyr() {
mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
}
-md5sums="8c0146330fb155c23d947ac37d431d4b xorg-server-1.7.7.tar.bz2
+md5sums="ba1173998a5a4216fd7b40eded96697e xorg-server-1.9.0.tar.bz2
222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch"