[SCM] blender/master: debian/patches/: patchset updated

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6e9c6ce5b5d505a208cca12de258c918d96e764e
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Thu May 12 14:07:34 2016 +0200

    debian/patches/: patchset updated
    
    - 0008-make_blender_reproducible.patch added
    
    Closes: #823940
    Thanks: Campbell Burton (upstream dev) for the patch.

diff --git a/debian/patches/0008-make_blender_reproducible.patch b/debian/patches/0008-make_blender_reproducible.patch
new file mode 100644
index 0000000..54fc5a7
--- /dev/null
+++ b/debian/patches/0008-make_blender_reproducible.patch
@@ -0,0 +1,81 @@
+From: Campbell Barton <ideasman42 at gmail.com>
+Date: Wed, 11 May 2016 02:43:58 +1000
+Subject: make_blender_reproducible
+
+---
+ CMakeLists.txt                    |  4 ++++
+ build_files/cmake/buildinfo.cmake | 26 +++++++++++++++++++-------
+ source/creator/CMakeLists.txt     |  3 +++
+ 3 files changed, 26 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa05865..d285df9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -221,6 +221,10 @@ if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
+ 	# add_library OBJECT arg unsupported
+ 	set(WITH_BUILDINFO OFF)
+ endif()
++set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date for reproducable builds (empty string disables this option)")
++set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time for reproducable builds (empty string disables this option)")
++mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
++mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
+ 
+ option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
+ option(WITH_IK_SOLVER     "Enable Legacy IK solver (only disable for development)" ON)
+diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
+index d292b35..d3b6d10 100644
+--- a/build_files/cmake/buildinfo.cmake
++++ b/build_files/cmake/buildinfo.cmake
+@@ -1,5 +1,10 @@
+-# This is called by cmake as an extermal process from
++# This is called by cmake as an external process from
+ # ./source/creator/CMakeLists.txt to write ./source/creator/buildinfo.h
++# Caller must define:
++#   SOURCE_DIR
++# Optional overrides:
++#   BUILD_DATE
++#   BUILD_TIME
+ 
+ # Extract working copy information for SOURCE_DIR into MY_XXX variables
+ # with a default in case anything fails, for example when using git-svn
+@@ -134,12 +139,19 @@ endif()
+ # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
+ # but BUILD_DATE and BUILD_TIME are platform dependent
+ if(UNIX)
+-	execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+-	execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+-endif()
+-if(WIN32)
+-	execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+-	execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
++	if(NOT BUILD_DATE)
++		execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
++	endif()
++	if(NOT BUILD_TIME)
++		execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
++	endif()
++elseif(WIN32)
++	if(NOT BUILD_DATE)
++		execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
++	endif()
++	if(NOT BUILD_TIME)
++		execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
++	endif()
+ endif()
+ 
+ # Write a file with the BUILD_HASH define
+diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+index e1e72d2..aa60c17 100644
+--- a/source/creator/CMakeLists.txt
++++ b/source/creator/CMakeLists.txt
+@@ -182,6 +182,9 @@ if(WITH_BUILDINFO)
+ 	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_buildinfo.h
+ 		COMMAND ${CMAKE_COMMAND}
+ 		-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
++		# overrides only used when non-empty strings
++		-DBUILD_DATE=${BUILDINFO_OVERRIDE_DATE}
++		-DBUILD_TIME=${BUILDINFO_OVERRIDE_TIME}
+ 		-P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake)
+ 
+ 	# buildinfo.h is a generated file
diff --git a/debian/patches/series b/debian/patches/series
index 5da87c3..2045be1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-do_not_use_version_number_in_system_path.patch
 0006-look_for_dejavu_ttf_with_fontconfig.patch
 0007-fix_FTBFS_on_armel.patch
+0008-make_blender_reproducible.patch

-- 
blender packaging