[Lunar-commits] <moonbase-other> blender: bump to 2.72 and other adjustments.

Dennis Veatch dennisveatch at bellsouth.net
Fri Oct 10 13:59:14 CEST 2014 

commit 2c26732880e2e880af0c8a72248776f530280d22
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Fri, 10 Oct 2014 07:58:52 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/2c26732880e2e880af0c8a72248776f530280d22

blender: bump to 2.72 and other adjustments.
---
  graphics/blender/BUILD   | +22/-13   
  graphics/blender/DEPENDS | +17/-15   
  graphics/blender/DETAILS | +3/-5     
  3 files changed, 42 insertions(+), 33 deletions(-)

--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -1,19 +1,28 @@
-(
 
-  PYTHON_VER="`lvu version Python-3 | cut -c 1`" &&
-
-  if in_depends $MODULE openjpeg ; then
-    OPENJPEG_VER=`lvu version openjpeg | cut -c 1-3` &&
-    OPTS+=" -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-${OPENJPEG_VER}"
+# Has trouble finding llvm
+  if in_depends $MODULE llvm && [[ `arch` == "x86_64" ]]; then
+    OPTS+=" -DLLVM_LIBRARY=/usr/lib/libLLVM-3.4.so"
   fi &&
 
-  sedit "s:if(SUPPORT_SSE2_BUILD):if(WITH_SSE2 AND SUPPORT_SSE2_BUILD):" CMakeLists.txt &&
+  OPTS+=" -DWITH_IMAGE_REDCODE=ON \
+          -DWITH_PYTHON_INSTALL=OFF \
+          -DWITH_PYTHON_INSTALL_NUMPY=OFF \
+          -DWITH_STATIC_LIBS=OFF \
+          -DWITH_PYTHON=ON \
+          -DWITH_PLAYER=ON   \
+          -DWITH_INSTALL_PORTABLE=OFF \
+          -DPYTHON_VERSION=3.4 \
+          -DPYTHON_LIBRARY=/usr/lib/libpython3.4m.so \
+          -DPYTHON_REQUESTS_PATH=/usr/lib/python3.4/site-packages/pip/_vendor/requests \
+          -DPYTHON_LIBRARIES=/usr/lib/python3.4 \
+          -DPYTHON_INCLUDE_DIRS=/usr/include/python3.4m" &&
+
+  default_cmake_config &&
 
-# For now adding -DWITH_INTERNATIONAL=OFF because of the recent boost bump.
-  OPTS+=" -DPYTHON_VERSION=3.$PYTHON_VER -DPYTHON_LIBRARIES=/usr/lib/python3.$PYTHON_VER -DWITH_IMAGE_REDCODE=ON \
-          -DPYTHON_INCLUDE_DIRS=/usr/include/python3.${PYTHON_VER}m -DWITH_PYTHON_INSTALL=OFF -DWITH_PLAYER=ON   \
-          -DWITH_INSTALL_PORTABLE=OFF -DWITH_BUILDINFO=OFF -DWITH_INTERNATIONAL=OFF" &&
+  make&&
 
-  default_cmake_build
+# We need to do it this way else make tanks
+  python3 ../doc/manpage/blender.1.py bin/blender bin/blender.1 &&
 
-) > $C_FIFO 2>&1
+  prepare_install &&
+  make install
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -7,23 +7,25 @@ depends scons
 depends %GLX
 depends yasm
 depends boost
+depends pcre
+depends glew
+depends eigen3
 
-optional_depends "lzma-sdk"   "-DWITH_LZMA=ON"   "-DWITH_LZMA=OFF"   "lzma compression support for pointcache"
-optional_depends "lzo"        "-DWITH_LZO=ON"    "-DWITH_LZO=OFF"    "real-time data compression support for pointcache"
-optional_depends "openal"     "-DWITH_OPENAL=ON" "-DWITH_OPENAL=OFF" "For 3D Audio support"
-optional_depends "SDL"        "-DWITH_SDL=ON"    "-DWITH_SDL=OFF"    "low-level access to hardware support for joystick and sound"
-optional_depends "fftw3"      "-DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON"  "-DWITH_FFTW3=OFF -DWITH_MOD_OCEANSIM=OFF"  "Fast Fourier Tranform support for ocean modifier, smoke and sounds effects"
-optional_depends "jack"       "-DWITH_JACK=ON"   "-DWITH_JACK=OFF"   "For low-latency audio support"
+optional_depends "lzma-sdk"   "-DWITH_LZMA=1"   "-DWITH_LZMA=0"   "lzma compression support for pointcache"
+optional_depends "lzo"        "-DWITH_LZO=1"    "-DWITH_LZO=0"    "real-time data compression support for pointcache"
+optional_depends "openal"     "-DWITH_OPENAL=1" "-DWITH_OPENAL=0" "For 3D Audio support"
+optional_depends "SDL"        "-DWITH_SDL=1"    "-DWITH_SDL=0"    "low-level access to hardware support for joystick and sound"
+optional_depends "fftw3"      "-DWITH_FFTW3=1 -DWITH_MOD_OCEANSIM=1"  "-DWITH_FFTW3=0 -DWITH_MOD_OCEANSIM=0"  "Fast Fourier Tranform support for ocean modifier, smoke and sounds effects"
+optional_depends "jack"       "-DWITH_JACK=1"   "-DWITH_JACK=0"   "For low-latency audio support"
+optional_depends "llvm"       "-DWITH_LLVM=1"   "-DWITH_LLVM=0"   "For Low Level Virtual Machine support"
 
