[SCM] csound/master: Fix building of CsoundAC

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 68db22c94a1f979f1e5c9285be36b2f8be4780ad
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Apr 19 00:08:02 2012 -0300

    Fix building of CsoundAC

diff --git a/debian/patches/0003-csoundac.patch b/debian/patches/0003-csoundac.patch
new file mode 100644
index 0000000..b95a91b
--- /dev/null
+++ b/debian/patches/0003-csoundac.patch
@@ -0,0 +1,72 @@
+--- a/frontends/CsoundAC/CMakeLists.txt
++++ b/frontends/CsoundAC/CMakeLists.txt
+@@ -46,7 +46,16 @@
+         StrangeAttractor.cpp
+         System.cpp
+         Voicelead.cpp
+-        VoiceleadingNode.cpp)
++        VoiceleadingNode.cpp
++        allegro.cpp
++        allegrord.cpp
++        allegroserial.cpp
++        allegrosmfrd.cpp
++        allegrosmfwr.cpp
++        allegrowr.cpp
++        mfmidi.cpp
++        strparse.cpp
++        trace.cpp)
+     
+     add_library(libCsoundAC SHARED ${libcsoundac_SRCS})
+     set_target_properties(libCsoundAC PROPERTIES
+@@ -57,7 +66,9 @@
+         LIBRARY_OUTPUT_DIRECTORY ${BUILD_LIB_DIR}
+         ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR}
+         )
+-    target_link_libraries(libCsoundAC libcsnd ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY})
++    target_link_libraries(libCsoundAC libcsnd ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${CSOUNDLIB})
++    add_compiler_flags(-pthread TARGETS libCsoundAC)
++    add_compiler_flags(-pthread TARGETS libCsoundAC LINKER)
+     
+     if(MUSICXML_LIBRARY) 
+         target_link_libraries(CsoundAC MUSICXML_LIBRARY)
+@@ -82,7 +93,7 @@
+             PROPERTIES CPLUSPLUS ON
+             SWIG_MODULE_NAME CsoundAC)
+         swig_add_module(CsoundAC python CsoundAC.i)
+-        swig_link_libraries(CsoundAC libCsoundAC ${PYTHON_LIBRARIES})
++        swig_link_libraries(CsoundAC libCsoundAC ${PYTHON_LIBRARIES} libcsnd ${CSOUNDLIB})
+ 
+         set_target_properties(${SWIG_MODULE_CsoundAC_REAL_NAME} PROPERTIES
+             RUNTIME_OUTPUT_DIRECTORY ${BUILD_LIB_DIR}
+--- a/frontends/CsoundAC/Cell.hpp
++++ b/frontends/CsoundAC/Cell.hpp
+@@ -37,7 +37,7 @@
+    * Score node that simplifies building up repetitive
+    * and overlapping motivic cells, such as used in Minimalism.
+    */
+-  class Cell :
++  class SILENCE_PUBLIC Cell :
+     public ScoreNode
+   {
+   public:
+--- a/frontends/CsoundAC/System.hpp
++++ b/frontends/CsoundAC/System.hpp
+@@ -252,7 +252,7 @@
+   /**
+    * Encapsulates a thread monitor, such as a Windows event handle.
+    */
+-  class ThreadLock
++  class SILENCE_PUBLIC ThreadLock
+   {
+     void *lock;
+   public:
+--- a/frontends/CsoundAC/Event.hpp
++++ b/frontends/CsoundAC/Event.hpp
+@@ -167,6 +167,6 @@
+ #endif
+   };
+ 
+-  bool operator < (const Event& a, const Event &b);
++  bool SILENCE_PUBLIC operator < (const Event& a, const Event &b);
+ }
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 4047ca4..3572c4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 0000-backported-cmake-additions.diff
 0001-functions-custom-cmake.diff
 0002-link-dssi-dl.patch
+0003-csoundac.patch
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff
 2004-fix-gettext.diff

-- 
csound packaging