Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-03 20:47:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mesa: fix libgl linkage

Browse Source
This commit is contained in:
philm 2011-06-19 00:33:37 +00:00
parent 680d52a648
commit 92d7650514
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
catalyst-utils/PKGBUILD
View File

@ -6,15 +6,15 @@
pkgname=catalyst-utils
pkgver=11.6
pkgrel=1
pkgrel=2
pkgdesc="AMD/ATI Catalyst drivers utilities and libraries."
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
depends=('xorg-server>=1.7.0' 'xorg-server<1.11.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs')
depends=('xorg-server>=1.7.0' 'xorg-server<1.11.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'libgl')
optdepends=('qt: to run ATi Catalyst Control Center (amdcccle)')
conflicts=('catalyst-test' 'nvidia-utils' 'libgl')
provides=('libgl' "libatical=${pkgver}")
conflicts=('catalyst-testing' 'nvidia-utils')
provides=("libatical=${pkgver}")
install=${pkgname}.install
source=(
@ -75,7 +75,7 @@ package() {
install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" || return 1
#install -m755 extensions/libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/" || return 1 #before 11.4
install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so" || return 1 # since 11.5
ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # since 11.4
#ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # since 11.4
#install -m755 extensions/libdri.so "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.ati" || return 1
# Controlcenter / libraries
@ -93,9 +93,9 @@ package() {
install -m755 X11R6/${_lib}/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx" || return 1 # since 11.5
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx/libGL.so.1.2" # since 11.4
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx-libGL.so.1.2" # since 11.4
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1.2" # since 11.4
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" # since 11.4
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" # since 11.4
#ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1.2" # since 11.4
#ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" # since 11.4
#ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" # since 11.4
install -m755 X11R6/${_lib}/libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/" || return 1 # since 11.4
ln -snf libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1" # since 11.4
ln -snf libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so" # since 11.4

21
catalyst-utils/catalyst-utils.install
View File

@ -32,19 +32,40 @@ check_libdri_so(){
fi
}
link_libgl_so(){
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1.2
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so
ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so /usr/lib/xorg/modules/extensions/libglx.so
ln -snf libglx.xorg /usr/lib/xorg/modules/extensions/FGL.renamed.libglx.so
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/FGL.renamed.libGL.so.1.2
}
restore_libgl_so(){
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/libGL.so.1.2
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/libGL.so.1
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/libGL.so
ln -snf libglx.xorg /usr/lib/xorg/modules/extensions/libglx.so
rm -f /usr/lib/xorg/modules/extensions/FGL.renamed.libglx.so
rm -f /usr/lib/FGL.renamed.libGL.so.1.2
}
post_install(){
check_libdri_so
link_libgl_so
whisperer
}
post_upgrade(){
check_libdri_so
link_libgl_so
whisperer
}
post_remove(){
# If the symlink is dead, remove it
check_libdri_so
restore_libgl_so
echo "NOTE: Don't forget to recover your original xorg.conf file."
}

2
mesa/PKGBUILD
View File

@ -66,7 +66,7 @@ package_libgl() {
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
# symlink to support ati hybrid switching
mv ${pkgdir}/usr/lib/libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so.1.2.mesa
ln -s ${pkgdir}/usr/lib/libGL.so.1.2.mesa ${pkgdir}/usr/lib/libGL.so.1.2
ln -s libGL.so.1.2.mesa ${pkgdir}/usr/lib/libGL.so.1.2
}
package_libgles() {