rpms/armstrong/F-11 armstrong-buildfix.patch, 1.1, 1.2 armstrong.spec, 1.1, 1.2

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/armstrong/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24924

Modified Files:
	armstrong-buildfix.patch armstrong.spec 
Log Message:
* Sun May 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-5
- Rebuild against new boost (on F-12)
- Re-enable sse optimizations on supported architectures


armstrong-buildfix.patch:

Index: armstrong-buildfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/armstrong/F-11/armstrong-buildfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- armstrong-buildfix.patch	5 Mar 2009 22:00:30 -0000	1.1
+++ armstrong-buildfix.patch	10 May 2009 23:46:07 -0000	1.2
@@ -1,5 +1,6 @@
+diff -rupN armstrong.old/SConstruct armstrong/SConstruct
 --- armstrong.old/SConstruct	2009-01-09 16:17:44.000000000 -0500
-+++ armstrong/SConstruct	2009-02-26 19:54:31.000000000 -0500
++++ armstrong/SConstruct	2009-05-10 17:33:46.000000000 -0400
 @@ -89,6 +89,7 @@ opts.Add("JOBS", "Number of threads to c
  opts.Add("PYZZUB", "Support pyzzub",True,None,bool_converter)
  opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None,
@@ -19,7 +20,7 @@
  	])
  	if os.uname()[0] == 'FreeBSD':
  		env.Append(CCFLAGS=[ '-I/usr/local/include' ])
-@@ -173,38 +172,15 @@ cl = env['CC'] == 'cl'
+@@ -173,13 +172,8 @@ cl = env['CC'] == 'cl'
  if gcc:
  	#env['CXXFLAGS'] += ['--no-rtti']
  	if env['DEBUG'] == False:
@@ -34,60 +35,64 @@
  	else:
  		env.Append(CCFLAGS=[
  			'-g',
- 			'-DDEBUG',
+@@ -187,19 +181,11 @@ if gcc:
  			'-D_DEBUG',
  		])
--	if env['SSE2'] == True:
+ 	if env['SSE2'] == True:
 -		if not x86_64:
 -			env.Append(CCFLAGS=[
 -				'-march=i686', 
 -			])
--		env.Append(CCFLAGS=[
--			'-mfpmath=sse',
--			'-msse2',
--		])
--	elif env['SSE'] == True:
+ 		env.Append(CCFLAGS=[
+ 			'-mfpmath=sse',
+ 			'-msse2',
+ 		])
+ 	elif env['SSE'] == True:
 -		if not x86_64:
 -			env.Append(CCFLAGS=[
 -				'-march=i686',
 -			])
--		env.Append(CCFLAGS=[
--			'-mfpmath=sse',
--			'-msse',
--		])
--
-+
- if cl:
- 	env.Append(CCFLAGS=[
- 		'-nologo',
-@@ -219,6 +195,13 @@ if cl:
+ 		env.Append(CCFLAGS=[
+ 			'-mfpmath=sse',
+ 			'-msse',
+@@ -219,6 +205,12 @@ if cl:
  		env.Append(CCFLAGS=['-MT', '-O2' ])
  	else:
  		env.Append(CCFLAGS=['-MTd', '-Zi' ])
 +
 +for flag in env["optflags"].split(" "):
-+    	 env.Append(CCFLAGS=flag)
++	env.Append(CCFLAGS=flag)
 +
 +for flag in env["optflags"].split(" "):
-+    	 env.Append(LINKFLAGS=flag)
-+
++	env.Append(LINKFLAGS=flag)
  
  ######################################
  # 64-bit fixes
-@@ -393,10 +376,8 @@ if env['LUNARTARGET'] == '':
+@@ -393,9 +385,7 @@ if env['LUNARTARGET'] == '':
  	env['CONFIGURED'] = ''
  
  def is_cleaning():
 -	import SCons.Script.Main 
 -	try: return SCons.Script.Main.GetOption('clean')
 -	except: return SCons.Script.Main.options.clean
--
-+	return False	
-+
++	return False
+ 
  if (not is_cleaning()) and ('configure' in COMMAND_LINE_TARGETS):
  	import os
+@@ -455,11 +445,8 @@ if (not is_cleaning()) and ('configure' 
+ 			print "Libraries and headers for either ALSA, OSS, JACK or CoreAudio are required for building."
+ 			Exit(1)
+ 	
+-	if conf.CheckCPUFlag('sse'):
+-		env['SSE'] = True
+-	if conf.CheckCPUFlag('sse2'):
++	if env['SSE2'] == True:
+ 		env['SSE'] = False
+-		env['SSE2'] = True
  	
-@@ -679,7 +660,7 @@ env.Signature(target='include/zzub/signa
+ 	if env['LUNAR'] == True: # user wants to build lunar
+ 		# needs LLVM for that
+@@ -679,7 +666,7 @@ env.Signature(target='include/zzub/signa
  
  env.SConscript('${LIBZZUB_SRC_PATH}/SConscript')
  env.SConscript('${PLUGINS_SRC_PATH}/SConscript')


Index: armstrong.spec
===================================================================
RCS file: /cvs/pkgs/rpms/armstrong/F-11/armstrong.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- armstrong.spec	5 Mar 2009 22:00:30 -0000	1.1
+++ armstrong.spec	10 May 2009 23:46:07 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           armstrong
 Version:        0.2.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Powerful music sequencing library
 Group:          System Environment/Libraries
 # src/plugins/Geonik is GPL+
@@ -140,6 +140,12 @@ scons configure \
         CCFLAGS="%{optflags}" \
         CXXFLAGS="%{optflags}" \
         optflags="%{optflags}" \
+%ifarch %{ix86}
+        SSE="true" \
+%endif
+%ifarch x86_64 ia64
+        SSE2="true" \
+%endif
         MP3="False"
 
 scons %{?_smp_mflags}
@@ -257,6 +263,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sun May 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-5
+- Rebuild against new boost (on F-12)
+- Re-enable sse optimizations on supported architectures
+
 * Thu Mar 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-4
 - Update the size_t patch to fix compilation on ppc64
 - Remove some proprietary code from the tarball (src/rtaudio/include)