GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-31 11:32:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't load swrast_dri.so, it's breaking(?) some driver/distro combinations and

Browse Source 
may not actually help.
This commit is contained in:
Joseph Lenox 2019-01-05 19:25:25 -06:00
parent b84be0deb5
commit f18c34006c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
package/linux/appimage-apprun.sh
View File

@ -36,14 +36,20 @@ if [ -e "./optional/libgcc/libgcc_s.so.1" ]; then
fi
fi
if [ -e "./optional/swrast_dri/swrast_dri.so" ]; then
lib="$(PATH="/sbin:$PATH" ldconfig -p | grep "swrast_dri\.so\ ($libc6arch)" | awk 'NR==1{print $NF}')"
sym_sys=$(tr '\0' '\n' < "$lib" | grep -e '^GCC_[0-9]\\.[0-9]' | tail -n1)
sym_app=$(tr '\0' '\n' < "./optional/swrast_dri/swrast_dri.so" | grep -e '^GCC_[0-9]\\.[0-9]' | tail -n1)
if [ "$(printf "${sym_sys}\n${sym_app}"| sort -V | tail -1)" != "$sym_sys" ]; then
swrastpath="./optional/swrast_dri:"
fi
fi
# Don't load swrast_dir for now, it is breaking new systems and this mechanism doesn't
# work for detecting whether or not it is necessary.
# if [ -e "./optional/swrast_dri/swrast_dri.so" ]; then
# lib="$(PATH="/sbin:$PATH" ldconfig -p | grep "swrast_dri\.so ($libc6arch)" | awk 'NR==1{print $NF}')"
# if [ "$lib" == "" ]; then
# swrastpath=""
# else
# sym_sys=$(tr '\0' '\n' < "$lib" | grep -e '^GCC_[0-9]\\.[0-9]' | tail -n1)
# sym_app=$(tr '\0' '\n' < "./optional/swrast_dri/swrast_dri.so" | grep -e '^GCC_[0-9]\\.[0-9]' | tail -n1)
# if [ "$(printf "${sym_sys}\n${sym_app}"| sort -V | tail -1)" != "$sym_sys" ]; then
# swrastpath="./optional/swrast_dri:"
# fi
# fi
# fi
if [ -n "$cxxpath" ] || [ -n "$gccpath" ] || [ -n "$swrastpath" ]; then
if [ -e "./optional/exec.so" ]; then