From 1b7d2a5d1f34590223bd307a0a4254c986d89fcb Mon Sep 17 00:00:00 2001 From: udeved Date: Sat, 28 Feb 2015 00:40:28 +0100 Subject: [PATCH 1/4] add fix_mesa_multilib --- Makefile | 3 ++- scripts/fix_mesa_multilib | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 scripts/fix_mesa_multilib diff --git a/Makefile b/Makefile index 79f55c0..7e4ab18 100644 --- a/Makefile +++ b/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 diff --git a/scripts/fix_mesa_multilib b/scripts/fix_mesa_multilib new file mode 100755 index 0000000..1342058 --- /dev/null +++ b/scripts/fix_mesa_multilib @@ -0,0 +1,23 @@ +#!/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. + +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 From 69b0057f17cfcec7e958f94924ecb0b69733ccfc Mon Sep 17 00:00:00 2001 From: udeved Date: Sat, 28 Feb 2015 00:41:09 +0100 Subject: [PATCH 2/4] [util-pkg] seperate the link creation into a script --- lib/util-pkg.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/util-pkg.sh b/lib/util-pkg.sh index 9ee4cde..99efd66 100644 --- a/lib/util-pkg.sh +++ b/lib/util-pkg.sh @@ -57,20 +57,10 @@ blacklist_pkg(){ } set_gl_multilib(){ - # keep this in-sync with mhwd msg "Setting libGL for multilib ..." - 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(){ From 406b28fe35d8328ccf17cba0f2f61a1871a5e7e6 Mon Sep 17 00:00:00 2001 From: udeved Date: Sat, 28 Feb 2015 00:42:12 +0100 Subject: [PATCH 3/4] [scripts] add fix_mesa_multilib for better maintenance --- scripts/fix_mesa_multilib | 2 ++ 1 file changed, 2 insertions(+) mode change 100755 => 100644 scripts/fix_mesa_multilib diff --git a/scripts/fix_mesa_multilib b/scripts/fix_mesa_multilib old mode 100755 new mode 100644 index 1342058..fab8380 --- a/scripts/fix_mesa_multilib +++ b/scripts/fix_mesa_multilib @@ -9,6 +9,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +# keep this in-sync with mhwd + 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 From 882112ed821c9ecf8404d939586bdb760e868b9b Mon Sep 17 00:00:00 2001 From: udeved Date: Sat, 28 Feb 2015 00:44:01 +0100 Subject: [PATCH 4/4] [scripts] update fix_mesa --- scripts/fix_mesa_multilib | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/fix_mesa_multilib b/scripts/fix_mesa_multilib index fab8380..2570372 100644 --- a/scripts/fix_mesa_multilib +++ b/scripts/fix_mesa_multilib @@ -11,6 +11,8 @@ # 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