This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
544b826702
commit
0b4b34139b
145
csound-python-2.6-fix.diff
Normal file
145
csound-python-2.6-fix.diff
Normal file
@ -0,0 +1,145 @@
|
||||
--- SConstruct-dist 2008-10-01 14:46:05.000000000 +0200
|
||||
+++ SConstruct 2008-10-01 15:25:35.000000000 +0200
|
||||
@@ -266,19 +266,19 @@
|
||||
Tool('mingw')(commonEnvironment)
|
||||
|
||||
customCPPPATH = commonEnvironment['customCPPPATH']
|
||||
-commonEnvironment.Prepend(CPPPATH = customCPPPATH)
|
||||
+commonEnvironment.Prepend(CPPPATH = Split(customCPPPATH))
|
||||
customCCFLAGS = commonEnvironment['customCCFLAGS']
|
||||
-commonEnvironment.Prepend(CCFLAGS = customCCFLAGS)
|
||||
+commonEnvironment.Prepend(CCFLAGS = Split(customCCFLAGS))
|
||||
customCXXFLAGS = commonEnvironment['customCXXFLAGS']
|
||||
-commonEnvironment.Prepend(CXXFLAGS = customCXXFLAGS)
|
||||
+commonEnvironment.Prepend(CXXFLAGS = Split(customCXXFLAGS))
|
||||
customLIBS = commonEnvironment['customLIBS']
|
||||
-commonEnvironment.Prepend(LIBS = customLIBS)
|
||||
+commonEnvironment.Prepend(LIBS = Split(customLIBS))
|
||||
customLIBPATH = commonEnvironment['customLIBPATH']
|
||||
-commonEnvironment.Prepend(LIBPATH = customLIBPATH)
|
||||
+commonEnvironment.Prepend(LIBPATH = Split(customLIBPATH))
|
||||
customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS']
|
||||
-commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS)
|
||||
+commonEnvironment.Prepend(SHLINKFLAGS = Split(customSHLINKFLAGS))
|
||||
customSWIGFLAGS = commonEnvironment['customSWIGFLAGS']
|
||||
-commonEnvironment.Prepend(SWIGFLAGS = customSWIGFLAGS)
|
||||
+commonEnvironment.Prepend(SWIGFLAGS = Split(customSWIGFLAGS))
|
||||
|
||||
# Define options for different platforms.
|
||||
if getPlatform() != 'win32':
|
||||
@@ -339,15 +339,15 @@
|
||||
# Define different build environments for different types of targets.
|
||||
|
||||
if not withMSVC():
|
||||
- commonEnvironment.Prepend(CCFLAGS = "-Wall")
|
||||
+ commonEnvironment.Prepend(CCFLAGS = ["-Wall"])
|
||||
|
||||
if getPlatform() == 'linux':
|
||||
- commonEnvironment.Append(CCFLAGS = "-DLINUX")
|
||||
- commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS')
|
||||
- commonEnvironment.Append(CPPPATH = '/usr/local/include')
|
||||
- commonEnvironment.Append(CPPPATH = '/usr/include')
|
||||
- commonEnvironment.Append(CPPPATH = '/usr/X11R6/include')
|
||||
- commonEnvironment.Append(CCFLAGS = "-DPIPES")
|
||||
+ commonEnvironment.Append(CCFLAGS = ["-DLINUX"])
|
||||
+ commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
|
||||
+ commonEnvironment.Append(CPPPATH = ['/usr/local/include'])
|
||||
+ commonEnvironment.Append(CPPPATH = ['/usr/include'])
|
||||
+ commonEnvironment.Append(CPPPATH = ['/usr/X11R6/include'])
|
||||
+ commonEnvironment.Append(CCFLAGS = ["-DPIPES"])
|
||||
commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
|
||||
elif getPlatform() == 'darwin':
|
||||
commonEnvironment.Append(CCFLAGS = "-DMACOSX")
|
||||
@@ -519,9 +519,9 @@
|
||||
|
||||
if getPlatform() == 'win32':
|
||||
if configure.CheckHeader("winsock.h", language = "C"):
|
||||
- commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS')
|
||||
+ commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
|
||||
elif configure.CheckHeader("sys/socket.h", language = "C"):
|
||||
- commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS')
|
||||
+ commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
|
||||
|
||||
if getPlatform() == 'darwin':
|
||||
commonEnvironment.Append(CPPFLAGS = '-DHAVE_DIRENT_H')
|
||||
@@ -954,7 +954,7 @@
|
||||
pyModule_ = env.Program('_%s.so' % targetName, srcs)
|
||||
else:
|
||||
if getPlatform() == 'linux':
|
||||
- pyModule_ = env.SharedLibrary('%s' % targetName, srcs, SHLIBPREFIX="_", SHLIBSUFFIX = '.so')
|
||||
+ pyModule_ = env.SharedLibrary('%s' % targetName, srcs, SHLIBPREFIX="_", SHLIBSUFFIX = ['.so'])
|
||||
else:
|
||||
pyModule_ = env.SharedLibrary('_%s' % targetName, srcs, SHLIBSUFFIX = '.pyd')
|
||||
if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
|
||||
@@ -992,7 +992,7 @@
|
||||
'''))
|
||||
csoundWrapperEnvironment = csoundInterfacesEnvironment.Copy()
|
||||
fixCFlagsForSwig(csoundWrapperEnvironment)
|
||||
- csoundWrapperEnvironment.Append(CPPFLAGS = '-D__BUILDING_CSOUND_INTERFACES')
|
||||
+ csoundWrapperEnvironment.Append(CPPFLAGS = ['-D__BUILDING_CSOUND_INTERFACES'])
|
||||
for option in csoundWrapperEnvironment['CCFLAGS']:
|
||||
if string.find(option, '-D') == 0:
|
||||
csoundWrapperEnvironment.Append(SWIGFLAGS = [option])
|
||||
@@ -1407,11 +1407,11 @@
|
||||
# distribution into the csound5/Opcodes/Loris directory, e.g.
|
||||
# csound5/Opcodes/Loris/src/*, etc.
|
||||
lorisEnvironment = pluginEnvironment.Copy()
|
||||
- lorisEnvironment.Append(CCFLAGS = '-DHAVE_FFTW3_H')
|
||||
+ lorisEnvironment.Append(CCFLAGS = ['-DHAVE_FFTW3_H'])
|
||||
if commonEnvironment['buildRelease'] == '0':
|
||||
- lorisEnvironment.Append(CCFLAGS = '-DDEBUG_LORISGENS')
|
||||
+ lorisEnvironment.Append(CCFLAGS = ['-DDEBUG_LORISGENS'])
|
||||
if getPlatform() == 'win32':
|
||||
- lorisEnvironment.Append(CCFLAGS = '-D_MSC_VER')
|
||||
+ lorisEnvironment.Append(CCFLAGS = ['-D_MSC_VER'])
|
||||
if not withMSVC():
|
||||
lorisEnvironment.Append(CCFLAGS = Split('''
|
||||
-Wno-comment -Wno-unknown-pragmas -Wno-sign-compare
|
||||
@@ -1474,15 +1474,15 @@
|
||||
''')
|
||||
stkEnvironment = pluginEnvironment.Copy()
|
||||
if getPlatform() == 'win32':
|
||||
- stkEnvironment.Append(CCFLAGS = '-D__OS_WINDOWS__')
|
||||
+ stkEnvironment.Append(CCFLAGS = ['-D__OS_WINDOWS__'])
|
||||
elif getPlatform() == 'linux':
|
||||
- stkEnvironment.Append(CCFLAGS = '-D__OS_LINUX__')
|
||||
+ stkEnvironment.Append(CCFLAGS = ['-D__OS_LINUX__'])
|
||||
elif getPlatform() == 'darwin':
|
||||
- stkEnvironment.Append(CCFLAGS = '-D__OS_MACOSX__')
|
||||
+ stkEnvironment.Append(CCFLAGS = ['-D__OS_MACOSX__'])
|
||||
if sys.byteorder == 'big':
|
||||
- stkEnvironment.Append(CCFLAGS = '-D__BIG_ENDIAN__')
|
||||
+ stkEnvironment.Append(CCFLAGS = ['-D__BIG_ENDIAN__'])
|
||||
else:
|
||||
- stkEnvironment.Append(CCFLAGS = '-D__LITTLE_ENDIAN__')
|
||||
+ stkEnvironment.Append(CCFLAGS = ['-D__LITTLE_ENDIAN__'])
|
||||
stkEnvironment.Prepend(CPPPATH = Split('''
|
||||
Opcodes/stk/include Opcodes/stk/src ./ ./../include
|
||||
'''))
|
||||
@@ -1523,7 +1523,7 @@
|
||||
pyEnvironment.Append(LIBS = ['dl', 'm'])
|
||||
elif getPlatform() == 'win32':
|
||||
pyEnvironment['ENV']['PATH'] = os.environ['PATH']
|
||||
- pyEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
|
||||
+ pyEnvironment.Append(SHLINKFLAGS = ['--no-export-all-symbols'])
|
||||
pythonOpcodes = makePlugin(pyEnvironment, 'py',
|
||||
['Opcodes/py/pythonopcodes.c'])
|
||||
if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
|
||||
@@ -1713,7 +1713,7 @@
|
||||
vstEnvironment.Append(SWIGFLAGS = Split('-c++ -includeall -verbose -outdir .'))
|
||||
if getPlatform() == 'linux':
|
||||
vstEnvironment.Append(LIBS = ['util', 'dl', 'm'])
|
||||
- vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
|
||||
+ vstEnvironment.Append(SHLINKFLAGS = ['--no-export-all-symbols'])
|
||||
vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
|
||||
guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
|
||||
os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_CsoundVST.so'])
|
||||
@@ -2029,7 +2029,7 @@
|
||||
print "...Building csLadspa"
|
||||
csLadspaEnv = commonEnvironment.Copy()
|
||||
csLadspaEnv.Append(LIBS=libCsoundLibs)
|
||||
-csLadspaEnv.Append(CCFLAGS='-I./frontends/csladspa')
|
||||
+csLadspaEnv.Append(CCFLAGS=['-I./frontends/csladspa'])
|
||||
csladspa = csLadspaEnv.SharedLibrary('frontends/csladspa/csladspa.cpp', PREFIX="")
|
||||
Depends(csladspa, csoundLibrary)
|
||||
libs.append(csladspa)
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 1 15:28:52 CEST 2008 - tiwai@suse.de
|
||||
|
||||
- fix build with python-2.6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 20 15:44:26 CEST 2007 - tiwai@suse.de
|
||||
|
||||
|
||||
59
csound.spec
59
csound.spec
@ -1,15 +1,23 @@
|
||||
#
|
||||
# spec file for package csound (Version 5.06.0)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: csound
|
||||
%define support_fltk 0
|
||||
BuildRequires: alsa-devel fdupes fluidsynth-devel gcc-c++ jack-devel liblo-devel libsndfile-devel portaudio-devel python-devel scons swig
|
||||
@ -18,16 +26,17 @@ BuildRequires: fltk-devel libjpeg-devel libpng-devel xorg-x11-devel
|
||||
%endif
|
||||
Summary: Computer Sound Synthesis and Composition Program
|
||||
Version: 5.06.0
|
||||
Release: 4
|
||||
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
|
||||
Release: 128
|
||||
License: LGPL v2.1 or later
|
||||
Group: Productivity/Multimedia/Sound/Utilities
|
||||
Source: Csound%{version}.tar.bz2
|
||||
Source1: README.SuSE
|
||||
Patch: csound-alsa-fix.diff
|
||||
Patch1: csound-tmpnam-fix.diff
|
||||
Patch2: csound-gcc-warning-fix.diff
|
||||
URL: http://www.csounds.com
|
||||
Autoreq: on
|
||||
Patch3: csound-python-2.6-fix.diff
|
||||
Url: http://www.csounds.com
|
||||
AutoReq: on
|
||||
Autoprov: off
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -44,6 +53,7 @@ For detailed information, refer to http://www.csounds.com.
|
||||
%patch
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
cp %{SOURCE1} .
|
||||
# fix encoding
|
||||
iconv -f latin1 -t utf8 readme-csound5.txt > readme-csound5.txt.utf8
|
||||
@ -75,17 +85,14 @@ mv $RPM_BUILD_ROOT%{_bindir}/extract $RPM_BUILD_ROOT%{_bindir}/csound-extract
|
||||
# remove devel files
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||
rm -rf $RPM_BUILD_ROOT%{_includedir}
|
||||
|
||||
%fdupes -s $RPM_BUILD_ROOT
|
||||
|
||||
%clean
|
||||
[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -97,37 +104,39 @@ rm -rf $RPM_BUILD_ROOT%{_includedir}
|
||||
# %{_libdir}/lib*
|
||||
|
||||
%changelog
|
||||
* Wed Jun 20 2007 - tiwai@suse.de
|
||||
* Wed Oct 01 2008 tiwai@suse.de
|
||||
- fix build with python-2.6
|
||||
* Wed Jun 20 2007 tiwai@suse.de
|
||||
- fix fdupes usage
|
||||
* Mon Jun 11 2007 - tiwai@suse.de
|
||||
* Mon Jun 11 2007 tiwai@suse.de
|
||||
- updated to version 5.06:
|
||||
* fix k-rate, vrandh and vrandi scaling problems, mod fix
|
||||
* new opcodes: partikkel, partikkelsync
|
||||
* Tue Mar 27 2007 - tiwai@suse.de
|
||||
* Tue Mar 27 2007 tiwai@suse.de
|
||||
- update to version 5.05:
|
||||
* fixes/improvements on FLTK support
|
||||
* fix heap overflow
|
||||
* clean up old codes
|
||||
* Mon Jan 22 2007 - tiwai@suse.de
|
||||
* Mon Jan 22 2007 tiwai@suse.de
|
||||
- major update to version 5.04
|
||||
(not built with fltk due to lack of threading support)
|
||||
* Mon Mar 27 2006 - pth@suse.de
|
||||
* Mon Mar 27 2006 pth@suse.de
|
||||
- Add missing parameter in printf call (bug #129676).
|
||||
* Wed Jan 25 2006 - mls@suse.de
|
||||
* Wed Jan 25 2006 mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Fri Oct 15 2004 - tiwai@suse.de
|
||||
* Fri Oct 15 2004 tiwai@suse.de
|
||||
- renamed extract to csound-extract to avoid name confliction
|
||||
(bug #45347).
|
||||
* Wed Jun 02 2004 - tiwai@suse.de
|
||||
* Wed Jun 02 2004 tiwai@suse.de
|
||||
- fixed the ALSA RT plugin with the new API.
|
||||
* Sat Jan 10 2004 - adrian@suse.de
|
||||
* Sat Jan 10 2004 adrian@suse.de
|
||||
- add %%run_ldconfig and %%defattr
|
||||
* Tue Aug 05 2003 - tiwai@suse.de
|
||||
* Tue Aug 05 2003 tiwai@suse.de
|
||||
- renamed sndinfo to csndinfo to avoid name confliction with snd.
|
||||
* Wed Jul 30 2003 - tiwai@suse.de
|
||||
* Wed Jul 30 2003 tiwai@suse.de
|
||||
- fixed the build on x86-64.
|
||||
* Mon Jul 28 2003 - tiwai@suse.de
|
||||
* Mon Jul 28 2003 tiwai@suse.de
|
||||
- updated to 4.24.1.
|
||||
- fixed tmpnam with mkstemp.
|
||||
* Thu Feb 01 2001 - tiwai@suse.de
|
||||
* Thu Feb 01 2001 tiwai@suse.de
|
||||
- Initial vesrion: unofficial-4.10.0.0c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user