jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xorg-server: fix INSTALL on archs where libglx is not available.

Browse source
This commit is contained in:
Juan RP 2013-05-06 14:54:52 +02:00
parent 2bfd116ae5
commit beafe8b614
2 changed files with 4 additions and 6 deletions
srcpkgs/xorg-server
INSTALLtemplate

2
srcpkgs/xorg-server/INSTALL
View file

@ -1,7 +1,7 @@
# Create libglx-xorg.so libglx.so symlink for Mesa. # Create libglx-xorg.so libglx.so symlink for Mesa.
case ${ACTION} in case ${ACTION} in
post) 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 cd usr/lib/xorg/modules/extensions
ln -sf libglx-xorg.so libglx.so ln -sf libglx-xorg.so libglx.so
fi fi

8
srcpkgs/xorg-server/template
View file

@ -1,7 +1,7 @@
# Template build file for 'xorg-server'. # Template build file for 'xorg-server'.
pkgname=xorg-server pkgname=xorg-server
version=1.13.4 version=1.13.4
revision=2 revision=3
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@ -98,7 +98,7 @@ xorg-server-devel_package() {
if [ "$build_option_opengl" ]; then if [ "$build_option_opengl" ]; then
depends+=" MesaLib-devel" depends+=" MesaLib-devel"
fi fi
short_desc="${short_desc} - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
@ -111,8 +111,6 @@ xorg-server_package() {
provides="xserver-abi-extension-7 xserver-abi-input-18 xserver-abi-video-13" provides="xserver-abi-extension-7 xserver-abi-input-18 xserver-abi-video-13"
depends="xkeyboard-config" depends="xkeyboard-config"
pkg_install() { pkg_install() {
vmove etc vmove all
vmove usr
vmove var
} }
} }