Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel
This commit is contained in:
commit
2651afce08
3 changed files with 32 additions and 15 deletions
3
Makefile
3
Makefile
|
@ -71,7 +71,8 @@ CPIOINST = \
|
|||
SCRIPTS = \
|
||||
scripts/mhwd-live \
|
||||
scripts/livecd \
|
||||
scripts/kbd-model-map
|
||||
scripts/kbd-model-map \
|
||||
scripts/fix_mesa_multilib
|
||||
|
||||
all: $(BINPROGS) #bin/bash_completion bin/zsh_completion
|
||||
|
||||
|
|
|
@ -57,21 +57,10 @@ blacklist_pkg(){
|
|||
}
|
||||
|
||||
set_gl_multilib(){
|
||||
# keep this in-sync with mhwd
|
||||
msg "Setting libGL for multilib ..."
|
||||
chroot-run $1/root mkdir -p /usr/lib32/
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so.1
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so.1.2.0
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 /usr/lib32/libGLESv1_CM.so
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 /usr/lib32/libGLESv1_CM.so.1
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 /usr/lib32/libGLESv1_CM.so.1.1.0
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGLESv2.so.2.0.0 /usr/lib32/libGLESv2.so
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGLESv2.so.2.0.0 /usr/lib32/libGLESv2.so.2
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libGLESv2.so.2.0.0 /usr/lib32/libGLESv2.so.2.0.0
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libEGL.so.1.0.0 /usr/lib32/libEGL.so
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libEGL.so.1.0.0 /usr/lib32/libEGL.so.1
|
||||
chroot-run $1/root ln -sf /usr/lib32/mesa/libEGL.so.1.0.0 /usr/lib32/libEGL.so.1.0.0
|
||||
cp ${PKGDATADIR}/scripts/fix_mesa_multilib $1/root/usr/bin
|
||||
chmod +x $1/root/usr/bin/fix_mesa_multilib
|
||||
chroot $1/root fix_mesa_multilib
|
||||
}
|
||||
|
||||
prepare_cachedir(){
|
||||
|
|
27
scripts/fix_mesa_multilib
Normal file
27
scripts/fix_mesa_multilib
Normal file
|
@ -0,0 +1,27 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; version 2 of the License.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# keep this in-sync with mhwd
|
||||
|
||||
mkdir -p /usr/lib32
|
||||
|
||||
ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so
|
||||
ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so.1
|
||||
ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so.1.2.0
|
||||
ln -sf /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 /usr/lib32/libGLESv1_CM.so
|
||||
ln -sf /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 /usr/lib32/libGLESv1_CM.so.1
|
||||
ln -sf /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 /usr/lib32/libGLESv1_CM.so.1.1.0
|
||||
ln -sf /usr/lib32/mesa/libGLESv2.so.2.0.0 /usr/lib32/libGLESv2.so
|
||||
ln -sf /usr/lib32/mesa/libGLESv2.so.2.0.0 /usr/lib32/libGLESv2.so.2
|
||||
ln -sf /usr/lib32/mesa/libGLESv2.so.2.0.0 /usr/lib32/libGLESv2.so.2.0.0
|
||||
ln -sf /usr/lib32/mesa/libEGL.so.1.0.0 /usr/lib32/libEGL.so
|
||||
ln -sf /usr/lib32/mesa/libEGL.so.1.0.0 /usr/lib32/libEGL.so.1
|
||||
ln -sf /usr/lib32/mesa/libEGL.so.1.0.0 /usr/lib32/libEGL.so.1.0.0
|
Loading…
Reference in a new issue