[SCM] csound/master: Get several patches from upstream
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Mon Sep 2 04:39:29 UTC 2013
The following commit has been merged in the master branch:
commit 0a845268d694c2daa0726b608b0a9689006da0a5
Author: Felipe Sateler <fsateler at debian.org>
Date: Wed Aug 28 20:14:42 2013 -0400
Get several patches from upstream
Conditional use of atomic operators, plus a missing declaration.
diff --git a/debian/patches/0002-better-atomic-check.patch b/debian/patches/0002-better-atomic-check.patch
new file mode 100644
index 0000000..8a37d5f
--- /dev/null
+++ b/debian/patches/0002-better-atomic-check.patch
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 0000000..3c11aab
--- /dev/null
+++ b/debian/patches/0003-Added-commandline-option-USE_ATOMIC_BUILTINS-to-allo.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..2d2b7c7
--- /dev/null
+++ b/debian/patches/0004-Improve-atomic-builtins-check.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 0000000..e93af5e
--- /dev/null
+++ b/debian/patches/0005-sfont.c-do-not-use-strtol_l.patch
@@ -0,0 +1,27 @@
+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 78dd284..8789fbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,9 @@
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