rpms/csound/FC-6 csound-5.03.0-default-opcodedir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 csound-5.03.0-enable-fluidsynth.patch, 1.2, 1.3 csound.spec, 1.3, 1.4 sources, 1.3, 1.4

Daniel Williams (dcbw) fedora-extras-commits at redhat.com
Wed Nov 1 16:56:48 UTC 2006 

Author: dcbw

Update of /cvs/extras/rpms/csound/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29397

Modified Files:
	.cvsignore csound-5.03.0-enable-fluidsynth.patch csound.spec 
	sources 
Added Files:
	csound-5.03.0-default-opcodedir.patch 
Log Message:
* Wed Nov  1 2006 Dan Williams <dcbw at redhat.com> 5.03.0-8
- CVS snapshot to pick up virtual Midi keyboard
- Make the default for OPCODEDIR be where the plugins are actually installed



csound-5.03.0-default-opcodedir.patch:

--- NEW FILE csound-5.03.0-default-opcodedir.patch ---
--- Csound5.03.0/Top/csmodule.c.default-plugindir	2006-11-01 10:44:42.000000000 -0500
+++ Csound5.03.0/Top/csmodule.c	2006-11-01 10:45:58.000000000 -0500
@@ -123,17 +123,20 @@
 /* default directory to load plugins from if environment variable is not set */
 #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"
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib/csound/plugins"
 #    else
-#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins64"
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib64/csound/plugins"
 #    endif
 #  endif
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Sep 2006 18:09:14 -0000	1.2
+++ .cvsignore	1 Nov 2006 16:56:17 -0000	1.3
@@ -1,2 +1,3 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
+Csound5.03.0_src-cvs20061101.tar.bz2

csound-5.03.0-enable-fluidsynth.patch:

Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound-5.03.0-enable-fluidsynth.patch	29 Oct 2006 03:32:20 -0000	1.2
+++ csound-5.03.0-enable-fluidsynth.patch	1 Nov 2006 16:56:17 -0000	1.3
@@ -1,24 +1,24 @@
---- Csound5.03.0/SConstruct.enable-fluidsynth	2006-10-21 11:03:22.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-10-23 15:36:10.000000000 -0400
-@@ -225,6 +225,9 @@
+--- 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 @@
      '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',
 +    '0')
- 
- # Define the common part of the build environment.
- # This section also sets up customized options for third-party libraries, which
-@@ -426,6 +429,7 @@
- pdhfound = configure.CheckHeader("m_pd.h", language = "C")
- tclhfound = configure.CheckHeader("tcl.h", language = "C")
+ opts.Add('buildCSEditor',
+     'Set to 1 to build the Csound syntax highlighting text editor. Requires FLTK headers and libs',
+     '0')
+@@ -437,6 +440,7 @@
+         tmp = '%s/tcl.h' % i
+         tclhfound = tclhfound or configure.CheckHeader(tmp, 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")
-@@ -1228,7 +1232,7 @@
+@@ -1263,7 +1267,7 @@
  
  # FLUIDSYNTH OPCODES
  


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csound.spec	29 Oct 2006 03:32:20 -0000	1.3
+++ csound.spec	1 Nov 2006 16:56:17 -0000	1.4
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       7%{?dist}
+Release:       8%{?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-cvs20061027.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -40,8 +40,7 @@
 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-remote-fixes.patch
-
+Patch4: csound-5.03.0-default-opcodedir.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -184,7 +183,7 @@
 %patch1 -p1 -b .gstabs-disable-option
 %patch2 -p1 -b .no-usr-local
 %patch3 -p1 -b .disable-atsa
-%patch4 -p1 -b .remote-fixes
+%patch4 -p1 -b .default-opcodedir
 
 tar xf %{SOURCE1}
 
@@ -403,6 +402,10 @@
 %doc tutorial/*.py
 
 %changelog
+* Wed Nov  1 2006 Dan Williams <dcbw at redhat.com> 5.03.0-8
+- CVS snapshot to pick up virtual Midi keyboard
+- Make the default for OPCODEDIR be where the plugins are actually installed
+
 * Sat Oct 28 2006 Dan Williams <dcbw at redhat.com> 5.03.0-7
 - Rebuild to drop old source tarball
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2006 03:32:20 -0000	1.3
+++ sources	1 Nov 2006 16:56:17 -0000	1.4
@@ -1,2 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-8f01e4b65c3cb046df04f7eae92448d5  Csound5.03_src-cvs20061027.tar.bz2
+5211f0c1fb54484c29de996e09ca6e3c  Csound5.03.0_src-cvs20061101.tar.bz2

More information about the scm-commits mailing list