xorg-server removed -devel pkg, we don't need it for now.

This commit is contained in:
AlmAck 2014-06-29 21:42:18 +02:00
parent e0691b8fe9
commit ab7d3d633e
7 changed files with 21 additions and 39 deletions

View File

@ -8,9 +8,9 @@ arch=('x86_64')
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc' 'systemd' 'mtdev')
makedepends=('xorg-server>=1.12.0' 'resourceproto' 'scrnsaverproto' 'xf86driproto')
makedepends=('xorg-server>=1.12.0' 'resourceproto' 'scrnsaverproto' 'xf86driproto' 'libevdev')
conflicts=('xorg-server<1.12.0')
options=('!libtool' '!makeflags')
options=('!makeflags')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
sha256sums=('0c0c4aa393cb027a2304967944867a21a340bcad2e5efe630291b6906c3abc35')

View File

@ -8,7 +8,7 @@ arch=('x86_64')
license=('custom')
url="http://xorg.freedesktop.org/"
depends=('libxtst' 'mtdev' 'libevdev')
makedepends=('xorg-server-devel' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
makedepends=('xorg-server' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
conflicts=('xorg-server<1.15.0')
replaces=('synaptics')
provides=('synaptics')

View File

@ -9,7 +9,7 @@ url="http://linuxwacom.sourceforge.net/"
license=(GPL)
backup=('etc/X11/xorg.conf.d/50-wacom.conf')
depends=(libxi libxinerama libxrandr systemd)
makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto')
makedepends=('xorg-server' 'resourceproto' 'scrnsaverproto')
conflicts=('xorg-server<1.15.0')
source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2)
md5sums=('2cf57400fbd9e35eb16b50ad9fe32de1')

View File

@ -9,7 +9,7 @@ arch=('x86_64')
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('libdrm>=2.4.41' 'systemd' 'ati-dri' 'glamor-egl')
makedepends=('xorg-server-devel')
makedepends=('xorg-server')
conflicts=('xorg-server<1.15.0')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

View File

@ -3,13 +3,13 @@
pkgname=xf86-video-intel
pkgver=2.99.912
pkgrel=1
arch=(i686 x86_64)
arch=('x86_64')
url="http://xorg.freedesktop.org/"
license=('custom')
install=$pkgname.install
pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9' 'glamor-egl')
makedepends=('xorg-server-devel' 'libx11' 'libxrender'
makedepends=('xorg-server' 'libx11' 'libxrender'
# additional deps for intel-virtual-output
'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
optdepends=('libxrandr: for intel-virtual-output'

View File

@ -7,11 +7,11 @@ pkgname=xf86-video-vmware
pkgver=13.0.2
pkgrel=1
pkgdesc="X.org vmware video driver"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('libdrm' 'svga-dri' 'mesa>=10.0')
makedepends=('xorg-server-devel')
makedepends=('xorg-server')
conflicts=('xorg-server<1.15.0')
groups=('xorg-drivers' 'xorg')
options=('!emptydirs')

View File

@ -1,7 +1,7 @@
# Maintainer: Drake Justice <djustice@chakraos.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common')
pkgver=1.15.1
pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
arch=('x86_64')
@ -103,10 +103,19 @@ package_xorg-server-common() {
package_xorg-server() {
pkgdesc="Xorg X server"
depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence)
# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
depends=(xproto randrproto renderproto xextproto inputproto kbproto
fontsproto pixman videoproto xf86driproto glproto
mesa dri2proto dri3proto xineramaproto libpciaccess
resourceproto scrnsaverproto presentproto
libxdmcp libxfont libdrm libgcrypt libxau xorg-server-common
xf86-input-evdev libxshmfence
# not technically required but almost every Xorg pkg needs it to build
xorg-util-macros)
backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
# 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
# and /usr/lib/pkgconfig/xorg-server.pc
provides=('X-ABI-VIDEODRV_VERSION=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server')
groups=('xorg')
conflicts=('nvidia-utils<=331.20')
@ -131,10 +140,6 @@ package_xorg-server() {
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
rm -rf "${pkgdir}/usr/lib/pkgconfig"
rm -rf "${pkgdir}/usr/include"
rm -rf "${pkgdir}/usr/share/aclocal"
}
package_xorg-server-xephyr() {
@ -184,26 +189,3 @@ package_xorg-server-xdmx() {
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
}
package_xorg-server-devel() {
pkgdesc="Development files for the X.Org X server"
depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
xproto randrproto renderproto xextproto inputproto kbproto
fontsproto pixman videoproto xf86driproto glproto
mesa dri2proto dri3proto xineramaproto libpciaccess
resourceproto scrnsaverproto presentproto
# not technically required but almost every Xorg pkg needs it to build
xorg-util-macros)
cd "${pkgbase}-${pkgver}"
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}/usr/bin"
rm -rf "${pkgdir}/usr/share/man"
rm -rf "${pkgdir}/usr/share/doc"
rm -rf "${pkgdir}/usr/share/X11"
rm -rf "${pkgdir}/usr/lib/xorg"
rm -rf "${pkgdir}/var"
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
}