From 45c86b5a5a227447bd58ee4484ab1b3dae1e8f01 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Mon, 28 May 2012 12:24:48 -0500
Subject: add extra shapes for testing 'holes' in cut projections. new test
 images.


diff --git a/testdata/scad/features/projection-tests.scad b/testdata/scad/features/projection-tests.scad
index edb65ba..e6c52ea 100644
--- a/testdata/scad/features/projection-tests.scad
+++ b/testdata/scad/features/projection-tests.scad
@@ -11,3 +11,10 @@ translate([44,0,0]) linear_extrude(height=20) projection(cut=true) translate([0,
 
 // Boundary case: clipping the top of a cube
 translate([0,-22,0]) linear_extrude(height=5) projection(cut=true) translate([0,0,-4.999999]) cube(10, center=true);
+
+// holes
+translate([0,-44,0]) linear_extrude(height=5) projection(cut=true) 
+	union() {
+		difference() { cube(5,center=true); cube(4,center=true); }
+		translate([2.1,2.1]) difference() { cube(5,center=true); cube(4,center=true); }
+	}
diff --git a/tests/regression/cgalpngtest/projection-tests-expected.png b/tests/regression/cgalpngtest/projection-tests-expected.png
index 800f7ba..2610507 100644
Binary files a/tests/regression/cgalpngtest/projection-tests-expected.png and b/tests/regression/cgalpngtest/projection-tests-expected.png differ
diff --git a/tests/regression/dumptest/projection-tests-expected.txt b/tests/regression/dumptest/projection-tests-expected.txt
index 77fdbb4..69cd4f6 100644
--- a/tests/regression/dumptest/projection-tests-expected.txt
+++ b/tests/regression/dumptest/projection-tests-expected.txt
@@ -35,4 +35,22 @@
 			}
 		}
 	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, -44], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		linear_extrude(height = 5, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 2) {
+			projection(cut = true, convexity = 0) {
+				union() {
+					difference() {
+						cube(size = [5, 5, 5], center = true);
+						cube(size = [4, 4, 4], center = true);
+					}
+					multmatrix([[1, 0, 0, 2.1], [0, 1, 0, 2.1], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						difference() {
+							cube(size = [5, 5, 5], center = true);
+							cube(size = [4, 4, 4], center = true);
+						}
+					}
+				}
+			}
+		}
+	}
 
diff --git a/tests/regression/opencsgtest/projection-tests-expected.png b/tests/regression/opencsgtest/projection-tests-expected.png
index 8239d3d..9aabe36 100644
Binary files a/tests/regression/opencsgtest/projection-tests-expected.png and b/tests/regression/opencsgtest/projection-tests-expected.png differ
diff --git a/tests/regression/throwntogethertest/projection-tests-expected.png b/tests/regression/throwntogethertest/projection-tests-expected.png
index 7bcb888..3be3ae0 100644
Binary files a/tests/regression/throwntogethertest/projection-tests-expected.png and b/tests/regression/throwntogethertest/projection-tests-expected.png differ
-- 
cgit v0.10.1


From ad041705744b8bbba98efa80337184db77c348a9 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Tue, 29 May 2012 01:25:43 +0200
Subject: paralell build curl


diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
new file mode 100755
index 0000000..b56ed05
--- /dev/null
+++ b/scripts/linux-build-dependencies.sh
@@ -0,0 +1,191 @@
+#!/bin/sh -e
+#
+# This script builds all library dependencies of OpenSCAD for Linux
+#
+# This script must be run from the OpenSCAD source root directory
+#
+# Usage: linux-build-dependencies.sh
+#
+# Prerequisites:
+# - curl
+# -- if you dont have curl, but do have wget, uncomment 'build_curl')
+# -- and add $BASEDIR/bin to your PATH, i.e. in .bash_profile
+# - Qt4
+#
+
+BASEDIR=$HOME
+OPENSCADDIR=$PWD
+SRCDIR=$BASEDIR/src
+DEPLOYDIR=$BASEDIR
+NUMCPU=4 # paralell builds
+
+printUsage()
+{
+  echo "Usage: $0"
+  echo
+}
+
+build_curl()
+{
+  version=$1
+  echo "Building curl" $version "..."
+  cd $BASEDIR/src
+  rm -rf curl-$version
+  if [ ! -f curl-$version.tar.bz2 ]; then
+    wget http://curl.haxx.se/download/curl-$version.tar.bz2
+  fi
+  tar xjf curl-$version.tar.bz2
+  cd curl-$version
+  mkdir build
+  cd build
+  ../configure --prefix=$DEPLOYDIR
+  make -j$NUMCPU install
+}
+
+build_gmp()
+{
+  version=$1
+  echo "Building gmp" $version "..."
+  cd $BASEDIR/src
+  rm -rf gmp-$version
+  if [ ! -f gmp-$version.tar.bz2 ]; then
+    curl -O ftp://ftp.gmplib.org/pub/gmp-$version/gmp-$version.tar.bz2
+  fi
+  tar xjf gmp-$version.tar.bz2
+  cd gmp-$version
+  mkdir build
+  cd build
+  ../configure --prefix=$DEPLOYDIR --enable-cxx
+  make install
+}
+
+build_mpfr()
+{
+  version=$1
+  echo "Building mpfr" $version "..."
+  cd $BASEDIR/src
+  rm -rf mpfr-$version
+  if [ ! -f mpfr-$version.tar.bz2 ]; then
+    curl -O http://www.mpfr.org/mpfr-current/mpfr-$version.tar.bz2
+  fi
+  tar xjf mpfr-$version.tar.bz2
+  cd mpfr-$version
+  curl -O http://www.mpfr.org/mpfr-current/allpatches
+  patch -N -Z -p1 < allpatches
+  mkdir build
+  cd build
+  ../configure --prefix=$DEPLOYDIR --with-gmp=$DEPLOYDIR
+  make install
+  cd ..
+}
+
+build_boost()
+{
+  version=$1
+  bversion=`echo $version | tr "." "_"`
+  echo "Building boost" $version "..."
+  cd $BASEDIR/src
+  rm -rf boost_$bversion
+  if [ ! -f boost_$bversion.tar.bz2 ]; then
+    curl -LO http://downloads.sourceforge.net/project/boost/boost/$version/boost_$bversion.tar.bz2
+  fi
+  tar xjf boost_$bversion.tar.bz2
+  cd boost_$bversion
+  # We only need certain portions of boost
+  ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex
+  ./bjam
+  ./bjam install
+}
+
+build_cgal()
+{
+  version=$1
+  echo "Building CGAL" $version "..."
+  cd $BASEDIR/src
+  rm -rf CGAL-$version
+  if [ ! -f CGAL-$version.tar.gz ]; then
+    #4.0
+    curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz
+    # 3.9 curl -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz
+    # 3.8 curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz
+    # 3.7 curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz
+  fi
+  tar xzf CGAL-$version.tar.gz
+  cd CGAL-$version
+  cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DGMP_INCLUDE_DIR=$DEPLOYDIR/include -DGMP_LIBRARIES=$DEPLOYDIR/lib/libgmp.so -DGMPXX_LIBRARIES=$DEPLOYDIR/lib/libgmpxx.so -DGMPXX_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_LIBRARIES=$DEPLOYDIR/lib/libmpfr.so -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DBOOST_ROOT=$DEPLOYDIR -DCMAKE_BUILD_TYPE=Debug
+  make -j$NUMCPU
+  make install
+}
+
+build_glew()
+{
+  version=$1
+  echo "Building GLEW" $version "..."
+  cd $BASEDIR/src
+  rm -rf glew-$version
+  if [ ! -f glew-$version.tgz ]; then
+    curl -LO http://downloads.sourceforge.net/project/glew/glew/$version/glew-$version.tgz
+  fi
+  tar xzf glew-$version.tgz
+  cd glew-$version
+  mkdir -p $DEPLOYDIR/lib/pkgconfig
+  make GLEW_DEST=$DEPLOYDIR install
+}
+
+build_opencsg()
+{
+  version=$1
+  echo "Building OpenCSG" $version "..."
+  cd $BASEDIR/src
+  rm -rf OpenCSG-$version
+  if [ ! -f OpenCSG-$version.tar.gz ]; then
+    curl -O http://www.opencsg.org/OpenCSG-$version.tar.gz
+  fi
+  tar xzf OpenCSG-$version.tar.gz
+  cd OpenCSG-$version
+  sed -i s/example// opencsg.pro # examples might be broken without GLUT
+  OPENSCAD_LIBRARIES=$DEPLOYDIR qmake
+  make install
+}
+
+build_eigen()
+{
+  version=$1
+  echo "Building eigen" $version "..."
+  cd $BASEDIR/src
+  rm -rf eigen-$version
+  ## Directory name for v2.0.17
+  rm -rf eigen-eigen-b23437e61a07
+  if [ ! -f eigen-$version.tar.bz2 ]; then
+    curl -LO http://bitbucket.org/eigen/eigen/get/$version.tar.bz2
+    mv $version.tar.bz2 eigen-$version.tar.bz2
+  fi
+  tar xjf eigen-$version.tar.bz2
+  ## File name for v2.0.17
+  ln -s eigen-eigen-b23437e61a07 eigen-$version
+  cd eigen-$version
+  cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR
+  make -j$NUMCPU
+  make install
+}
+
+if [ ! -f $OPENSCADDIR/openscad.pro ]; then
+  echo "Must be run from the OpenSCAD source root directory"
+  exit 0
+fi
+
+if [ ! -d $BASEDIR/bin ]; then
+  mkdir --parents $BASEDIR/bin
+fi
+
+echo "Using basedir:" $BASEDIR
+mkdir -p $SRCDIR $DEPLOYDIR
+#build_curl 7.26.0
+build_eigen 2.0.17
+build_gmp 5.0.5
+build_mpfr 3.1.0
+build_boost 1.47.0
+# NB! For CGAL, also update the actual download URL in the function
+build_cgal 4.0
+build_glew 1.7.0
+build_opencsg 1.3.2
-- 
cgit v0.10.1


