[SCM] csound/master: Refresh patches
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Sat Jan 27 12:51:22 UTC 2018
The following commit has been merged in the master branch:
commit 63dfb8247479c66f71230fb1c516f2671679af0d
Author: Felipe Sateler <fsateler at debian.org>
Date: Fri Dec 22 20:24:27 2017 -0300
Refresh patches
diff --git a/debian/patches/Allow-overriding-_MODULE_INSTALL_DIR.patch b/debian/patches/Allow-overriding-_MODULE_INSTALL_DIR.patch
deleted file mode 100644
index 0369def..0000000
--- a/debian/patches/Allow-overriding-_MODULE_INSTALL_DIR.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Mon, 17 Jul 2017 16:33:44 -0400
-Subject: Allow overriding {PYTHON,JAVA,LUA}_MODULE_INSTALL_DIR
-
----
- CMakeLists.txt | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f97541b..6013c93 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -221,11 +221,13 @@ endif()
- execute_process (
- COMMAND python -c
- "import site, sys; sys.stdout.write(site.getusersitepackages())"
-- OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
-+ OUTPUT_VARIABLE PYTHON_USER_SITE_PACKAGES
- )
-
--set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
--set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
-+SET(PYTHON_MODULE_INSTALL_DIR ${PYTHON_USER_SITE_PACKAGES} CACHE PATH "Python module install dir")
-+
-+set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR} CACHE PATH "Java module install dir")
-+set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR} CACHE PATH "Lua module install dir")
-
- # VL this is breaking CUDA compilation. It's not necessary
- #if(APPLE)
-@@ -242,7 +244,7 @@ if(WIN32 AND NOT MSVC)
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--add-stdcall-alias")
- endif()
-
--if(MSVC)
-+if(MSVC)
- include_directories(${PROJECT_SOURCE_DIR}/msvc/include)
- set(CMAKE_REQUIRED_INCLUDES "${PROJECT_SOURCE_DIR}/msvc/include;${PROJECT_SOURCE_DIR}/msvc/deps/include")
- endif()
-@@ -347,7 +349,7 @@ message(STATUS "Building for OSX")
- set(VECLIB_PATH "/System/Library/Frameworks/")
- endif()
- endif()
--
-+
- endif()
-
- if(USE_DOUBLE)
-@@ -466,7 +468,7 @@ endif()
- if(NOT MSVC AND REQUIRE_PTHREADS)
- # Use ladder of if's to support older CMake versions (i.e., travis)
- find_library(PTHREAD_LIBRARY winpthread-1)
-- if(NOT PTHREAD_LIBRARY)
-+ if(NOT PTHREAD_LIBRARY)
- find_library(PTHREAD_LIBRARY pthread)
- endif()
- if(NOT PTHREAD_LIBRARY)
-@@ -829,7 +831,7 @@ set(mp3in_SRCS
- InOut/libmpadec/tables.c
- InOut/libmpadec/mpadec.c
- InOut/libmpadec/mp3dec.c)
--
-+
- list(APPEND libcsound_SRCS ${stdopcod_SRCS} ${cs_pvs_ops_SRCS} ${oldpvoc_SRCS} ${mp3in_SRCS})
-
- if(INIT_STATIC_MODULES)
-@@ -889,7 +891,7 @@ set_source_files_properties(${YACC_OUTH} GENERATED)
- set_source_files_properties(${LEX_OUT} GENERATED)
- set_source_files_properties(${PRELEX_OUT} GENERATED)
-
--if(MSVC)
-+if(MSVC)
- set_source_files_properties(${LEX_OUT} PROPERTIES
- COMPILE_FLAGS -DYY_NO_UNISTD_H)
- set_source_files_properties(${PRELEX_OUT} PROPERTIES
-@@ -939,7 +941,7 @@ list(APPEND libcsound_SRCS ${PRELEX_SCOOUT})
- #set_source_files_properties(${YACC_SCOOUT} GENERATED)
- #set_source_files_properties(${LEX_SCOOUT} GENERATED)
- set_source_files_properties(${PRELEX_SCOOUT} GENERATED)
--if(MSVC)
-+if(MSVC)
- set_source_files_properties(${PRELEX_SCOOUT} PROPERTIES
- COMPILE_FLAGS -DYY_NO_UNISTD_H)
- endif()
-@@ -1340,7 +1342,7 @@ set (CPACK_PACKAGE_VERSION_MINOR "0")
- set (CPACK_PACKAGE_VERSION_PATCH "0")
- include (CPack)
-
--# Documentation
-+# Documentation
- find_package(Doxygen)
- if(DOXYGEN_FOUND)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.doxygen
diff --git a/debian/patches/Fix-build-failure-with-GMM-5.2.patch b/debian/patches/Fix-build-failure-with-GMM-5.2.patch
deleted file mode 100644
index 79f2094..0000000
--- a/debian/patches/Fix-build-failure-with-GMM-5.2.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Wed, 23 Aug 2017 13:11:10 -0300
-Subject: Fix build failure with GMM 5.2+
-
-Forwarded: https://github.com/csound/csound/pull/839
----
- CMakeLists.txt | 1 +
- Opcodes/CMakeLists.txt | 4 ++--
- Opcodes/linear_algebra.cpp | 10 ++++++++++
- cmake/Modules/FindGMM.cmake | 17 +++++++++++++++++
- 4 files changed, 30 insertions(+), 2 deletions(-)
- create mode 100644 cmake/Modules/FindGMM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6013c93..e33ab74 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -504,6 +504,7 @@ endif()
- find_library(VORBISFILE_LIBRARY vorbisfile)
- check_include_file(libintl.h LIBINTL_HEADER)
- find_path(EIGEN3_INCLUDE_PATH eigen3/Eigen/Dense)
-+find_package(GMM)
- find_library(LIBINTL_LIBRARY intl)
- find_package(Gettext)
- check_library_exists(m lrint "" HAVE_LRINT)
-diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt
-index 9ab4051..45d88e1 100644
---- a/Opcodes/CMakeLists.txt
-+++ b/Opcodes/CMakeLists.txt
-@@ -29,7 +29,6 @@ find_library(FLUIDSYNTH_LIBRARY fluidsynth)
- find_library(JACK_LIBRARY jack)
- find_library(JACKDMP_LIBRARY jackdmp)
- check_include_file(jack/jack.h JACK_HEADER)
--check_include_file_cxx(gmm/gmm.h GMM_HEADER)
- check_include_file(lo/lo.h OSC_HEADER)
- find_library(LIBLO_LIBRARY lo)
- find_package(ZLIB)
-@@ -197,9 +196,10 @@ if(BUILD_JACK_OPCODES)
- make_plugin(jackTransport jackTransport.c "${jack_LIBS}")
- endif()
-
--check_deps(BUILD_LINEAR_ALGEBRA_OPCODES GMM_HEADER)
-+check_deps(BUILD_LINEAR_ALGEBRA_OPCODES GMM_FOUND)
- if(BUILD_LINEAR_ALGEBRA_OPCODES)
- make_plugin(linear_algebra linear_algebra.cpp)
-+ target_include_directories(linear_algebra PRIVATE ${GMM_INCLUDE_DIRS})
- endif()
-
- check_deps(BUILD_OSC_OPCODES LIBLO_LIBRARY OSC_HEADER)
-diff --git a/Opcodes/linear_algebra.cpp b/Opcodes/linear_algebra.cpp
-index a8a87b1..4bc84f7 100644
---- a/Opcodes/linear_algebra.cpp
-+++ b/Opcodes/linear_algebra.cpp
-@@ -349,6 +349,16 @@ extern "C"
-
- using namespace csound;
-
-+static std::ostream &operator <<(std::ostream &o, const std::vector<double>& m)
-+{
-+ gmm::write(o,m); return o;
-+}
-+
-+static std::ostream &operator <<(std::ostream &o, const std::vector< std::complex<double> >& m)
-+{
-+ gmm::write(o,m); return o;
-+}
-+
- /**
- * Template union for safely and efficiently
- * typecasting the value of a MYFLT variable
-diff --git a/cmake/Modules/FindGMM.cmake b/cmake/Modules/FindGMM.cmake
-new file mode 100644
-index 0000000..5bd70f6
---- /dev/null
-+++ b/cmake/Modules/FindGMM.cmake
-@@ -0,0 +1,17 @@
-+# Try to find the GMM library.
-+# Once done this will define:
-+# GMM_FOUND - System has the GMM library.
-+# GMM_INCLUDE_DIRS - The GMM include directories.
-+# GMM_HAS_VECTOR_OSTREAM - Wether GMM defines operator<< for std::vector
-+
-+find_path(GMM_INCLUDE_DIR gmm/gmm.h)
-+
-+set(GMM_INCLUDE_DIRS ${GMM_INCLUDE_DIR})
-+
-+include(FindPackageHandleStandardArgs)
-+# handle the QUIETLY and REQUIRED arguments and set GMM_FOUND to TRUE
-+# if all listed variables are TRUE
-+find_package_handle_standard_args(GMM DEFAULT_MSG
-+ GMM_INCLUDE_DIR)
-+
-+mark_as_advanced(GMM_INCLUDE_DIR GMM_HAS_VECTOR_OSTREAM)
diff --git a/debian/patches/debian-specific/lua-link.diff b/debian/patches/debian-specific/lua-link.diff
index 1f2e30c..1f985c3 100644
--- a/debian/patches/debian-specific/lua-link.diff
+++ b/debian/patches/debian-specific/lua-link.diff
@@ -14,10 +14,10 @@ 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 27af591..ef11d2b 100644
+index 7413cf3..36a3004 100644
--- a/frontends/CsoundAC/CMakeLists.txt
+++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -157,10 +157,10 @@ if(BUILD_CSOUND_AC)
+@@ -166,10 +166,10 @@ if(BUILD_CSOUND_AC)
PROPERTIES CPLUSPLUS ON
SWIG_MODULE_NAME luaCsoundAC)
SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
@@ -29,12 +29,12 @@ index 27af591..ef11d2b 100644
+ SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY})
endif()
-
+ if(APPLE)
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
-index 8a949c3..b005578 100644
+index df4cb12..021b19e 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
-@@ -187,7 +187,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
+@@ -180,7 +180,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
endif()
if(BUILD_LUA_INTERFACE)
diff --git a/debian/patches/series b/debian/patches/series
index 1f1653b..540bb9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
debian-specific/lua-link.diff
-Allow-overriding-_MODULE_INSTALL_DIR.patch
-Fix-build-failure-with-GMM-5.2.patch
--
csound packaging
More information about the pkg-multimedia-commits
mailing list