[SCM] hydrogen/master: Remove debian/patches/1002_relax_SCons_linux2_resolving.patch as buildsystem has changed to cmake.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Jan 27 01:45:56 UTC 2012


The following commit has been merged in the master branch:
commit 5adaa966961d7b286458e1695f843a906147cee1
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 27 02:32:35 2012 +0100

    Remove debian/patches/1002_relax_SCons_linux2_resolving.patch as buildsystem has changed to cmake.

diff --git a/debian/patches/1002_relax_SCons_linux2_resolving.patch b/debian/patches/1002_relax_SCons_linux2_resolving.patch
deleted file mode 100644
index 3822469..0000000
--- a/debian/patches/1002_relax_SCons_linux2_resolving.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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: 2011-03-17
----
- Sconstruct |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- hydrogen.orig/Sconstruct
-+++ hydrogen/Sconstruct
-@@ -47,7 +47,7 @@ def get_platform_flags( opts ):
- 
- 	env = Environment( options = opts )
- 
--	if sys.platform == "linux2" or sys.platform == "darwin":
-+	if sys.platform[:6] == "linux2" or sys.platform == "darwin":
- 		if str(env['debug']) == "1":
- 			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
- 			for flag in env["optflags"].split(" "):
-@@ -91,7 +91,7 @@ def get_platform_flags( opts ):
- 		includes.append( '/opt/local/include' )
- 		includes.append( '/usr/local/include/jack' )
- 
--	elif sys.platform == 'linux2':
-+	elif sys.platform[:6] == 'linux2':
- 		ldflags.append('-lpthread')
- 		ldflags.append('-lasound')
- 	#	ldflags.append('-lrubberband')
diff --git a/debian/patches/series b/debian/patches/series
index 1505bdf..4c37773 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 09_portaudio_v2.patch
 1001_rubberband_path.patch
-1002_relax_SCons_linux2_resolving.patch
 1003_gcc45.patch
 1004_indirect_linking.patch
 1005_name_shouldnt_repeat_genericname.patch

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list