From 145bc6df6163c74841e722a1ca8e954e4c9ebf6a Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Tue, 29 May 2012 01:27:40 +0200
Subject: documentation


diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index b56ed05..96c4fff 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -17,7 +17,7 @@ BASEDIR=$HOME
 OPENSCADDIR=$PWD
 SRCDIR=$BASEDIR/src
 DEPLOYDIR=$BASEDIR
-NUMCPU=4 # paralell builds
+NUMCPU=4 # paralell builds for some libraries
 
 printUsage()
 {
-- 
cgit v0.10.1


From bf5eac68809e1bb2c38f19f63589bc3a05ffcb72 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Tue, 29 May 2012 01:50:31 +0200
Subject: tweaks, add more documentation, fix opencsg.h bug


diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index 96c4fff..50c7949 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -144,8 +144,9 @@ build_opencsg()
   tar xzf OpenCSG-$version.tar.gz
   cd OpenCSG-$version
   sed -i s/example// opencsg.pro # examples might be broken without GLUT
-  OPENSCAD_LIBRARIES=$DEPLOYDIR qmake
+  OPENSCAD_LIBRARIES=$DEPLOYDIR qmake-qt4
   make install
+  cp -av include/opencsg.h $BASEDIR/include/ # kludge
 }
 
 build_eigen()
@@ -180,7 +181,7 @@ fi
 
 echo "Using basedir:" $BASEDIR
 mkdir -p $SRCDIR $DEPLOYDIR
-#build_curl 7.26.0
+build_curl 7.26.0
 build_eigen 2.0.17
 build_gmp 5.0.5
 build_mpfr 3.1.0
@@ -189,3 +190,9 @@ build_boost 1.47.0
 build_cgal 4.0
 build_glew 1.7.0
 build_opencsg 1.3.2
+
+echo "Now do this:"
+echo "export LD_LIBRARY_PATH=$BASEDIR/lib"
+echo "OPENSCAD_LIBRARIES=$BASEDIR qmake-qt4"
+echo "make"
+
diff --git a/src/glview.cc b/src/glview.cc
index aa2e746..82ca084 100644
--- a/src/glview.cc
+++ b/src/glview.cc
@@ -600,7 +600,7 @@ void GLView::mouseMoveEvent(QMouseEvent *event)
       double mz = -(dy) * viewer_distance/1000;
 
 			double my = 0;
