[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35052] trunk/blender: part of a patch from Dan Eicher with some edits.

[Campbell Barton]

Revision: 35052
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35052
Author:   campbellbarton
Date:     2011-02-22 05:49:21 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
part of a patch from Dan Eicher with some edits.
- clean svn string: 35042:35051M -> 35051
- debian and pacman build with threads by default.

Modified Paths:
--------------
    trunk/blender/GNUmakefile
    trunk/blender/build_files/package_spec/build_debian.sh
    trunk/blender/build_files/package_spec/debian/control
    trunk/blender/build_files/package_spec/pacman/PKGBUILD

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-02-22 05:23:20 UTC (rev 35051)
+++ trunk/blender/GNUmakefile	2011-02-22 05:49:21 UTC (rev 35052)
@@ -85,10 +85,10 @@
 
 # package types
 package_debian:
-	cd build_files/package_spec ; sh ./build_debian.sh
+	cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
 
 package_pacman:
-	cd build_files/package_spec/pacman ; makepkg --asroot
+	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
 
 # forward build targets
 test:

Modified: trunk/blender/build_files/package_spec/build_debian.sh
===================================================================
--- trunk/blender/build_files/package_spec/build_debian.sh	2011-02-22 05:23:20 UTC (rev 35051)
+++ trunk/blender/build_files/package_spec/build_debian.sh	2011-02-22 05:49:21 UTC (rev 35052)
@@ -11,7 +11,8 @@
 
 
 # Get values from blender to use in debian/changelog.
-BLENDER_REVISION=$(svnversion)
+# value may be formatted: 35042:35051M
+BLENDER_REVISION=$(svnversion | cut -d: -f2 | tr -dc 0-9)
 
 blender_srcdir=$PWD
 blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)

Modified: trunk/blender/build_files/package_spec/debian/control
===================================================================
--- trunk/blender/build_files/package_spec/debian/control	2011-02-22 05:23:20 UTC (rev 35051)
+++ trunk/blender/build_files/package_spec/debian/control	2011-02-22 05:49:21 UTC (rev 35052)
@@ -5,8 +5,6 @@
 Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.1-dev, libopenjpeg-dev
 Standards-Version: 3.9.1
 Homepage: http://blender.org/
-Vcs-Browser: http://github.com/eponymous/blender
-Vcs-Git: git://github.com/eponymous/blender.git
 X-Python3-Version: >= 3.1, << 3.2
 
 Package: blender-snapshot

Modified: trunk/blender/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD	2011-02-22 05:23:20 UTC (rev 35051)
+++ trunk/blender/build_files/package_spec/pacman/PKGBUILD	2011-02-22 05:49:21 UTC (rev 35052)
@@ -2,7 +2,8 @@
 
 # custom blender vars
 blender_srcdir=$(dirname $startdir)"/../.."
-blender_revision=$(svnversion $blender_srcdir)
+# value may be formatted: 35042:35051M
+blender_revision=$(svnversion $blender_srcdir | cut -d: -f2 | tr -dc 0-9)
 blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
 # blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
 blender_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100)+svn$blender_revision
@@ -40,7 +41,7 @@
     -DWITH_PYTHON_INSTALL:BOOL=OFF \
     -DWITH_OPENCOLLADA:BOOL=OFF
 
-  make
+  make $MAKEFLAGS
 }
 
 package() {