[SCM] csound/master: Fix indentation in use system stk patch: actually building the opcode was being skipped

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9a81125aa90b0dde1f2bd7b352db4ee70f427ddf
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Jan 18 20:25:49 2011 -0300

    Fix indentation in use system stk patch: actually building the opcode was being skipped

diff --git a/debian/patches/1000-use-system-stk.diff b/debian/patches/1000-use-system-stk.diff
index 5386311..5ab22e9 100644
--- a/debian/patches/1000-use-system-stk.diff
+++ b/debian/patches/1000-use-system-stk.diff
@@ -6,8 +6,8 @@ Author: Felipe Sateler <fsateler at gmail.com>
 Forwarded: no
 Index: csound-5.13.0~dfsg/SConstruct
 ===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:20:05.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:19:26.000000000 -0300
+--- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:59:28.000000000 -0300
++++ csound-5.13.0~dfsg/SConstruct	2011-01-18 20:25:07.000000000 -0300
 @@ -800,6 +800,7 @@
  pulseaudioFound = configure.CheckHeader("pulse/simple.h", language = "C")
  #else:
@@ -75,10 +75,6 @@ Index: csound-5.13.0~dfsg/SConstruct
 -        stkEnvironment.Append(LIBS = csoundWindowsLibraries)
 -    elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'sunos':
 -        stkEnvironment.Append(LIBS = ['pthread'])
--    # This is the one that actually defines the opcodes.
--    # They are straight wrappers, as simple as possible.
--    stk = makePlugin(stkEnvironment, 'stk', ['Opcodes/stk/stkOpcodes.cpp'])
--    Depends(stk, stkLibrary)
 +        if getPlatform() == 'win32':
 +            stkEnvironment.Append(CCFLAGS = '-D__OS_WINDOWS__')
 +            stkEnvironment.Append(CCFLAGS = '-D__STK_REALTIME__')
@@ -112,9 +108,11 @@ Index: csound-5.13.0~dfsg/SConstruct
 +            stkEnvironment.Append(LIBS = csoundWindowsLibraries)
 +        elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'sunos':
 +            stkEnvironment.Append(LIBS = ['pthread'])
-+        # This is the one that actually defines the opcodes.
-+        # They are straight wrappers, as simple as possible.
-+        stk = makePlugin(stkEnvironment, 'stkopcodes', ['Opcodes/stk/stkOpcodes.cpp'])
+     # This is the one that actually defines the opcodes.
+     # They are straight wrappers, as simple as possible.
+-    stk = makePlugin(stkEnvironment, 'stk', ['Opcodes/stk/stkOpcodes.cpp'])
+-    Depends(stk, stkLibrary)
++    stk = makePlugin(stkEnvironment, 'stkopcodes', ['Opcodes/stk/stkOpcodes.cpp'])
  
  # Python opcodes
  

-- 
csound packaging