rpms/csound/devel csound-5.03.0-disable-atsa.patch, NONE, 1.1 csound-5.03.0-gstabs-disable-option.patch, NONE, 1.1 csound-5.03.0-no-usr-local.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 csound-5.03.0-enable-fluidsynth.patch, 1.1, 1.2 csound.spec, 1.2, 1.3 sources, 1.2, 1.3 csound-5.03.0-no-gstabs.patch, 1.1, NONE csound-5.03.0-printf-redef.patch, 1.1, NONE csound-5.03.0-uninitialized.patch, 1.1, NONE
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Tue Oct 24 04:35:53 UTC 2006
- Previous message (by thread): rpms/telepathy-gabble/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 telepathy-gabble.spec, 1.11, 1.12
- Next message (by thread): rpms/jd/devel .cvsignore,1.6,1.7 jd.spec,1.6,1.7 sources,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24405
Modified Files:
.cvsignore csound-5.03.0-enable-fluidsynth.patch csound.spec
sources
Added Files:
csound-5.03.0-disable-atsa.patch
csound-5.03.0-gstabs-disable-option.patch
csound-5.03.0-no-usr-local.patch
Removed Files:
csound-5.03.0-no-gstabs.patch csound-5.03.0-printf-redef.patch
csound-5.03.0-uninitialized.patch
Log Message:
* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
- Drop csound-5.03.0-uninitialized.patch, upstream
- Drop csound-5.03.0-printf-redef.patch, upstream
- CVS snapshot to grab some updated opcodes and fixes
- Make disabling -gstabs an option for better upstream palatability
- Disable atsa; it breaks the build for some unknown reason
csound-5.03.0-disable-atsa.patch:
--- NEW FILE csound-5.03.0-disable-atsa.patch ---
diff -ru Csound5.03.0/SConstruct /tmp/Csound5.03.0/SConstruct
--- Csound5.03.0/SConstruct 2006-10-23 16:07:41.000000000 -0400
+++ /tmp/Csound5.03.0/SConstruct 2006-08-11 09:23:01.000000000 -0400
@@ -1422,7 +1365,6 @@
if (commonEnvironment['buildUtilities'] != '0'):
utils = [
- ['atsa', 'util/atsa_main.c' ],
['cvanal', 'util/cvl_main.c' ],
['dnoise', 'util/dnoise_main.c' ],
['envext', 'util/env_main.c' ],
csound-5.03.0-gstabs-disable-option.patch:
--- NEW FILE csound-5.03.0-gstabs-disable-option.patch ---
--- Csound5.03.0/SConstruct.gstabs-disable-option 2006-10-23 15:36:38.000000000 -0400
+++ Csound5.03.0/SConstruct 2006-10-23 15:39:28.000000000 -0400
@@ -161,6 +161,9 @@
opts.Add('noDebug',
'Build without debugging information.',
'0')
+opts.Add('disableGStabs',
+ 'Set to 1 if you want to turn off GStabs debug info support, which may break some architectures',
+ '0')
opts.Add('gcc3opt',
'Enable gcc 3.3.x or later optimizations for the specified CPU architecture (e.g. pentium3); implies noDebug.',
'0')
@@ -289,7 +292,10 @@
commonEnvironment.Prepend(CCFLAGS = ['-g', '-O2'])
else:
if not withMSVC():
- commonEnvironment.Prepend(CCFLAGS = ['-g', '-gstabs', '-O2'])
+ debug_opts = ['-g', '-O2']
+ if commonEnvironment['disableGStabs'] == '0':
+ debug_opts.append('-gstabs')
+ commonEnvironment.Prepend(CCFLAGS = debug_opts)
else:
commonEnvironment.Prepend(CCFLAGS = ['-O2'])
if commonEnvironment['useGprof'] == '1':
csound-5.03.0-no-usr-local.patch:
--- NEW FILE csound-5.03.0-no-usr-local.patch ---
--- 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 @@
if commonEnvironment['buildRelease'] == '0':
commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
if commonEnvironment['Word64'] == '1':
- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
+ commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
commonEnvironment.Append(CCFLAGS = ['-fPIC'])
else:
- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
+ commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
if commonEnvironment['useDouble'] == '0':
print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
@@ -325,14 +325,12 @@
if getPlatform() == 'linux':
commonEnvironment.Append(CCFLAGS = "-DLINUX")
- commonEnvironment.Append(CPPPATH = '/usr/local/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 optmisation'
@@ -343,7 +341,6 @@
commonEnvironment.Append(CCFLAGS = "-DPIPES")
commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
if not withMSVC():
- commonEnvironment.Append(CPPPATH = '/usr/local/include')
commonEnvironment.Append(CPPPATH = '/usr/include')
commonEnvironment.Append(CCFLAGS = "-mthreads")
else:
@@ -351,15 +348,14 @@
if getPlatform() == 'linux':
path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
- path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
- pythonIncludePath = [path1, path2]
+ pythonIncludePath = [path1]
pythonLinkFlags = []
if commonEnvironment['Word64'] == '1':
tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
- pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
+ pythonLibraryPath = ['/usr/lib64', tmp]
else:
tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
- pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
+ pythonLibraryPath = ['/usr/lib', tmp]
pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
elif getPlatform() == 'darwin':
pyBasePath = '/System/Library/Frameworks/Python.Framework'
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.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 24 Oct 2006 04:35:22 -0000 1.3
@@ -1,2 +1,3 @@
Csound5.03_manual.tgz
Csound5.03_src.tgz
+Csound5.03_src-cvs20061023.tar.bz2
csound-5.03.0-enable-fluidsynth.patch:
Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-enable-fluidsynth.patch 5 Sep 2006 18:09:14 -0000 1.1
+++ csound-5.03.0-enable-fluidsynth.patch 24 Oct 2006 04:35:22 -0000 1.2
@@ -1,16 +1,16 @@
---- 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',
+--- 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 @@
'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
-@@ -405,6 +408,7 @@
+@@ -426,6 +429,7 @@
pdhfound = configure.CheckHeader("m_pd.h", language = "C")
tclhfound = configure.CheckHeader("tcl.h", language = "C")
luaFound = configure.CheckHeader("lua.h", language = "C")
@@ -18,7 +18,7 @@
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 @@
+@@ -1228,7 +1232,7 @@
# FLUIDSYNTH OPCODES
Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound.spec 8 Sep 2006 14:59:23 -0000 1.2
+++ csound.spec 24 Oct 2006 04:35:22 -0000 1.3
@@ -11,7 +11,7 @@
Summary: Csound - sound synthesis language and library
Name: csound
Version: 5.03.0
-Release: 3%{?dist}
+Release: 4%{?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.tgz
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061023.tar.bz2
# NOTE:
# Manual sources aren't distributed, but may be extracted from CVS via...
@@ -36,10 +36,10 @@
# 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
-Patch3: csound-5.03.0-no-gstabs.patch
+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
%description
@@ -161,10 +161,11 @@
%prep
%setup -q -n Csound5.03.0
-%patch0 -p1 -b .uninitialized
-%patch1 -p1 -b .printf-redef
-%patch2 -p1 -b .enable-fluidsynth
-%patch3 -p1 -b .no-gstabs
+%patch0 -p1 -b .enable-fluidsynth
+%patch1 -p1 -b .gstabs-disable-option
+%patch2 -p1 -b .no-usr-local
+%patch3 -p1 -b .disable-atsa
+
tar xf %{SOURCE1}
%build
@@ -174,6 +175,11 @@
frontends/fltk_gui/CsoundGlobalSettings.cpp
scons dynamicCsoundLibrary=1 \
+ buildRelease=0 \
+ noDebug=0 \
+ disableGStabs=1 \
+ buildInterfaces=1 \
+ useALSA=1 \
usePortAudio=0 \
usePortMIDI=0 \
useOSC=1 \
@@ -186,6 +192,7 @@
buildTclcsound=1 \
buildJavaWrapper=1 \
buildDSSI=1 \
+ buildUtilities=1 \
prefix=%{_prefix} \
customCCFLAGS="%{optflags}" \
customCXXFLAGS="%{optflags}" \
@@ -268,6 +275,8 @@
%{_bindir}/scsort
%{_bindir}/sndinfo
%{_bindir}/srconv
+%{_bindir}/pv_export
+%{_bindir}/pv_import
%{_libdir}/lib%{name}.so.5.1
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/xmg/*.xmg
@@ -298,6 +307,9 @@
%{_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
%files devel
@@ -364,6 +376,13 @@
%doc tutorial/*.py
%changelog
+* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
+- Drop csound-5.03.0-uninitialized.patch, upstream
+- Drop csound-5.03.0-printf-redef.patch, upstream
+- CVS snapshot to grab some updated opcodes and fixes
+- Make disabling -gstabs an option for better upstream palatability
+- Disable atsa; it breaks the build for some unknown reason
+
* Fri Sep 8 2006 Dan Williams <dcbw at redhat.com> 5.03.0-3
- csound-5.03.0-no-gstabs.patch added; produce dwarf2 like everyone else
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Sep 2006 18:09:14 -0000 1.2
+++ sources 24 Oct 2006 04:35:22 -0000 1.3
@@ -1,2 +1,2 @@
acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz
-15801aef4abce5efb8975b201aa900a2 Csound5.03_src.tgz
+58b8a3f2f7729387acb7cd365191a979 Csound5.03_src-cvs20061023.tar.bz2
--- csound-5.03.0-no-gstabs.patch DELETED ---
--- csound-5.03.0-printf-redef.patch DELETED ---
--- csound-5.03.0-uninitialized.patch DELETED ---
- Previous message (by thread): rpms/telepathy-gabble/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 telepathy-gabble.spec, 1.11, 1.12
- Next message (by thread): rpms/jd/devel .cvsignore,1.6,1.7 jd.spec,1.6,1.7 sources,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list