rpms/csound/devel .cvsignore, 1.3, 1.4 csound-5.03.0-no-usr-local.patch, 1.1, 1.2 csound-5.03.0-remote-fixes.patch, 1.1, 1.2 csound.spec, 1.4, 1.5 sources, 1.3, 1.4
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Fri Oct 27 21:12:36 UTC 2006
Author: dcbw
Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275
Modified Files:
.cvsignore csound-5.03.0-no-usr-local.patch
csound-5.03.0-remote-fixes.patch csound.spec sources
Log Message:
* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
- Update to a cvs snapshot for the remote plugin and a few other fixes
- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
- Put the virtual MIDI keyboard into its own package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 24 Oct 2006 04:35:22 -0000 1.3
+++ .cvsignore 27 Oct 2006 21:12:05 -0000 1.4
@@ -1,3 +1,4 @@
Csound5.03_manual.tgz
Csound5.03_src.tgz
Csound5.03_src-cvs20061023.tar.bz2
+Csound5.03_src-cvs20061027.tar.bz2
csound-5.03.0-no-usr-local.patch:
Index: csound-5.03.0-no-usr-local.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-no-usr-local.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-no-usr-local.patch 24 Oct 2006 04:35:22 -0000 1.1
+++ csound-5.03.0-no-usr-local.patch 27 Oct 2006 21:12:05 -0000 1.2
@@ -1,6 +1,6 @@
---- Csound5.03.0/SConstruct.no-usr-local 2006-10-23 15:42:27.000000000 -0400
-+++ Csound5.03.0/SConstruct 2006-10-23 15:43:31.000000000 -0400
-@@ -307,10 +307,10 @@
+--- 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':
commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
if commonEnvironment['Word64'] == '1':
@@ -13,7 +13,7 @@
if commonEnvironment['useDouble'] == '0':
print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
-@@ -325,14 +325,12 @@
+@@ -324,14 +324,12 @@
if getPlatform() == 'linux':
commonEnvironment.Append(CCFLAGS = "-DLINUX")
@@ -28,7 +28,7 @@
commonEnvironment.Append(CCFLAGS = "-DPIPES")
if commonEnvironment['useAltivec'] == '1':
print 'CONFIGURATION DECISION using Altivec optmisation'
-@@ -343,7 +341,6 @@
+@@ -342,7 +340,6 @@
commonEnvironment.Append(CCFLAGS = "-DPIPES")
commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
if not withMSVC():
@@ -36,13 +36,17 @@
commonEnvironment.Append(CPPPATH = '/usr/include')
commonEnvironment.Append(CCFLAGS = "-mthreads")
else:
-@@ -351,15 +348,14 @@
+@@ -350,18 +347,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/tcl8.4'
+ path2 = '/usr/include/tk8.4'
+- tclIncludePath = [path1, path2]
++ tclIncludePath = [path1]
pythonLinkFlags = []
if commonEnvironment['Word64'] == '1':
tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
csound-5.03.0-remote-fixes.patch:
Index: csound-5.03.0-remote-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-remote-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-remote-fixes.patch 25 Oct 2006 16:13:06 -0000 1.1
+++ csound-5.03.0-remote-fixes.patch 27 Oct 2006 21:12:05 -0000 1.2
@@ -1,6 +1,6 @@
---- Csound5.03.0/OOps/remote.c.remote-debug 2006-10-23 08:18:21.000000000 -0400
-+++ Csound5.03.0/OOps/remote.c 2006-10-25 12:08:20.000000000 -0400
-@@ -36,15 +36,18 @@
+--- Csound5.03.0/OOps/remote.c.remote-fixes 2006-10-27 16:00:10.000000000 -0400
++++ Csound5.03.0/OOps/remote.c 2006-10-27 16:32:02.000000000 -0400
+@@ -38,6 +38,9 @@
#define ST(x) (((REMOTE_GLOBALS*) ((CSOUND*)csound)->remoteGlobals)->x)
@@ -10,7 +10,8 @@
void remoteRESET(CSOUND *csound)
{
csound->remoteGlobals = NULL;
- }
+@@ -46,9 +49,9 @@
+ #ifdef HAVE_SOCKETS
/* get the IPaddress of this machine */
-static void getIpAddress(char *ipaddr, char *ifname)
@@ -21,11 +22,11 @@
#ifdef WIN32
/* VL 12/10/06: something needs to go here */
/* gethostbyname is the real answer; code below id unsafe */
-@@ -57,25 +60,26 @@
- memset(&sin, 0, sizeof (struct sockaddr_in));
- memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
- strcpy(ipaddr, inet_ntoa (sin.sin_addr));
-+ret = 0;
+@@ -61,25 +64,26 @@
+ memset(&sin, 0, sizeof (struct sockaddr_in));
+ memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
+ strcpy(ipaddr, inet_ntoa (sin.sin_addr));
++ ret = 0;
#else
struct ifreq ifr;
@@ -54,7 +55,7 @@
}
char remoteID(CSOUND *csound)
-@@ -84,31 +88,83 @@
+@@ -88,31 +92,83 @@
return ST(ipadrs)[len-1];
}
@@ -116,8 +117,8 @@
+ goto error;
+ }
+
-+ /* get IP adrs of this machine */
-+ /* FIXME: don't hardcode eth0 */
++ /* get IP adrs of this machine */
++ /* FIXME: don't hardcode eth0 */
+ if (getIpAddress(ST(ipadrs), "eth0") < 0) {
+ csound->Message(csound, Str("unable to get local ip address."));
+ goto error;
@@ -144,7 +145,7 @@
SOCK *sop = ST(socksout), *sop_end = sop + MAXREMOTES;
for ( ; sop < sop_end; sop++)
if ((fd = sop->rfd) > 0)
-@@ -285,7 +341,12 @@
+@@ -289,7 +345,12 @@
{ /* INSTR 0 opcode */
short nargs = p->INOCOUNT;
@@ -158,7 +159,7 @@
if (nargs < 3) {
csound->InitError(csound, Str("missing instr nos"));
return 0;
-@@ -327,7 +388,12 @@
+@@ -331,7 +392,12 @@
{ /* INSTR 0 opcode */
short nargs = p->INOCOUNT;
@@ -172,7 +173,7 @@
if (nargs < 2) {
csound->InitError(csound, Str("missing instr nos"));
return NOTOK;
-@@ -357,7 +423,12 @@
+@@ -361,7 +427,12 @@
{ /* INSTR 0 opcode */
short nargs = p->INOCOUNT;
@@ -186,7 +187,7 @@
if (nargs < 3) {
csound->InitError(csound, Str("missing channel nos"));
return NOTOK;
-@@ -396,7 +467,12 @@
+@@ -400,7 +471,12 @@
{ /* INSTR 0 opcode */
short nargs = p->INOCOUNT;
Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- csound.spec 25 Oct 2006 16:13:06 -0000 1.4
+++ csound.spec 27 Oct 2006 21:12:05 -0000 1.5
@@ -11,7 +11,7 @@
Summary: Csound - sound synthesis language and library
Name: csound
Version: 5.03.0
-Release: 5%{?dist}
+Release: 7%{?dist}
URL: http://csound.sourceforge.net/
License: LGPL
Group: Applications/Multimedia
@@ -28,7 +28,7 @@
BuildRequires: tk-devel tcl-devel
BuildRequires: tetex tetex-latex libxslt
-Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061023.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2
# NOTE:
# Manual sources aren't distributed, but may be extracted from CVS via...
@@ -110,6 +110,15 @@
%description gui
Contains a FLTK-based GUI for Csound
+%package fltk
+Summary: FLTK plugins for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description fltk
+Contains FLTK plugins for csound
+
%package jack
Summary: Jack Audio plugins for Csound
Group: Applications/Multimedia
@@ -145,6 +154,15 @@
%description osc
Open Sound Control (OSC) plugin for Csound
+%package virtual-keyboard
+Summary: Virtual MIDI keyboard plugin for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description virtual-keyboard
+A virtual MIDI keyboard plugin for Csound
+
%package manual
Summary: Csound manual
Group: Documentation
@@ -346,6 +364,9 @@
%files gui
%defattr(-,root,root,0755)
%{_bindir}/csound5gui
+
+%files fltk
+%defattr(-,root,root,0755)
%{_libdir}/%{name}/plugins/libwidgets.so
%files jack
@@ -364,6 +385,10 @@
%defattr(-,root,root,0755)
%{_libdir}/%{name}/plugins/libosc.so
+%files virtual-keyboard
+%defattr(-,root,root,0755)
+%{_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
@@ -378,6 +403,11 @@
%doc tutorial/*.py
%changelog
+* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
+- Update to a cvs snapshot for the remote plugin and a few other fixes
+- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
+- Put the virtual MIDI keyboard into its own package
+
* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
- Fix the remote plugin's local IP address read code, add more error checking
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 24 Oct 2006 04:35:22 -0000 1.3
+++ sources 27 Oct 2006 21:12:05 -0000 1.4
@@ -1,2 +1,3 @@
acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz
58b8a3f2f7729387acb7cd365191a979 Csound5.03_src-cvs20061023.tar.bz2
+8f01e4b65c3cb046df04f7eae92448d5 Csound5.03_src-cvs20061027.tar.bz2
More information about the scm-commits
mailing list