[Hugin-cvs] /hgroot/hugin/hugin: [OSX] more changes to build scripts w.r.t. ...

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/f11f85ff8d01
changeset:  5764:f11f85ff8d01
user:       harryvanderwolf <hv...@gm...>
date:       Tue May 01 09:17:34 2012 +0200
description:

[OSX] more changes to build scripts w.r.t. openmp and lion

diffstat:

 mac/ExternalPrograms/scripts/boost.sh                       |    8 +
 mac/ExternalPrograms/scripts/build-all.sh                   |    2 +-
 mac/ExternalPrograms/scripts/enblend.sh                     |   54 ++-
 mac/ExternalPrograms/scripts/gettext.sh                     |   16 +-
 mac/ExternalPrograms/scripts/lensfun.sh                     |   24 +-
 mac/ExternalPrograms/scripts/libglew.sh                     |   64 +---
 mac/ExternalPrograms/scripts/libglib2.sh                    |   15 +-
 mac/ExternalPrograms/scripts/libjpeg.sh                     |   32 +-
 mac/ExternalPrograms/scripts/libpng.sh                      |  112 +++----
 mac/ExternalPrograms/scripts/libpng14_for_enblendvigra.diff |   12 +
 mac/ExternalPrograms/scripts/libtiff.sh                     |   14 -
 mac/ExternalPrograms/scripts/multiblend.sh                  |   50 +--
 mac/ExternalPrograms/scripts/pano13.sh                      |   41 +-
 mac/Hugin.xcodeproj/project.pbxproj                         |  164 +++++++----
 mac/complete-bundle.sh                                      |    6 +-
 15 files changed, 305 insertions(+), 309 deletions(-)

diffs (truncated from 1445 to 500 lines):

diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/boost.sh

--- a/mac/ExternalPrograms/scripts/boost.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/boost.sh	Tue May 01 09:17:34 2012 +0200
@@ -79,6 +79,8 @@
 
 # init
 
+ORGPATH=$PATH
+
 let NUMARCH="0"
 
 for i in $ARCHS
@@ -107,6 +109,8 @@
   export CC=$i386CC;
   export CXX=$i386CXX;
   export ARCHTARGET=$i386TARGET;
+  myPATH=$ORGPATH
+  ARCHFLAG="-m32"
  elif [ $ARCH = "x86_64" ]
  then
   MACSDKDIR=$x64MACSDKDIR
@@ -117,8 +121,12 @@
   export CC=$x64CC;
   export CXX=$x64CXX;
   export ARCHTARGET=$x86_64TARGET;
+  ARCHFLAG="-m64"
+  myPATH=/usr/local/bin:$PATH
  fi
 
+ env $myPATH
+
  SDKVRSION=$(echo $MACSDKDIR | sed 's/^[^1]*\([[:digit:]]*\.[[:digit:]]*\).*/\1/')
 
 echo "CXX should now be known: $CXX"
diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/build-all.sh
--- a/mac/ExternalPrograms/scripts/build-all.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/build-all.sh	Tue May 01 09:17:34 2012 +0200
@@ -26,7 +26,7 @@
 echo "$pre libiconv $pst"        && cd ../libiconv-1.13.1  || exit 1   && sh ../scripts/libiconv.sh;
 echo "$pre gettext $pst"         && cd ../gettext-0.17  || exit 1      && sh ../scripts/gettext.sh
 echo "$pre libjpeg-8d $pst"      && cd ../jpeg-8d || exit 1            && sh ../scripts/libjpeg.sh;
-echo "$pre libpng $pst"          && cd ../libpng-1.2.44 || exit 1      && sh ../scripts/libpng.sh;
+echo "$pre libpng $pst"          && cd ../libpng-1.4.11 || exit 1      && sh ../scripts/libpng.sh;
 echo "$pre libtiff $pst"         && cd ../tiff-3.9.2 || exit 1         && sh ../scripts/libtiff.sh;
 echo "$pre wxmac $pst"           && cd ../wxMac-2.8.12 || exit 1       && sh ../scripts/wxmac28.sh;
 echo "$pre ilmbase $pst"         && cd ../ilmbase-1.0.2 || exit 1      && sh ../scripts/ilmbase.sh;
diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/enblend.sh
--- a/mac/ExternalPrograms/scripts/enblend.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/enblend.sh	Tue May 01 09:17:34 2012 +0200
@@ -24,6 +24,7 @@
 # 20091223.0 sg Added argument to configure to locate missing TTF
 #               Building enblend documentation requires tex. Check if possible.
 # 20100624.0 hvdw More robust error checking on compilation
+# 20120430.0 hvdw Patch too old vigra in enblend for libpng 14
 # -------------------------------
 
 # init
@@ -34,6 +35,11 @@
         exit 1
 }
 
+# Patch the far too old vigra version inside enblend for libpng >= 1.4
+patch -Np0 < ../scripts/libpng14_for_enblendvigra.diff
+
+
+ORGPATH=$PATH
 
 # Fancy doc builds on Enblend 3.2 are doomed to failure, so don't even try...
 AC_INIT=$(grep AC_INIT Configure.in)
@@ -79,31 +85,24 @@
  if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then
    TARGET=$i386TARGET
    MACSDKDIR=$i386MACSDKDIR
-   ARCHARGs="$i386ONLYARG"
+#   ARCHARGs="$i386ONLYARG"
+   ARCHARGs="-march=prescott -mtune=pentium-m -ftree-vectorize -mmacosx-version-min=10.5"
    OSVERSION="$i386OSVERSION"
    CC=$i386CC
    CXX=$i386CXX
- elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then
-   TARGET=$ppcTARGET
-   MACSDKDIR=$ppcMACSDKDIR
-   ARCHARGs="$ppcONLYARG"
-   OSVERSION="$ppcOSVERSION"
-   CC=$ppcCC
-   CXX=$ppcCXX
- elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then
-   TARGET=$ppc64TARGET
-   MACSDKDIR=$ppc64MACSDKDIR
-   ARCHARGs="$ppc64ONLYARG"
-   OSVERSION="$ppc64OSVERSION"
-   CC=$ppc64CC
-   CXX=$ppc64CXX
+   myPATH=$ORGPATH
+   ARCHFLAG="-m32"
  elif [ $ARCH = "x86_64" ] ; then
    TARGET=$x64TARGET
    MACSDKDIR=$x64MACSDKDIR
    ARCHARGs="$x64ONLYARG"
    OSVERSION="$x64OSVERSION"
-   CC=$x64CC
-   CXX=$x64CXX
+#   CC=$x64CC
+#   CXX=$x64CXX
+   CC="gcc-4.6"
+   CXX="g++-4.6"
+   ARCHFLAG="-m64"
+   myPATH=/usr/local/bin:$PATH
  fi
 
 # To build documentation, you will need to install the following (port) packages:
@@ -123,19 +122,28 @@
 # export PATH=/usr/local/texlive/2009/bin/universal-darwin:$PATH
 # To make the change permanent, edit ~/.profile.
 
- env \
+ export \
+   PATH=$myPATH \
    CC=$CC CXX=$CXX \
-   CFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I$REPOSITORYDIR/include/boost -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
-   CXXFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I$REPOSITORYDIR/include/boost -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
+   CFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I$REPOSITORYDIR/include/boost $ARCHFLAG $ARCHARGs $OTHERARGs -dead_strip" \
+   CXXFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I$REPOSITORYDIR/include/boost $ARCHFLAG $ARCHARGs $OTHERARGs -dead_strip" \
    CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I/usr/include" \
    LIBS="-lGLEW -framework GLUT -lobjc -framework OpenGL -framework AGL" \
    LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
    NEXT_ROOT="$MACSDKDIR" \
-   PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \
-   ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \
+   PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" ;
+
+   if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then
+     ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
+     --enable-image-cache=yes --disable-openmp  --disable-gpu-support \
      --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \
      --with-glew $extraConfig --with-openexr || fail "configure step for $ARCH";
-
+   elif [ $ARCH = "x86_64" ] ; then
+    ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
+     --disable-image-cache --enable-openmp  --disable-gpu-support \
+     --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \
+     --with-glew $extraConfig --with-openexr || fail "configure step for $ARCH";
+   fi 
  # hack; AC_FUNC_MALLOC sucks!!
 
  mv ./config.h ./config.h-copy; 
diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/gettext.sh
--- a/mac/ExternalPrograms/scripts/gettext.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/gettext.sh	Tue May 01 09:17:34 2012 +0200
@@ -32,6 +32,7 @@
         exit 1
 }
 
+ORGPATH=$PATH
 
 let NUMARCH="0"
 
@@ -75,6 +76,8 @@
    OSVERSION="$i386OSVERSION"
    CC=$i386CC
    CXX=$i386CXX
+   myPATH=/usr/bin:$ORGPATH
+   ARCHFLAG="-m32"
  elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then
    TARGET=$ppcTARGET
    MACSDKDIR=$ppcMACSDKDIR
@@ -94,21 +97,26 @@
    MACSDKDIR=$x64MACSDKDIR
    ARCHARGs="$x64ONLYARG"
    OSVERSION="$x64OSVERSION"
+   #CC="gcc-4.6"
+   #CXX="g++-4.6"
    CC=$x64CC
    CXX=$x64CXX
+   ARCHFLAG="-m64"
+   #myPATH=/usr/local/bin:$PATH
+   myPATH=/usr/bin:$ORGPATH
  fi
 
  # first patch the make file
  #patch -po < patch-gettext-tools-Makefile.in
 
- export PATH=/usr/bin:$PATH
 
  env \
+  PATH=$myPATH \
   CC=$CC CXX=$CXX \
-  CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \
-  CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \
+  CFLAGS="-isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs $OTHERARGs -O3 -dead_strip" \
+  CXXFLAGS="-isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs $OTHERARGs -O3 -dead_strip" \
   CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include -no-cpp-precomp" \
-  LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
+  LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip $ARCHFLAG" \
   NEXT_ROOT="$MACSDKDIR" \
   ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
     --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \
diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/lensfun.sh
--- a/mac/ExternalPrograms/scripts/lensfun.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/lensfun.sh	Tue May 01 09:17:34 2012 +0200
@@ -22,6 +22,7 @@
 # -------------------------------
 # 20120307 hvdw initial lensfun based on svn 152
 # 20120415.0 hvdw now builds correctly
+# 20120429.0 hvdw compile x86_64 with gcc-4.6 for lion and up openmp compatibility
 # -------------------------------
 
 # init
@@ -32,6 +33,8 @@
         exit 1
 }
 
+ORGPATH=$PATH
+
 #patch -Np0 < ../scripts/lensfun-patch-pkgconfig.diff
 
 let NUMARCH="0"
@@ -63,6 +66,8 @@
    OSVERSION="$i386OSVERSION"
    CC=$i386CC
    CXX=$i386CXX
+   myPATH=$ORGPATH
+   ARCHFLAG="-m32"
  elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then
    TARGET=$ppcTARGET
    MACSDKDIR=$ppcMACSDKDIR
@@ -82,20 +87,25 @@
    MACSDKDIR=$x64MACSDKDIR
    ARCHARGs="$x64ONLYARG"
    OSVERSION="$x64OSVERSION"
-   CC=$x64CC
-   CXX=$x64CXX
+#   CC=$x64CC
+#   CXX=$x64CXX
+   CC="gcc-4.6"
+   CXX="g++-4.6"
+   ARCHFLAG="-m64"
+   myPATH=/usr/local/bin:$PATH
  fi
 
  make clean;
  env \
+  PATH=$myPATH \
   CC=$CC CXX=$CXX \
-  CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip -I$REPOSITORYDIR/include/glib-2.0 -I$REPOSITORYDIR/include/gio-unix-2.0 \
+  CFLAGS="-isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs $OTHERARGs -O3 -dead_strip -I$REPOSITORYDIR/include/glib-2.0 -I$REPOSITORYDIR/include/gio-unix-2.0 \
          -I$REPOSITORYDIR/arch/$ARCH/lib/glib-2.0/include -I$REPOSITORYDIR/arch/$ARCH/lib/gio/include -I$REPOSITORYDIR/include" \
