diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-27 21:51:52 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-27 21:51:52 +0000 |
| commit | 20ea5f65427d3f36dcda8149895b1064c05751c8 (patch) | |
| tree | e9ad60d6f42d8105956f73ef230d3b9349b9b96a /main | |
| parent | e000f4a3d83575d523c95a2ad2dc95b3db608fb5 (diff) | |
| download | aports-20ea5f65427d3f36dcda8149895b1064c05751c8.tar.bz2 aports-20ea5f65427d3f36dcda8149895b1064c05751c8.tar.xz | |
Revert "main/[xf86 drivers]: bump pkgrel"
This reverts commit 5640f1c42f62e0acbede764b303b70c859e0ba77.
Diffstat (limited to 'main')
37 files changed, 44 insertions, 50 deletions
diff --git a/main/xf86-input-evdev/APKBUILD b/main/xf86-input-evdev/APKBUILD index 2c0e2df11c..d0946ebf70 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=1 +pkgrel=0 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 440b4e180d..5315b173ae 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=3 +pkgrel=2 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 f1b54c09df..78eb5b4c38 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=4 +pkgrel=3 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 5294823f81..8ec7ca59b3 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=2 +pkgrel=1 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 bc0af78308..20eec3e3c3 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=3 +pkgrel=2 pkgdesc="Alliance ProMotion video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-ark/APKBUILD b/main/xf86-video-ark/APKBUILD index eda1331880..6f4683f969 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=3 +pkgrel=2 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 ece394465c..6bebdeec1d 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=2 +pkgrel=1 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 1fdcad61a3..f004aa019f 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=1 +pkgrel=0 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 1d243aa691..ba6ef00ddc 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=2 +pkgrel=1 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 3d122600be..c2412a6a8a 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=4 +pkgrel=3 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 dfc8cc0557..6cf6774ba7 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=1 +pkgrel=0 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 0b8242e30a..ebd7b04d4a 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=2 +pkgrel=1 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 30ca0ea61c..9e0d240bfd 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=3 +pkgrel=2 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 eff6e13c4e..554fda2620 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=3 +pkgrel=2 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 243db1f2fe..2ec4d300ce 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=3 +pkgrel=2 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 b7a42ee6d1..43771f60da 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=3 +pkgrel=2 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 1683bbbc4c..ff710c00b9 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=1 +pkgrel=0 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 f7ee07880e..948c053ac3 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=3 +pkgrel=2 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 4a100c73fe..4aac546584 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=2 +pkgrel=1 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 a41210658b..49cc7b53d6 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=2 +pkgrel=1 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 1411c8d966..5260923146 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=4 +pkgrel=3 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 953f1e696f..691331b7c6 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=4 +pkgrel=3 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 1440679e6d..546512c0d7 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=3 +pkgrel=2 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 909acb3f13..c2d677bfe6 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=1 +pkgrel=0 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 5e7fb39a9e..bb48034b4a 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=3 +pkgrel=2 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 c24794741d..e2a62b3c77 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=2 +pkgrel=1 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 91eabf810b..6572053d78 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=3 +pkgrel=2 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 32deaac880..39a34827d8 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=1 +pkgrel=0 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 2c438dff91..d8bd028f29 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=1 +pkgrel=0 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 835ba4fc27..003415417e 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=2 +pkgrel=1 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 780c67b479..ac930235b2 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=4 +pkgrel=3 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 c59815c898..6804918933 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=3 +pkgrel=2 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 5123b02175..7a68a22d59 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=1 +pkgrel=0 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 fc9223ebb2..4be24ebef6 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=4 +pkgrel=3 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 23d8c36bf8..b73c82ffca 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=2 +pkgrel=1 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 e60a3a564e..e01ed3493c 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=2 +pkgrel=1 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 b24f06b332..8f22a6b2f2 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.9.0 -pkgrel=0 +pkgver=1.7.7 +pkgrel=1 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" license="custom" @@ -23,10 +23,10 @@ makedepends=" libxv-dev libxxf86dga-dev libxxf86misc-dev - recordproto-dev openssl-dev pixman-dev zlib-dev + bigreqsproto compositeproto damageproto @@ -52,8 +52,6 @@ makedepends=" automake autoconf util-macros - udev-dev - xproto-dev " # hal>=0.5.11 xcursor-themes xkeyboard-config>=1.3 # xorg-server-utils xorg-utils xorg-fonts-misc xbitmaps libdrm>=2.3.1 @@ -82,18 +80,16 @@ 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-fontrootdir=$_fontroot \ - --with-default-font-path=${_fontroot}/misc,${_fontroot}/100dpi:unscaled,${_fontroot}/75dpi:unscaled,${_fontroot}/TTF,${_fontroot}/Type1 \ + --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-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-udev \ + --enable-config-dbus \ --enable-dri \ --enable-ipv6 \ --enable-xfbdev \ @@ -101,7 +97,6 @@ build() { --enable-xorg \ --enable-xv \ --enable-xres \ - --enable-xace \ --disable-xephyr \ --disable-config-hal \ --disable-dmx \ @@ -109,11 +104,10 @@ build() { --disable-xnest \ --disable-xsdl \ --disable-aiglx \ - --disable-config-dbus \ - --enable-config-udev \ + --disable-xace \ || return 1 - make || return 1 + make } package() { @@ -147,5 +141,5 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="ba1173998a5a4216fd7b40eded96697e xorg-server-1.9.0.tar.bz2 +md5sums="8c0146330fb155c23d947ac37d431d4b xorg-server-1.7.7.tar.bz2 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" |