rpms/csound/F-8 csound-5.03.0-64-bit-plugin-path.patch, NONE, 1.1 csound-5.03.0-fix-conflicts.patch, NONE, 1.1 csound.spec, 1.11, 1.12
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Fri Feb 1 16:26:04 UTC 2008
Author: dcbw
Update of /cvs/extras/rpms/csound/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29771
Modified Files:
csound.spec
Added Files:
csound-5.03.0-64-bit-plugin-path.patch
csound-5.03.0-fix-conflicts.patch
Log Message:
* Fri Feb 1 2008 Dan Williams <dcbw at redhat.com> - 5.03.0-14
- Fix default plugin path on 64-bit platforms (rh #407911)
- Fix file conflicts with other packages (rh #210215)
- Fix unowned directories (rh #233830)
csound-5.03.0-64-bit-plugin-path.patch:
--- NEW FILE csound-5.03.0-64-bit-plugin-path.patch ---
diff -up Csound5.03.0/SConstruct.64-bit-plugin-path Csound5.03.0/SConstruct
--- Csound5.03.0/SConstruct.64-bit-plugin-path 2008-02-01 07:20:15.000000000 -0500
+++ Csound5.03.0/SConstruct 2008-02-01 07:20:15.000000000 -0500
@@ -570,9 +570,7 @@ def buildzip(env, target, source):
# library version is CS_VERSION.CS_APIVERSION
csoundLibraryVersion = '5.1'
csoundLibraryName = 'csound'
-if commonEnvironment['useDouble'] != '0':
- csoundLibraryName += '64'
-elif getPlatform() == 'win32':
+if getPlatform() == 'win32':
csoundLibraryName += '32'
# flags for linking with the Csound library
libCsoundLinkFlags = []
@@ -600,8 +598,6 @@ if commonEnvironment['buildRelease'] !=
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:
@@ -1964,10 +1960,7 @@ for i in sys.path:
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',
diff -up Csound5.03.0/Top/csmodule.c.64-bit-plugin-path Csound5.03.0/Top/csmodule.c
--- Csound5.03.0/Top/csmodule.c.64-bit-plugin-path 2008-02-01 07:23:56.000000000 -0500
+++ Csound5.03.0/Top/csmodule.c 2008-02-01 07:24:18.000000000 -0500
@@ -617,17 +617,12 @@ int csoundLoadModules(CSOUND *csound)
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 (dir == (DIR*) NULL) {
csound-5.03.0-fix-conflicts.patch:
--- NEW FILE csound-5.03.0-fix-conflicts.patch ---
diff -up Csound5.03.0/SConstruct.fix-conflicts Csound5.03.0/SConstruct
--- Csound5.03.0/SConstruct.fix-conflicts 2008-02-01 10:18:51.000000000 -0500
+++ Csound5.03.0/SConstruct 2008-02-01 10:31:36.000000000 -0500
@@ -1463,36 +1463,44 @@ if (commonEnvironment['buildUtilities']
utils = [
['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)
executables.append(csoundProgramEnvironment.Program('scsort',
['util1/sortex/smain.c']))
-executables.append(csoundProgramEnvironment.Program('extract',
- ['util1/sortex/xmain.c']))
-executables.append(commonEnvironment.Program('cs',
- ['util1/csd_util/cs.c']))
+
+a = csoundProgramEnvironment.Program('cs-extract', ['util1/sortex/xmain.c'])
+executables.append(a)
+Depends(a, csoundLibrary)
+
+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',
diff -up Csound5.03.0/install.py.fix-conflicts Csound5.03.0/install.py
--- Csound5.03.0/install.py.fix-conflicts 2008-02-01 10:40:00.000000000 -0500
+++ Csound5.03.0/install.py 2008-02-01 10:41:02.000000000 -0500
@@ -20,12 +20,12 @@ headerFiles = ['H/cfgvar.h', 'H/cscore.h
exeFiles1 = ['csound', 'csound5gui', 'CsoundVST', 'winsound',
'cstclsh', 'cswish',
- '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']
Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/F-8/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 1 Feb 2008 16:25:30 -0000 1.12
@@ -2,16 +2,18 @@
%ifarch x86_64 ia64 ppc64
%define build64bit 1
%define install64bit --word64
+%define useDouble 1
%else
%define build64bit 0
%define install64bit %{nil}
+%define useDouble 0
%endif
Summary: Csound - sound synthesis language and library
Name: csound
Version: 5.03.0
-Release: 13%{?dist}
+Release: 14%{?dist}
URL: http://csound.sourceforge.net/
License: LGPL
Group: Applications/Multimedia
@@ -43,6 +45,8 @@
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: csound-5.03.0-64-bit-plugin-path.patch
+Patch8: csound-5.03.0-fix-conflicts.patch
%description
Csound is a sound and music synthesis system, providing facilities for
@@ -167,6 +171,7 @@
%package manual
Summary: Csound manual
Group: Documentation
+Requires: %{name} = %{version}-%{release}
%description manual
Canonical Reference Manual for Csound.
@@ -174,6 +179,7 @@
%package tutorial
Summary: Csound tutorial
Group: Documentation
+Requires: %{name} = %{version}-%{release}
%description tutorial
Tutorial documentation and sample files for Csound.
@@ -188,6 +194,8 @@
%patch4 -p1 -b .default-opcodedir
%patch5 -p1 -b .rtalsa-fix
%patch6 -p1 -b .fltk-fixes
+%patch7 -p1 -b .64-bit-plugin-path
+%patch8 -p1 -b .fix-conflicts
tar xf %{SOURCE1}
@@ -219,7 +227,8 @@
prefix=%{_prefix} \
customCCFLAGS="%{optflags}" \
customCXXFLAGS="%{optflags}" \
- Word64=%{build64bit}
+ Word64=%{build64bit} \
+ useDouble=%{useDouble}
# Build the manual
(cd manual; make)
@@ -275,14 +284,14 @@
%files
%defattr(-,root,root,0755)
%doc COPYING ChangeLog readme-csound5.txt
-%{_bindir}/cs
+%{_bindir}/cs-launcher
%{_bindir}/csb64enc
%{_bindir}/csound
%{_bindir}/cvanal
%{_bindir}/dnoise
-%{_bindir}/envext
-%{_bindir}/extract
-%{_bindir}/extractor
+%{_bindir}/cs-envext
+%{_bindir}/cs-extract
+%{_bindir}/cs-extractor
%{_bindir}/het_export
%{_bindir}/het_import
%{_bindir}/hetro
@@ -290,19 +299,21 @@
%{_bindir}/lpc_export
%{_bindir}/lpc_import
%{_bindir}/makecsd
-%{_bindir}/mixer
+%{_bindir}/cs-mixer
%{_bindir}/pvanal
%{_bindir}/pvlook
-%{_bindir}/scale
-%{_bindir}/scot
+%{_bindir}/cs-scale
+%{_bindir}/cs-scot
%{_bindir}/scsort
-%{_bindir}/sndinfo
-%{_bindir}/srconv
+%{_bindir}/cs-sndinfo
+%{_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}
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/plugins/libbabo.so
%{_libdir}/%{name}/plugins/libbarmodel.so
@@ -406,6 +417,11 @@
%doc tutorial/*.py
%changelog
+* Fri Feb 1 2008 Dan Williams <dcbw at redhat.com> - 5.03.0-14
+- Fix default plugin path on 64-bit platforms (rh #407911)
+- Fix file conflicts with other packages (rh #210215)
+- Fix unowned directories (rh #233830)
+
* 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
More information about the fedora-extras-commits
mailing list