From 875f554cff9be6bbf581d67c64344c4af91e81d4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 11 Feb 2011 10:29:47 +0000 Subject: [PATCH] patch [#26030] Debian spec fix (Patch for #26028) from Shinsuke Irie (irie) --- build_files/package_spec/build_debian.sh | 18 ++++++++++-------- build_files/package_spec/debian/changelog | 2 +- build_files/package_spec/debian/control | 5 +++-- build_files/package_spec/debian/rules | 22 ++++++++++++++++------ 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/build_files/package_spec/build_debian.sh b/build_files/package_spec/build_debian.sh index 79d917b430e..17c0abb888b 100644 --- a/build_files/package_spec/build_debian.sh +++ b/build_files/package_spec/build_debian.sh @@ -1,10 +1,13 @@ #!/bin/sh # Builds a debian package from SVN source. - +# +# For paralelle builds use: +# DEB_BUILD_OPTIONS="parallel=5" sh build_files/package_spec/build_debian.sh # this needs to run in the root dir. cd $(dirname $0)/../../ -ln -s $PWD/build_files/package_spec/debian $PWD/debian +rm -rf debian +cp -a build_files/package_spec/debian . # Get values from blender to use in debian/changelog. @@ -13,11 +16,10 @@ BLENDER_REVISION=$(svnversion) blender_srcdir=$PWD blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9) BLENDER_VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100) +DEB_VERSION=${BLENDER_VERSION}+svn${BLENDER_REVISION}-bf -# replace changelog value -svn revert debian/changelog -sed -i 's//'$BLENDER_VERSION'/g' debian/changelog -sed -i 's//'$BLENDER_REVISION'/g' debian/changelog +# update debian/changelog +dch -b -v $DEB_VERSION "New upstream SVN snapshot." # run the rules makefile @@ -28,5 +30,5 @@ mv *.gz ../ debuild -i -us -uc -b -# remove symlink -rm debian +# remove temp dir +rm -rf debian diff --git a/build_files/package_spec/debian/changelog b/build_files/package_spec/debian/changelog index a37e46ffe07..0559bb0c4d8 100644 --- a/build_files/package_spec/debian/changelog +++ b/build_files/package_spec/debian/changelog @@ -1,4 +1,4 @@ -blender (+svn-bf) unstable; urgency=low +blender (2.56+svn34749-bf) unstable; urgency=low * New upstream SVN snapshot. diff --git a/build_files/package_spec/debian/control b/build_files/package_spec/debian/control index d07db427af6..5d9615faf8b 100644 --- a/build_files/package_spec/debian/control +++ b/build_files/package_spec/debian/control @@ -2,15 +2,16 @@ Source: blender Section: graphics Priority: extra Maintainer: Dan Eicher -Build-Depends: debhelper (>= 7.0.50~), cdbs, cmake, python-support, 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 [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] +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 [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] 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 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends} Description: Very fast and versatile 3D modeller/renderer Blender is an integrated 3d suite for modelling, animation, rendering, post-production, interactive creation and playback (games). Blender has its diff --git a/build_files/package_spec/debian/rules b/build_files/package_spec/debian/rules index 932ad19f7ad..5844d289d88 100755 --- a/build_files/package_spec/debian/rules +++ b/build_files/package_spec/debian/rules @@ -1,15 +1,25 @@ #!/usr/bin/make -f - -# blender spesific CMake options -DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_BUILD_TYPE:STRING=Release -DWITH_PYTHON_INSTALL:BOOL=OFF -DWITH_OPENCOLLADA:BOOL=OFF - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk +# -*- makefile -*- SVN_URL := https://svn.blender.org/svnroot/bf-blender/trunk/blender REV := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]svn([0-9]+).*,\1,p') VER := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') +REL := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]+\.[0-9]+).*,\1,p') TARBALL = blender_$(VER).orig.tar.gz +BLDDIR = debian/cmake + +%: + dh $@ -Scmake -B$(BLDDIR) --parallel --with python3 --without python-support + +override_dh_auto_configure: + # blender spesific CMake options + dh_auto_configure -- \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DWITH_PYTHON_INSTALL:BOOL=OFF \ + -DWITH_OPENCOLLADA:BOOL=OFF + +override_dh_python3: + dh_python3 -V 3.1-3.2 /usr/share/blender/$(REL)/scripts get-orig-source: rm -rf get-orig-source $(TARBALL)