diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-22 08:49:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-22 08:49:21 +0300 |
| commit | 44e33571cad0843ecd5029b77a336dc4d7120eef (patch) | |
| tree | 7ad6052fcdfa9f79277e1d4e80d050d36e22d878 /build_files/package_spec | |
| parent | dd8383e469369a116c00b479af23028b77827b42 (diff) | |
part of a patch from Dan Eicher with some edits.
- clean svn string: 35042:35051M -> 35051
- debian and pacman build with threads by default.
Diffstat (limited to 'build_files/package_spec')
| -rwxr-xr-x | build_files/package_spec/build_debian.sh | 3 | ||||
| -rw-r--r-- | build_files/package_spec/debian/control | 2 | ||||
| -rw-r--r-- | build_files/package_spec/pacman/PKGBUILD | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build_files/package_spec/build_debian.sh b/build_files/package_spec/build_debian.sh index dda24eabee5..1d35e4590e2 100755 --- a/build_files/package_spec/build_debian.sh +++ b/build_files/package_spec/build_debian.sh @@ -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) diff --git a/build_files/package_spec/debian/control b/build_files/package_spec/debian/control index 3a6fda8ff6c..7329a552dbc 100644 --- a/build_files/package_spec/debian/control +++ b/build_files/package_spec/debian/control @@ -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 diff --git a/build_files/package_spec/pacman/PKGBUILD b/build_files/package_spec/pacman/PKGBUILD index 6102be5833c..3cbd452dbf4 100644 --- a/build_files/package_spec/pacman/PKGBUILD +++ b/build_files/package_spec/pacman/PKGBUILD @@ -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() { |