[SCM] hydrogen/master: Unfuzz patch 1002.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Mar 18 01:00:20 UTC 2011


The following commit has been merged in the master branch:
commit f9d3f5e50a460ceb9b4ec1a5ea45c55b40d43803
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Mar 17 21:57:33 2011 +0100

    Unfuzz patch 1002.

diff --git a/debian/patches/1002_relax_SCons_linux2_resolving.patch b/debian/patches/1002_relax_SCons_linux2_resolving.patch
index cf36ce0..d99300a 100644
--- a/debian/patches/1002_relax_SCons_linux2_resolving.patch
+++ b/debian/patches/1002_relax_SCons_linux2_resolving.patch
@@ -2,7 +2,7 @@ Description: relax SCons linux2 resolving
  Some architectures use a platform-string like linux2-hppa, so fails to
  resolve as a linux2 architecture.  Fixed by cutting at 6th character.
 Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2010-03-20
+Last-Update: 2011-03-17
 --- a/Sconstruct
 +++ b/Sconstruct
 @@ -47,7 +47,7 @@
@@ -14,12 +14,12 @@ Last-Update: 2010-03-20
  		if str(env['debug']) == "1":
  			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
  			for flag in env["optflags"].split(" "):
-@@ -84,7 +84,7 @@
- 	if sys.platform == "darwin":
- 		ldflags.append( '-L/opt/local/lib' )
+@@ -91,7 +91,7 @@
+ 		includes.append( '/opt/local/include' )
+ 		includes.append( '/usr/local/include/jack' )
  
--	if sys.platform == 'linux2':
-+	if sys.platform[:6] == 'linux2':
+-	elif sys.platform == 'linux2':
++	elif sys.platform[:6] == 'linux2':
+ 		ldflags.append('-lpthread')
  		ldflags.append('-lasound')
- 
- 	elif sys.platform == "win32":
+ 	#	ldflags.append('-lrubberband')

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list