[SCM] supercollider-sc3-plugins/master: 03-sse-only-on-x86.patch was accepted upstream. https://github.com/supercollider/sc3-plugins/pull/73
hanno-guest at users.alioth.debian.org
hanno-guest at users.alioth.debian.org
Tue Apr 19 08:09:32 UTC 2016
The following commit has been merged in the master branch:
commit 60fcf35ffc5edc595ae780f2d42940f1eba0af47
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date: Tue Apr 19 09:56:01 2016 +0200
03-sse-only-on-x86.patch was accepted upstream.
https://github.com/supercollider/sc3-plugins/pull/73
diff --git a/debian/patches/03-sse-only-on-x86.patch b/debian/patches/03-sse-only-on-x86.patch
deleted file mode 100644
index 215fe8f..0000000
--- a/debian/patches/03-sse-only-on-x86.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Description: Use SSE flags on x86 CPUs, only
- Upstream develops on x86 hardware and failed to test for the system's
- hardware when setting the cpu-specific SSE flags. This adds this test.
- <URL: https://github.com/supercollider/sc3-plugins/pull/73>
-Forwarded: yes
-Author: Hanno Zulla <kontakt at hanno.de>
-Last-Update: 2016-02-25
-
-Index: supercollider-sc3-plugins/CMakeLists.txt
-===================================================================
---- supercollider-sc3-plugins.orig/CMakeLists.txt 2016-01-11 09:12:04.580499484 +0100
-+++ supercollider-sc3-plugins/CMakeLists.txt 2016-02-25 16:36:04.307733672 +0100
-@@ -53,6 +53,39 @@
- if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
- add_definitions(-fvisibility=hidden)
-
-+ include (${CMAKE_ROOT}/Modules/CheckCCompilerFlag.cmake)
-+ include (${CMAKE_ROOT}/Modules/CheckCXXCompilerFlag.cmake)
-+
-+ CHECK_C_COMPILER_FLAG(-msse HAS_SSE)
-+ CHECK_CXX_COMPILER_FLAG(-msse HAS_CXX_SSE)
-+
-+ if (HAS_SSE)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse")
-+ endif()
-+ if (HAS_CXX_SSE)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
-+ endif()
-+
-+ CHECK_C_COMPILER_FLAG(-msse2 HAS_SSE2)
-+ CHECK_CXX_COMPILER_FLAG(-msse2 HAS_CXX_SSE2)
-+
-+ if (HAS_SSE2)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
-+ endif()
-+ if (HAS_CXX_SSE2)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
-+ endif()
-+
-+ 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()
-+
- if(NATIVE)
- add_definitions(-march=native)
- endif()
-Index: supercollider-sc3-plugins/source/StkInst/CMakeLists.txt
-===================================================================
---- supercollider-sc3-plugins.orig/source/StkInst/CMakeLists.txt 2016-01-11 09:12:04.892500979 +0100
-+++ supercollider-sc3-plugins/source/StkInst/CMakeLists.txt 2016-02-25 16:05:01.980361599 +0100
-@@ -25,6 +25,13 @@
- include_directories(${STKDIR})
- include_directories(${STKDIR}/include)
- include_directories(${STKDIR}/src/include)
-+
-+ TEST_BIG_ENDIAN(is_big_endian)
-+ if(NOT is_big_endian)
-+ add_definitions("-D__LITTLE_ENDIAN__")
-+ endif()
-+
-+ add_definitions("-D_STK_DEBUG_")
- endif()
-
- include_directories(${SC_PATH}/include/plugin_interface)
-@@ -38,24 +45,11 @@
- set(CMAKE_SHARED_MODULE_SUFFIX ".scx")
- endif()
-
--if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mstackrealign")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mstackrealign")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
--endif()
--if(NOT SYSTEM_STK)
-- add_definitions("-D_STK_DEBUG_")
--endif()
--
--TEST_BIG_ENDIAN(is_big_endian)
--if(NOT is_big_endian)
-- add_definitions("-D__LITTLE_ENDIAN__")
--endif()
--
- add_library(${PROJECT} MODULE ${PROJECT}.cpp ${STKSources})
- if(SYSTEM_STK)
- target_link_libraries(${PROJECT} ${STK_LIBRARY})
- endif()
-+
- if(SUPERNOVA)
- add_library(${PROJECT}_supernova MODULE ${PROJECT}.cpp ${STKSources})
- set_property(TARGET ${PROJECT}_supernova APPEND PROPERTY COMPILE_DEFINITIONS "SUPERNOVA")
diff --git a/debian/patches/series b/debian/patches/series
index 190a20b..8ba365a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01-install-destination-ladspalist.patch
02-no-local.patch
-03-sse-only-on-x86.patch
--
supercollider-sc3-plugins packaging
More information about the pkg-multimedia-commits
mailing list