Changeset 360 in flair-src for trunk

Timestamp:

May 26, 2020, 11:25:30 AM (5 years ago)

Author:

Sanahuja Guillaume

Message:

diusable dri3 if used

File:

• trunk/scripts/distribution_specific_hack.sh (modified) (3 diffs)

trunk/scripts/distribution_specific_hack.sh

@@ -16 +16 @@
         return 1
     fi
+}
+
+function green_echo () {
+        echo -e "\033[32m$1\033[0m"
 }
 
@@ -39 +43 @@
 ldd $EXEC | grep "libGL.so" > /dev/null
 if [ $? -eq 0 ]; then
+    green_echo "checking for incompatibility when using libGL and trying to solve it..."
     #allow root access to the X server
     xhost si:localuser:root
@@ -60 +65 @@
                    ADDED_LIBS="$ADDED_LIBS:$(ldconfig -p | grep libstdc++.so.6 | grep libc6,x86-64 | cut -d'>' -f2)"
             fi
+
         #remove whitespace
         #add libs to LD_PRELOAD if version robomap3 version is not sufficient
         export LD_PRELOAD="$(echo -e "${ADDED_LIBS}" | tr -d '[:space:]')"
     fi
+
+    #check if using DRI3 and disable it
+    #otherwise you get /usr/lib/x86_64-linux-gnu/libGLX_mesa.so.0: undefined symbol: xcb_dri3_get_supported_modifiers
+    cat /var/log/Xorg.0.log | grep DRI3 > /dev/null
+    if [ $? -eq 0 ]; then
+        export LIBGL_DRI3_DISABLE=1
+        echo "we must disable DRI3"
+    fi
+    green_echo "...done\n"
 fi