Merge branch 'master' into travis

6 files changed, 146 insertions, 87 deletions

diff --git a/scripts/builder.sh b/scripts/builder.sh
index 552d559..ca7e5b2 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -1,11 +1,41 @@
 #!/usr/bin/env bash
 
 # build&upload script for linux & windows snapshot binaries
-# tested under linux
+#
+# Usage:
+#
+# Start with a clean directory. For example:
+#
+# mkdir builder
+# cd builder
+#
+# Then run this script, or optionally the 'build only' or 'upload only' version
+#
+# /some/path/openscad/builder.sh            # standard build & upload
+# /some/path/openscad/builder.sh buildonly  # only do build, dont upload
+# /some/path/openscad/builder.sh uploadonly # only upload, dont build
 
+# Notes:
+#
+# This script is designed to build a 'clean' version of openscad directly
+# from the openscad github master source code. It will then optionally
+# upload the build to the OpenSCAD official file repository, and modify
+# the OpenSCAD website with links to the most recently built files.
+#
+#
+# For the mingw- cross build for Windows(TM) this script does a massive
+# 'from nothing' build, including downloading and building an MXE cross
+# environment, and dependencies, into $HOME/openscad_deps. This can take
+# many many many hours and use several gigabytes of disk space.
+#
+# This script itself is designed to call other scripts that do the heavy
+# lifting. This script itself should be kept relatively simple.
+#
+
+#
 # requirements -
 # see http://mxe.cc for required tools (scons, perl, yasm, etc etc etc)
-
+#
 # todo - can we build 32 bit linux from within 64 bit linux?
 #
 # todo - make linux work
@@ -19,18 +49,24 @@ init_variables()
 {
 	STARTPATH=$PWD
 	export STARTPATH
+	DOBUILD=1
+	DOUPLOAD=1
+	DRYRUN=
 	if [ "`echo $* | grep uploadonly`" ]; then
-		UPLOADONLY=1
+		DOUPLOAD=1
+		DOBUILD=
+		DATECODE=`date +"%Y.%m.%d"`
+	fi
+	if [ "`echo $* | grep buildonly`" ]; then
+		DOUPLOAD=
+		DOBUILD=1
 		DATECODE=`date +"%Y.%m.%d"`
-	else
-		UPLOADONLY=
 	fi
 	if [ "`echo $* | grep dry`" ]; then
 		DRYRUN=1
-	else
-		DRYRUN=
 	fi
-	export UPLOADONLY
+	export DOBUILD
+	export DOUPLOAD
 	export DRYRUN
 	export DATECODE
 }
@@ -43,9 +79,15 @@ check_starting_path()
 	fi
 }
 
-get_source_code()
+get_openscad_source_code()
 {
 	git clone http://github.com/openscad/openscad.git
+	if [ "`echo $? | grep 0`" ]; then
+		echo clone of source code is ok
+	else
+		echo clone of openscad source code failed. exiting
+		exit 1
+	fi
 	cd openscad
 	git submodule update --init # MCAD
 	#git checkout branch ##debugging
@@ -80,7 +122,7 @@ build_lin32()
 	export DATECODE
 }
 
-upload_win_generic()
+upload_win_common()
 {
 	summary="$1"
 	username=$2
@@ -110,8 +152,8 @@ upload_win32()
 	BASEDIR=./mingw32/
 	WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32-Installer.exe
 	WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32.zip
-	upload_win_generic "$SUMMARY1" $USERNAME $BASEDIR/$WIN32_PACKAGEFILE1
-	upload_win_generic "$SUMMARY2" $USERNAME $BASEDIR/$WIN32_PACKAGEFILE2
+	upload_win_common "$SUMMARY1" $USERNAME $BASEDIR/$WIN32_PACKAGEFILE1
+	upload_win_common "$SUMMARY2" $USERNAME $BASEDIR/$WIN32_PACKAGEFILE2
 	export WIN32_PACKAGEFILE1
 	export WIN32_PACKAGEFILE2
 	WIN32_PACKAGEFILE1_SIZE=`ls -sh $BASEDIR/$WIN32_PACKAGEFILE1 | awk ' {print $1} ';`
@@ -129,8 +171,8 @@ upload_win64()
 	BASEDIR=./mingw64/
 	WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64-Installer.exe
 	WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64.zip
-	upload_win_generic "$SUMMARY1" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE1
-	upload_win_generic "$SUMMARY2" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE2
+	upload_win_common "$SUMMARY1" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE1
+	upload_win_common "$SUMMARY2" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE2
 	export WIN64_PACKAGEFILE1
 	export WIN64_PACKAGEFILE2
 	WIN64_PACKAGEFILE1_SIZE=`ls -sh $BASEDIR/$WIN64_PACKAGEFILE1 | awk ' {print $1} ';`
@@ -188,6 +230,7 @@ update_win_www_download_links()
 	BASEURL='http://files.openscad.org/'
 	DATECODE=`date +"%Y.%m.%d"`
 
+	mv win_snapshot_links.js win_snapshot_links.js.backup
 	rm win_snapshot_links.js
 	echo "fileinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js
 	echo "fileinfo['WIN64_SNAPSHOT2_URL'] = '$BASEURL$WIN64_PACKAGEFILE2'" >> win_snapshot_links.js
@@ -229,19 +272,20 @@ check_ssh_agent()
 }
 
 init_variables $*