-  CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip -I$REPOSITORYDIR/include/glib-2.0 -I$REPOSITORYDIR/include/gio-unix-2.0 \
+  CXXFLAGS="-isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs $OTHERARGs -O3 -dead_strip -I$REPOSITORYDIR/include/glib-2.0 -I$REPOSITORYDIR/include/gio-unix-2.0 \
          -I$REPOSITORYDIR/arch/$ARCH/lib/glib-2.0/include -I$REPOSITORYDIR/arch/$ARCH/lib/gio/include -I$REPOSITORYDIR/include" \
-  CPPFLAGS="-arch $ARCH -I$REPOSITORYDIR/include/glib-2.0 -I$REPOSITORYDIR/include/gio-unix-2.0 -I/usr/include \
+  CPPFLAGS="$ARCHFLAG -I$REPOSITORYDIR/include/glib-2.0 -I$REPOSITORYDIR/include/gio-unix-2.0 -I/usr/include \
          -I$REPOSITORYDIR/arch/$ARCH/lib/glib-2.0/include -I$REPOSITORYDIR/arch/$ARCH/lib/gio/include -I$REPOSITORYDIR/include" \
-  LDFLAGS="-arch $ARCH -L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
+  LDFLAGS="$ARCHFLAG -L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
   NEXT_ROOT="$MACSDKDIR" \
   ./configure --prefix="$REPOSITORYDIR/arch/$ARCH" --sdkdir="$REPOSITORYDIR/arch/$ARCH" --mode="release" \
   || fail "configure step for $ARCH";
@@ -104,7 +114,7 @@
 # Very stupid lensfun doesn't listen very well to CFLAGS/CXXFLAGS etc.. so we have 
 # to manually modify the config.mak
  cp config.mak config.mak.org
- sed -e "s+/opt/local/lib+$REPOSITORYDIR/arch/$ARCH/lib+g" -e "s+/opt/local/include+$REPOSITORYDIR/include+g" -e 's+png14+png12+g'  config.mak.org > config.mak
+ sed -e "s+/opt/local/lib+$REPOSITORYDIR/arch/$ARCH/lib+g" -e "s+/opt/local/include+$REPOSITORYDIR/include+g" -e 's+png14+png15+g'  config.mak.org > config.mak
 
 
  make libs || fail "failed at make step of $ARCH";
diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/libglew.sh
--- a/mac/ExternalPrograms/scripts/libglew.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/libglew.sh	Tue May 01 09:17:34 2012 +0200
@@ -22,6 +22,7 @@
 # 20100110.0 sg Script enhanced to copy dynamic lib also
 # 20100624.0 hvdw More robust error checking on compilation
 # 20120414.0 hvdw updated to 1.7
+# 20120428.0 hvdw use gcc 4.6 for x86_64 for openmp compatibility on lion an up
 # -------------------------------
 
 GLEW_MAJOR=1
@@ -36,37 +37,14 @@
 
 
 # init
-uname_release=$(uname -r)
-uname_arch=$(uname -p)
-[ $uname_arch = powerpc ] && uname_arch="ppc"
-os_dotvsn=${uname_release%%.*}
-os_dotvsn=$(($os_dotvsn - 4))
-case $os_dotvsn in
- 4 ) os_sdkvsn="10.4u" ;;
- 5|6 ) os_sdkvsn=10.$os_dotvsn ;;
- * ) echo "Unhandled OS Version: 10.$os_dotvsn. Build aborted."; exit 1 ;;
-esac
+ORGPATH=$PATH
 
-NATIVE_SDKDIR="/Developer/SDKs/MacOSX$os_sdkvsn.sdk"
-NATIVE_OSVERSION="10.$os_dotvsn"
-NATIVE_ARCH=$uname_arch
-NATIVE_OPTIMIZE=""
+# patch 1.7 for gcc 4.6
+cp config/Makefile.darwin config/Makefile.darwin.org
+cp config/Makefile.darwin-x86_64 config/Makefile.darwin-x86_64.org
+sed 's/-no-cpp-precomp//' config/Makefile.darwin.org > config/Makefile.darwin
+sed 's/-no-cpp-precomp//' config/Makefile.darwin-x86_64.org > config/Makefile.darwin-x86_64
 
