rpms/csound/devel csound-5.03.0-enable-fluidsynth.patch, NONE, 1.1 csound-5.03.0-printf-redef.patch, NONE, 1.1 csound-5.03.0-uninitialized.patch, NONE, 1.1 csound.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Tue Sep 5 18:09:14 UTC 2006
Author: dcbw
Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24767/devel
Modified Files:
.cvsignore sources
Added Files:
csound-5.03.0-enable-fluidsynth.patch
csound-5.03.0-printf-redef.patch
csound-5.03.0-uninitialized.patch csound.spec
Log Message:
auto-import csound-5.03.0-2 on branch devel from csound-5.03.0-2.src.rpm
csound-5.03.0-enable-fluidsynth.patch:
--- NEW FILE csound-5.03.0-enable-fluidsynth.patch ---
--- Csound5.03.0/SConstruct.enable-fluidsynth 2006-08-11 09:23:01.000000000 -0400
+++ Csound5.03.0/SConstruct 2006-08-30 13:48:19.000000000 -0400
@@ -212,6 +212,9 @@
opts.Add('buildOSXGUI',
'On OSX, set to 1 to build the basic GUI frontend',
'0')
+opts.Add('useFluidsynth',
+ 'Set to 1 if you want OSC support',
+ '0')
# Define the common part of the build environment.
# This section also sets up customized options for third-party libraries, which
@@ -405,6 +408,7 @@
pdhfound = configure.CheckHeader("m_pd.h", language = "C")
tclhfound = configure.CheckHeader("tcl.h", language = "C")
luaFound = configure.CheckHeader("lua.h", language = "C")
+fluidsynthFound = configure.CheckHeader("fluidsynth.h", language = "C")
swigFound = 'swig' in commonEnvironment['TOOLS']
print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
pythonFound = configure.CheckHeader("Python.h", language = "C")
@@ -1187,7 +1191,7 @@
# FLUIDSYNTH OPCODES
-if not configure.CheckHeader("fluidsynth.h", language = "C"):
+if not (commonEnvironment['useFluidsynth'] == '1' and fluidsynthFound):
print "CONFIGURATION DECISION: Not building fluid opcodes."
else:
print "CONFIGURATION DECISION: Building fluid opcodes."
csound-5.03.0-printf-redef.patch:
--- NEW FILE csound-5.03.0-printf-redef.patch ---
--- Csound5.03.0/H/csoundCore.h.redef 2006-08-29 14:29:59.000000000 -0400
+++ Csound5.03.0/H/csoundCore.h 2006-08-29 14:30:34.000000000 -0400
@@ -116,7 +116,9 @@
#define WARNMSG 04
#define IGN(X) (void) X
+#if 0
#define printf use_csoundMessage_instead_of_printf
+#endif
typedef struct {
int odebug;
csound-5.03.0-uninitialized.patch:
--- NEW FILE csound-5.03.0-uninitialized.patch ---
--- Csound5.03.0/Opcodes/biquad.c.foo 2006-08-18 21:34:10.000000000 -0400
+++ Csound5.03.0/Opcodes/biquad.c 2006-08-18 21:35:24.000000000 -0400
@@ -118,7 +118,7 @@
MYFLT *out, *in;
double xn;
MYFLT *fcoptr, *resptr;
- double fco, res, fcon, kp, pp1d2, scale, k;
+ double fco, res, fcon, kp = 0, pp1d2 = 0, scale, k = 0;
MYFLT max = p->maxint;
double xnm1 = p->xnm1, y1nm1 = p->y1nm1, y2nm1 = p->y2nm1, y3nm1 = p->y3nm1;
double y1n = p->y1n, y2n = p->y2n, y3n = p->y3n, y4n = p->y4n;
@@ -194,8 +194,8 @@
int n, nsmps = csound->ksmps;
MYFLT *out, *fcoptr, *rezptr, *in;
double fco, rez, xn, yn;
- double fqcadj, c, rez2, a,
- csq, b, tval; /* Temporary varibles for the filter */
+ double fqcadj, c, rez2 = 0, a = 0,
+ csq = 0, b = 0, tval = 0; /* Temporary varibles for the filter */
double xnm1 = p->xnm1, xnm2 = p->xnm2, ynm1 = p->ynm1, ynm2 = p->ynm2;
in = p->in;
@@ -1029,7 +1029,7 @@
MYFLT *fcoptr, *resptr, *distptr, *asymptr;
MYFLT fco, res, dist, asym;
MYFLT y = p->y, y1 = p->y1, y2 = p->y2;
- MYFLT ih, fc, fco1, q, q1, fdbk, d, ad;
+ MYFLT ih, fc = 0, fco1, q = 0, q1 = 0, fdbk, d, ad;
ih = FL(0.001); /* ih is the incremental factor */
@@ -1098,7 +1098,7 @@
long n, nsmps = csound->ksmps;
MYFLT *out, *fcoptr, *rezptr, *in;
double fco, rez, xn, yn;
- double sin2, cos2, beta, alpha, gamma, mu, sigma, chi;
+ double sin2, cos2 = 0, beta = 0, alpha, gamma = 0, mu, sigma, chi;
double theta;
double xnm1 = p->xnm1, xnm2 = p->xnm2, ynm1 = p->ynm1, ynm2 = p->ynm2;
--- NEW FILE csound.spec ---
# Csound is really dumb about 64-bit
%ifarch x86_64 ia64 ppc64
%define build64bit 1
%define install64bit --word64
%else
%define build64bit 0
%define install64bit %{nil}
%endif
Summary: Csound - sound synthesis language and library
Name: csound
Version: 5.03.0
Release: 2%{?dist}
URL: http://csound.sourceforge.net/
License: LGPL
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: 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
Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src.tgz
# 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-uninitialized.patch
Patch1: csound-5.03.0-printf-redef.patch
Patch2: csound-5.03.0-enable-fluidsynth.patch
%description
Csound is a sound and music synthesis system, providing facilities for
composition and performance over a wide range of platforms. It is not
restricted to any style of music, having been used for many years in
at least classical, pop, techno, ambient...
%package devel
Summary: Csound development files and libraries
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
Contains headers and libraries for developing applications that use Csound.
%package python
Summary: Python Csound development files and libraries
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: python
%description python
Contains Python language bindings for developing Python applications that
use Csound.
%package java
Summary: Java Csound support
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils >= 1.5
Requires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_88rh
Requires(post): jpackage-utils >= 1.5
Requires(postun): jpackage-utils >= 1.5
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%description java
Contains Java language bindings for developing and running Java
applications that use Csound.
%package javadoc
Summary: API documentation for Java Csound support
Group: Documentation
%description javadoc
API documentation for the %{name}-java package.
%package tk
Summary: Tcl/Tk related Csound utilities
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: tcl tk
%description tk
Contains Tcl/Tk related Csound utilities
%package gui
Summary: A FLTK-based GUI for Csound
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: fltk xdg-utils
%description gui
Contains a FLTK-based GUI for Csound
%package jack
Summary: Jack Audio plugins for Csound
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: jack-audio-connection-kit
%description jack
Contains Jack Audio plugins for Csound
%package fluidsynth
Summary: Fluidsyth soundfont plugin for Csound
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: fluidsynth-libs
%description fluidsynth
Contains Fluidsynth soundfont plugin for Csound.
%package dssi
Summary: Disposable Soft Synth Interface (DSSI) plugin for Csound
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: dssi
%description dssi
Disposable Soft Synth Interface (DSSI) plugin for Csound
%package osc
Summary: Open Sound Control (OSC) plugin for Csound
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
%description osc
Open Sound Control (OSC) plugin for Csound
%package manual
Summary: Csound manual
Group: Documentation
%description manual
Canonical Reference Manual for Csound.
%package tutorial
Summary: Csound tutorial
Group: Documentation
%description tutorial
Tutorial documentation and sample files for Csound.
%prep
%setup -q -n Csound5.03.0
%patch0 -p1 -b .uninitialized
%patch1 -p1 -b .printf-redef
%patch2 -p1 -b .enable-fluidsynth
tar xf %{SOURCE1}
%build
# Adjust location of the documentation for the GUI bits
sed -ie 's#\"firefox /usr/local/share/doc/csound/manual/#\"xdg-open file://%{_docdir}/%{name}-manual-%{version}/#' \
frontends/fltk_gui/CsoundGlobalSettings.cpp
scons dynamicCsoundLibrary=1 \
usePortAudio=0 \
usePortMIDI=0 \
useOSC=1 \
useJack=1 \
useFLTK=1 \
useFluidsynth=1 \
generatePdf=0 \
buildCsound5GUI=1 \
buildPythonOpcodes=1 \
buildTclcsound=1 \
buildJavaWrapper=1 \
buildDSSI=1 \
prefix=%{_prefix} \
customCCFLAGS="%{optflags}" \
customCXXFLAGS="%{optflags}" \
Word64=%{build64bit}
# 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}
%{__rm} -f %{buildroot}%{_docdir}/%{name}/COPYING
%{__rm} -f %{buildroot}%{_docdir}/%{name}/ChangeLog
%{__rm} -f %{buildroot}%{_docdir}/%{name}/INSTALL
%{__rm} -f %{buildroot}%{_docdir}/%{name}/readme-csound5.txt
%{__rm} -f %{buildroot}%{_bindir}/uninstall-csound5
%{__rm} -f %{buildroot}%{_prefix}/csound5-*.md5sums
# This file is zero-lenth for some reason
%{__rm} -f manual/examples/ifthen.csd
%{__mv} %{buildroot}%{_libdir}/lib_csnd.so %{buildroot}%{_libdir}/python2.4/site-packages/_csnd.so
install -dm 755 %{buildroot}%{_javadir}
(cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .)
install -dm 766 %{buildroot}%{_javadocdir}/%{name}-java
(cd interfaces; tar cf - *.html csnd/*.html) | (cd %{buildroot}%{_javadocdir}/%{name}-java; tar xvf -)
%{_bindir}/aot-compile-rpm
%clean
%{__rm} -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post java
if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%postun java
if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%files
%defattr(-,root,root,0755)
%doc COPYING ChangeLog readme-csound5.txt
%{_bindir}/cs
%{_bindir}/csb64enc
%{_bindir}/csound
%{_bindir}/cvanal
%{_bindir}/dnoise
%{_bindir}/envext
%{_bindir}/extract
%{_bindir}/extractor
%{_bindir}/het_export
%{_bindir}/het_import
%{_bindir}/hetro
%{_bindir}/lpanal
%{_bindir}/lpc_export
%{_bindir}/lpc_import
%{_bindir}/makecsd
%{_bindir}/mixer
%{_bindir}/pvanal
%{_bindir}/pvlook
%{_bindir}/scale
%{_bindir}/scot
%{_bindir}/scsort
%{_bindir}/sndinfo
%{_bindir}/srconv
%{_libdir}/lib%{name}.so.5.1
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/xmg/*.xmg
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/plugins/libbabo.so
%{_libdir}/%{name}/plugins/libbarmodel.so
%{_libdir}/%{name}/plugins/libcompress.so
%{_libdir}/%{name}/plugins/libcontrol.so
%{_libdir}/%{name}/plugins/libftest.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/libphisem.so
%{_libdir}/%{name}/plugins/libphysmod.so
%{_libdir}/%{name}/plugins/libpitch.so
%{_libdir}/%{name}/plugins/libpvoc.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/libsfont.so
%{_libdir}/%{name}/plugins/libstackops.so
%{_libdir}/%{name}/plugins/libstdopcod.so
%{_libdir}/%{name}/plugins/libstdutil.so
%{_libdir}/%{name}/plugins/libudprecv.so
%{_libdir}/%{name}/plugins/libudpsend.so
%{_libdir}/%{name}/plugins/libvbap.so
%{_libdir}/%{name}/plugins/opcodes.dir
%files devel
%defattr(-,root,root,0755)
%{_includedir}/%{name}/
%{_libdir}/lib%{name}.so
%files python
%defattr(-,root,root,0755)
%{_libdir}/python2.4/site-packages/*
%files java
%{_libdir}/lib_jcsound.so
%{_libdir}/%{name}/java/
%{_javadir}/csnd.jar
%attr(-,root,root) %{_libdir}/gcj/%{name}
%files javadoc
%defattr(-,root,root,0755)
%doc %{_javadocdir}/%{name}-java
%files tk
%defattr(-,root,root,0755)
%{_libdir}/%{name}/tcl/
%{_bindir}/matrix.tk
%{_bindir}/brkpt
%{_bindir}/linseg
%{_bindir}/tabdes
%{_bindir}/cstclsh
%{_bindir}/cswish
%files gui
%defattr(-,root,root,0755)
%{_bindir}/csound5gui
%{_libdir}/%{name}/plugins/libwidgets.so
%files jack
%defattr(-,root,root,0755)
%{_libdir}/%{name}/plugins/librtjack.so
%files fluidsynth
%defattr(-,root,root,0755)
%{_libdir}/%{name}/plugins/libfluidOpcodes.so
%files dssi
%defattr(-,root,root,0755)
%{_libdir}/%{name}/plugins/libdssi4cs.so
%files osc
%defattr(-,root,root,0755)
%{_libdir}/%{name}/plugins/libosc.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/html/*
%doc manual/examples
%files tutorial
%defattr(-,root,root,0755)
%doc tutorial/tutorial.pdf
%doc tutorial/*.csd
%doc tutorial/*.cpr
%doc tutorial/*.py
%changelog
* Fri Aug 24 2006 Dan Williams <dcbw at redhat.com> 5.03.0-2
- Kill printf redefinition
- Remove zero-length ifthen.csd
- Remove explicit liblo dep in csound-osc
- Add fluidsynth plugin
* Fri Aug 24 2006 Dan Williams <dcbw at redhat.com> 5.03.0-1
- Package for Fedora Extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Sep 2006 18:07:41 -0000 1.1
+++ .cvsignore 5 Sep 2006 18:09:14 -0000 1.2
@@ -0,0 +1,2 @@
+Csound5.03_manual.tgz
+Csound5.03_src.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Sep 2006 18:07:41 -0000 1.1
+++ sources 5 Sep 2006 18:09:14 -0000 1.2
@@ -0,0 +1,2 @@
+acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz
+15801aef4abce5efb8975b201aa900a2 Csound5.03_src.tgz
More information about the fedora-extras-commits
mailing list