[SCM] csound/master: Drop patches applied upstream
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Sat Oct 19 23:03:45 UTC 2013
The following commit has been merged in the master branch:
commit 02f141a2e384caccb6b2e83d5f42559526f4d8b6
Author: Felipe Sateler <fsateler at debian.org>
Date: Sat Oct 19 18:06:14 2013 -0300
Drop patches applied upstream
diff --git a/debian/patches/0000-cmake-flags-fixes.patch b/debian/patches/0000-cmake-flags-fixes.patch
deleted file mode 100644
index 747fcc8..0000000
--- a/debian/patches/0000-cmake-flags-fixes.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -160,6 +160,11 @@
- endif()
- endfunction(add_compiler_flags)
-
-+### COMPILER OPTIMIZATION FLAGS
-+option(USE_COMPILER_OPTIMIZATIONS "Use the default Csound compiler optimization flags" ON)
-+if(USE_COMPILER_OPTIMIZATIONS)
-+include(cmake/CompilerOptimizations.cmake)
-+endif()
-
- # Include this after the install path definitions so we can override them here.
- # Also after function definitions so we can use them there
-@@ -309,7 +314,7 @@
-
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
- add_definitions("-Wno-format")
-- add_compiler_flags("-g")
-+ # add_compiler_flags("-g")
- endif()
-
-
-@@ -340,7 +345,6 @@
- SET(BUILD_SHARED_LIBS ON)
-
- ## HEADER/LIBRARY/OTHER CHECKS ##
--
- find_package(OpenMP)
-
- # First, required stuff
-@@ -376,6 +380,12 @@
-
- # Now, non required library searches #
-
-+include(cmake/CheckAtomic.cmake)
-+if(HAVE_ATOMIC_BUILTIN)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_ATOMIC_BUILTIN")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_ATOMIC_BUILTIN")
-+endif()
-+
- find_library(VORBISFILE_LIBRARY vorbisfile)
- check_include_file(libintl.h LIBINTL_HEADER)
- check_include_file_cxx(eigen3/Eigen/Dense EIGEN3_HEADER)
-@@ -1005,20 +1015,7 @@
- endif()
-
-
--# VL 13.02.2013: I have added this code to make the PUBLIC attribute mean
--# something on gcc (OSX, LINUX), since we are using it.
--# see http://gcc.gnu.org/wiki/Visibility
--
--if(NOT WIN32)
--if(CMAKE_C_COMPILER MATCHES "gcc")
-- add_compiler_flags(${libcsound_CFLAGS} -fvisibility=hidden
-- -ffast-math -mfpmath=sse -fomit-frame-pointer TARGETS ${CSOUNDLIB})
--else()
-- add_compiler_flags(${libcsound_CFLAGS} TARGETS ${CSOUNDLIB})
--endif()
--else()
-- add_compiler_flags(${libcsound_CFLAGS} TARGETS ${CSOUNDLIB})
--endif()
-+add_compiler_flags(${libcsound_CFLAGS} TARGETS ${CSOUNDLIB})
-
- target_link_libraries(${CSOUNDLIB} ${libcsound_LIBS})
-
---- a/Custom.cmake.ex
-+++ b/Custom.cmake.ex
-@@ -2,7 +2,7 @@
-
- # GLOBAL
-
--set(CMAKE_BUILD_TYPE "Debug")
-+#set(CMAKE_BUILD_TYPE "Debug")
- set(CMAKE_VERBOSE_MAKEFILE ON)
- set(BUILD_STATIC_LIBRARY ON)
- set(USE_OPEN_MP OFF)
---- /dev/null
-+++ b/cmake/CheckAtomic.cmake
-@@ -0,0 +1,13 @@
-+
-+include(CheckCSourceCompiles)
-+
-+check_c_source_compiles("
-+
-+int main() {
-+ int val = 0;
-+ __sync_lock_test_and_set(&val, 1);
-+}
-+
-+" HAVE_ATOMIC_BUILTIN)
-+
-+
---- /dev/null
-+++ b/cmake/CompilerOptimizations.cmake
-@@ -0,0 +1,55 @@
-+include(CheckCCompilerFlag)
-+include(CheckCXXCompilerFlag)
-+
-+
-+check_c_compiler_flag(-ftree-vectorize HAS_TREE_VECTORIZE)
-+check_cxx_compiler_flag(-ftree-vectorize HAS_CXX_TREE_VECTORIZE)
-+if (HAS_TREE_VECTORISE)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftree-vectorize")
-+endif()
-+if (HAS_CXX_TREE_VECTORISE)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftree-vectorize")
-+endif()
-+
-+
-+check_c_compiler_flag(-ffast-math HAS_FAST_MATH)
-+check_cxx_compiler_flag(-ffast-math HAS_CXX_FAST_MATH)
-+if (HAS_FAST_MATH)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffast-math")
-+endif()
-+if (HAS_CXX_FAST_MATH)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
-+endif()
-+
-+
-+check_c_compiler_flag(-fvisibility=hidden HAS_VISIBILITY_HIDDEN)
-+check_cxx_compiler_flag(-fvisibility=hidden HAS_CXX_VISIBILITY_HIDDEN)
-+if (HAS_VISIBILITY_HIDDEN)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
-+endif()
-+if (HAS_CXX_VISBILITY_HIDDEN)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-+endif()
-+
-+if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-+
-+check_c_compiler_flag(-mfpmath=sse HAS_FPMATH_SSE)
-+check_cxx_compiler_flag(-mfpmath=sse HAS_CXX_FPMATH_SSE)
-+ if (HAS_FPMATH_SSE)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
-+endif()
-+if (HAS_CXX_FPMATH_SSE)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
-+endif()
-+
-+endif()
-+
-+
-+check_c_compiler_flag(-fomit-frame-pointer HAS_OMIT_FRAME_POINTER)
-+check_cxx_compiler_flag(-fomit-frame-pointer HAS_CXX_OMIT_FRAME_POINTER)
-+if (HAS_OMIT_FRAME_POINTER)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fomit-frame-pointer")
-+endif()
-+if (HAS_CXX_OMIT_FRAME_POINTER)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fomit-frame-pointer")
-+endif()
---- a/include/csound.h
-+++ b/include/csound.h
-@@ -157,7 +157,6 @@
- # define PUBLIC __declspec(dllexport)
- #elif defined(__GNUC__) && (__GNUC__ >= 4) /* && !defined(__MACH__) */
- # define PUBLIC __attribute__ ( (visibility("default")) )
--# define HAVE_ATOMIC_BUILTIN
- #else
- # define PUBLIC
- #endif
diff --git a/debian/patches/0001-lua-luajit.diff b/debian/patches/0001-lua-luajit.diff
deleted file mode 100644
index a86ad62..0000000
--- a/debian/patches/0001-lua-luajit.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Opcodes/CMakeLists.txt
-+++ b/Opcodes/CMakeLists.txt
-@@ -29,7 +29,7 @@
- set(Python_ADDITIONAL_VERSIONS 2.7)
- find_package(PythonLibs)
-
--find_library(LUA_LIBRARIES luajit)
-+find_library(LUAJIT_LIBRARIES luajit)
- check_include_file(wiiuse.h WIIUSE_H)
- find_library(WIIUSE_LIB wiiuse)
- check_include_file(p5glove.h P5GLOVE_H)
-@@ -139,13 +139,13 @@
- endif()
-
- # this is broken at the moment
--check_deps(BUILD_LUA_OPCODES LUA_LIBRARIES)
-+check_deps(BUILD_LUA_OPCODES LUAJIT_LIBRARIES)
- if(BUILD_LUA_OPCODES)
-- find_path(LUA_INCLUDE_DIR lua.h
-+ find_path(LUAJIT_INCLUDE_DIR lua.h
- /usr/include/luajit-2.0
- /usr/local/include/luajit-2.0)
-- include_directories(${LUA_INCLUDE_DIR})
-- make_plugin(LuaCsound LuaCsound.cpp ${LUA_LIBRARIES})
-+ include_directories(${LUAJIT_INCLUDE_DIR})
-+ make_plugin(LuaCsound LuaCsound.cpp ${LUAJIT_LIBRARIES})
- add_compiler_flags(${OpenMP_CXX_FLAGS} TARGETS LuaCsound)
- add_compiler_flags(${OpenMP_CXX_FLAGS} TARGETS LuaCsound LINKER)
- endif()
diff --git a/debian/patches/0002-better-atomic-check.patch b/debian/patches/0002-better-atomic-check.patch
deleted file mode 100644
index 8a37d5f..0000000
--- a/debian/patches/0002-better-atomic-check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6917b12f1082fa33e298785d7d21581e9b99cfe1 Mon Sep 17 00:00:00 2001
-From: Steven Yi <stevenyi at gmail.com>
-Date: Sat, 17 Aug 2013 20:00:54 +0100
-Subject: [PATCH 2/3] better atomic check
-
----
- cmake/CheckAtomic.cmake | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/CheckAtomic.cmake b/cmake/CheckAtomic.cmake
-index 0e613e8..d7e994a 100644
---- a/cmake/CheckAtomic.cmake
-+++ b/cmake/CheckAtomic.cmake
-@@ -2,10 +2,18 @@
- include(CheckCSourceCompiles)
-
- check_c_source_compiles("
-+#include <stdio.h>
-+#include <stdlib.h>
-
- int main() {
-- int val = 0;
-- __sync_lock_test_and_set(&val, 1);
-+ static volatile unsigned long val = 0;
-+ unsigned long u = __sync_add_and_fetch(&val, 1);
-+
-+ if(u - 1 == 0) {
-+ return 0;
-+ }
-+
-+ return 1;
- }
-
- " HAVE_ATOMIC_BUILTIN)
---
-1.8.4.rc3
-
diff --git a/debian/patches/0003-Added-commandline-option-USE_ATOMIC_BUILTINS-to-allo.patch b/debian/patches/0003-Added-commandline-option-USE_ATOMIC_BUILTINS-to-allo.patch
deleted file mode 100644
index 3c11aab..0000000
--- a/debian/patches/0003-Added-commandline-option-USE_ATOMIC_BUILTINS-to-allo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 81bc7404286badf1ee272cd7f1daa7540d82ecd9 Mon Sep 17 00:00:00 2001
-From: Steven Yi <stevenyi at gmail.com>
-Date: Sat, 17 Aug 2013 15:08:55 -0400
-Subject: [PATCH 3/3] Added commandline option USE_ATOMIC_BUILTINS to allow
- user ability to disable (enabled by default)
-
----
- CMakeLists.txt | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -380,10 +380,18 @@
-
- # Now, non required library searches #
-
-+option(USE_ATOMIC_BUILTIN "Use Atomic Builtins if supported" ON)
-+if(USE_ATOMIC_BUILTIN)
- include(cmake/CheckAtomic.cmake)
--if(HAVE_ATOMIC_BUILTIN)
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_ATOMIC_BUILTIN")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_ATOMIC_BUILTIN")
-+ if(HAVE_ATOMIC_BUILTIN)
-+ message(STATUS "Using Atomic Builtins")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_ATOMIC_BUILTIN")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_ATOMIC_BUILTIN")
-+ else()
-+ message(STATUS "Not using Atomic Builtins - not found")
-+ endif()
-+else()
-+ message(STATUS "Not using Atomic Builtins - user disabled")
- endif()
-
- find_library(VORBISFILE_LIBRARY vorbisfile)
diff --git a/debian/patches/0004-Improve-atomic-builtins-check.patch b/debian/patches/0004-Improve-atomic-builtins-check.patch
deleted file mode 100644
index 2d2b7c7..0000000
--- a/debian/patches/0004-Improve-atomic-builtins-check.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a4d94746b14d6b13e327622804999c8b83d13796 Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler at debian.org>
-Date: Wed, 28 Aug 2013 19:40:47 -0400
-Subject: [PATCH] Improve atomic builtins check
-
-When using double precision, we need 8-byte builtins, which are more
-likely to be non-existent
----
- cmake/CheckAtomic.cmake | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/CheckAtomic.cmake b/cmake/CheckAtomic.cmake
-index d7e994a..49b929c 100644
---- a/cmake/CheckAtomic.cmake
-+++ b/cmake/CheckAtomic.cmake
-@@ -1,13 +1,19 @@
-
- include(CheckCSourceCompiles)
-
-+if(USE_DOUBLE)
-+ set(type "int64_t")
-+else()
-+ set(type "int32_t")
-+endif()
-+
- check_c_source_compiles("
- #include <stdio.h>
- #include <stdlib.h>
-
- int main() {
-- static volatile unsigned long val = 0;
-- unsigned long u = __sync_add_and_fetch(&val, 1);
-+ static volatile ${type} val = 0;
-+ ${type} u = __sync_add_and_fetch(&val, 1);
-
- if(u - 1 == 0) {
- return 0;
---
-1.8.4.rc3
-
diff --git a/debian/patches/0005-sfont.c-do-not-use-strtol_l.patch b/debian/patches/0005-sfont.c-do-not-use-strtol_l.patch
deleted file mode 100644
index e93af5e..0000000
--- a/debian/patches/0005-sfont.c-do-not-use-strtol_l.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 573cc50ffde6f6858954351fe91e82a3314f670c Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler at debian.org>
-Date: Wed, 28 Aug 2013 20:11:57 -0400
-Subject: [PATCH] sfont.c: do not use strtol_l
-
-Only parsing straight numbers in base 10, so
-(hopefully) no need to worry about locales
----
- Opcodes/sfont.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Opcodes/sfont.c b/Opcodes/sfont.c
-index 1938d8e..71d892a 100644
---- a/Opcodes/sfont.c
-+++ b/Opcodes/sfont.c
-@@ -1456,7 +1456,7 @@ static void ChangeByteOrder(char *fmt, char *p, int32 size)
- while (*fmt) {
- c = *fmt++;
- if (isdigit(*fmt)) {
-- times = strtol_l(fmt, &fmt, 0, c_locale);
-+ times = strtol(fmt, &fmt, 10);
- } else {
- times = 1;
- }
---
-1.8.4.rc3
-
diff --git a/debian/patches/series b/debian/patches/series
index 8789fbb..48cbb42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-0000-cmake-flags-fixes.patch
-0001-lua-luajit.diff
-0002-better-atomic-check.patch
-0003-Added-commandline-option-USE_ATOMIC_BUILTINS-to-allo.patch
-0004-Improve-atomic-builtins-check.patch
-0005-sfont.c-do-not-use-strtol_l.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