-# update config.guess and config.sub -- locations vary by OS version
-case $NATIVE_OSVERSION in
-	10.4 )
-		;;
-	10.5 )
-		cp -f /usr/share/libtool/config.{guess,sub} ./config/ 
-		;;
-	10.6 )
-		cp -f /usr/share/libtool/config/config.{guess,sub} ./config/ 
-		;;
-	* )
-		echo "Unknown OS version; Add code to support $NATIVE_OSVERSION"; 
-		exit 1 
-		;;
-esac
 
 let NUMARCH="0"
 
@@ -98,31 +76,27 @@
    ARCHARGs="$i386ONLYARG"
    CC=$i386CC
    CXX=$i386CXX
- elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then
-   TARGET=$ppcTARGET
-   MACSDKDIR=$ppcMACSDKDIR
-   ARCHARGs="$ppcONLYARG"
-   CC=$ppcCC
-   CXX=$ppcCXX
- elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then
-   TARGET=$ppc64TARGET
-   MACSDKDIR=$ppc64MACSDKDIR
-   ARCHARGs="$ppc64ONLYARG"
-   CC=$ppc64CC
-   CXX=$ppc64CXX
+   myPATH=$ORGPATH
+   ARCHFLAG="-m32"
  elif [ $ARCH = "x86_64" ] ; then
    TARGET=$x64TARGET
    MACSDKDIR=$x64MACSDKDIR
    ARCHARGs="$x64ONLYARG"
-   CC=$x64CC
-   CXX=$x64CXX
+#   CC=$x64CC
+#   CXX=$x64CXX
+   CC="gcc-4.6"
+   CXX="g++-4.6"
+   ARCHFLAG="-m64"
+   myPATH=/usr/local/bin:$PATH
  fi
 
+ env PATH=$myPATH;
  make clean;
  make install \
   GLEW_DEST="$REPOSITORYDIR/arch/$ARCH" \
-  CC="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -O3 -dead_strip" \
-  LD="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -O3" \
+  CC="$CC -isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs -O3 -dead_strip" \
+  CXX="$CC -isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs -O3 -dead_strip" \
+  LD="$CC -isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs -O3" \
   || fail "failed at make step of $ARCH";
 
 done
diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/libglib2.sh
--- a/mac/ExternalPrograms/scripts/libglib2.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/libglib2.sh	Tue May 01 09:17:34 2012 +0200
@@ -31,6 +31,8 @@
         exit 1
 }
 
+ORGPATH=$PATH
+
 VERSION="2.0"
 FULLVERSION="2.0.0"
 
@@ -67,6 +69,8 @@
    OSVERSION="$i386OSVERSION"
    CC=$i386CC
    CXX=$i386CXX
+   myPATH=$ORGPATH
+   ARCHFLAG="-m32"
  elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then
    TARGET=$ppcTARGET
    MACSDKDIR=$ppcMACSDKDIR
@@ -88,6 +92,10 @@
    OSVERSION="$x64OSVERSION"
    CC=$x64CC
    CXX=$x64CXX
+#   CC="gcc-4.6"
+#   CXX="g++-4.6"
+   ARCHFLAG="-m64"
+#   myPATH=/usr/local/bin:$PATH
  fi
 
 
@@ -95,11 +103,12 @@
 
 
  env \
+  PATH=$myPATH \
   CC=$CC CXX=$CXX \
-  CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip -fstrict-aliasing" \
-  CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip -fstrict-aliasing" \
+  CFLAGS="-isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs $OTHERARGs -O3 -dead_strip -fstrict-aliasing" \
+  CXXFLAGS="-isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs $OTHERARGs -O3 -dead_strip -fstrict-aliasing" \
   CPPFLAGS="-I$REPOSITORYDIR/include" \
-  LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -L$MACSDKDIR/usr/lib -dead_strip -lresolv -bind_at_load" \
+  LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -L$MACSDKDIR/usr/lib -dead_strip -lresolv -bind_at_load $ARCHFLAG" \
   NEXT_ROOT="$MACSDKDIR" \
   ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
   --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \
diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/libjpeg.sh
--- a/mac/ExternalPrograms/scripts/libjpeg.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/libjpeg.sh	Tue May 01 09:17:34 2012 +0200
@@ -21,6 +21,7 @@
 # 20091206.0 sg Script tested and used to build 2009.4.0-RC3
 # 20100121.0 sg Script updated for version 8
 # 20100624.0 hvdw More robust error checking on compilation
+# 20120427.0 hvdw compile x86_64 with gcc 4.6 for Lion and up openmp compatibility
 # -------------------------------
 
 JPEGLIBVER="8"
@@ -34,6 +35,8 @@
 
 # init
 
+ORGPATH=$PATH
+
 uname_release=$(uname -r)
 uname_arch=$(uname -p)
 [ $uname_arch = powerpc ] && uname_arch="ppc"
@@ -97,33 +100,24 @@
    OSVERSION="$i386OSVERSION"
    CC=$i386CC
    CXX=$i386CXX
- elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then
-   TARGET=$ppcTARGET
-   MACSDKDIR=$ppcMACSDKDIR
-   ARCHARGs="$ppcONLYARG"
-   OSVERSION="$ppcOSVERSION"
-   CC=$ppcCC
-   CXX=$ppcCXX
- elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then
-   TARGET=$ppc64TARGET
-   MACSDKDIR=$ppc64MACSDKDIR
-   ARCHARGs="$ppc64ONLYARG"
-   OSVERSION="$ppc64OSVERSION"
-   CC=$ppc64CC
-   CXX=$ppc64CXX
+   myPATH=$ORGPATH
+   ARCHFLAG="-m32"
  elif [ $ARCH = "x86_64" ] ; then
    TARGET=$x64TARGET
    MACSDKDIR=$x64MACSDKDIR
    ARCHARGs="$x64ONLYARG"
    OSVERSION="$x64OSVERSION"
-   CC=$x64CC
-   CXX=$x64CXX
- fi
+    CC="gcc-4.6"
+   CXX="g++-4.6"
+   ARCHFLAG="-m64"
+   myPATH=/usr/local/bin:$PATH
+fi
 
  env \
+  PATH=$myPATH \
   CC=$CC CXX=$CXX \
-  CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \
-  CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -dead_strip" \
+  CFLAGS="-isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs $OTHERARGs -O3 -dead_strip" \
+  CXXFLAGS="-isysroot $MACSDKDIR $ARCHFLAG $ARCHARGs $OTHERARGs -O3 -dead_strip" \
   CPPFLAGS="-I$REPOSITORYDIR/include -I/usr/include" \
   LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
   NEXT_ROOT="$MACSDKDIR" \
diff -r b4d44ecad7d0 -r f11f85ff8d01 mac/ExternalPrograms/scripts/libpng.sh
--- a/mac/ExternalPrograms/scripts/libpng.sh	Mon Apr 30 09:22:19 2012 +0200
+++ b/mac/ExternalPrograms/scripts/libpng.sh	Tue May 01 09:17:34 2012 +0200
@@ -24,15 +24,19 @@
 # 201005xx.0 hvdw Adapted for 1.2.43
 # 20100624.0 hvdw More robust error checking on compilation
 # 20100831.0 hvdw upgrade to 1.2.44
+# 20120422.0 hvdw upgrade to 1.5.10
+# 20120427.0 hvdw use gcc 4.6 for x86_64 for openmp compatibility on lion an up
+# 20120430.0 hvdw downgrade from 1.5.10 to 1.4.11 as enblend's vigra  can't work with 1.5.10 even after patching
 # -------------------------------
 
 #libraries created:
 # libpng.3.1.2.42 <- (libpng.3, libpng)
 # libpng12.12.1.2.42 <- (libpng12.12, libpng12)
 # libpng12.a <- libpng.a
-PNGVER_M="12"
-PNGVER="1.2.44"
-PNGVER_FULL="$PNGVER_M.1.2.44"
+#PNGVER_M="15"
+#PNGVER_FULL="$PNGVER_M.15"
+PNGVER_M="14"




[Hugin-cvs] /hgroot/hugin/hugin: [OSX] more changes to build scripts w.r.t. ...

Panorama photo stitcher

[Hugin-cvs] /hgroot/hugin/hugin: [OSX] more changes to build scripts w.r.t. ...