-check_ssh_agent
+if [ $DOUPLOAD ]; then
+	check_ssh_agent
+fi
 check_starting_path
 read_username_from_user
 read_password_from_user
-get_source_code
-
-if [ ! $UPLOADONLY ]; then
+get_openscad_source_code
+if [ $DOBUILD ]; then
 	build_win32
 	build_win64
 fi
-upload_win32
-upload_win64
-update_win_www_download_links
-
-
+if [ $DOUPLOAD ]; then
+	upload_win32
+	upload_win64
+	update_win_www_download_links
+fi
 
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh
index c4f2893..b63c677 100755
--- a/scripts/check-dependencies.sh
+++ b/scripts/check-dependencies.sh
@@ -86,21 +86,16 @@ mpfr_sysver()
 
 gmp_sysver()
 {
-  # on some systems you have VERSION in gmp-$arch.h not gmp.h. use gmp*.h
-  if [ -e $1/include/multiarch-x86_64-linux ]; then
-    subdir=include/multiarch-x86_64-linux
-  else
-    subdir=include
+  gmppaths="`find $1 -name 'gmp.h' -o -name 'gmp-*.h'`"
+  if [ ! "$gmppaths" ]; then
+    debug "gmp_sysver no gmp.h beneath $1"
+    return
   fi
-  if [ ! -e $1/$subdir ]; then return; fi
-  gmppaths=`ls $1/$subdir | grep ^gmp`
-  if [ ! "$gmppaths" ]; then return; fi
   for gmpfile in $gmppaths; do
-    gmppath=$1/$subdir/$gmpfile
-    if [ "`grep __GNU_MP_VERSION $gmppath`" ]; then
-      gmpmaj=`grep "define  *__GNU_MP_VERSION  *[0-9]*" $gmppath | awk '{print $3}'`
-      gmpmin=`grep "define  *__GNU_MP_VERSION_MINOR  *[0-9]*" $gmppath | awk '{print $3}'`
-      gmppat=`grep "define  *__GNU_MP_VERSION_PATCHLEVEL  *[0-9]*" $gmppath | awk '{print $3}'`
+    if [ "`grep __GNU_MP_VERSION $gmpfile`" ]; then
+      gmpmaj=`grep "define  *__GNU_MP_VERSION  *[0-9]*" $gmpfile | awk '{print $3}'`
+      gmpmin=`grep "define  *__GNU_MP_VERSION_MINOR  *[0-9]*" $gmpfile | awk '{print $3}'`
+      gmppat=`grep "define  *__GNU_MP_VERSION_PATCHLEVEL  *[0-9]*" $gmpfile | awk '{print $3}'`
     fi
   done
   gmp_sysver_result="$gmpmaj.$gmpmin.$gmppat"
@@ -261,32 +256,47 @@ pkg_config_search()
 
 get_minversion_from_readme()
 {
-  if [ -e README.md ]; then READFILE=README.md; fi
-  if [ -e ../README.md ]; then READFILE=../README.md; fi
-  if [ ! $READFILE ]; then
-    if [ "`command -v dirname`" ]; then
-      READFILE=`dirname $0`/../README.md
-    fi
-  fi
-  if [ ! $READFILE ]; then echo "cannot find README.md"; exit 1; fi
   debug get_minversion_from_readme $*
+
+  # Extract dependency name
   if [ ! $1 ]; then return; fi
   depname=$1
-  local grv_tmp=
+
   debug $depname
-  # example-->     * [CGAL (3.6 - 3.9)] (www.cgal.org)  becomes 3.6
-  # steps: eliminate *, find left (, find -, make 'x' into 0, delete junk
-  grv_tmp=`grep -i ".$depname.*([0-9]" $READFILE | sed s/"*"//`
-  debug $grv_tmp
-  grv_tmp=`echo $grv_tmp | awk -F"(" '{print $2}'`
-  debug $grv_tmp
-  grv_tmp=`echo $grv_tmp | awk -F"-" '{print $1}'`
-  debug $grv_tmp
-  grv_tmp=`echo $grv_tmp | sed s/"x"/"0"/g`
-  debug $grv_tmp
-  grv_tmp=`echo $grv_tmp | sed s/"[^0-9.]"//g`
-  debug $grv_tmp
-  get_minversion_from_readme_result=$grv_tmp
+  local grv_tmp=
+  for READFILE in README.md ../README.md "`dirname "$0"`/../README.md"
+  do
+    if [ ! -e "$READFILE" ]
+    then
+      debug "get_minversion_from_readme $READFILE not found"
+      continue
+    fi
+    debug "get_minversion_from_readme $READFILE found"
+    grep -qi ".$depname.*([0-9]" $READFILE || continue
+    grv_tmp="`grep -i ".$depname.*([0-9]" $READFILE | sed s/"*"//`"
+    debug $grv_tmp
+    grv_tmp="`echo $grv_tmp | awk -F"(" '{print $2}'`"
+    debug $grv_tmp
+    grv_tmp="`echo $grv_tmp | awk -F"-" '{print $1}'`"
+    debug $grv_tmp
+    grv_tmp="`echo $grv_tmp | sed s/"x"/"0"/g`"
+    debug $grv_tmp
+    grv_tmp="`echo $grv_tmp | sed s/"[^0-9.]"//g`"
+    debug $grv_tmp
+    if [ "z$grv_tmp" = "z" ]
+    then
+      debug "get_minversion_from_readme no result for $depname from $READFILE"
+      continue
+    fi
+    get_minversion_from_readme_result=$grv_tmp
+    return 0
+  done
+  if [ "z$grv_tmp" = "z" ]
+  then
+    debug "get_minversion_from_readme no result for $depname found anywhere"
+    get_minversion_from_readme_result=""
+    return 0
+  fi
 }
 
 find_min_version()
@@ -462,7 +472,7 @@ check_old_local()
 {
   warnon=
   if [ "`uname | grep -i linux`" ]; then
-    header_list="opencsg.h CGAL boost GL/glew.h gmp.h mpfr.h eigen2 eigen3"
+    header_list="opencsg.h CGAL boost GL/glew.h gmp.h mpfr.h eigen3"
     for i in $header_list; do
       if [ -e /usr/local/include/$i ]; then
         echo "Warning: you have a copy of "$i" under /usr/local/include"
@@ -533,7 +543,7 @@ main()
     dep_minver=$find_min_version_result
     compare_version $dep_minver $dep_sysver
     dep_compare=$compare_version_result
-    pretty_print $depname $dep_minver $dep_sysver $dep_compare
+    pretty_print $depname "$dep_minver" "$dep_sysver" $dep_compare
   done
   check_old_local
   check_misc
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh
index 994d2a1..d4ca1f7 100755
--- a/scripts/macosx-build-dependencies.sh
+++ b/scripts/macosx-build-dependencies.sh
@@ -24,7 +24,7 @@ BASEDIR=$PWD/../libraries
 OPENSCADDIR=$PWD
 SRCDIR=$BASEDIR/src
 DEPLOYDIR=$BASEDIR/install
-MAC_OSX_VERSION_MIN=10.6
+MAC_OSX_VERSION_MIN=10.7
 OPTION_32BIT=false
 OPTION_LLVM=false
 OPTION_CLANG=false
@@ -54,6 +54,9 @@ build_qt()
   fi
   tar xzf qt-everywhere-opensource-src-$version.tar.gz
   cd qt-everywhere-opensource-src-$version
+  patch -p0 < $OPENSCADDIR/patches/qt4/patch-src_corelib_global_qglobal.h.diff
+  patch -p0 < $OPENSCADDIR/patches/qt4/patch-libtiff.diff
+  patch -p0 < $OPENSCADDIR/patches/qt4/patch-src_plugins_bearer_corewlan_qcorewlanengine.mm.diff
   if $USING_CLANG; then
     # FIX for clang
     sed -i "" -e "s/::TabletProximityRec/TabletProximityRec/g"  src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -220,7 +223,7 @@ build_boost()
     BOOST_TOOLSET="toolset=clang"
     echo "using clang ;" >> tools/build/v2/user-config.jam 
   fi
-  ./b2 -d+2 $BOOST_TOOLSET cflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS" linkflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS -headerpad_max_install_names" install
+  ./b2 -j6 -d+2 $BOOST_TOOLSET cflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS" linkflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS -headerpad_max_install_names" install
   install_name_tool -id $DEPLOYDIR/lib/libboost_thread.dylib $DEPLOYDIR/lib/libboost_thread.dylib 
   install_name_tool -change libboost_system.dylib $DEPLOYDIR/lib/libboost_system.dylib $DEPLOYDIR/lib/libboost_thread.dylib 
   install_name_tool -change libboost_chrono.dylib $DEPLOYDIR/lib/libboost_chrono.dylib $DEPLOYDIR/lib/libboost_thread.dylib 
@@ -309,10 +312,10 @@ build_eigen()
   rm -rf eigen-$version
 
   EIGENDIR="none"
-  if [ $version = "2.0.17" ]; then EIGENDIR=eigen-eigen-b23437e61a07; fi
   if [ $version = "3.1.2" ]; then EIGENDIR=eigen-eigen-5097c01bcdc4;
   elif [ $version = "3.1.3" ]; then EIGENDIR=eigen-eigen-2249f9c22fe8;
-  elif [ $version = "3.1.4" ]; then EIGENDIR=eigen-eigen-36bf2ceaf8f5; fi
+  elif [ $version = "3.1.4" ]; then EIGENDIR=eigen-eigen-36bf2ceaf8f5;
+  elif [ $version = "3.2.0" ]; then EIGENDIR=eigen-eigen-ffa86ffb5570; fi
 
   if [ $EIGENDIR = "none" ]; then
     echo Unknown eigen version. Please edit script.
@@ -439,7 +442,7 @@ echo "Using basedir:" $BASEDIR
 mkdir -p $SRCDIR $DEPLOYDIR
 build_qt 4.8.5
 # NB! For eigen, also update the path in the function
-build_eigen 3.1.4
+build_eigen 3.2.0
 build_gmp 5.1.3
 build_mpfr 3.1.2
 build_boost 1.54.0
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index e9f124b..c0f658d 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -6,8 +6,13 @@
 # This script must be run from the OpenSCAD source root directory
 #
 # Usage:
-#        ./scripts/mingw-x-build-dependencies.sh       # 32 bit
-#        ./scripts/mingw-x-build-dependencies.sh 64    # 64 bit
+#        ./scripts/mingw-x-build-dependencies.sh              # 32 bit
+#        ./scripts/mingw-x-build-dependencies.sh 64           # 64 bit
+#
+# If you just want to download, and build later:
+#
+#        ./scripts/mingw-x-build-dependencies.sh download     # 32 bit download
+#        ./scripts/mingw-x-build-dependencies.sh 64 download  # 64 bit download
 #
 # Prerequisites:
 #
@@ -48,21 +53,25 @@ if [ ! -e $MXEDIR ]; then
 	mkdir -p $MXEDIR
 	cd $MXEDIR/..
 	echo "Downloading MXE into " $PWD
-	if [ "`echo $* | grep 64`" ]; then
-		git clone -b multi-rebase git://github.com/tonytheodore/mxe.git $MXEDIR
-	else
-		git clone git://github.com/mxe/mxe.git $MXEDIR
-	fi
+	git clone git://github.com/mxe/mxe.git $MXEDIR
 fi
 
 echo "entering" $MXEDIR
 cd $MXEDIR
 if [ "`echo $* | grep 64`" ]; then
-  MXE_TARGETS='x86_64-w64-mingw32'
+ MXE_TARGETS='x86_64-w64-mingw32'
+ if [ "`echo $* | grep download`" ]; then
+  PACKAGES='download-mpfr download-eigen download-opencsg download-cgal download-qt'
+ else
   PACKAGES='mpfr eigen opencsg cgal qt'
+ fi
 else
-  MXE_TARGETS=
+ MXE_TARGETS='i686-pc-mingw32' # fixme - does this work? test it.
+ if [ "`echo $* | grep download`" ]; then
+  PACKAGES='download-mpfr download-eigen download-opencsg download-cgal download-qt download-nsis'
+ else
   PACKAGES='mpfr eigen opencsg cgal qt nsis'
+ fi
 fi
 echo make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS
 make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index 48f162a..e652c47 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -343,7 +343,7 @@ build_cgal()
   if [ "`echo $2 | grep use-sys-libs`" ]; then
     cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DCMAKE_BUILD_TYPE=$CGAL_BUILDTYPE -DBoost_DEBUG=$DEBUGBOOSTFIND ..
   else
-    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_LIBRARYDIR=$DEPLOYDIR/lib -DBOOST_INCLUDEDIR=$DEPLOYDIR/include -DCMAKE_BUILD_TYPE=$CGAL_BUILD_TYPE -DBoost_DEBUG=$DEBUGBOOSTFIND -DBoost_NO_SYSTEM_PATHS=1 ..
+    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_LIBRARYDIR=$DEPLOYDIR/lib -DBOOST_INCLUDEDIR=$DEPLOYDIR/include -DCMAKE_BUILD_TYPE=$CGAL_BUILDTYPE -DBoost_DEBUG=$DEBUGBOOSTFIND -DBoost_NO_SYSTEM_PATHS=1 ..
   fi
   make -j$NUMCPU
   make install
@@ -476,12 +476,6 @@ build_opencsg()
 build_eigen()
 {
   version=$1
-  if [ -e $DEPLOYDIR/include/eigen2 ]; then
-    if [ `echo $version | grep 2....` ]; then
-      echo "Eigen2 already installed. not building"
-      return
-    fi
-  fi
   if [ -e $DEPLOYDIR/include/eigen3 ]; then
     if [ `echo $version | grep 3....` ]; then
       echo "Eigen3 already installed. not building"
@@ -492,7 +486,6 @@ build_eigen()
   cd $BASEDIR/src
   rm -rf eigen-$version
   EIGENDIR="none"
-  if [ $version = "2.0.17" ]; then EIGENDIR=eigen-eigen-b23437e61a07; fi
   if [ $version = "3.1.1" ]; then EIGENDIR=eigen-eigen-43d9075b23ef; fi
   if [ $EIGENDIR = "none" ]; then
     echo Unknown eigen version. Please edit script.
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh
index 31337c8..a0306ef 100755
--- a/scripts/uni-get-dependencies.sh
+++ b/scripts/uni-get-dependencies.sh
@@ -6,7 +6,7 @@
 
 get_fedora_deps()
 {
- sudo yum install qt-devel bison flex eigen2-devel python-paramiko \
+ sudo yum install qt-devel bison flex eigen3-devel python-paramiko \
   boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc gcc-c++ pkgconfig \
   opencsg-devel git libXmu-devel curl imagemagick ImageMagick make \
   xorg-x11-server-Xvfb
@@ -20,13 +20,13 @@ get_qomo_deps()
 get_altlinux_deps()
 {
  for i in boost-devel boost-filesystem-devel gcc4.5 gcc4.5-c++ boost-program_options-devel \
-  boost-thread-devel boost-system-devel boost-regex-devel eigen2 libmpfr libgmp libgmp_cxx-devel qt4-devel libcgal-devel git-core \
+  boost-thread-devel boost-system-devel boost-regex-devel eigen3 libmpfr libgmp libgmp_cxx-devel qt4-devel libcgal-devel git-core \
   libglew-devel flex bison curl imagemagick; do sudo apt-get install $i; done
 }
 
 get_freebsd_deps()
 {
- pkg_add -r bison boost-libs cmake git bash eigen2 flex gmake gmp mpfr \
+ pkg_add -r bison boost-libs cmake git bash eigen3 flex gmake gmp mpfr \
   xorg libGLU libXmu libXi xorg-vfbserver glew \
   qt4-corelib qt4-gui qt4-moc qt4-opengl qt4-qmake qt4-rcc qt4-uic \
   opencsg cgal curl imagemagick
@@ -41,7 +41,7 @@ get_netbsd_deps()
 
 get_opensuse_deps()
 {
- sudo zypper install libeigen2-devel mpfr-devel gmp-devel boost-devel \
+ sudo zypper install libeigen3-devel mpfr-devel gmp-devel boost-devel \
   libqt4-devel glew-devel cmake git bison flex cgal-devel opencsg-devel curl
 }
 
@@ -57,7 +57,7 @@ get_debian_deps()
 {
  for pkg in build-essential libqt4-dev libqt4-opengl-dev \
   libxmu-dev cmake bison flex git-core libboost-all-dev \
-  libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev \
+  libXi-dev libmpfr-dev libboost-dev libglew-dev \
   libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev \
   python-paramiko curl imagemagick; do
    sudo apt-get -y install $pkg;