From beafe8b6140e1d4517e2c1a6adb020fadf6e0839 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 May 2013 14:54:52 +0200
Subject: [PATCH] xorg-server: fix INSTALL on archs where libglx is not
available.
---
srcpkgs/xorg-server/INSTALL | 2 +-
srcpkgs/xorg-server/template | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xorg-server/INSTALL b/srcpkgs/xorg-server/INSTALL
index 9aa5ff171f..60e08f68d2 100644
--- a/srcpkgs/xorg-server/INSTALL
+++ b/srcpkgs/xorg-server/INSTALL
@@ -1,7 +1,7 @@
# Create libglx-xorg.so libglx.so symlink for Mesa.
case ${ACTION} in
post)
- if [ ! -e usr/lib/xorg/modules/extensions/libglx.so ]; then
+ if [ -d usr/lib/xorg/modules/extensions -a ! -e usr/lib/xorg/modules/extensions/libglx.so ]; then
cd usr/lib/xorg/modules/extensions
ln -sf libglx-xorg.so libglx.so
fi
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 59f04e08a6..beedc35d24 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template build file for 'xorg-server'.
pkgname=xorg-server
version=1.13.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@@ -98,7 +98,7 @@ xorg-server-devel_package() {
if [ "$build_option_opengl" ]; then
depends+=" MesaLib-devel"
fi
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -111,8 +111,6 @@ xorg-server_package() {
provides="xserver-abi-extension-7 xserver-abi-input-18 xserver-abi-video-13"
depends="xkeyboard-config"
pkg_install() {
- vmove etc
- vmove usr
- vmove var
+ vmove all
}
}