-optional_depends "tiff"       "-DWITH_IMAGE_TIFF=ON"      "-DWITH_IMAGE_TIFF=OFF"      "For tiff graphcis support"
-optional_depends "openexr"    "-DWITH_IMAGE_OPENEXR=ON"   "-DWITH_IMAGE_OPENEXR=OFF"   "For exr support"
-optional_depends "ffmpeg"     "-DWITH_CODEC_FFMPEG=ON"    "-DWITH_CODEC_FFMPEG=OFF"    "For ffmpeg audio/video support"
-optional_depends "libsndfile" "-DWITH_CODEC_SNDFILE=ON"   "-DWITH_CODEC_SNDFILE=OFF"   "For sound file audio support"
-optional_depends "glew"       "-DWITH_SYSTEM_GLEW=ON"     "-DWITH_SYSTEM_GLEW=OFF"     "For OpenGL Extension support, say yes for system provided"
-optional_depends "openjpeg"   "-DWITH_SYSTEM_OPENJPEG=ON" "-DWITH_SYSTEM_OPENJPEG=OFF" "For openjpeg support, say yes for system provided"
+optional_depends "tiff"       "-DWITH_IMAGE_TIFF=1"      "-DWITH_IMAGE_TIFF=0"      "For tiff graphcis support"
+optional_depends "openexr"    "-DWITH_IMAGE_OPENEXR=1"   "-DWITH_IMAGE_OPENEXR=0"   "For exr support"
+optional_depends "ffmpeg"     "-DWITH_CODEC_FFMPEG=1"    "-DWITH_CODEC_FFMPEG=0"    "For ffmpeg audio/video support"
+optional_depends "libsndfile" "-DWITH_CODEC_SNDFILE=1"   "-DWITH_CODEC_SNDFILE=0"   "For sound file audio support"
+optional_depends "openjpeg"   "-DWITH_SYSTEM_OPENJPEG=1" "-DWITH_SYSTEM_OPENJPEG=0" "For openjpeg support, say yes for system provided"
 
-optional_depends "llvm"       "-DWITH_LLVM=ON -DLLVM_DIRECTORY=/usr" "-DWITH_LLVM=OFF" "For Low Level Virtual Machine support"
 
-optional_depends "imageworks-OpenColorIO" "-DWITH_OPENCOLORIO=ON" "-DWITH_OPENCOLORIO=OFF" "For color management support"
-optional_depends "OpenImageIO-oiio" "-DWITH_CYCLES=ON" "-DWITH_CYCLES=OFF" "For cycles support"
+optional_depends "imageworks-OpenColorIO" "-DWITH_OPENCOLORIO=1" "-DWITH_OPENCOLORIO=0" "For color management support"
+optional_depends "OpenImageIO-oiio" "-DWITH_CYCLES=1" "-DWITH_CYCLES=0" "For cycles support"
 
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -1,14 +1,12 @@
           MODULE=blender
-         VERSION=2.71
+         VERSION=2.72
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://mirror.cs.umn.edu/blender.org/source/
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-v$VERSION
-      SOURCE_VFY=sha1:035db91f91a77ffe7faa4d5f4a89f80b3d97c0cd
+      SOURCE_VFY=sha1:edc8ba7ac266224d739b6fd92d98b2dce733f3ea
         WEB_SITE=http://www.blender.org
          ENTERED=20030929
-         UPDATED=20140812
+         UPDATED=20141010
            SHORT="3D editor for modeling, animation, and rendering"
-
 cat << EOF
 3D tool does everything from modeling, animation, rendering, and
 post-production to interactive creation and playback.

More information about the Lunar-commits mailing list