Fixed GL apps failure on qemux86/x86-64 on Ubuntu 11 with Nvidia GLX driver, Apr1, 2012

From: Zhai Edwin <[email protected]>

All,
Previous version of nVidia GLX driver in Ubuntu 10 cause qemu segfault, so we fall back to Mesa GLX driver if detecting nVidia driver installed. From Ubuntu 11, nVidia GLX driver works well, while previous work around cause GL apps failure. So this work around is limited in Ubuntu 10 only, and will be removed in future.

Pls. help to review and pull.

Thanks,
Edwin

The following changes since commit 8691a588267472eb5a32b978a0eb9ddfd0c91733:

cross-canadian.bbclass: fix rpath for sdk executables (2012-03-31 18:00:59 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/fix2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix2

Zhai Edwin (1):
qemugl: Fix GL apps failure on Ubuntu 11 host with nVidia GLX driver

 scripts/runqemu-internal |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

1.7.5.4

From: Zhai Edwin <[email protected]>

Previous version of nVidia GLX driver in Ubuntu 10 cause qemu segfault, so we fall back to Mesa GLX driver if detecting nVidia driver installed. From Ubuntu 11, nVidia GLX driver works well, while previous work around cause GL apps failure. So this work around is limited in Ubuntu 10 only, and will be removed in future.

[YOCTO #1886] got fixed.

---
 scripts/runqemu-internal |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

index 73b8b41..92f245a 100755
@@ -467,11 +467,15 @@ cat << EOM
 WARNING: nVidia proprietary OpenGL libraries detected.
 nVidia's OpenGL libraries are known to have compatibility issues with qemu,
 resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL
-libraries precede nvidia's via LD_PRELOAD(Already do it on Ubuntu).
+libraries precede nvidia's via LD_PRELOAD(Already do it on Ubuntu 10).
 EOM
 
 # Automatically use Ubuntu system's mesa libGL, other distro can add its own path
-    if grep -i ubuntu /etc/lsb-release &> /dev/null
+if grep -i ubuntu /etc/lsb-release &> /dev/null
+then
+    # precede nvidia's driver on Ubuntu 10
+    UBUNTU_MAIN_VERSION=`cat /etc/lsb-release |grep DISTRIB_RELEASE |cut -d=  -f 2| cut -d. -f 1`
+    if [ $UBUNTU_MAIN_VERSION -eq 10 ];
     then
         GL_PATH=""
         if test -e /usr/lib/libGL.so

@@ -482,10 +486,11 @@ EOM
             GL_PATH="/usr/lib/x86_64-linux-gnu/libGL.so"
         fi
 
-        echo "Skip nVidia's libGL on Ubuntu!"
+        echo "Skip nVidia's libGL on Ubuntu 10!"
         GL_LD_PRELOAD="$GL_PATH $LD_PRELOAD"
     fi
 fi
+fi
 
 echo "Running $QEMU..."
 # -no-reboot is a mandatory option - see bug #100

1.7.5.4

Merged into OE-Core

Thanks
Sau!