rpms/csound/OLPC-2 csound-5.07.0-install-fixes.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 csound-5.03.0-enable-fluidsynth.patch, 1.3, 1.4 csound-5.03.0-no-usr-local.patch, 1.2, 1.3 csound.spec, 1.11, 1.12 sources, 1.6, 1.7 csound-5.03.0-fltk-fixes.patch, 1.1, NONE csound-5.03.0-gstabs-disable-option.patch, 1.1, NONE
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Aug 30 13:13:19 UTC 2007
Author: dcbw
Update of /cvs/extras/rpms/csound/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030
Modified Files:
.cvsignore csound-5.03.0-enable-fluidsynth.patch
csound-5.03.0-no-usr-local.patch csound.spec sources
Added Files:
csound-5.07.0-install-fixes.patch
Removed Files:
csound-5.03.0-fltk-fixes.patch
csound-5.03.0-gstabs-disable-option.patch
Log Message:
* Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.1.cvs20070830
- Update to CVS snapshot of 5.07
- Expose functions for fluid opcodes that work better on low-power machines
csound-5.07.0-install-fixes.patch:
--- NEW FILE csound-5.07.0-install-fixes.patch ---
--- csound5/install.py.fixes 2007-08-22 23:43:42.000000000 -0400
+++ csound5/install.py 2007-08-22 23:48:46.000000000 -0400
@@ -242,7 +242,7 @@ if ('csound' in installedBinaries) or ('
print ' === Installing executables ==='
for i in exeFiles1:
if findFiles('.', i).__len__() > 0:
- err = installXFile('--strip-unneeded', i, binDir)
+ err = installXFile('', i, binDir)
installErrors = installErrors or err
for i in exeFiles2:
if findFiles('.', i).__len__() > 0:
@@ -256,22 +256,21 @@ libList = findFiles('.', 'libcsound\\.a'
libList += findFiles('.', 'libcsound64\\.a')
libList += findFiles('.', 'libcsound\\.so\\..+')
libList += findFiles('.', 'libcsound64\\.so\\..+')
-libList += findFiles('.', 'lib_csnd\\.so')
+libList += findFiles('.', '_csnd\\.so')
libList += findFiles('.', 'lib_jcsound\\.so')
libList += findFiles('.', 'lib_CsoundVST\\.so')
for i in libList:
if i[-2:] == '.a':
err = installFile(i, libDir)
+ elif i == '_csnd.so':
+ err = installFile(i, pythonDir2)
else:
- err = installXFile('--strip-debug', i, libDir)
+ err = installFile(i, libDir)
if err == 0:
if i[:13] == 'libcsound.so.':
err = installLink(i, concatPath([libDir, 'libcsound.so']))
elif i[:15] == 'libcsound64.so.':
err = installLink(i, concatPath([libDir, 'libcsound64.so']))
- elif i == 'lib_csnd.so':
- err = installLink(concatPath([libDir, i]),
- concatPath([pythonDir2, '_csnd.so']))
elif i == 'lib_CsoundVST.so':
err = installLink(concatPath([libDir, i]),
concatPath([pythonDir2, '_CsoundVST.so']))
@@ -291,7 +290,7 @@ for i in ['libcsound.so', 'libcsound64.s
if i in pluginList:
pluginList.remove(i)
for i in pluginList:
- err = installXFile('--strip-unneeded', i, pluginDir)
+ err = installXFile('', i, pluginDir)
installErrors = installErrors or err
# copy header files
@@ -318,7 +317,7 @@ for i in wrapperList:
if i[1] == '0':
err = installFile(fName, i[2])
else:
- err = installXFile('--strip-debug', fName, i[2])
+ err = installXFile('', fName, i[2])
installErrors = installErrors or err
# copy XMG files
@@ -339,7 +338,7 @@ installErrors = installErrors or err
print ' === Installing Tcl/Tk modules and scripts ==='
if findFiles('.', 'tclcsound\\.so').__len__() > 0:
- err = installXFile('--strip-unneeded', 'tclcsound.so', tclDir)
+ err = installXFile('', 'tclcsound.so', tclDir)
installErrors = installErrors or err
err = installFile('frontends/tclcsound/command_summary.txt', tclDir)
installErrors = installErrors or err
@@ -381,7 +380,7 @@ except:
pdDir = ''
if pdDir != '':
print ' === Installing csoundapi~ PD object ==='
- err = installXFile('--strip-unneeded', 'csoundapi~.pd_linux', pdDir)
+ err = installXFile('', 'csoundapi~.pd_linux', pdDir)
if err == 0:
try:
os.chmod(concatPath([instDir, pdDir, 'csoundapi~.pd_linux']), 0644)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/OLPC-2/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 9 Nov 2006 01:28:00 -0000 1.6
+++ .cvsignore 30 Aug 2007 13:12:45 -0000 1.7
@@ -2,3 +2,5 @@
Csound5.03_src.tgz
Csound5.03.0_src-cvs20061101.tar.bz2
Csound5.03.0_src-cvs20061108.tar.bz2
+Csound5.07.0_src-cvs20070830.tar.bz2
+Csound5.07.0_manual-cvs20070830.tar.bz2
csound-5.03.0-enable-fluidsynth.patch:
Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/OLPC-2/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csound-5.03.0-enable-fluidsynth.patch 1 Nov 2006 17:12:36 -0000 1.3
+++ csound-5.03.0-enable-fluidsynth.patch 30 Aug 2007 13:12:45 -0000 1.4
@@ -1,16 +1,16 @@
---- Csound5.03.0/SConstruct.enable-fluidsynth 2006-11-01 09:50:30.000000000 -0500
-+++ Csound5.03.0/SConstruct 2006-11-01 10:36:08.000000000 -0500
-@@ -224,6 +224,9 @@
+--- csound5/SConstruct.enable-fluidsynth 2007-08-21 07:27:54.000000000 -0400
++++ csound5/SConstruct 2007-08-22 22:38:16.000000000 -0400
+@@ -221,6 +221,9 @@ commandOptions.Add('buildNewParser',
+ commandOptions.Add('buildvst4cs',
+ 'Set to 1 to build vst4cs plugins (requires Steinberg VST headers)',
'0')
- opts.Add('isWinNT', 'On windows, if win2000 or NT is used',
- '%d' % withMSVC())
-+opts.Add('useFluidsynth',
-+ 'Set to 1 if you want OSC support',
++commandOptions.Add('useFluidsynth',
++ 'Set to 1 if you want Fluidsynth support',
+ '0')
- opts.Add('buildCSEditor',
- 'Set to 1 to build the Csound syntax highlighting text editor. Requires FLTK headers and libs',
- '0')
-@@ -437,6 +440,7 @@
+
+ # Define the common part of the build environment.
+ # This section also sets up customized options for third-party libraries, which
+@@ -478,6 +481,7 @@ if not tclhfound:
tmp = '%s/tcl.h' % i
tclhfound = tclhfound or configure.CheckHeader(tmp, language = "C")
luaFound = configure.CheckHeader("lua.h", language = "C")
@@ -18,7 +18,7 @@
swigFound = 'swig' in commonEnvironment['TOOLS']
print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
pythonFound = configure.CheckHeader("Python.h", language = "C")
-@@ -1263,7 +1267,7 @@
+@@ -1353,7 +1357,7 @@ else:
# FLUIDSYNTH OPCODES
csound-5.03.0-no-usr-local.patch:
Index: csound-5.03.0-no-usr-local.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/OLPC-2/csound-5.03.0-no-usr-local.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound-5.03.0-no-usr-local.patch 27 Oct 2006 21:12:05 -0000 1.2
+++ csound-5.03.0-no-usr-local.patch 30 Aug 2007 13:12:45 -0000 1.3
@@ -1,42 +1,26 @@
---- Csound5.03.0/SConstruct.no-usr-local 2006-10-27 16:24:08.000000000 -0400
-+++ Csound5.03.0/SConstruct 2006-10-27 16:26:03.000000000 -0400
-@@ -306,10 +306,10 @@
- if commonEnvironment['buildRelease'] == '0':
+--- csound5/SConstruct.no-usr-local 2007-08-22 22:40:32.000000000 -0400
++++ csound5/SConstruct 2007-08-22 22:44:59.000000000 -0400
+@@ -336,9 +336,9 @@ if commonEnvironment['buildRelease'] ==
commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
- if commonEnvironment['Word64'] == '1':
+
+ if commonEnvironment['Lib64'] == '1':
- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
+ commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
- commonEnvironment.Append(CCFLAGS = ['-fPIC'])
else:
- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
+ commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
- if commonEnvironment['useDouble'] == '0':
- print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
-@@ -324,14 +324,12 @@
-
+ if commonEnvironment['Word64'] == '1':
+ commonEnvironment.Append(CCFLAGS = ['-fPIC'])
+@@ -357,7 +357,6 @@ if not withMSVC():
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(LINKFLAGS = ['-Wl,-Bdynamic'])
- elif getPlatform() == 'darwin':
- commonEnvironment.Append(CCFLAGS = "-DMACOSX")
-- commonEnvironment.Append(CPPPATH = '/usr/local/include')
- commonEnvironment.Append(CCFLAGS = "-DPIPES")
- if commonEnvironment['useAltivec'] == '1':
- print 'CONFIGURATION DECISION using Altivec optmisation'
-@@ -342,7 +340,6 @@
- commonEnvironment.Append(CCFLAGS = "-DPIPES")
- commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
- if not withMSVC():
-- commonEnvironment.Append(CPPPATH = '/usr/local/include')
- commonEnvironment.Append(CPPPATH = '/usr/include')
- commonEnvironment.Append(CCFLAGS = "-mthreads")
- else:
-@@ -350,18 +347,17 @@
+@@ -387,18 +386,17 @@ elif getPlatform() == 'win32':
if getPlatform() == 'linux':
path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
@@ -45,10 +29,9 @@
+ pythonIncludePath = [path1]
path1 = '/usr/include/tcl8.4'
path2 = '/usr/include/tk8.4'
-- tclIncludePath = [path1, path2]
-+ tclIncludePath = [path1]
+ tclIncludePath = [path1, path2]
pythonLinkFlags = []
- if commonEnvironment['Word64'] == '1':
+ if commonEnvironment['Lib64'] == '1':
tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
- pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
+ pythonLibraryPath = ['/usr/lib64', tmp]
Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/OLPC-2/csound.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- csound.spec 4 Apr 2007 21:12:17 -0000 1.11
+++ csound.spec 30 Aug 2007 13:12:45 -0000 1.12
@@ -10,8 +10,8 @@
Summary: Csound - sound synthesis language and library
Name: csound
-Version: 5.03.0
-Release: 13%{?dist}
+Version: 5.07.0
+Release: 0.1.cvs20070830%{?dist}
URL: http://csound.sourceforge.net/
License: LGPL
Group: Applications/Multimedia
@@ -28,21 +28,20 @@
BuildRequires: tk-devel tcl-devel
BuildRequires: tetex tetex-latex libxslt
-Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061108.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.07.0_src-cvs20070830.tar.bz2
# NOTE:
# Manual sources aren't distributed, but may be extracted from CVS via...
# cvs -d :pserver:anonymous at csound.cvs.sourceforge.net:/cvsroot/csound login
# cvs -z9 -d :pserver:anonymous at csound.cvs.sourceforge.net:/cvsroot/csound checkout -P -r csound-5_03_0 manual
-Source1: Csound5.03_manual.tgz
+Source1: Csound5.07.0_manual-cvs20070830.tar.bz2
Patch0: csound-5.03.0-enable-fluidsynth.patch
-Patch1: csound-5.03.0-gstabs-disable-option.patch
+Patch1: csound-5.07.0-install-fixes.patch
Patch2: csound-5.03.0-no-usr-local.patch
Patch3: csound-5.03.0-disable-atsa.patch
Patch4: csound-5.03.0-default-opcodedir.patch
Patch5: csound-5.03.0-rtalsa-fix.patch
-Patch6: csound-5.03.0-fltk-fixes.patch
%description
Csound is a sound and music synthesis system, providing facilities for
@@ -180,14 +179,13 @@
%prep
-%setup -q -n Csound5.03.0
+%setup -q -n csound5
%patch0 -p1 -b .enable-fluidsynth
-%patch1 -p1 -b .gstabs-disable-option
+%patch1 -p1 -b .install-fixes
%patch2 -p1 -b .no-usr-local
%patch3 -p1 -b .disable-atsa
%patch4 -p1 -b .default-opcodedir
%patch5 -p1 -b .rtalsa-fix
-%patch6 -p1 -b .fltk-fixes
tar xf %{SOURCE1}
@@ -208,6 +206,7 @@
useOSC=1 \
useJack=1 \
useFLTK=1 \
+ buildVirtual=1 \
useFluidsynth=1 \
generatePdf=0 \
buildCsound5GUI=1 \
@@ -245,8 +244,6 @@
# This file is zero-lenth for some reason
%{__rm} -f manual/examples/ifthen.csd
-%{__mv} %{buildroot}%{_libdir}/lib_csnd.so %{buildroot}%{_libdir}/python2.5/site-packages/_csnd.so
-
install -dm 755 %{buildroot}%{_javadir}
(cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .)
@@ -304,36 +301,46 @@
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/xmg/*.xmg
%dir %{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/plugins/libampmidid.so
%{_libdir}/%{name}/plugins/libbabo.so
%{_libdir}/%{name}/plugins/libbarmodel.so
%{_libdir}/%{name}/plugins/libcompress.so
%{_libdir}/%{name}/plugins/libcontrol.so
+%{_libdir}/%{name}/plugins/libcsnd.so
+%{_libdir}/%{name}/plugins/libdate.so
+%{_libdir}/%{name}/plugins/libeqfil.so
%{_libdir}/%{name}/plugins/libftest.so
+%{_libdir}/%{name}/plugins/libgabnew.so
%{_libdir}/%{name}/plugins/libgrain4.so
%{_libdir}/%{name}/plugins/libhrtferX.so
%{_libdir}/%{name}/plugins/libloscilx.so
%{_libdir}/%{name}/plugins/libminmax.so
%{_libdir}/%{name}/plugins/libmixer.so
%{_libdir}/%{name}/plugins/libmodal4.so
+%{_libdir}/%{name}/plugins/libmutexops.so
+%{_libdir}/%{name}/plugins/libpartikkel.so
%{_libdir}/%{name}/plugins/libphisem.so
%{_libdir}/%{name}/plugins/libphysmod.so
%{_libdir}/%{name}/plugins/libpitch.so
+%{_libdir}/%{name}/plugins/libptrack.so
%{_libdir}/%{name}/plugins/libpvoc.so
+%{_libdir}/%{name}/plugins/libpvsbuffer.so
%{_libdir}/%{name}/plugins/libpvs_ops.so
%{_libdir}/%{name}/plugins/libpy.so
%{_libdir}/%{name}/plugins/librtalsa.so
%{_libdir}/%{name}/plugins/libscansyn.so
+%{_libdir}/%{name}/plugins/libscoreline.so
%{_libdir}/%{name}/plugins/libsfont.so
%{_libdir}/%{name}/plugins/libstackops.so
%{_libdir}/%{name}/plugins/libstdopcod.so
%{_libdir}/%{name}/plugins/libstdutil.so
+%{_libdir}/%{name}/plugins/libsystem_call.so
%{_libdir}/%{name}/plugins/libudprecv.so
%{_libdir}/%{name}/plugins/libudpsend.so
%{_libdir}/%{name}/plugins/libvbap.so
%{_libdir}/%{name}/plugins/libharmon.so
%{_libdir}/%{name}/plugins/libugakbari.so
%{_libdir}/%{name}/plugins/libvaops.so
-%{_libdir}/%{name}/plugins/opcodes.dir
%files devel
%defattr(-,root,root,0755)
@@ -406,6 +413,16 @@
%doc tutorial/*.py
%changelog
+* Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.1.cvs20070830
+- Update to CVS snapshot of 5.07
+ - Expose functions for fluid opcodes that work better on low-power machines
+
+* Fri Aug 24 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.1.cvs20070824
+- Update to CVS snapshot of 5.07
+
+* Wed Aug 22 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.1.cvs20070822
+- Update to CVS snapshot of 5.07
+
* Mon Apr 2 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 5.03.0-13
- Patch out FLTK widget initialization code made unnecessary by
fltk-fluid 1.1.8, snapshot r5555
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/OLPC-2/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 9 Nov 2006 01:28:00 -0000 1.6
+++ sources 30 Aug 2007 13:12:45 -0000 1.7
@@ -1,2 +1,2 @@
-acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz
-9e26eac5de2de842cabfbb759ed83fe4 Csound5.03.0_src-cvs20061108.tar.bz2
+31b951da47b9416d0d6f533c1c4a552c Csound5.07.0_src-cvs20070830.tar.bz2
+34d8e1d7b3a395e1ae1a44faba2c0c3e Csound5.07.0_manual-cvs20070830.tar.bz2
--- csound-5.03.0-fltk-fixes.patch DELETED ---
--- csound-5.03.0-gstabs-disable-option.patch DELETED ---
More information about the fedora-extras-commits
mailing list