-			if (event->buttons() & Qt::MiddleButton) {
+			if (event->buttons() & Qt::MidButton) {
 				my = mz;
 				mz = 0;
 				// actually lock the x-position
-- 
cgit v0.10.1


From 26b3c3633c4cce04383d4d12e9e56f8c9cb5230a Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Tue, 29 May 2012 02:15:49 +0200
Subject: tweak opencsg installation.


diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index 50c7949..be2c8eb 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -144,9 +144,10 @@ build_opencsg()
   tar xzf OpenCSG-$version.tar.gz
   cd OpenCSG-$version
   sed -i s/example// opencsg.pro # examples might be broken without GLUT
-  OPENSCAD_LIBRARIES=$DEPLOYDIR qmake-qt4
-  make install
-  cp -av include/opencsg.h $BASEDIR/include/ # kludge
+  qmake-qt4
+  make
+  install -v lib/* $DEPLOYDIR/lib
+  install -v include/* $DEPLOYDIR/include
 }
 
 build_eigen()
@@ -181,14 +182,14 @@ fi
 
 echo "Using basedir:" $BASEDIR
 mkdir -p $SRCDIR $DEPLOYDIR
-build_curl 7.26.0
-build_eigen 2.0.17
-build_gmp 5.0.5
-build_mpfr 3.1.0
-build_boost 1.47.0
+#build_curl 7.26.0
+#build_eigen 2.0.17
+#build_gmp 5.0.5
+#build_mpfr 3.1.0
+#build_boost 1.47.0
 # NB! For CGAL, also update the actual download URL in the function
-build_cgal 4.0
-build_glew 1.7.0
+#build_cgal 4.0
+#build_glew 1.7.0
 build_opencsg 1.3.2
 
 echo "Now do this:"
-- 
cgit v0.10.1


From 056f6c6131bfc5067bcac7b0e71a0ac5aa2f5753 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Tue, 29 May 2012 02:29:29 +0200
Subject: add documentation to workaround GLEWDIR bug


diff --git a/glew.pri b/glew.pri
index 981d14b..f4a6ccd 100644
--- a/glew.pri
+++ b/glew.pri
@@ -5,6 +5,7 @@ glew {
   !isEmpty(GLEW_DIR) {
     QMAKE_INCDIR += $$GLEW_DIR/include
     QMAKE_LIBDIR += $$GLEW_DIR/lib
+    QMAKE_LIBDIR += $$GLEW_DIR/lib64
     message("GLEW location: $$GLEW_DIR")
   }
 
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index be2c8eb..b7f2ffc 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -129,7 +129,8 @@ build_glew()
   tar xzf glew-$version.tgz
   cd glew-$version
   mkdir -p $DEPLOYDIR/lib/pkgconfig
-  make GLEW_DEST=$DEPLOYDIR install
+  GLEW_DEST=$DEPLOYDIR make -j$NUMCPU
+  GLEW_DEST=$DEPLOYDIR make install
 }
 
 build_opencsg()
@@ -189,11 +190,11 @@ mkdir -p $SRCDIR $DEPLOYDIR
 #build_boost 1.47.0
 # NB! For CGAL, also update the actual download URL in the function
 #build_cgal 4.0
-#build_glew 1.7.0
+build_glew 1.7.0
 build_opencsg 1.3.2
 
 echo "Now do this:"
-echo "export LD_LIBRARY_PATH=$BASEDIR/lib"
-echo "OPENSCAD_LIBRARIES=$BASEDIR qmake-qt4"
+echo "export LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64"
+echo "GLEWDIR=$DEPLOYDIR OPENSCAD_LIBRARIES=$DEPLOYDIR qmake-qt4"
 echo "make"
 
-- 
cgit v0.10.1


From 5b454adeef057f3c0bffdd7582cc46ce67344458 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 2 Jun 2012 18:26:44 +0200
Subject: add paralellization flags to various builds


diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index b7f2ffc..4adf092 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -39,7 +39,8 @@ build_curl()
   mkdir build
   cd build
   ../configure --prefix=$DEPLOYDIR
-  make -j$NUMCPU install
+  make -j$NUMCPU
+  make install
 }
 
 build_gmp()
@@ -93,7 +94,7 @@ build_boost()
   cd boost_$bversion
   # We only need certain portions of boost
   ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex
-  ./bjam
+  ./bjam -j$NUMCPU
   ./bjam install
 }
 
@@ -182,19 +183,21 @@ if [ ! -d $BASEDIR/bin ]; then
 fi
 
 echo "Using basedir:" $BASEDIR
+echo "Using deploydir:" $DEPLOYDIR
+echo "Using srcdir:" $SRCDIR
 mkdir -p $SRCDIR $DEPLOYDIR
-#build_curl 7.26.0
-#build_eigen 2.0.17
-#build_gmp 5.0.5
-#build_mpfr 3.1.0
-#build_boost 1.47.0
+build_curl 7.26.0
+build_eigen 2.0.17
+build_gmp 5.0.5
+build_mpfr 3.1.0
+build_boost 1.47.0
 # NB! For CGAL, also update the actual download URL in the function
-#build_cgal 4.0
+build_cgal 4.0
 build_glew 1.7.0
 build_opencsg 1.3.2
 
 echo "Now do this:"
 echo "export LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64"
 echo "GLEWDIR=$DEPLOYDIR OPENSCAD_LIBRARIES=$DEPLOYDIR qmake-qt4"
-echo "make"
+echo "make -j$NUMCPU"
 
-- 
cgit v0.10.1


From a2902a527aaf41cdb9151d0726281f6d914cba9b Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 2 Jun 2012 18:29:50 +0200
Subject: fix glview to work with QT versions less than 4.7


diff --git a/src/glview.cc b/src/glview.cc
index 82ca084..bea5856 100644
--- a/src/glview.cc
+++ b/src/glview.cc
@@ -600,7 +600,11 @@ void GLView::mouseMoveEvent(QMouseEvent *event)
       double mz = -(dy) * viewer_distance/1000;
 
 			double my = 0;
+#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0))
 			if (event->buttons() & Qt::MidButton) {
+#else
+			if (event->buttons() & Qt::MiddleButton) {
+#endif
 				my = mz;
 				mz = 0;
 				// actually lock the x-position
-- 
cgit v0.10.1


From 8abd201dd87bb423807e18e2980ace581efa171b Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 2 Jun 2012 18:58:08 +0200
Subject: add script to download and build updated cmake version (for CGAL)


diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index 4adf092..9097850 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -8,16 +8,18 @@
 #
 # Prerequisites:
 # - curl
-# -- if you dont have curl, but do have wget, uncomment 'build_curl')
+# -- you can uncomment 'build_curl' at the bottom
 # -- and add $BASEDIR/bin to your PATH, i.e. in .bash_profile
 # - Qt4
+# - cmake 2.8 
+# -- you can uncomment 'build_cmake' at the bottom
 #
 
 BASEDIR=$HOME
 OPENSCADDIR=$PWD
 SRCDIR=$BASEDIR/src
 DEPLOYDIR=$BASEDIR
-NUMCPU=4 # paralell builds for some libraries
+NUMCPU=2 # paralell builds for some libraries
 
 printUsage()
 {
@@ -25,6 +27,24 @@ printUsage()
   echo
 }
 
+build_cmake()
+{
+  version=$1
+  echo "Building cmake" $version "..."
+  cd $BASEDIR/src
+  rm -rf cmake-$version
+  if [ ! -f cmake-$version.tar.gz ]; then
+    curl -O http://www.cmake.org/files/v2.8/cmake-$version.tar.gz
+  fi
+  tar zxf cmake-$version.tar.gz
+  cd cmake-$version
+  mkdir build
+  cd build
+  ../configure --prefix=$DEPLOYDIR
+  make -j$NUMCPU
+  make install
+}
+
 build_curl()
 {
   version=$1
@@ -185,8 +205,12 @@ fi
 echo "Using basedir:" $BASEDIR
 echo "Using deploydir:" $DEPLOYDIR
 echo "Using srcdir:" $SRCDIR
+echo "Number of CPUs for parallel builds:" $NUMCPU
 mkdir -p $SRCDIR $DEPLOYDIR
-build_curl 7.26.0
+
+#build_curl 7.26.0
+# NB! For cmake, also update the actual download URL in the function
+#build_cmake 2.8.8
 build_eigen 2.0.17
 build_gmp 5.0.5
 build_mpfr 3.1.0
-- 
cgit v0.10.1


From cd2d2dabf616e2e82a3d2c4de876ccef05f92e38 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 2 Jun 2012 21:57:28 +0200
Subject: enable CMAKE to find glew on systems that use 'lib64'


diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 12b8543..569f631 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -237,7 +237,7 @@ if (NOT GLEW_INCLUDE_DIR)
 	    NO_DEFAULT_PATH)
   find_library(GLEW_LIBRARY
                NAMES GLEW glew
-               HINTS ${GLEW_DIR}/lib
+               HINTS ${GLEW_DIR}/lib ${GLEW_DIR}/lib64
 	       NO_DEFAULT_PATH)
   if (NOT GLEW_LIBRARY)
     find_package(GLEW REQUIRED)
-- 
cgit v0.10.1


From 25dca401e701f102e7360dc009064f12f1bf3a13 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 2 Jun 2012 22:15:28 +0200
Subject: improve documentation for test builds under unix/linux


diff --git a/doc/testing.txt b/doc/testing.txt
index 6990c2f..dbe0791 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -77,6 +77,10 @@ virtual framebuffer program like Xvnc or Xvfb. For example:
 $ Xvfb :5 -screen 0 800x600x24 &
 $ DISPLAY=:5 ctest
 
+or
+
+$ xvfb-run ctest
+
 Some versions of Xvfb may fail, however. 
 
 1. Trouble finding libraries on unix
@@ -84,13 +88,18 @@ Some versions of Xvfb may fail, however.
  To help CMAKE find eigen2, OpenCSG, CGAL, Boost, and GLEW, you can use 
  environment variables, just like for the main qmake & openscad.pro. Examples:
 
- OPENSCAD_LIBRARIES=~ cmake .
- CGALDIR=~/CGAL-3.9 BOOSTDIR=~/boost-1.47.0 cmake .
-
+ OPENSCAD_LIBRARIES=$HOME cmake .
+ CGALDIR=$HOME/CGAL-3.9 BOOSTDIR=$HOME/boost-1.47.0 cmake .
+ 
  Valid variables are as follows:
 
  BOOSTDIR, CGALDIR, EIGEN2DIR, GLEWDIR, OPENCSGDIR, OPENSCAD_LIBRARIES
 
+ When running, this might help find your locally built libraries (assuming
+ you installed into $HOME)
+
+ export LD_LIBRARY_PATH=$HOME/lib:$HOME/lib64
+
 2. Location of logs
  
 Logs of test runs are found in tests/build/Testing/Temporary
-- 
cgit v0.10.1


From 7f803b51a21bc5b66c5e0c8c70382d833fbad864 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 2 Jun 2012 22:42:36 +0200
Subject: mention locale error/workaround in documentation


diff --git a/doc/testing.txt b/doc/testing.txt
index dbe0791..714a480 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -120,7 +120,16 @@ Comparison method.
 Your version of imagemagick is old. Upgrade, or pass -DCOMPARATOR=old to 
 cmake. The comparison will be of lowered reliability.
 
-5. Other issues
+5. Locale errors
+
+"terminate called after throwing an instance of 'std::runtime_error'
+  what():  locale::facet::_S_create_c_locale name not valid" 
+
+Is a boost/libstdc++ bug. Fix like so:
+
+  $ export LC_MESSAGES=
+
+6. Other issues
 
 The OpenSCAD User Manual has a section on buildling. Please check there 
 for updates:
-- 
cgit v0.10.1


From c2f19f450b037fb28a269ad2ff5c228dfa6d5dad Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sun, 3 Jun 2012 16:16:40 +0200
Subject: more reliable way of ensuring GLU is linked on new DSO linux systems.


diff --git a/openscad.pro b/openscad.pro
index 453ab77..591ed5f 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -81,9 +81,13 @@ win32 {
 CONFIG += qt
 QT += opengl
 
-# Fedora Linux + DSO fix
-linux*:exists(/usr/lib64/libGLU*)|linux*:exists(/usr/lib/libGLU*) {
-  LIBS += -lGLU
+# see http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
+# and https://github.com/openscad/openscad/pull/119
+# ( QT += opengl does not automatically link glu on some DSO systems. )
+unix:!macx {
+  !contains ( QMAKE_LIBS_OPENGL, "-lGLU" ) {
+    QMAKE_LIBS_OPENGL += -lGLU
+  }
 }
 
 netbsd* {
-- 
cgit v0.10.1


From bcf02d6013b07bf3481a6b725568fbe5039e34a9 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 4 Jun 2012 07:46:19 +0200
Subject: Minor Mac vs. Linux difference


diff --git a/doc/testing.txt b/doc/testing.txt
index 714a480..8ab1cee 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -98,7 +98,8 @@ Some versions of Xvfb may fail, however.
  When running, this might help find your locally built libraries (assuming
  you installed into $HOME)
 
- export LD_LIBRARY_PATH=$HOME/lib:$HOME/lib64
+ Linux: export LD_LIBRARY_PATH=$HOME/lib:$HOME/lib64
+ Mac: export DYLD_LIBRARY_PATH=$HOME/lib
 
 2. Location of logs
  
-- 
cgit v0.10.1