[colobot] 01/02: Update oggenc-reproducibility patch to use the original file's bytesize as --serial integer

[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 db85c1067214a1de9f5f4f0cf55c854196dbee2c
Author: Didier Raboud <odyx at debian.org>
Date:   Mon Dec 5 13:34:42 2016 +0100

    Update oggenc-reproducibility patch to use the original file's bytesize as --serial integer
    
    Thanks-To: Clint Adams <clint at debian.org>
    Closes: #846976
---
 debian/patches/oggenc-reproducibly.patch | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/patches/oggenc-reproducibly.patch b/debian/patches/oggenc-reproducibly.patch
index 56a7eec..be19a04 100644
--- a/debian/patches/oggenc-reproducibly.patch
+++ b/debian/patches/oggenc-reproducibly.patch
@@ -1,16 +1,23 @@
-Description: pass the original flac file as serial to oggenc to avoid picking
- unreproducibilty from current time and process id
+Description: pass the original flac file's bytesize as serial integer to oggenc
+ to avoid picking unreproducibilty from current time and process id
 Author: Didier Raboud <odyx at debian.org>
-Last-Update: 2016-11-04
+Thanks-To: Chris Lamb <lamby at debian.org>
+Thanks-To: Clint Adams <clint at debian.org>
+Bug-Debian: https://bugs.debian.org/846976
+Last-Update: 2016-12-05
 
 --- a/data/music/CMakeLists.txt
 +++ b/data/music/CMakeLists.txt
-@@ -86,7 +86,7 @@
+@@ -84,9 +84,11 @@
+                 install(FILES ${DOWNLOAD_FILE_LOC} DESTINATION ${COLOBOT_INSTALL_MUSIC_DIR})
+             else()
                  message(STATUS "Adding OGG convert target for ${FILE}")
++                find_program(STAT stat)
++                execute_process(COMMAND ${STAT} --printf="%s" "${DOWNLOAD_FILE_LOC}" OUTPUT_VARIABLE FILENAME_INT)
                  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}"
++                    COMMAND ${OGGENC} --serial ${FILENAME_INT} -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")

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