[colobot] 01/03: Rework the handling of music re-encoding:

[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 7beee71a5a285436705fd7235b45bd4f931c18d8
Author: Didier Raboud <odyx at debian.org>
Date:   Tue Sep 15 21:14:20 2015 +0200

    Rework the handling of music re-encoding:
    
     - Patch the music CMake machinery to cope with the music orig archive being unpacked at the root of the source directory
     - Make sure arch-indep builds don't try to oggenc the music files
---
 .../find-music-in-root-for-multi-source.patch        | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 debian/rules                                         | 18 ++++++++++--------
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/debian/patches/find-music-in-root-for-multi-source.patch b/debian/patches/find-music-in-root-for-multi-source.patch
new file mode 100644
index 0000000..52db743
--- /dev/null
+++ b/debian/patches/find-music-in-root-for-multi-source.patch
@@ -0,0 +1,20 @@
+Description: Cope with the music orig.tar being unpacked in music/ and not in data/music
+Author: Didier Raboud <odyx at debian.org>
+Origin: vendor
+Forwarded: not likely to be adopted, so not yet
+Last-Update: 2015-09-16
+--- a/data/music/CMakeLists.txt
++++ b/data/music/CMakeLists.txt
+@@ -58,9 +58,9 @@
+             set(DOWNLOAD_FILE ${FILENAME}.ogg)
+         endif()
+ 
+-        # If the required file is already available in source directory, don't download
+-        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DOWNLOAD_FILE}")
+-            set(DOWNLOAD_FILE_LOC "${CMAKE_CURRENT_SOURCE_DIR}/${DOWNLOAD_FILE}")
++        # If the required file is already available in the root music/ source directory, don't download
++        if(EXISTS "${CMAKE_SOURCE_DIR}/music/${DOWNLOAD_FILE}")
++            set(DOWNLOAD_FILE_LOC "${CMAKE_SOURCE_DIR}/music/${DOWNLOAD_FILE}")
+             add_custom_target(download-${FILENAME}) # no operation
+         else()
+             if(NOT WGET)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..aa2f228
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+find-music-in-root-for-multi-source.patch
diff --git a/debian/rules b/debian/rules
index a96d346..9b4d483 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+CBOT_CONFIGURE_SOUNDS=-DMUSIC:BOOL=False
+ifneq (,$(findstring colobot-common-sounds, $(shell dh_listpackages)))
+CBOT_CONFIGURE_SOUNDS=-DMUSIC:BOOL=True -DMUSIC_FLAC:BOOL=True
+endif
+
 %:
 	dh $@ \
 		--buildsystem=cmake \
@@ -7,22 +12,19 @@
 		--dbg-package=colobot-dbg
 
 override_dh_auto_configure:
-ifneq (,$(findstring colobot-common-sounds, $(shell dh_listpackages)))
-	# Make sure the data/music submodule is reacheable where it should
-	[ -h data/music ] || (rmdir data/music; ln -s ../music data/music)
-endif
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
 	                     -DINSTALL_DOCS:BOOL=True \
+	                     ${CBOT_CONFIGURE_SOUNDS} \
 	                     -DOPENAL_SOUND:BOOL=True
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	dh_auto_build -a
-	dh_auto_build -i -- doc
 	# obj-* is the default builddirectory in debhelper
 	convert obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)/desktop/32/colobot.png debian/colobot.xpm
 
+override_dh_auto_build-indep:
+	dh_auto_build -i -- doc
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f debian/colobot.xpm
-	# Make sure the data/music submodule is reacheable where it should
-	[ ! -h data/music ] || (rm -f data/music; mkdir data/music)

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