[SCM] csound/master: Remove patch applied upstream
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Thu Aug 15 00:07:13 UTC 2013
The following commit has been merged in the master branch:
commit cadf63afe4753dc59e122f2274dde2272d17e4fc
Author: Felipe Sateler <fsateler at debian.org>
Date: Wed Aug 14 18:00:51 2013 -0400
Remove patch applied upstream
diff --git a/debian/patches/0000-hide-non-public-functions.patch b/debian/patches/0000-hide-non-public-functions.patch
deleted file mode 100644
index be75207..0000000
--- a/debian/patches/0000-hide-non-public-functions.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-commit 6117f9ca000907c73af94399adfdfe3bdee9e948
-Author: steven <steven at localhost.localdomain>
-Date: Mon Jul 15 15:50:31 2013 -0400
-
- made unit tests link to static csound lib, removed PUBLIC macro from functions that don't need to be PUBLIC
-
-diff --git a/Engine/csound_orc_compile.c b/Engine/csound_orc_compile.c
-index f55a5c6..9da3d0e 100644
---- a/Engine/csound_orc_compile.c
-+++ b/Engine/csound_orc_compile.c
-@@ -181,7 +181,7 @@ static inline void append_optxt(OPTXT *op1, OPTXT *op2)
- }
-
- /** Counts number of args in argString, taking into account array identifiers */
--PUBLIC int argsRequired(char* argString)
-+int argsRequired(char* argString)
- {
- int retVal = 0;
- char* t = argString;
-@@ -205,7 +205,7 @@ PUBLIC int argsRequired(char* argString)
- }
-
- /** Splits args in argString into char**, taking into account array identifiers */
--PUBLIC char** splitArgs(CSOUND* csound, char* argString)
-+char** splitArgs(CSOUND* csound, char* argString)
- {
- int argCount = argsRequired(argString);
- char** args = mmalloc(csound, sizeof(char**) * (argCount + 1));
-diff --git a/Engine/csound_orc_semantics.c b/Engine/csound_orc_semantics.c
-index ae6e0ed..6d332d4 100644
---- a/Engine/csound_orc_semantics.c
-+++ b/Engine/csound_orc_semantics.c
-@@ -49,7 +49,7 @@ extern int pnum(char*);
- OENTRIES* find_opcode2(CSOUND*, char*);
- char* resolve_opcode_get_outarg(CSOUND* csound,
- OENTRIES* entries, char* inArgTypes);
--PUBLIC int check_out_args(CSOUND* csound, char* outArgsFound, char* opOutArgs);
-+int check_out_args(CSOUND* csound, char* outArgsFound, char* opOutArgs);
- char* get_arg_string_from_tree(CSOUND* csound, TREE* tree, TYPE_TABLE* typeTable);
- char* convert_internal_to_external(CSOUND* csound, char* arg);
- char* convert_external_to_internal(CSOUND* csound, char* arg);
-@@ -171,7 +171,7 @@ char* get_array_sub_type(CSOUND* csound, char* arrayName) {
- }
-
- /* This function gets arg type without checking type table */
--PUBLIC char* get_arg_type(CSOUND* csound, TREE* tree)
-+char* get_arg_type(CSOUND* csound, TREE* tree)
- { /* find arg type: d, w, a, k, i, c, p, r, S, B, b, t */
- char* s;
- char* t;
-@@ -421,7 +421,7 @@ char *check_annotated_type(CSOUND* csound, OENTRIES* entries,
-
-
- /* This function gets arg type with checking type table */
--PUBLIC char* get_arg_type2(CSOUND* csound, TREE* tree, TYPE_TABLE* typeTable)
-+char* get_arg_type2(CSOUND* csound, TREE* tree, TYPE_TABLE* typeTable)
- {
- char* s;
- char* t;
-@@ -714,7 +714,7 @@ OENTRY* find_opcode(CSOUND *csound, char *opname)
- /* Finds OENTRIES that match the given opcode name. May return multiple
- * OENTRY*'s for each entry in a polyMorphic opcode.
- */
--PUBLIC OENTRIES* find_opcode2(CSOUND* csound, char* opname) {
-+OENTRIES* find_opcode2(CSOUND* csound, char* opname) {
-
- int i = 0;
- char *shortName;
-@@ -768,7 +768,7 @@ int check_array_arg(char* found, char* required) {
- return (*f == *r);
- }
-
--PUBLIC int check_in_arg(char* found, char* required) {
-+int check_in_arg(char* found, char* required) {
- char* t;
- int i;
- if (UNLIKELY(found == NULL || required == NULL)) {
-@@ -823,7 +823,7 @@ PUBLIC int check_in_arg(char* found, char* required) {
- return 0;
- }
-
--PUBLIC int check_in_args(CSOUND* csound, char* inArgsFound, char* opInArgs) {
-+int check_in_args(CSOUND* csound, char* inArgsFound, char* opInArgs) {
- if((inArgsFound == NULL || strlen(inArgsFound) == 0) &&
- (opInArgs == NULL || strlen(opInArgs) == 0)) {
- return 1;
-@@ -900,7 +900,7 @@ inline static int is_out_var_arg(char arg) {
- return (strchr("mzIXNF*", arg) != NULL);
- }
-
--PUBLIC int check_out_arg(char* found, char* required) {
-+int check_out_arg(char* found, char* required) {
- char* t;
- int i;
-
-@@ -950,7 +950,7 @@ PUBLIC int check_out_arg(char* found, char* required) {
- return 0;
- }
-
--PUBLIC int check_out_args(CSOUND* csound, char* outArgsFound, char* opOutArgs)
-+int check_out_args(CSOUND* csound, char* outArgsFound, char* opOutArgs)
- {
-
- if((outArgsFound == NULL || strlen(outArgsFound) == 0) &&
-@@ -1020,7 +1020,7 @@ PUBLIC int check_out_args(CSOUND* csound, char* outArgsFound, char* opOutArgs)
- * are multiple opcode entries with same types and last one should
- * override previous definitions.
- */
--PUBLIC OENTRY* resolve_opcode(CSOUND* csound, OENTRIES* entries,
-+OENTRY* resolve_opcode(CSOUND* csound, OENTRIES* entries,
- char* outArgTypes, char* inArgTypes) {
-
- // OENTRY* retVal = NULL;
-@@ -1049,7 +1049,7 @@ PUBLIC OENTRY* resolve_opcode(CSOUND* csound, OENTRIES* entries,
- }
-
- /* used when creating T_FUNCTION's */
--PUBLIC char* resolve_opcode_get_outarg(CSOUND* csound, OENTRIES* entries,
-+char* resolve_opcode_get_outarg(CSOUND* csound, OENTRIES* entries,
- char* inArgTypes) {
- int i;
-
-@@ -1149,7 +1149,7 @@ char* convert_external_to_internal(CSOUND* csound, char* arg) {
- }
-
-
--PUBLIC char* get_arg_string_from_tree(CSOUND* csound, TREE* tree,
-+char* get_arg_string_from_tree(CSOUND* csound, TREE* tree,
- TYPE_TABLE* typeTable) {
-
- int len = tree_arg_list_count(tree);
-@@ -1199,7 +1199,7 @@ PUBLIC char* get_arg_string_from_tree(CSOUND* csound, TREE* tree,
-
-
-
--PUBLIC OENTRY* find_opcode_new(CSOUND* csound, char* opname,
-+OENTRY* find_opcode_new(CSOUND* csound, char* opname,
- char* outArgsFound, char* inArgsFound) {
-
- // csound->Message(csound, "Searching for opcode: %s | %s | %s\n",
-diff --git a/tests/c/CMakeLists.txt b/tests/c/CMakeLists.txt
-index b49eb20..475966f 100644
---- a/tests/c/CMakeLists.txt
-+++ b/tests/c/CMakeLists.txt
-@@ -5,56 +5,56 @@ set(TEST_ARGS "-+env:OPCODE6DIR64=${CMAKE_CURRENT_BINARY_DIR}/../..")
-
- # Tests that depend on cunit
- find_library(CUNIT_LIBRARY cunit)
--check_deps(BUILD_TESTS CUNIT_LIBRARY)
-+check_deps(BUILD_TESTS CUNIT_LIBRARY BUILD_STATIC_LIBRARY)
- if(BUILD_TESTS)
-
- ENABLE_TESTING()
-
- add_executable(testCompilation compilation_test.c)
--target_link_libraries(testCompilation ${CSOUNDLIB} ${CUNIT_LIBRARY})
-+target_link_libraries(testCompilation ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY})
- add_test(NAME testCompilation
- COMMAND $<TARGET_FILE:testCompilation> minimal.csd ${TEST_ARGS})
-
- add_executable(testCsoundTypeSystem csound_type_system_test.c)
--target_link_libraries(testCsoundTypeSystem ${CSOUNDLIB} ${CUNIT_LIBRARY})
-+target_link_libraries(testCsoundTypeSystem ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY})
- set(testCsoundTypeSystem -D__BUILDING_LIBCSOUND)
- add_test(NAME testCsoundTypeSystem
- COMMAND $<TARGET_FILE:testCsoundTypeSystem> ${TEST_ARGS})
-
- add_executable(testCsoundMessageBuffer csound_message_buffer_test.c)
- include_directories("${CMAKE_CURRENT_BINARY_DIR}/../../H")
--target_link_libraries(testCsoundMessageBuffer ${CSOUNDLIB} ${CUNIT_LIBRARY})
-+target_link_libraries(testCsoundMessageBuffer ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY})
- add_test(NAME testCsoundMessageBuffer
- COMMAND $<TARGET_FILE:testCsoundMessageBuffer> ${TEST_ARGS})
-
- add_executable(testCsoundOrcSemantics csound_orc_semantics_test.c)
--target_link_libraries(testCsoundOrcSemantics ${CSOUNDLIB} ${CUNIT_LIBRARY})
-+target_link_libraries(testCsoundOrcSemantics ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY})
- add_test(NAME testCsoundOrcSemantics
- COMMAND $<TARGET_FILE:testCsoundOrcSemantics> ${TEST_ARGS})
-
- add_executable(testCsoundOrcCompileTest csound_orc_compile_test.c)
--target_link_libraries(testCsoundOrcCompileTest ${CSOUNDLIB} ${CUNIT_LIBRARY})
-+target_link_libraries(testCsoundOrcCompileTest ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY})
- add_test(NAME testCsoundOrcCompileTest
- COMMAND $<TARGET_FILE:testCsoundOrcCompileTest> ${TEST_ARGS})
-
- add_executable(testChannels channel_tests.c)
- include_directories("${CMAKE_CURRENT_BINARY_DIR}/../../H")
--target_link_libraries(testChannels ${CSOUNDLIB} ${CUNIT_LIBRARY})
-+target_link_libraries(testChannels ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY})
- add_test(NAME testChannels
- COMMAND $<TARGET_FILE:testChannels> ${TEST_ARGS})
-
- add_executable(testCsoundDataStructures csound_data_structures_test.c)
--target_link_libraries(testCsoundDataStructures ${CSOUNDLIB} ${CUNIT_LIBRARY})
-+target_link_libraries(testCsoundDataStructures ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY})
- add_test(NAME testCsoundDataStructures
- COMMAND $<TARGET_FILE:testCsoundDataStructures> ${TEST_ARGS})
-
- add_executable(testIo io_test.c)
--target_link_libraries(testIo ${CSOUNDLIB} ${CUNIT_LIBRARY})
-+target_link_libraries(testIo ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY})
- add_test(NAME testIo
- COMMAND $<TARGET_FILE:testIo> minimal.csd ${TEST_ARGS})
-
- add_executable(testCircularBuffer csound_circular_buffer_test.c)
--target_link_libraries(testCircularBuffer ${CSOUNDLIB} ${CUNIT_LIBRARY} pthread)
-+target_link_libraries(testCircularBuffer ${CSOUNDLIB_STATIC} ${CUNIT_LIBRARY} pthread)
- add_test(NAME testCircularBuffer
- COMMAND $<TARGET_FILE:testCircularBuffer> minimal.csd ${TEST_ARGS})
- endif()
diff --git a/debian/patches/series b/debian/patches/series
index a741869..eb4a843 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0000-hide-non-public-functions.patch
2000-avoid-nonfree-scansyn-plugin.diff
2001-lua-link.diff
2004-fix-gettext.diff
--
csound packaging
More information about the pkg-multimedia-commits
mailing list