[Lunar-commits] <moonbase> mesa-lib: use %GLUT to support deprecated glut

Paul Bredbury brebs at lunar-linux.org
Mon Feb 21 10:04:44 CET 2011


commit 226cbdb96d2b661ef815b77e020d5a4b03b98157
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Mon Feb 21 16:04:44 2011 +0700

    mesa-lib: use %GLUT to support deprecated glut
---
 xorg7/mesa-lib/POST_INSTALL |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/xorg7/mesa-lib/POST_INSTALL b/xorg7/mesa-lib/POST_INSTALL
index 4351df0..aac8056 100644
--- a/xorg7/mesa-lib/POST_INSTALL
+++ b/xorg7/mesa-lib/POST_INSTALL
@@ -1,5 +1,12 @@
-if [[ ! -e /usr/include/GL/glut.h ]] || [[ ! -e /usr/include/GL/freeglut.h ]] ; then
+if [[ ! -e /usr/include/GL/glut.h ]] ; then
   # freeglut provides %GLUT, previously overlapping with mesa-lib.
   # mesa-lib previously installed part of %GLUT, so install freeglut so it is complete.
-  lin -c freeglut
+  # Still need to support the deprecated glut also.
+  GLUT=`unalias %GLUT`
+  if [[ $GLUT == "glut" ]] ; then
+    lin -c glut
+  else
+    # Preferred default
+    lin -c freeglut
+  fi
 fi


More information about the Lunar-commits mailing list