[SCM] csound/master: Refresh patches
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Sun Aug 4 00:15:42 UTC 2013
The following commit has been merged in the master branch:
commit 1dafbe8c03b2590f41cddf9cef32a3cd1db79fe7
Author: Felipe Sateler <fsateler at debian.org>
Date: Sat Jun 29 19:14:44 2013 -0400
Refresh patches
diff --git a/debian/patches/0000-backported-cmake-additions.diff b/debian/patches/0000-backported-cmake-additions.diff
deleted file mode 100644
index 6d805fa..0000000
--- a/debian/patches/0000-backported-cmake-additions.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Opcodes/CMakeLists.txt
-+++ b/Opcodes/CMakeLists.txt
-@@ -105,8 +105,7 @@
- if(BUILD_IMAGE_OPCODES)
- include_directories(${PNG_INCLUDE_DIR})
- make_plugin(image imageOpcodes.c "${PNG_LIBRARIES}")
-- set_target_properties(image
-- PROPERTIES COMPILER_FLAGS "${PNG_DEFINITIONS}")
-+ add_compiler_flags(${PNG_DEFINITIONS} TARGETS image)
- endif()
-
- check_deps(BUILD_PYTHON_OPCODES PYTHONLIBS_FOUND)
diff --git a/debian/patches/0003-csoundac.patch b/debian/patches/0003-csoundac.patch
deleted file mode 100644
index 3f04e53..0000000
--- a/debian/patches/0003-csoundac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/frontends/CsoundAC/CMakeLists.txt
-+++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -68,7 +68,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)
-@@ -93,7 +95,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}
diff --git a/debian/patches/0004-swig-java-package.patch b/debian/patches/0004-swig-java-package.patch
deleted file mode 100644
index d98dbb9..0000000
--- a/debian/patches/0004-swig-java-package.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Correctly pass the -package flag to the java interface build
---- a/interfaces/CMakeLists.txt
-+++ b/interfaces/CMakeLists.txt
-@@ -97,8 +97,9 @@
- INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS})
- set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd)
-
-+ list(APPEND javaSwigOptions -package csnd)
- SET_SOURCE_FILES_PROPERTIES(java_interface.i PROPERTIES CPLUSPLUS ON)
-- SET_SOURCE_FILES_PROPERTIES(java_interface.i SWIG_FLAGS "-package" "csnd")
-+ SET_SOURCE_FILES_PROPERTIES(java_interface.i PROPERTIES SWIG_FLAGS "${javaSwigOptions}")
- SWIG_ADD_MODULE(_jcsound java java_interface.i)
- SWIG_LINK_LIBRARIES(_jcsound ${swigjava_LIBS})
-
diff --git a/debian/patches/1000-csoundac-cmake-bugfix.patch b/debian/patches/1000-csoundac-cmake-bugfix.patch
index 97f7c35..d063adf 100644
--- a/debian/patches/1000-csoundac-cmake-bugfix.patch
+++ b/debian/patches/1000-csoundac-cmake-bugfix.patch
@@ -1,6 +1,6 @@
--- a/frontends/CsoundAC/CMakeLists.txt
+++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -29,7 +29,6 @@
+@@ -33,7 +33,6 @@
allegrowr.cpp
Cell.cpp
ChordLindenmayer.cpp
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index 5d8f1b2..d4d42bc 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -6,8 +6,8 @@ Description: Avoid non-free scansyn plugin
Author: Felipe Sateler <fsateler at gmail.com>
--- a/Opcodes/CMakeLists.txt
+++ b/Opcodes/CMakeLists.txt
-@@ -46,10 +46,6 @@
-
+@@ -58,10 +58,6 @@
+ make_plugin(platerev platerev.c)
endif()
-set(scansyn_SRCS
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 64dd46b..8fd30c2 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -8,18 +8,22 @@ Description: Only link to lua when necessary, and to the correct lib
Author: Felipe Sateler <fsateler at gmail.com>
--- a/frontends/CsoundAC/CMakeLists.txt
+++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -117,7 +117,7 @@
+@@ -123,10 +123,10 @@
PROPERTIES CPLUSPLUS ON
SWIG_MODULE_NAME luaCsoundAC)
SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
-- SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC ${LUA_LIBRARIES})
-+ SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC)
+- SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${LUA_LIBRARIES})
++ SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY})
+
+ if(MUSICXML_LIBRARY)
+- SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY} ${LUA_LIBRARIES})
++ SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY})
+ endif()
set_target_properties(${SWIG_MODULE_luaCsoundAC_REAL_NAME} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY ${BUILD_LIB_DIR}
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
-@@ -126,7 +126,7 @@
+@@ -141,7 +141,7 @@
if(BUILD_LUA_INTERFACE)
INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
diff --git a/debian/patches/2004-fix-gettext.diff b/debian/patches/2004-fix-gettext.diff
index 5955875..dbce4dc 100644
--- a/debian/patches/2004-fix-gettext.diff
+++ b/debian/patches/2004-fix-gettext.diff
@@ -2,15 +2,15 @@ Description: Set the correct path to search for locales
Author: Felipe Sateler <fsateler at gmail.com>
--- a/Top/getstring.c
+++ b/Top/getstring.c
-@@ -64,10 +64,7 @@
+@@ -74,10 +74,7 @@
/* setlocale (LC_MESSAGES, s); /\* Set to particular value *\/ */
- /* textdomain("csound5"); */ /* This is not needed when using dgettext */
- /* bind_textdomain_codeset("csound5", "UTF-8"); */
+ /* textdomain("csound6"); */ /* This is not needed when using dgettext */
+ /* bind_textdomain_codeset("csound6", "UTF-8"); */
-#ifdef never
- /* This is experimental; where should these be?? */
-- bindtextdomain("csound5", "/home/jpff/Sourceforge/csound/csound5/po");
+- bindtextdomain("csound6", "/home/jpff/Sourceforge/csound/csound6/po");
-#endif
-+ bindtextdomain("csound5", "/usr/share/locale");
++ bindtextdomain("csound6", "/usr/share/locale");
+ #ifndef HAVE_STRTOD_L
setlocale(LC_NUMERIC, "C"); /* Ensure C syntax */
- }
-
+ #else
diff --git a/debian/patches/2007-apidoc-dotpath.patch b/debian/patches/2007-apidoc-dotpath.patch
index c21752d..0fcd5af 100644
--- a/debian/patches/2007-apidoc-dotpath.patch
+++ b/debian/patches/2007-apidoc-dotpath.patch
@@ -2,7 +2,7 @@ Description: Leave dotpath blank in doxygen config
Author: Felipe Sateler <fsateler at gmail.com>
--- a/Doxyfile
+++ b/Doxyfile
-@@ -1457,7 +1457,7 @@
+@@ -1512,7 +1512,7 @@
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
diff --git a/debian/patches/2013-no-rawwave-defined.diff b/debian/patches/2013-no-rawwave-defined.diff
index fa8bac8..8922549 100644
--- a/debian/patches/2013-no-rawwave-defined.diff
+++ b/debian/patches/2013-no-rawwave-defined.diff
@@ -2,7 +2,7 @@ Description: Do not print error message when RAWwAVE_PATH is undefined
In Debian, we know where they are.
--- a/Opcodes/stk/stkOpcodes.cpp
+++ b/Opcodes/stk/stkOpcodes.cpp
-@@ -681,19 +681,13 @@
+@@ -715,19 +715,15 @@
const char *path = csound->GetEnv(csound, "RAWWAVE_PATH");
if(!path)
{
@@ -10,21 +10,18 @@ Description: Do not print error message when RAWwAVE_PATH is undefined
- Str("Error: define environment variable RAWWAVE_PATH\n"
- "(points to rawwaves directory) to use STK opcodes."));
- return 0;
-- }
-- else
-- {
-- csound_global_mutex_lock();
-- Stk::setRawwavePath(path);
-- csound_global_mutex_unlock();
-- csound->Message(csound,
-- Str("RAWWAVE_PATH: %s\n"), Stk::rawwavePath().c_str());
+ path = "/usr/share/stk/rawwaves";
}
-+ csound_global_mutex_lock();
-+ Stk::setRawwavePath(path);
-+ csound_global_mutex_unlock();
-+ csound->Message(csound,
-+ Str("RAWWAVE_PATH: %s\n"), Stk::rawwavePath().c_str());
+- else
+- {
++
+ csound_global_mutex_lock();
+ Stk::setRawwavePath(path);
+ csound_global_mutex_unlock();
+ csound->DebugMsg(csound,
+ Str("RAWWAVE_PATH: %s\n"), Stk::rawwavePath().c_str());
+- }
++
int status = 0;
for(OENTRY *oentry = &oentries[0]; oentry->opname; oentry++)
{
diff --git a/debian/patches/2014-cmake-libsndfile-hack.patch b/debian/patches/2014-cmake-libsndfile-hack.patch
deleted file mode 100644
index c1df729..0000000
--- a/debian/patches/2014-cmake-libsndfile-hack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -808,6 +808,14 @@
- list(APPEND libcsound_CFLAGS -DWORDS_BIGENDIAN)
- endif()
-
-+# Debian-specific hack to to set the define for libsndfile
-+# to the highest version needed for proper compilation.
-+# The version is already higher in Debian stable, so this
-+# should be no problem. Ideally, the CMake build will be
-+# fixed to test the libsndfile version, at which point
-+# this hack can be removed.
-+list(APPEND libcsound_CFLAGS -DHAVE_LIBSNDFILE=1016)
-+
- add_compiler_flags(${libcsound_CFLAGS} TARGETS ${CSOUNDLIB})
-
- target_link_libraries(${CSOUNDLIB} ${libcsound_LIBS})
diff --git a/debian/patches/2015-bison-2.6.patch b/debian/patches/2015-bison-2.6.patch
deleted file mode 100644
index c28e5d8..0000000
--- a/debian/patches/2015-bison-2.6.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Description: Fix compilation with bison 2.6
-Origin: upstream,
- http://sourceforge.net/p/csound/csound5-git/ci/a8bc8d505cd05ea4e989b02ffd43d2632abaa63d/,
- http://sourceforge.net/p/csound/csound5-git/ci/96102e2b48176b669b7cbe8acd372498af901053/,
- http://sourceforge.net/p/csound/csound5-git/ci/8190391da6ed248a86f9f363e536dba6c2e5fa16/,
- http://sourceforge.net/p/csound/csound5-git/ci/df9f511370de339abc603364de8da4c99fc5d27a/
-Bug-Debian: http://bugs.debian.org/710619
-Last-Update: 2013-06-03
-
---- a/Engine/csound_orc_compile.c
-+++ b/Engine/csound_orc_compile.c
-@@ -24,6 +24,8 @@
- */
-
- #include "csoundCore.h"
-+ /* needed for bison 2.6 */
-+#include "parse_param.h"
- #include "csound_orc.h"
- #include <math.h>
- #include <ctype.h>
-@@ -1849,7 +1851,7 @@
- }
-
- /* For diagnostics map file name or macro name to an index */
--int file_to_int(CSOUND *csound, const char *name)
-+uint8_t file_to_int(CSOUND *csound, const char *name)
- {
- extern char *strdup(const char *);
- int n = 0;
---- a/Engine/parse_param.h
-+++ b/Engine/parse_param.h
-@@ -1,3 +1,6 @@
-+#ifndef __PARSE_PARAM_H
-+#define __PARSE_PARAM_H
-+
- #define MARGS (3)
- #define MAX_INCLUDE_DEPTH 100
- struct MACRO;
-@@ -54,4 +57,6 @@
- void cs_init_omacros(CSOUND*, PRE_PARM*, NAMES*);
-
- uint32_t make_location(PRE_PARM *);
--extern uint8_t file_to_int(CSOUND*, char*);
-+extern uint8_t file_to_int(CSOUND*, const char*);
-+
-+#endif
---- a/Engine/csound_orc.l
-+++ b/Engine/csound_orc.l
-@@ -33,8 +33,9 @@
- #define YYLTYPE ORCTOKEN*
- #include "tok.h"
- #define YY_DECL int yylex (YYLTYPE *lvalp, CSOUND *csound, yyscan_t yyscanner)
--#include "csound_orcparse.h"
-+//#include "parse_param.h"
- #include "csound_orc.h"
-+#include "csound_orcparse.h"
- #include "corfile.h"
- YYSTYPE *yylval_param;
- YYLTYPE *yylloc_param;
---- a/Engine/symbtab.c
-+++ b/Engine/symbtab.c
-@@ -27,7 +27,7 @@
- #include <string.h>
- #include "csoundCore.h"
- #include "tok.h"
--#include "csound_orcparse.h"
-+#include "csound_orc.h"
- #include "insert.h"
- #include "namedins.h"
- #include "interlocks.h"
---- a/Engine/cs_par_dispatch.c
-+++ b/Engine/cs_par_dispatch.c
-@@ -26,7 +26,7 @@
-
- #include "csoundCore.h"
- #include "csound_orc.h"
--#include "tok.h"
-+//#include "tok.h"
- #include "cs_par_base.h"
- #include "cs_par_orc_semantics.h"
- #include "cs_par_dispatch.h"
---- a/Engine/new_orc_parser.c
-+++ b/Engine/new_orc_parser.c
-@@ -24,9 +24,9 @@
- */
-
- #include "csoundCore.h"
--#include "csound_orcparse.h"
- #include "csound_orc.h"
--#include "parse_param.h"
-+#include "csound_orcparse.h"
-+//#include "parse_param.h"
- #include "corfile.h"
-
- extern void csound_orcrestart(FILE*, void *);
---- a/H/csound_orc.h
-+++ b/H/csound_orc.h
-@@ -1,6 +1,7 @@
- #ifndef __CSOUND_ORC_H
-
- #define __CSOUND_ORC_H
-+#include "parse_param.h"
- #include "tok.h"
- typedef struct TREE {
- int type;
---- a/Top/main.c
-+++ b/Top/main.c
-@@ -52,8 +52,8 @@
- extern OENTRY opcodlst_1[];
- extern uintptr_t kperfThread(void * cs);
- #if defined(ENABLE_NEW_PARSER)
--extern void cs_init_math_constants_macros(CSOUND *csound,void *yyscanner);
--extern void cs_init_omacros(CSOUND *csound, NAMES *nn);
-+extern void cs_init_math_constants_macros(CSOUND *csound,PRE_PARM *yyscanner);
-+extern void cs_init_omacros(CSOUND *csound, PRE_PARM* yyscanner, NAMES *nn);
- #endif
-
- static void create_opcodlst(CSOUND *csound)
diff --git a/debian/patches/series b/debian/patches/series
index 665ba27..fef61cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-0000-backported-cmake-additions.diff
-0003-csoundac.patch
-0004-swig-java-package.patch
1000-csoundac-cmake-bugfix.patch
2000-avoid-nonfree-scansyn-plugin.diff
2001-lua-link.diff
@@ -8,6 +5,3 @@
2007-apidoc-dotpath.patch
2008-apidoc-listings-pkg.patch
2013-no-rawwave-defined.diff
-
-2014-cmake-libsndfile-hack.patch
-2015-bison-2.6.patch
--
csound packaging
More information about the pkg-multimedia-commits
mailing list