[SCM] csound/master: Refresh patches.
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Thu Apr 19 12:52:39 UTC 2012
The following commit has been merged in the master branch:
commit e9f5c8d366270bc478007488babeaf2546074b95
Author: Felipe Sateler <fsateler at debian.org>
Date: Wed Apr 18 19:24:59 2012 -0300
Refresh patches.
Drop irrelevant font patch
diff --git a/debian/patches/0000-backported-cmake-additions.diff b/debian/patches/0000-backported-cmake-additions.diff
index 677a1ad..395a7b2 100644
--- a/debian/patches/0000-backported-cmake-additions.diff
+++ b/debian/patches/0000-backported-cmake-additions.diff
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4837a61..322ca62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -32,6 +32,8 @@ include(TestBigEndian)
+@@ -32,6 +32,8 @@
include(CheckFunctionExists)
include(CheckIncludeFile)
include(CheckIncludeFileCXX)
@@ -11,7 +9,7 @@ index 4837a61..322ca62 100644
# Utility function to make plugins. All plugin targets should use this as it
# sets up output directory set in top-level CmakeLists.txt
-@@ -143,6 +145,45 @@ function(check_deps option)
+@@ -143,6 +145,45 @@
endif()
endfunction(check_deps)
@@ -57,7 +55,7 @@ index 4837a61..322ca62 100644
if(WIN32 AND NOT MSVC)
if(EXISTS "C:/MinGW/include")
-@@ -217,6 +258,8 @@ option(USE_GETTEXT "Use the Gettext internationalization library" ON)
+@@ -217,6 +258,8 @@
option(BUILD_STATIC_LIBRARY "Also build a static version of the csound library" OFF)
option(USE_OPEN_MP "Use OpenMP for Parallel Performance" ON)
@@ -66,7 +64,7 @@ index 4837a61..322ca62 100644
# Optional targets, they should all default to ON (check_deps will disable them if not possible to build)
-@@ -227,12 +270,23 @@ if(USE_DOUBLE)
+@@ -227,12 +270,23 @@
add_definitions("-DUSE_DOUBLE")
endif(USE_DOUBLE)
if(${CMAKE_C_COMPILER} MATCHES "gcc" AND LINUX)
@@ -92,19 +90,7 @@ index 4837a61..322ca62 100644
endif()
#if(USE_DOUBLE)
-@@ -263,6 +317,11 @@ find_package(OpenMP)
-
- # First, required stuff
- find_library(LIBSNDFILE_LIBRARY sndfile)
-+
-+if(NOT LIBSNDFILE_LIBRARY AND WIN32)
-+find_library(LIBSNDFILE_LIBRARY sndfile-1)
-+endif()
-+
- if(NOT LIBSNDFILE_LIBRARY)
- message(FATAL_ERROR "Csound requires the sndfile library")
- endif()
-@@ -293,6 +352,7 @@ find_library(VORBISFILE_LIBRARY vorbisfile)
+@@ -298,6 +352,7 @@
check_include_file(libintl.h LIBINTL_HEADER)
find_library(LIBINTL_LIBRARY intl)
find_package(Gettext)
@@ -112,7 +98,7 @@ index 4837a61..322ca62 100644
set(HEADERS_TO_CHECK
unistd.h io.h fcntl.h stdint.h
-@@ -307,6 +367,11 @@ foreach(header ${HEADERS_TO_CHECK})
+@@ -312,6 +367,11 @@
check_include_file(${header} HAVE_${upper_header})
endforeach()
@@ -124,22 +110,7 @@ index 4837a61..322ca62 100644
# Flex/Bison for the new parser
if(BUILD_NEW_PARSER)
find_package(FLEX)
-@@ -339,8 +404,12 @@ endif()
- check_deps(USE_OPEN_MP OPENMP_FOUND PTHREAD_BARRIER_INIT_EXISTS)
- if(USE_OPEN_MP)
- list(APPEND libcsound_CFLAGS -DUSE_OPENMP)
-- list(APPEND CMAKE_C_FLAGS ${OpenMP_C_FLAGS})
-- list(APPEND CMAKE_CXX_FLAGS ${OpenMP_CXX_FLAGS})
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-+
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
-+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
-+
- endif()
-
-
-@@ -736,10 +805,7 @@ if(BIG_ENDIAN)
+@@ -745,10 +805,7 @@
list(APPEND libcsound_CFLAGS -DWORDS_BIGENDIAN)
endif()
@@ -151,7 +122,7 @@ index 4837a61..322ca62 100644
target_link_libraries(${CSOUNDLIB} ${libcsound_LIBS})
-@@ -752,9 +818,7 @@ if(BUILD_STATIC_LIBRARY)
+@@ -761,9 +818,7 @@
add_library(${CSOUNDLIB_STATIC} STATIC ${libcsound_SRCS})
SET_TARGET_PROPERTIES(${CSOUNDLIB_STATIC} PROPERTIES OUTPUT_NAME ${CSOUNDLIB})
SET_TARGET_PROPERTIES(${CSOUNDLIB_STATIC} PROPERTIES PREFIX "lib")
@@ -162,119 +133,21 @@ index 4837a61..322ca62 100644
target_link_libraries(${CSOUNDLIB_STATIC} ${libcsound_LIBS})
-diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt
-index 133fa88..d7951e8 100644
--- a/Opcodes/CMakeLists.txt
+++ b/Opcodes/CMakeLists.txt
-@@ -34,6 +34,8 @@ make_plugin(fractalnoise tl/fractalnoise.cpp)
-
- make_plugin(fareygen fareygen.c)
-
-+make_plugin(cellular cellular.c)
-+
- # temporarily do not build on Windows until these opcodes are fixed
- # to compile
- if(NOT WIN32)
-@@ -101,8 +103,7 @@ check_deps(BUILD_IMAGE_OPCODES PNG_FOUND)
- 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/Opcodes/stk/CMakeLists.txt b/Opcodes/stk/CMakeLists.txt
-index 9aaf761..fdaec77 100644
---- a/Opcodes/stk/CMakeLists.txt
-+++ b/Opcodes/stk/CMakeLists.txt
-@@ -3,29 +3,50 @@ option(BUILD_STK_OPCODES "Build the stk opcodes" ON)
- if(BUILD_STK_OPCODES)
- find_library(STK_LIBRARY stk)
- if(STK_LIBRARY)
-- make_plugin(stk-ops stkOpcodes.cpp "stk")
-- set_target_properties(stk-ops PROPERTIES
-- OUTPUT_NAME stk)
-+ find_path(STK_INCLUDE_DIR Stk.h
-+ /usr/include/stk
-+ /usr/local/include/stk)
-+
-+ check_deps(BUILD_STK_OPCODES STK_INCLUDE_DIR)
-+ if(STK_INCLUDE_DIR)
-+ include_directories(${STK_INCLUDE_DIR})
-+
-+ make_plugin(stk-ops stkOpcodes.cpp "stk")
-+
-+ set_target_properties(stk-ops PROPERTIES
-+ OUTPUT_NAME stk)
-+ endif()
- else()
-- set(stk_srcs
-+
-+ set(stk_remove_srcs
- src/InetWvIn.cpp src/InetWvOut.cpp
- src/Mutex.cpp src/RtAudio.cpp
- src/RtMidi.cpp
- src/RtWvIn.cpp src/RtWvOut.cpp
- src/Socket.cpp src/TcpClient.cpp
- src/TcpServer.cpp src/Thread.cpp
-- src/UdpSocket.cpp
-- stkOpcodes.cpp)
-+ src/UdpSocket.cpp)
-+
-+ file(GLOB stk_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*)
-+
-+ list(REMOVE_ITEM stk_srcs ${stk_remove_srcs})
-
-+ list(APPEND stk_srcs stkOpcodes.cpp)
-+
- # Assume that if this file exists, then we have the sources
- find_file(STK_FOUND
- NAMES src/InetWvIn.cpp
- HINTS ${CMAKE_CURRENT_SOURCE_DIR})
-- check_deps(BUILD_STK_OPCODES STK_FOUND)
-+
-+ find_path(STK_INCLUDE_DIR Stk.h ./include)
-+
-+ check_deps(BUILD_STK_OPCODES STK_FOUND STK_INCLUDE_DIR)
-
- if(BUILD_STK_OPCODES)
-
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/stk)
-+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
+@@ -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()
- make_plugin(stk "${stk_srcs}")
-
-@@ -46,9 +67,7 @@ if(BUILD_STK_OPCODES)
- list(APPEND stkdefs "__LITTLE_ENDIAN__")
- endif()
-
--
-- set_target_properties(stk PROPERTIES
-- COMPILE_DEFINITIONS "${stkdefs}")
-+ add_compiler_flags(${stkdefs} TARGETS stk)
-
- endif()
- endif()
-diff --git a/frontends/CsoundAC/CMakeLists.txt b/frontends/CsoundAC/CMakeLists.txt
-index c7a350e..4b0891e 100644
---- a/frontends/CsoundAC/CMakeLists.txt
-+++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -71,6 +71,7 @@ if(BUILD_CSOUND_AC)
- include(${SWIG_USE_FILE})
- set(CMAKE_SWIG_OUTDIR ${BUILD_LIB_DIR})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-+ list(APPEND CMAKE_SWIG_FLAGS "-includeall" "-verbose")
- endif()
-
- if(BUILD_CSOUND_AC_PYTHON_INTERFACE)
-diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
-index e4ff55d..0526fda 100644
+ check_deps(BUILD_PYTHON_OPCODES PYTHONLIBS_FOUND)
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
-@@ -31,8 +31,7 @@ if(BUILD_CXX_INTERFACE)
+@@ -31,8 +31,7 @@
ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR}
)
if(${libcsnd_CFLAGS})
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index 9bf88ce..5d8f1b2 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -6,14 +6,14 @@ Description: Avoid non-free scansyn plugin
Author: Felipe Sateler <fsateler at gmail.com>
--- a/Opcodes/CMakeLists.txt
+++ b/Opcodes/CMakeLists.txt
-@@ -44,10 +44,6 @@
-
- endif()
-
--set(scansyn_SRCS
-- scansyn.c scansynx.c)
--make_plugin(scansyn "${scansyn_SRCS}" m)
--
- if(UNIX)
- make_plugin(control control.c)
- endif()
+@@ -46,10 +46,6 @@
+
+ endif()
+
+-set(scansyn_SRCS
+- scansyn.c scansynx.c)
+-make_plugin(scansyn "${scansyn_SRCS}" m)
+-
+ if(UNIX)
+ make_plugin(control control.c)
+ endif()
diff --git a/debian/patches/2004-fix-gettext.diff b/debian/patches/2004-fix-gettext.diff
index 296a420..5955875 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
-@@ -63,10 +63,8 @@
+@@ -64,10 +64,7 @@
/* setlocale (LC_MESSAGES, s); /\* Set to particular value *\/ */
/* textdomain("csound5"); */ /* This is not needed when using dgettext */
/* bind_textdomain_codeset("csound5", "UTF-8"); */
-#ifdef never
- /* This is experimental; where should these be?? */
+- /* This is experimental; where should these be?? */
- bindtextdomain("csound5", "/home/jpff/Sourceforge/csound/csound5/po");
-#endif
+ bindtextdomain("csound5", "/usr/share/locale");
+ setlocale(LC_NUMERIC, "C"); /* Ensure C syntax */
}
- PUBLIC char *csoundLocalizeString(const char *s)
diff --git a/debian/patches/2007-apidoc-dotpath.patch b/debian/patches/2007-apidoc-dotpath.patch
index a6b6330..c21752d 100644
--- a/debian/patches/2007-apidoc-dotpath.patch
+++ b/debian/patches/2007-apidoc-dotpath.patch
@@ -2,12 +2,12 @@ Description: Leave dotpath blank in doxygen config
Author: Felipe Sateler <fsateler at gmail.com>
--- a/Doxyfile
+++ b/Doxyfile
-@@ -1459,7 +1459,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.
-
--DOT_PATH = D:\utah\opt\ATT\Graphviz\bin
-+DOT_PATH =
-
- # The DOTFILE_DIRS tag can be used to specify one or more directories that
- # contain dot files that are included in the documentation (see the
+@@ -1457,7 +1457,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.
+
+-DOT_PATH = D:\utah\opt\ATT\Graphviz\bin
++DOT_PATH =
+
+ # The DOTFILE_DIRS tag can be used to specify one or more directories that
+ # contain dot files that are included in the documentation (see the
diff --git a/debian/patches/series b/debian/patches/series
index 27cf5ce..e732167 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
2000-avoid-nonfree-scansyn-plugin.diff
2001-lua-link.diff
2004-fix-gettext.diff
-2006-apidocs-font.patch
2007-apidoc-dotpath.patch
2008-apidoc-listings-pkg.patch
2013-no-rawwave-defined.diff
--
csound packaging
More information about the pkg-multimedia-commits
mailing list