[SCM] csound/master: Refresh patches

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Wed Jun 21 01:31:32 UTC 2017


The following commit has been merged in the master branch:
commit f3be642a38193d1d31b0fe698177a5487ceec4cf
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Jun 20 20:05:09 2017 -0400

    Refresh patches

diff --git a/debian/patches/debian-specific/lua-link.diff b/debian/patches/debian-specific/lua-link.diff
index 27bfa1e..148b075 100644
--- a/debian/patches/debian-specific/lua-link.diff
+++ b/debian/patches/debian-specific/lua-link.diff
@@ -14,27 +14,27 @@ else it will fail to load. Use the correct library name.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/frontends/CsoundAC/CMakeLists.txt b/frontends/CsoundAC/CMakeLists.txt
-index 3ff5647..2405327 100644
+index 27af591..ef11d2b 100644
 --- a/frontends/CsoundAC/CMakeLists.txt
 +++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -155,10 +155,10 @@ if(BUILD_CSOUND_AC)
-             PROPERTIES CPLUSPLUS ON
-             SWIG_MODULE_NAME luaCsoundAC)
-         SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
--        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${LUAJIT_LIBRARY})
-+        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY})
- 
-         if(MUSICXML_LIBRARY)
--          SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY} ${LUAJIT_LIBRARY})
-+          SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY})
-         endif()
- 
- 
+@@ -157,10 +157,10 @@ if(BUILD_CSOUND_AC)
+             PROPERTIES CPLUSPLUS ON
+             SWIG_MODULE_NAME luaCsoundAC)
+         SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
+-        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${LUAJIT_LIBRARY})
++        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY})
+ 
+         if(MUSICXML_LIBRARY)
+-          SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY} ${LUAJIT_LIBRARY})
++          SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY})
+         endif()
+ 
+ 
 diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
-index 83c0864..54d71dc 100644
+index ce8b199..6bd11e0 100644
 --- a/interfaces/CMakeLists.txt
 +++ b/interfaces/CMakeLists.txt
-@@ -183,7 +183,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
+@@ -199,7 +199,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
      endif()
  
      if(BUILD_LUA_INTERFACE)

-- 
csound packaging



More information about the pkg-multimedia-commits mailing list