[colobot] 70/74: Patch the flac-to-ogg conversion to use the filename as ogg serial number; makes that part of the build reproducible

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 5b761173db54248832f79556fbd2ce29f5ff1372
Author: Didier Raboud <odyx at debian.org>
Date:   Fri Nov 4 11:42:45 2016 +0100

    Patch the flac-to-ogg conversion to use the filename as ogg serial number; makes that part of the build reproducible
---
 debian/patches/oggenc-reproducibly.patch | 16 ++++++++++++++++
 debian/patches/series                    |  1 +
 2 files changed, 17 insertions(+)

diff --git a/debian/patches/oggenc-reproducibly.patch b/debian/patches/oggenc-reproducibly.patch
new file mode 100644
index 0000000..56a7eec
--- /dev/null
+++ b/debian/patches/oggenc-reproducibly.patch
@@ -0,0 +1,16 @@
+Description: pass the original flac file as serial to oggenc to avoid picking
+ unreproducibilty from current time and process id
+Author: Didier Raboud <odyx at debian.org>
+Last-Update: 2016-11-04
+
+--- a/data/music/CMakeLists.txt
++++ b/data/music/CMakeLists.txt
+@@ -86,7 +86,7 @@
+                 message(STATUS "Adding OGG convert target for ${FILE}")
+                 add_custom_command(
+                     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.ogg"
+-                    COMMAND ${OGGENC} -q ${MUSIC_QUALITY} -o "${FILENAME}.ogg" "${DOWNLOAD_FILE_LOC}"
++                    COMMAND ${OGGENC} --serial "${FILENAME}" -q ${MUSIC_QUALITY} -o "${FILENAME}.ogg" "${DOWNLOAD_FILE_LOC}"
+                     DEPENDS download-${FILENAME} "${DOWNLOAD_FILE_LOC}"
+                 )
+                 add_custom_target(generate-${FILENAME} ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.ogg")
diff --git a/debian/patches/series b/debian/patches/series
index aa2f228..0e9e2d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 find-music-in-root-for-multi-source.patch
+oggenc-reproducibly.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git