[SCM] csound/master: Pass DEFAULT_STK_RAWWAVE_PATH via cmake flags instead of custom.cmake

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a170aa9e8f12930ee252ea638b190347f4203d3b
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Dec 24 15:02:18 2017 -0300

    Pass DEFAULT_STK_RAWWAVE_PATH via cmake flags instead of custom.cmake
    
    Fixes some quoting issues

diff --git a/debian/Custom.cmake b/debian/Custom.cmake
index 216e782..abdb2ef 100644
--- a/debian/Custom.cmake
+++ b/debian/Custom.cmake
@@ -29,4 +29,3 @@ add_definitions(-DCS_PACKAGE_DATE=\"@DATE@\")
 #set(FLTK_INCLUDE_DIR "/usr/include")
 set(FLTK_SKIP_OPENGL ON)
 
-set(DEFAULT_STK_RAWWAVE_PATH "/usr/share/stk/rawwaves")
diff --git a/debian/patches/cmake-Don-t-backslash-escape-default-rawwave-path.patch b/debian/patches/cmake-Don-t-backslash-escape-default-rawwave-path.patch
new file mode 100644
index 0000000..00fdba5
--- /dev/null
+++ b/debian/patches/cmake-Don-t-backslash-escape-default-rawwave-path.patch
@@ -0,0 +1,43 @@
+From: Felipe Sateler <fsateler at gmail.com>
+Date: Sat, 23 Dec 2017 10:21:08 -0300
+Subject: cmake: Don't backslash-escape default rawwave path
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+
+U2luY2UgdGhlIHN3aXRjaCB0byBuYXRpdmUgY21ha2UgZnVuY3Rpb25zIHRoaXMgZG91YmxlIGVz
+Y2FwZSBpcyBub3QgbmVjZXNzYXJ5LCBhbmQKY2F1c2VzIGEgYnVpbGQgZmFpbHVyZSB3aGVuIGJ1
+aWxkaW5nIHdpdGggLURERUZBVUxUX1NUS19SQVdXQVZFX1BBVEg9L3NvbWUvcGF0aDoKCjxjb21t
+YW5kLWxpbmU+OjA6MjM6IHdhcm5pbmc6IG1pc3NpbmcgdGVybWluYXRpbmcgIiBjaGFyYWN0ZXIK
+PGNvbW1hbmQtbGluZT46MDoyMjogZXJyb3I6IHN0cmF5IOKAmFzigJkgaW4gcHJvZ3JhbQouLi9P
+cGNvZGVzL3N0ay9zdGtPcGNvZGVzLmNwcDo3NDI6MTY6IG5vdGU6IGluIGV4cGFuc2lvbiBvZiBt
+YWNybyDigJhERUZBVUxUX1JBV1dBVkVfUEFUSOKAmQogICAgICAgICBwYXRoID0gREVGQVVMVF9S
+QVdXQVZFX1BBVEg7CiAgICAgICAgICAgICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fgo8Y29tbWFu
+ZC1saW5lPjowOjIzOiBlcnJvcjogbWlzc2luZyB0ZXJtaW5hdGluZyAiIGNoYXJhY3RlcgouLi9P
+cGNvZGVzL3N0ay9zdGtPcGNvZGVzLmNwcDo3NDI6MTY6IG5vdGU6IGluIGV4cGFuc2lvbiBvZiBt
+YWNybyDigJhERUZBVUxUX1JBV1dBVkVfUEFUSOKAmQogICAgICAgICBwYXRoID0gREVGQVVMVF9S
+QVdXQVZFX1BBVEg7CiAgICAgICAgICAgICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fgouLi9PcGNv
+ZGVzL3N0ay9zdGtPcGNvZGVzLmNwcDogSW4gZnVuY3Rpb24g4oCYaW50IGNzb3VuZE1vZHVsZUlu
+aXQoQ1NPVU5EKinigJk6Ci4uL09wY29kZXMvc3RrL3N0a09wY29kZXMuY3BwOjc0MjozNjogZXJy
+b3I6IGV4cGVjdGVkIHByaW1hcnktZXhwcmVzc2lvbiBiZWZvcmUg4oCYO+KAmSB0b2tlbgogICAg
+ICAgICBwYXRoID0gREVGQVVMVF9SQVdXQVZFX1BBVEg7CiAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgIF4KCkp1c3QgcmVtb3ZlIGl0IGFuZCB0aGUgYnVpbGQgaXMgZml4ZWQKCihj
+aGVycnkgcGlja2VkIGZyb20gY29tbWl0IDZkMzcwODg0NDE0Mzc2YmUwZDZjZjYwNDkyYjFkMzFl
+MGNlNjU0ODApCg==
+---
+ Opcodes/stk/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Opcodes/stk/CMakeLists.txt b/Opcodes/stk/CMakeLists.txt
+index 49a8d2f..25e6d55 100644
+--- a/Opcodes/stk/CMakeLists.txt
++++ b/Opcodes/stk/CMakeLists.txt
+@@ -10,7 +10,7 @@ endif()
+ 
+ if(BUILD_STK_OPCODES)
+     if(DEFAULT_STK_RAWWAVE_PATH)
+-        set(rawwave_path "-DDEFAULT_RAWWAVE_PATH=\\\"${DEFAULT_STK_RAWWAVE_PATH}\\\"")
++        set(rawwave_path "-DDEFAULT_RAWWAVE_PATH=\"${DEFAULT_STK_RAWWAVE_PATH}\"")
+     endif()
+     #find_library(STK_LIBRARY stk)
+     if(STK_LIBRARY)
diff --git a/debian/patches/series b/debian/patches/series
index 540bb9c..dfcafeb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-specific/lua-link.diff
+cmake-Don-t-backslash-escape-default-rawwave-path.patch
diff --git a/debian/rules b/debian/rules
index 80fd63e..c2a2ccf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,7 @@ endif
 DEB_CMAKE_EXTRA_FLAGS += \
 	-DUSE_FLTK=ON \
 	-DBUILD_STK_OPCODES=ON \
+	-DDEFAULT_STK_RAWWAVE_PATH=/usr/share/stk/rawwaves \
 	-DBUILD_VIRTUAL_KEYBOARD=ON \
 	-DBUILD_DSSI_OPCODES=ON \
 	-DBUILD_CHUA_OPCODES=ON \

-- 
csound packaging