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

MesaLib: misc changes to allow 32bit pkg creation/work.

Browse source 
- Don't do symlink tricks with libGL, install as is.
- The libGL pkg now also provides the xorg-server libglx.so symlink.
- Use lib32 on x86 to make this work on x86_64.
This commit is contained in:
Juan RP 2014-03-06 20:53:00 +01:00
parent 29d82822a6
commit e060a1284e
3 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
srcpkgs/MesaLib/libGL.INSTALL
View file

@ -1,10 +0,0 @@
# Create libGL.so symlinks.
case ${ACTION} in
post)
if [ ! -h usr/lib/libGL.so -a ! -h usr/lib/libGL.so.1 ]; then
cd usr/lib
ln -sf libGL-mesa.so* libGL.so
ln -sf libGL-mesa.so* libGL.so.1
fi
;;
esac

11
srcpkgs/MesaLib/libGL.REMOVE
View file

@ -1,11 +0,0 @@
# Remove libGL.so symlinks.
case ${ACTION} in
post)
if [ -h usr/lib/libGL.so ]; then
rm -f usr/lib/libGL.so
fi
if [ -h usr/lib/libGL.so.1 ]; then
rm -f usr/lib/libGL.so.1
fi
;;
esac

25
srcpkgs/MesaLib/template
View file

@ -1,12 +1,11 @@
# Template build file for 'MesaLib'.
pkgname=MesaLib
version=10.1.0
revision=1
revision=2
wrksrc="Mesa-${version}"
build_style=gnu-configure
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
--enable-gles1 --enable-gles2 --enable-openvg --enable-egl --enable-vdpau
--with-dri-driverdir=/usr/lib/xorg/modules/drivers
--enable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
--with-egl-platforms=drm,wayland"
short_desc="Graphics library similar to SGI's OpenGL"
@ -20,7 +19,7 @@ hostmakedepends="
automake libtool flex pkg-config llvm>=3.3 libxml2-python wayland-devel"
makedepends="
glproto dri2proto>=2.1 dri3proto presentproto libXext-devel libXxf86vm-devel
libudev-devel>=183 libdrm-devel expat-devel talloc-devel libvdpau-devel
libudev-devel libdrm-devel expat-devel talloc-devel libvdpau-devel
libXdamage-devel libXvMC-devel>=1.0.6 libxshmfence-devel wayland-devel
elfutils-devel ncurses-devel zlib-devel"
@ -39,6 +38,11 @@ i686*|x86_64*)
;;
esac
case "$XBPS_TARGET_MACHINE" in
i686*) configure_args+=" --libdir=/usr/lib32 --with-dri-driverdir=/usr/lib32/xorg/modules/drivers";;
*) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";;
esac
conf_files="/etc/drirc"
pre_configure() {
@ -46,9 +50,14 @@ pre_configure() {
libtoolize -f
}
pre_install() {
vmkdir usr/lib32
ln -s lib32 ${DESTDIR}/usr/lib
}
post_install() {
rm -f ${DESTDIR}/usr/lib/libGL.so{,.1}
mv ${DESTDIR}/usr/lib/libGL.so.1.2.0 ${DESTDIR}/usr/lib/libGL-mesa.so.1.2.0
vmkdir usr/lib/xorg/modules/extensions
ln -s libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx-xorg.so
}
libgbm_package() {
@ -89,6 +98,7 @@ libGL_package() {
replaces="MesaLib<7.11_2"
pkg_install() {
vmove "usr/lib/libGL*.so.*"
vmove usr/lib/xorg/modules/extensions
}
}
@ -136,7 +146,6 @@ MesaLib-devel_package() {
mesa-swraster-dri_package() {
short_desc="Mesa DRI drivers for the Software Rasterizer"
depends="${sourcepkg}>=${version}_${revision}"
replaces="MesaLib<9.0.2"
pkg_install() {
vmove "usr/lib/xorg/modules/drivers/swrast*"
@ -156,7 +165,6 @@ libxatracker_package() {
mesa-ati-dri_package() {
short_desc="Mesa DRI drivers for ATI GPUs"
depends="${sourcepkg}>=${version}_${revision}"
replaces="MesaLib<9.0.2"
pkg_install() {
vmove "usr/lib/libXvMCr[36]00.so*"
@ -171,7 +179,6 @@ mesa-ati-dri_package() {
mesa-intel-dri_package() {
short_desc="Mesa DRI drivers for Intel GPUs"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*"
}
@ -179,7 +186,6 @@ mesa-intel-dri_package() {
mesa-nouveau-dri_package() {
short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
depends="${sourcepkg}>=${version}_${revision}"
replaces="MesaLib<9.0.2"
pkg_install() {
vmove "usr/lib/libXvMCnouveau.so*"
@ -191,7 +197,6 @@ mesa-nouveau-dri_package() {
mesa-vmwgfx-dri_package() {
short_desc="Mesa DRI drivers for VMware"
depends="${sourcepkg}>=${version}_${revision}"
replaces="MesaLib<9.0.2"
pkg_install() {
vmove "usr/lib/xorg/modules/drivers/vmwgfx*"