[SCM] csound/master: Only use simd instructions on amd64
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Mon Jul 4 01:42:50 UTC 2016
The following commit has been merged in the master branch:
commit 1a07d108e6218011f6fec22a45a60ad74c130d67
Author: Felipe Sateler <fsateler at debian.org>
Date: Sun Jul 3 21:23:14 2016 -0400
Only use simd instructions on amd64
It is not guaranteed to exist elsewhere
diff --git a/debian/Custom.cmake b/debian/Custom.cmake
index 92a2052..216e782 100644
--- a/debian/Custom.cmake
+++ b/debian/Custom.cmake
@@ -16,9 +16,13 @@ add_compiler_flags("-Wno-error=format-security")
add_compiler_flags("-ftree-vectorize -ffast-math -O3 -fno-finite-math-only")
# Only in 386 or amd64 enable mtune, specified from the rules file
set(mtuneopt "@MTUNE@")
+set(simdopt "@ENABLE_SIMD@")
if(mtuneopt)
add_compiler_flags("-mtune=generic")
endif()
+if(NOT simdopt)
+ add_definitions("-DPFFFT_SIMD_DISABLE")
+endif()
add_definitions(-DCS_PACKAGE_DATE=\"@DATE@\")
diff --git a/debian/control b/debian/control
index 4b4b564..2ae3ea6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,54 +1,58 @@
Source: csound
+Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Felipe Sateler <fsateler at debian.org>,
+ Jonas Smedegaard <dr at jones.dk>,
+ Forrest Cahoon <forrest.cahoon at gmail.com>
Section: sound
Priority: optional
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders:
- Felipe Sateler <fsateler at debian.org>,
- Jonas Smedegaard <dr at jones.dk>,
- Forrest Cahoon <forrest.cahoon at gmail.com>
Build-Depends: cdbs (>= 0.4.131~),
- debhelper,
- dh-buildinfo,
- python,
- devscripts,
- cmake (>= 2.8.3),
- libsndfile1-dev,
- libasound2-dev [linux-any],
- libjack-dev,
- portaudio19-dev,
- libportmidi-dev,
- libpulse-dev,
- swig,
- liblua5.1-0-dev,
- python-dev (>= 2.6.6-3~),
- puredata-dev,
- default-jdk,
- libsamplerate0-dev,
- libfltk1.1-dev,
- libfluidsynth-dev,
- liblo-dev,
- fluid,
- ladspa-sdk,
- libboost-dev,
- libboost-serialization-dev,
- libpng-dev,
- dssi-dev,
- libstk0-dev,
- libgmm++-dev (>= 4.2.1~beta1~svn4635~dfsg-4),
- bison (>= 2.6),
- flex,
- libportsmf-dev,
- libeigen3-dev,
- dh-python
-Build-Depends-Indep: dh-linktree, doxygen, graphviz, libjs-jquery, ttf-dejavu
-Standards-Version: 3.9.6
-Vcs-Git: git://git.debian.org/git/pkg-multimedia/csound
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/csound.git
+ debhelper (>= 7),
+ dh-buildinfo,
+ python,
+ devscripts,
+ cmake,
+ libsndfile1-dev,
+ libasound2-dev [linux-any],
+ libjack-dev,
+ portaudio19-dev,
+ libportmidi-dev,
+ libpulse-dev,
+ swig,
+ liblua5.1-0-dev,
+ python-dev,
+ puredata-dev,
+ default-jdk,
+ libsamplerate0-dev,
+ libfltk1.1-dev,
+ libfluidsynth-dev,
+ liblo-dev,
+ fluid,
+ ladspa-sdk,
+ libboost-dev,
+ libboost-serialization-dev,
+ libpng-dev,
+ dssi-dev,
+ libstk0-dev,
+ libgmm++-dev (>= 4.2.1~beta1~svn4635~dfsg-4),
+ bison,
+ flex,
+ libportsmf-dev,
+ libeigen3-dev,
+ dh-python
+Build-Depends-Indep: dh-linktree,
+ doxygen,
+ graphviz,
+ libjs-jquery,
+ ttf-dejavu
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/csound.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/csound
Homepage: https://csound.github.io/
Package: csound
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Recommends: csound-utils
Description: powerful and versatile sound synthesis software
Csound is a sound and music synthesis system. Drawing from over 450
@@ -69,7 +73,9 @@ Description: data files used by the csound library
Package: csound-utils
Architecture: any
-Depends: csound, ${misc:Depends}, ${shlibs:Depends}
+Depends: csound,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: miscellaneous utilities for the Csound system
This package contains several utilities which may be useful with
Csound.
@@ -77,10 +83,13 @@ Description: miscellaneous utilities for the Csound system
transformations.
Package: libcsound64-6.0
-Section: libs
Architecture: any
-Depends: csound-data, ${misc:Depends}, ${shlibs:Depends}
-Recommends: csound, stk
+Section: libs
+Depends: csound-data,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: csound,
+ stk
Description: main library for Csound
This package contains the library which provides most of the Csound
functionality. This library was built using 64-bit precision for the
@@ -91,7 +100,8 @@ Description: main library for Csound
Package: libcsnd6-java
Architecture: any
Section: java
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Recommends: csound
Suggests: java-virtual-machine
Description: Java bindings for the Csound API
@@ -102,10 +112,9 @@ Description: Java bindings for the Csound API
Package: libcsound64-dev
Architecture: all
Section: libdevel
-Depends:
- libcsound64-6.0 (<< ${source:Version}.1~),
- libcsound64-6.0 (>= ${source:Version}),
- ${misc:Depends}
+Depends: libcsound64-6.0 (<< ${source:Version}.1~),
+ libcsound64-6.0 (>= ${source:Version}),
+ ${misc:Depends}
Description: development files for Csound
This package contains the development files needed to build programs
linking to the Csound library.
@@ -115,11 +124,10 @@ Description: development files for Csound
Package: libcsnd-dev
Architecture: all
Section: libdevel
-Depends:
- libcsnd6-6.0v5 (<< ${source:Version}.1~),
- libcsnd6-6.0v5 (>= ${source:Version}),
- libcsound64-dev,
- ${misc:Depends}
+Depends: libcsnd6-6.0v5 (<< ${source:Version}.1~),
+ libcsnd6-6.0v5 (>= ${source:Version}),
+ libcsound64-dev,
+ ${misc:Depends}
Suggests: liblua5.1-luacsnd
Provides: liblua5.1-luacsnd-dev
Description: development files for Csound -- C++ API
@@ -133,10 +141,9 @@ Description: development files for Csound -- C++ API
Package: libcsoundac-dev
Architecture: all
Section: libdevel
-Depends:
- libcsoundac6.0v5 (<< ${source:Version}.1~),
- libcsoundac6.0v5 (>= ${source:Version}),
- ${misc:Depends}
+Depends: libcsoundac6.0v5 (<< ${source:Version}.1~),
+ libcsoundac6.0v5 (>= ${source:Version}),
+ ${misc:Depends}
Description: development files for CsoundAC
This package contains the development files needed to build programs
using the CsoundAC algorithmic composition system.
@@ -146,7 +153,10 @@ Description: development files for CsoundAC
Package: pd-csound
Architecture: any
-Depends: csound, puredata | pd, ${misc:Depends}, ${shlibs:Depends}
+Depends: csound,
+ puredata | pd,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Csound external for PureData
This is the csound6~ opcode for PureData.
.
@@ -156,8 +166,11 @@ Description: Csound external for PureData
Package: python-csound
Architecture: any
Section: python
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
-Recommends: python-matplotlib, python-numpy
+Depends: ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends: python-matplotlib,
+ python-numpy
Provides: ${python:Provides}
Description: Python bindings for Csound
This is the Python binding for the Csound API.
@@ -170,9 +183,10 @@ Description: Python bindings for Csound
Package: libcsnd6-6.0v5
Architecture: any
Section: libs
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Breaks: libcsnd6-6.0
Replaces: libcsnd6-6.0
-Depends: ${misc:Depends}, ${shlibs:Depends}
Description: C++ bindings for the Csound API
This is the C++ binding for the Csound API.
.
@@ -180,7 +194,8 @@ Description: C++ bindings for the Csound API
Package: liblua5.1-luacsnd
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Description: Lua bindings for the Csound API
This is the Lua binding for the Csound API.
.
@@ -189,9 +204,10 @@ Description: Lua bindings for the Csound API
Package: libcsoundac6.0v5
Architecture: any
Section: libs
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Breaks: libcsoundac6.0
Replaces: libcsoundac6.0
-Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Csound Algorithmic Composition library
This is the core library for CsoundAC. It provides all the CsoundAC
functionality. It also contains the development files to create C++
@@ -202,7 +218,10 @@ Description: Csound Algorithmic Composition library
Package: python-csoundac
Architecture: any
Section: python
-Depends: python-csound, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Depends: python-csound,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Provides: ${python:Provides}
Description: Python bindings for CsoundAC
This is the Python interface to the Csound Algorithmic Composition
@@ -212,7 +231,8 @@ Description: Python bindings for CsoundAC
Package: csladspa
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Provides: ladspa-plugin
Description: LADSPA plugin for Csound
This plugin enables the creation of LADSPA plugins with the Csound
@@ -225,7 +245,8 @@ Package: libcsound64-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Recommends: csound, libcsound64-dev
+Recommends: csound,
+ libcsound64-dev
Description: Csound API documentation
This package contains the API documentation for the Csound library in
HTML format.
diff --git a/debian/copyright b/debian/copyright
index a125d3f..043e163 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: CSound
Upstream-Contact: CSOUND-DEV at listserv.heanet.ie
Source: https://github.com/csound/csound
@@ -100,8 +100,7 @@ Copyright: 1986-1992,1994,1997, the Massachussetts Institute of Technology
1991-2008, Barry Vercoe
1991-2011, John ffitch
1991-2011, Csound developers
-License: LGPL-2.1+
-Files-Excluded:
+Files-Excluded:
Opcodes/scansyn*
dependencies/*
iOS/*
@@ -110,6 +109,7 @@ Files-Excluded:
installer/*
nacl/*
examples/html/*
+License: LGPL-2.1+
Files: *
Copyright: 1986-2015 Csound Developers
@@ -248,8 +248,7 @@ Files: SuSE/*
Copyright: 2011, SUSE LINUX Products GmbH, Nuernberg, Germany
License: LGPL-2.1+
-Files:
- frontends/CsoundAC/algrd_internal.h
+Files: frontends/CsoundAC/algrd_internal.h
frontends/CsoundAC/algsmfrd_internal.h
frontends/CsoundAC/allegro.cpp
frontends/CsoundAC/allegro.h
@@ -411,4 +410,3 @@ License: other-sdif
DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS".
REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
ENHANCEMENTS, OR MODIFICATIONS.
-
diff --git a/debian/rules b/debian/rules
index 4474b82..94ab204 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,6 +125,11 @@ DEB_CMAKE_EXTRA_FLAGS += \
ifneq "$(filter amd64 i386, $(DEB_HOST_ARCH_CPU))" ""
MTUNE = ON
endif
+ifneq "$(filter amd64, $(DEB_HOST_ARCH_CPU))" ""
+ ENABLE_SIMD = 1
+else
+ ENABLE_SIMD = 0
+endif
PYLIBPATH = usr/lib/$(cdbs_python_current_binary)/dist-packages
# Path with PREFIX removed
@@ -150,6 +155,7 @@ build-doxygen-stamp:
pre-build:: Custom.cmake
Custom.cmake: debian/Custom.cmake
sed -e 's, at PYLIBPATH@,$(PYLIBPATH2),' -e 's, at MTUNE@,$(MTUNE),' \
+ -e 's, at ENABLE_SIMD@,$(ENABLE_SIMD),' \
-e 's, at DATE@,$(PACKAGE_DATE),' -e 's, at PYVERSION@,$(cdbs_python_current_version),' \
debian/Custom.cmake > \
Custom.cmake
--
csound packaging
More information about the pkg-multimedia-commits
mailing list