mirrors/blender
1
0
Fork 0
mirror of https://projects.blender.org/blender/blender.git synced 2025-01-22 15:32:15 -05:00
Code Issues Projects Releases Packages Wiki Activity

part of a patch from Dan Eicher with some edits.

Browse source 
- clean svn string: 35042:35051M -> 35051
- debian and pacman build with threads by default.
This commit is contained in:
Campbell Barton 2011-02-22 05:49:21 +00:00
parent dd8383e469
commit 44e33571ca
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
GNUmakefile
View file

@ -85,10 +85,10 @@ debug: all
# 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:

3
build_files/package_spec/build_debian.sh
View file

@ -11,7 +11,8 @@ cp -a build_files/package_spec/debian .
# 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)

2
build_files/package_spec/debian/control
View file

@ -5,8 +5,6 @@ Maintainer: Dan Eicher <dan@trollwerks.org>
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

5
build_files/package_spec/pacman/PKGBUILD
View file

@ -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 @@ build() {
-DWITH_PYTHON_INSTALL:BOOL=OFF \
-DWITH_OPENCOLLADA:BOOL=OFF
make
make $MAKEFLAGS
}
package() {