rpms/csound/F-11 csound-5.10.1-64-bit-plugin-path.patch, NONE, 1.1 csound-5.10.1-default-opcodedir.patch, NONE, 1.1 csound-5.10.1-enable-oggplay.patch, NONE, 1.1 csound-5.10.1-fix-conflicts.patch, NONE, 1.1 csound-5.10.1-fix-locale-install.patch, NONE, 1.1 csound-5.10.1-makebuild.patch, NONE, 1.1 csound-5.10.1-no-usr-local.patch, NONE, 1.1 csound-5.10.1-rtalsa-fix.patch, NONE, 1.1 csound.spec, 1.19, 1.20 sources, 1.6, 1.7 Csound5.03.0.makebuild.patch, 1.1, NONE csound-5.03.0-64-bit-plugin-path.patch, 1.1, NONE csound-5.03.0-default-opcodedir.patch, 1.1, NONE csound-5.03.0-disable-atsa.patch, 1.1, NONE csound-5.03.0-enable-fluidsynth.patch, 1.3, NONE csound-5.03.0-fix-conflicts.patch, 1.1, NONE csound-5.03.0-fltk-fixes.patch, 1.1, NONE csound-5.03.0-gstabs-disable-option.patch, 1.1, NONE csound-5.03.0-no-usr-local.patch, 1.2, NONE csound-5.03.0-rtalsa-fix.patch, 1.1, NONE
Peter Robinson
pbrobinson at fedoraproject.org
Wed May 13 18:54:10 UTC 2009
Author: pbrobinson
Update of /cvs/pkgs/rpms/csound/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1128
Modified Files:
csound.spec sources
Added Files:
csound-5.10.1-64-bit-plugin-path.patch
csound-5.10.1-default-opcodedir.patch
csound-5.10.1-enable-oggplay.patch
csound-5.10.1-fix-conflicts.patch
csound-5.10.1-fix-locale-install.patch
csound-5.10.1-makebuild.patch csound-5.10.1-no-usr-local.patch
csound-5.10.1-rtalsa-fix.patch
Removed Files:
Csound5.03.0.makebuild.patch
csound-5.03.0-64-bit-plugin-path.patch
csound-5.03.0-default-opcodedir.patch
csound-5.03.0-disable-atsa.patch
csound-5.03.0-enable-fluidsynth.patch
csound-5.03.0-fix-conflicts.patch
csound-5.03.0-fltk-fixes.patch
csound-5.03.0-gstabs-disable-option.patch
csound-5.03.0-no-usr-local.patch
csound-5.03.0-rtalsa-fix.patch
Log Message:
Upgrade from 5.03 to 5.10.1
csound-5.10.1-64-bit-plugin-path.patch:
--- NEW FILE csound-5.10.1-64-bit-plugin-path.patch ---
--- Csound5.10.1/SConstruct.orig 2008-12-18 18:26:46.000000000 +0000
+++ Csound5.10.1/SConstruct 2009-03-30 20:08:10.000000000 +0100
@@ -768,9 +768,7 @@
# library version is CS_VERSION.CS_APIVERSION
csoundLibraryVersion = '5.2'
csoundLibraryName = 'csound'
-if commonEnvironment['useDouble'] != '0':
- csoundLibraryName += '64'
-elif getPlatform() == 'win32':
+if getPlatform() == 'win32':
csoundLibraryName += '32'
# flags for linking with the Csound library
libCsoundLinkFlags = []
@@ -814,8 +812,6 @@
tmp = '%s/lib/csound/plugins' % commonEnvironment['prefix']
else:
tmp = '%s/lib64/csound/plugins' % commonEnvironment['prefix']
- if commonEnvironment['useDouble'] != '0':
- tmp += '64'
s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
csoundLibraryEnvironment.Append(CPPFLAGS = [s])
elif buildOSXFramework != 0:
@@ -2588,10 +2584,7 @@
if i[:sys.prefix.__len__()] == sys.prefix and i[-13:] == 'site-packages':
PYTHON_DIR = i
-if commonEnvironment['useDouble'] == '0':
- PLUGIN_DIR = LIB_DIR + "/csound/plugins"
-else:
- PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
+PLUGIN_DIR = LIB_DIR + "/csound/plugins"
if commonEnvironment['install'] == '1':
installExecutables = Alias('install-executables',
--- Csound5.10.1/Top/csmodule.c.orig 2008-12-18 17:37:02.000000000 +0000
+++ Csound5.10.1/Top/csmodule.c 2009-03-30 20:08:10.000000000 +0100
@@ -638,17 +638,12 @@
return CSOUND_ERROR;
/* open plugin directory */
- dname = csoundGetEnv(csound, (sizeof(MYFLT) == sizeof(float) ?
- plugindir_envvar : plugindir64_envvar));
+ dname = csoundGetEnv(csound, plugindir_envvar);
if (dname == NULL) {
#if ENABLE_OPCODEDIR_WARNINGS
csound->opcodedirWasOK = 0;
-# ifdef USE_DOUBLE
- dname = csoundGetEnv(csound, plugindir_envvar);
- if (dname == NULL)
-# endif
#endif
- dname = CS_DEFAULT_PLUGINDIR;
+ dname = CS_DEFAULT_PLUGINDIR;
}
dir = opendir(dname);
if (UNLIKELY(dir == (DIR*) NULL)) {
csound-5.10.1-default-opcodedir.patch:
--- NEW FILE csound-5.10.1-default-opcodedir.patch ---
--- Csound5.10.1/Top/csmodule.c.orig 2009-03-31 00:09:56.000000000 +0100
+++ Csound5.10.1/Top/csmodule.c 2009-03-31 00:21:59.000000000 +0100
@@ -126,17 +126,20 @@
#else
#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
# define ENABLE_OPCODEDIR_WARNINGS 1
-# ifdef CS_DEFAULT_PLUGINDIR
-# undef CS_DEFAULT_PLUGINDIR
+# ifndef CS_DEFAULT_PLUGINDIR
+# ifndef USE_DOUBLE
+# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins"
+# else
+# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins"
+# endif
# endif
-# define CS_DEFAULT_PLUGINDIR "."
#else
# define ENABLE_OPCODEDIR_WARNINGS 0
# ifndef CS_DEFAULT_PLUGINDIR
# ifndef USE_DOUBLE
-# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins"
-# Else
-# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64"
+# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins"
+# else
+# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins"
# endif
# endif
#endif
csound-5.10.1-enable-oggplay.patch:
--- NEW FILE csound-5.10.1-enable-oggplay.patch ---
--- Csound5.10.1/SConstruct.orig 2009-03-31 12:17:17.000000000 +0100
+++ Csound5.10.1/SConstruct 2009-03-31 12:19:17.000000000 +0100
@@ -132,6 +132,9 @@
commandOptions.Add('useUDP',
'Set to 1 if you want UDP support',
'0')
+commandOptions.Add('useOGG',
+ 'Set to 1 to build ogg opcodes',
+ '1')
commandOptions.Add('buildPythonOpcodes',
'Set to 1 to build Python opcodes',
'0')
@@ -1725,7 +1728,9 @@
# end udp opcodes
# OGG opcodes
-if buildOLPC:
+if commonEnvironment['useOGG'] == '0':
+ print "CONFIGURATION DECISION: Not building OGG plugins."
+else:
print "CONFIGURATION DECISION: Building OGG plugins."
oggEnvironment = pluginEnvironment.Clone()
oggEnvironment.Append(LINKFLAGS = ['-lvorbisfile', '-lvorbis', '-logg'])
csound-5.10.1-fix-conflicts.patch:
--- NEW FILE csound-5.10.1-fix-conflicts.patch ---
--- Csound5.10.1/SConstruct.orig 2009-03-31 10:03:57.000000000 +0100
+++ Csound5.10.1/SConstruct 2009-03-31 10:15:37.000000000 +0100
@@ -1975,38 +1975,43 @@
['atsa', 'util/atsa_main.c' ],
['cvanal', 'util/cvl_main.c' ],
['dnoise', 'util/dnoise_main.c' ],
- ['envext', 'util/env_main.c' ],
- ['extractor', 'util/xtrc_main.c' ],
+ ['cs-envext', 'util/env_main.c' ],
+ ['cs-extractor', 'util/xtrc_main.c' ],
['het_export', 'util/hetx_main.c' ],
['het_import', 'util/heti_main.c' ],
['hetro', 'util/het_main.c' ],
['lpanal', 'util/lpc_main.c' ],
['lpc_export', 'util/lpcx_main.c' ],
['lpc_import', 'util/lpci_main.c' ],
- ['mixer', 'util/mixer_main.c' ],
+ ['cs-mixer', 'util/mixer_main.c' ],
['pvanal', 'util/pvc_main.c' ],
['pvlook', 'util/pvl_main.c' ],
['pv_export', 'util/pvx_main.c' ],
['pv_import', 'util/pvi_main.c' ],
- ['scale', 'util/scale_main.c' ],
- ['sndinfo', 'util/sndinfo_main.c' ],
- ['srconv', 'util/srconv_main.c' ]]
+ ['cs-scale', 'util/scale_main.c' ],
+ ['cs-sndinfo', 'util/sndinfo_main.c' ],
+ ['cs-srconv', 'util/srconv_main.c' ]]
for i in utils:
- executables.append(csoundProgramEnvironment.Program(i[0], i[1]))
+ a = csoundProgramEnvironment.Program(i[0], i[1])
+ executables.append(a)
+ if i[0].startswith("cs-"):
+ Depends(a, csoundLibrary)
if not buildOLPC:
executables.append(csoundProgramEnvironment.Program('scsort',
['util1/sortex/smain.c']))
- executables.append(csoundProgramEnvironment.Program('extract',
- ['util1/sortex/xmain.c']))
+ a = csoundProgramEnvironment.Program('cs-extract', ['util1/sortex/xmain.c'])
+ executables.append(a)
+ Depends(a, csoundLibrary)
if compilerGNU():
- executables.append(commonEnvironment.Program('cs',
- ['util1/csd_util/cs.c']))
+ a = commonEnvironment.Program('cs-launcher', ['util1/csd_util/cs.c'])
+ executables.append(a)
+ Depends(a, csoundLibrary)
executables.append(commonEnvironment.Program('csb64enc',
['util1/csd_util/base64.c', 'util1/csd_util/csb64enc.c']))
executables.append(commonEnvironment.Program('makecsd',
['util1/csd_util/base64.c', 'util1/csd_util/makecsd.c']))
- executables.append(commonEnvironment.Program('scot',
+ executables.append(commonEnvironment.Program('cs-scot',
['util1/scot/scot_main.c', 'util1/scot/scot.c']))
#executables.append(csoundProgramEnvironment.Program('cscore',
# ['util1/cscore/cscore_main.c']))
--- Csound5.10.1/install.py.orig 2009-03-31 10:19:04.000000000 +0100
+++ Csound5.10.1/install.py 2009-03-31 10:20:37.000000000 +0100
@@ -20,12 +20,12 @@
exeFiles1 = ['csound', 'csound5gui', 'CsoundVST', 'winsound',
'cstclsh', 'cswish', 'cseditor',
- 'cvanal', 'dnoise', 'envext', 'extractor',
+ 'cvanal', 'dnoise', 'cs-envext', 'cs-extractor',
'het_export', 'het_import', 'hetro', 'lpanal',
- 'lpc_export', 'lpc_import', 'mixer', 'pvanal',
+ 'lpc_export', 'lpc_import', 'cs-mixer', 'pvanal',
'pv_export', 'pv_import',
- 'pvlook', 'scale', 'sndinfo', 'srconv',
- 'scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot']
+ 'pvlook', 'cs-scale', 'cs-sndinfo', 'cs-srconv',
+ 'scsort', 'cs-extract', 'cs-launcher', 'csb64enc', 'makecsd', 'cs-scot']
exeFiles2 = ['brkpt', 'linseg', 'tabdes']
csound-5.10.1-fix-locale-install.patch:
--- NEW FILE csound-5.10.1-fix-locale-install.patch ---
--- Csound5.10.1/install.py.orig 2009-03-31 11:31:45.000000000 +0100
+++ Csound5.10.1/install.py 2009-03-31 11:32:01.000000000 +0100
@@ -152,7 +152,7 @@
fileList += [fileName]
fullName = concatPath([instDir, fileName])
err = runCmd(['install', '-p', '-m', perm, src, fullName])
- if err == 0 and stripMode != '':
+ if err == 0 and stripMode == 'packman':
err = runCmd(['strip', stripMode, fullName])
if err == 0:
addMD5(fullName, fileName)
@@ -333,7 +333,7 @@
for i in xmgList:
makeDir(concatPath([xmgDir, i, 'LC_MESSAGES']))
src = 'po/' + i + '/LC_MESSAGES/csound5.mo'
- fileName = concatPath([xmgDir, i, 'LC_MESSAGES/csound5.mo'])
+ fileName = concatPath([instDir, xmgDir, i, 'LC_MESSAGES/csound5.mo'])
err = runCmd(['install', '-p', '-m', '0644', src, fileName])
if err == 0:
addMD5(fileName, fileName)
csound-5.10.1-makebuild.patch:
--- NEW FILE csound-5.10.1-makebuild.patch ---
--- Csound5.10.1/InOut/widgets.cpp.orig 2009-03-30 15:27:44.000000000 +0100
+++ Csound5.10.1/InOut/widgets.cpp 2009-03-30 15:28:47.000000000 +0100
@@ -2946,7 +2946,7 @@
return OK;
}
- static int fl_box_(CSOUND *csound, FL_BOX *p)
+ static int fl_boxthing_(CSOUND *csound, FL_BOX *p)
{
char *text = GetString(csound, p->itext, p->XSTRCODE);
Fl_Box *o = new Fl_Box((int)*p->ix, (int)*p->iy,
@@ -5465,7 +5465,7 @@
{ (char*)"FLsetAlign", S(FL_TALIGN), 1, (char*)"", (char*)"ii",
(SUBR) fl_align, (SUBR) NULL, (SUBR) NULL },
{ (char*)"FLbox", S(FL_BOX), 1, (char*)"i", (char*)"Tiiiiiii",
- (SUBR) fl_box_, (SUBR) NULL, (SUBR) NULL },
+ (SUBR) fl_boxthing_, (SUBR) NULL, (SUBR) NULL },
{ (char*)"FLvalue", S(FLVALUE), 1, (char*)"i", (char*)"Tjjjj",
(SUBR) fl_value, (SUBR) NULL, (SUBR) NULL },
{ (char*)"FLpanel", S(FLPANEL), 1, (char*)"", (char*)"Tjjjoooo",
--- Csound5.10.1/SConstruct.orig 2009-03-30 15:30:20.000000000 +0100
+++ Csound5.10.1/SConstruct 2009-03-30 15:31:11.000000000 +0100
@@ -243,7 +243,7 @@
'0')
commandOptions.Add('tclversion',
'Set to 8.4 or 8.5',
- '8.4')
+ '8.5')
# Define the common part of the build environment.
# This section also sets up customized options for third-party libraries, which
csound-5.10.1-no-usr-local.patch:
--- NEW FILE csound-5.10.1-no-usr-local.patch ---
--- Csound5.10.1/SConstruct.orig 2009-03-30 18:11:39.000000000 +0100
+++ Csound5.10.1/SConstruct 2009-03-30 18:19:44.000000000 +0100
@@ -136,8 +136,8 @@
'Set to 1 to build Python opcodes',
'0')
commandOptions.Add('prefix',
- 'Base directory for installs. Defaults to /usr/local.',
- '/usr/local')
+ 'Base directory for installs. Defaults to /usr.',
+ '/usr')
commandOptions.Add('instdir',
'For the install target: puts instdir before the prefix',
'')
@@ -444,9 +444,9 @@
commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
if commonEnvironment['Lib64'] == '1':
- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
+ commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
else:
- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
+ commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
if commonEnvironment['Word64'] == '1':
commonEnvironment.Append(CCFLAGS = ['-fPIC'])
@@ -462,15 +462,12 @@
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/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 optimisation'
@@ -487,7 +484,6 @@
commonEnvironment.Append(CXXFLAGS = '-DFL_DLL')
if compilerGNU():
commonEnvironment.Prepend(CCFLAGS = "-Wall")
- commonEnvironment.Append(CPPPATH = '/usr/local/include')
commonEnvironment.Append(CPPPATH = '/usr/include')
commonEnvironment.Append(CCFLAGS = '-mthreads')
commonEnvironment.Append(SHLINKFLAGS = Split('-mwindows -mno-cygwin -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc'))
@@ -519,18 +515,17 @@
if getPlatform() == 'linux':
path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
- path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
- pythonIncludePath = [path1, path2]
+ pythonIncludePath = [path1]
path1 = '/usr/include/tcl%s' % commonEnvironment['tclversion']
path2 = '/usr/include/tk%s' % commonEnvironment['tclversion']
- tclIncludePath = [path1, path2]
+ tclIncludePath = [path1]
pythonLinkFlags = []
if commonEnvironment['Lib64'] == '1':
tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
- pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
+ pythonLibraryPath = ['/usr/lib64', '/usr/lib64', tmp]
else:
tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
- pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
+ pythonLibraryPath = ['/usr/lib', '/usr/lib', tmp]
pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
elif getPlatform() == 'darwin':
# find Mac OS X major version
csound-5.10.1-rtalsa-fix.patch:
--- NEW FILE csound-5.10.1-rtalsa-fix.patch ---
--- Csound5.10.1/InOut/rtalsa.c.orig 2008-12-15 21:18:39.000000000 +0000
+++ Csound5.10.1/InOut/rtalsa.c 2009-03-31 00:28:48.000000000 +0100
@@ -45,6 +45,7 @@
#include <sys/select.h>
#include <termios.h>
#include <errno.h>
+#define _POSIX_C_SOURCE 1
#include <alsa/asoundlib.h>
#include <sched.h>
#include <unistd.h>
Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-11/csound.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- csound.spec 24 Feb 2009 10:01:40 -0000 1.19
+++ csound.spec 13 May 2009 18:54:10 -0000 1.20
@@ -11,10 +11,10 @@
%{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-Summary: Csound - sound synthesis language and library
+Summary: A sound synthesis language and library
Name: csound
-Version: 5.03.0
-Release: 21%{?dist}
+Version: 5.10.1
+Release: 4%{?dist}
URL: http://csound.sourceforge.net/
License: LGPLv2+
Group: Applications/Multimedia
@@ -22,33 +22,32 @@ Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: swig scons libsndfile-devel libpng-devel libjpeg-devel
BuildRequires: python python-devel
-BuildRequires: alsa-lib-devel fluidsynth-devel
-BuildRequires: jack-audio-connection-kit-devel liblo-devel dssi-devel
+BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel pulseaudio-libs-devel
+BuildRequires: fluidsynth-devel liblo-devel dssi-devel
BuildRequires: fltk-devel fltk-fluid
BuildRequires: java-devel >= 1.4.0
BuildRequires: jpackage-utils >= 1.5
BuildRequires: java-gcj-compat-devel
BuildRequires: tk-devel tcl-devel
BuildRequires: tetex tetex-latex libxslt
+BuildRequires: libvorbis-devel libogg-devel
+BuildRequires: gettext
-Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061108.tar.bz2
+Source0: http://downloads.sourceforge.net/csound/Csound5.10.1.tar.gz
+Source1: http://downloads.sourceforge.net/csound/Csound5.10_manual_src.tar.gz
+Source2: http://downloads.sourceforge.net/csound/Csound5.10_manual_html.zip
+
+Patch1: csound-5.10.1-no-usr-local.patch
+Patch2: csound-5.10.1-default-opcodedir.patch
+Patch3: csound-5.10.1-rtalsa-fix.patch
+Patch4: csound-5.10.1-makebuild.patch
+Patch5: csound-5.10.1-64-bit-plugin-path.patch
+Patch6: csound-5.10.1-fix-conflicts.patch
+Patch7: csound-5.10.1-fix-locale-install.patch
+Patch8: csound-5.10.1-enable-oggplay.patch
-# 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
-
-Patch0: csound-5.03.0-enable-fluidsynth.patch
-Patch1: csound-5.03.0-gstabs-disable-option.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
-Patch7: Csound5.03.0.makebuild.patch
-Patch8: csound-5.03.0-64-bit-plugin-path.patch
-Patch9: csound-5.03.0-fix-conflicts.patch
+#FIXME
+Patch9: csound-5.10.1-version-libcsnd.patch3
%description
Csound is a sound and music synthesis system, providing facilities for
@@ -139,7 +138,6 @@ Contains Jack Audio plugins for Csound
Summary: Fluidsyth soundfont plugin for Csound
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
-Requires: fluidsynth-libs
%description fluidsynth
Contains Fluidsynth soundfont plugin for Csound.
@@ -174,33 +172,27 @@ A virtual MIDI keyboard plugin for Csoun
Summary: Csound manual
Group: Documentation
Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description manual
Canonical Reference Manual for Csound.
-%package tutorial
-Summary: Csound tutorial
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-
-%description tutorial
-Tutorial documentation and sample files for Csound.
-
%prep
-%setup -q -n Csound5.03.0
-%patch0 -p1 -b .enable-fluidsynth
-%patch1 -p1 -b .gstabs-disable-option
-%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
-%patch7 -p1 -b .makebuild
-%patch8 -p1 -b .64-bit-plugin-path
-%patch9 -p1 -b .fix-conflicts
+%setup -q -n Csound5.10.1
+%patch1 -p1 -b .no-usr-local
+%patch2 -p1 -b .default-opcodedir
+%patch3 -p1 -b .rtalsa
+%patch4 -p1 -b .makebuild
+%patch5 -p1 -b .64-bit-plugin-path
+%patch6 -p1 -b .fix-conflicts
+%patch7 -p1 -b .fix-local-install
+%patch8 -p1 -b .enable-oggplay
+#FIXME
+%patch9 -p0 -b .version-libcsnd
tar xf %{SOURCE1}
+(cd manual; unzip -q %{SOURCE2})
%build
@@ -213,12 +205,15 @@ scons dynamicCsoundLibrary=1 \
noDebug=0 \
disableGStabs=1 \
buildInterfaces=1 \
+ useGettext=1 \
useALSA=1 \
usePortAudio=0 \
usePortMIDI=0 \
+ useOGG=1 \
useOSC=1 \
useJack=1 \
useFLTK=1 \
+ buildVirtual=1 \
useFluidsynth=1 \
generatePdf=0 \
buildCsound5GUI=1 \
@@ -233,17 +228,9 @@ scons dynamicCsoundLibrary=1 \
Word64=%{build64bit} \
useDouble=%{useDouble}
-# Build the manual
-(cd manual; make)
-
# Generate javadoc
(cd interfaces; javadoc *.java)
-# Build the tutorial documentation
-(cd tutorial; \
- pdflatex tutorial; bibtex tutorial; pdflatex tutorial; pdflatex tutorial)
-
-
%install
%{__rm} -rf %{buildroot}
%{__python} install.py --prefix=%{_prefix} --instdir=%{buildroot} %{install64bit}
@@ -256,17 +243,20 @@ scons dynamicCsoundLibrary=1 \
# This file is zero-lenth for some reason
%{__rm} -f manual/examples/ifthen.csd
-
-%{__mv} %{buildroot}%{_libdir}/lib_csnd.so %{buildroot}%{_libdir}/python%{pyver}/site-packages/_csnd.so
+# Remove the CVS dir in examples
+%{__rm} -rf manual/examples/CVS
install -dm 755 %{buildroot}%{_javadir}
(cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .)
-install -dm 766 %{buildroot}%{_javadocdir}/%{name}-java
+install -dm 644 %{buildroot}%{_javadocdir}/%{name}-java
+%{__chmod} -R 755 %{buildroot}%{_javadocdir}/%{name}-java
(cd interfaces; tar cf - *.html csnd/*.html) | (cd %{buildroot}%{_javadocdir}/%{name}-java; tar xvf -)
%{_bindir}/aot-compile-rpm
+%find_lang %{name}5
+
%clean
%{__rm} -rf %{buildroot}
@@ -284,8 +274,8 @@ if [ -x %{_bindir}/rebuild-gcj-db ]; the
%{_bindir}/rebuild-gcj-db
fi
-%files
-%defattr(-,root,root,0755)
+%files -f %{name}5.lang
+%defattr(-,root,root,-)
%doc COPYING ChangeLog readme-csound5.txt
%{_bindir}/cs-launcher
%{_bindir}/csb64enc
@@ -312,53 +302,70 @@ fi
%{_bindir}/cs-srconv
%{_bindir}/pv_export
%{_bindir}/pv_import
-%{_libdir}/lib%{name}.so.5.1
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/xmg
-%{_datadir}/%{name}/xmg/*.xmg
-%dir %{_libdir}/%{name}
+%{_libdir}/lib%{name}.so.5.2
+#FIXME
+#%{_libdir}/libcsnd.so.5.2
%dir %{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/plugins/libambicode1.so
+%{_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/libcs_date.so
+%{_libdir}/%{name}/plugins/libcs_pan2.so
+%{_libdir}/%{name}/plugins/libcs_pvs_ops.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/libhrtfnew.so
+%{_libdir}/%{name}/plugins/libimage.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/liboggplay.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/libpvs_ops.so
+%{_libdir}/%{name}/plugins/libpvsbuffer.so
%{_libdir}/%{name}/plugins/libpy.so
%{_libdir}/%{name}/plugins/librtalsa.so
+%{_libdir}/%{name}/plugins/librtpulse.so
%{_libdir}/%{name}/plugins/libscansyn.so
+%{_libdir}/%{name}/plugins/libscoreline.so
%{_libdir}/%{name}/plugins/libsfont.so
+%{_libdir}/%{name}/plugins/libshape.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
+%{_libdir}/%{name}/plugins/libvosim.so
%files devel
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/lib%{name}.so
+%{_libdir}/libcsnd.so
%files python
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_libdir}/python%{pyver}/site-packages/*
%files java
+%defattr(-,root,root,-)
%{_libdir}/lib_jcsound.so
%{_libdir}/%{name}/java/
%{_javadir}/csnd.jar
@@ -369,7 +376,7 @@ fi
%doc %{_javadocdir}/%{name}-java
%files tk
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_libdir}/%{name}/tcl/
%{_bindir}/matrix.tk
%{_bindir}/brkpt
@@ -379,47 +386,55 @@ fi
%{_bindir}/cswish
%files gui
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_bindir}/csound5gui
%files fltk
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/libwidgets.so
%files jack
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/librtjack.so
+%{_libdir}/%{name}/plugins/libjackTransport.so
%files fluidsynth
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/libfluidOpcodes.so
%files dssi
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/libdssi4cs.so
%files osc
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/libosc.so
%files virtual-keyboard
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/libvirtual.so
%files manual
%defattr(-,root,root,0755)
-%doc manual/copying.txt manual/credits.txt manual/bugs.txt manual/readme.txt manual/news.txt
+%doc manual/copying.txt manual/credits.txt manual/readme.txt manual/news.txt
%doc manual/html/*
%doc manual/examples
-%files tutorial
-%defattr(-,root,root,0755)
-%doc tutorial/tutorial.pdf
-%doc tutorial/*.csd
-%doc tutorial/*.cpr
-%doc tutorial/*.py
-
%changelog
+* Tue May 12 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-4
+- Once more with feeling :-)
+
+* Tue May 12 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-3
+- Some further spec fixes
+
+* Tue May 12 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-2
+- Some build fixes. Enable pulseaudio support
+
+* Mon May 11 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-1
+- Update to 5.10.1 based massively on dcbw's 5.07 spec from the OLPC-2 cvs branch
+ rebase what looks to be relevant pataches from both branches
+ add a number of other build fixes
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.03.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 9 Nov 2006 01:28:00 -0000 1.6
+++ sources 13 May 2009 18:54:10 -0000 1.7
@@ -1,2 +1,3 @@
-acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz
-9e26eac5de2de842cabfbb759ed83fe4 Csound5.03.0_src-cvs20061108.tar.bz2
+7b2f4b4eb6ccab66e06625cb5377d4f7 Csound5.10.1.tar.gz
+e1eba0da11cfc1d85ef2113a81af91eb Csound5.10_manual_html.zip
+90d9a0e441e6473d7f42ca35fae86394 Csound5.10_manual_src.tar.gz
--- Csound5.03.0.makebuild.patch DELETED ---
--- csound-5.03.0-64-bit-plugin-path.patch DELETED ---
--- csound-5.03.0-default-opcodedir.patch DELETED ---
--- csound-5.03.0-disable-atsa.patch DELETED ---
--- csound-5.03.0-enable-fluidsynth.patch DELETED ---
--- csound-5.03.0-fix-conflicts.patch DELETED ---
--- csound-5.03.0-fltk-fixes.patch DELETED ---
--- csound-5.03.0-gstabs-disable-option.patch DELETED ---
--- csound-5.03.0-no-usr-local.patch DELETED ---
--- csound-5.03.0-rtalsa-fix.patch DELETED ---
More information about the scm-commits
mailing list