[proaudio] Fwd: media-sound/mixxx Patch Updates

[Alex Barker <alex@xxxxxxxxxx>]

i th ink this was missed


-------- Original Message --------
Subject: 	media-sound/mixxx Patch Updates
Date: 	Wed, 12 Sep 2012 21:56:55 -0700
From: 	Alex Barker <alex@xxxxxxxxxx>
To: 	proaudio@xxxxxxxxxxxxxxxxxxx



The no-bzr.patch files are failing for the live ebuilds.  I have
included updated patches for drop in replacement.




--- mixxx/src/SConscript	2012-09-07 21:48:19 +0000
+++ mixxx/src/SConscript	2012-09-13 04:47:25 +0000
@@ -12,8 +12,8 @@
 from build import util, depends
 
 mixxx_version = util.get_mixxx_version()
-branch_name = util.get_bzr_branch_name()
-bazaar_revision = util.get_bzr_revision()
+#branch_name = util.get_bzr_branch_name()
+#bazaar_revision = util.get_bzr_revision()
 print "WE ARE IN:", os.getcwd()
 
 plugins = []

--- mixxx/src/SConscript.env	2012-09-06 08:04:47 +0000
+++ mixxx/src/SConscript.env	2012-09-13 04:46:47 +0000
@@ -20,19 +20,6 @@
     print "Deleting deprecated build file: %s" % defs
     os.remove(defs)
 
-#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
-## instead, embed BZR version into build
-## Put version info into a file, so it doesn't force a rebuild of everything :)
-
-if os.path.exists(os.path.join('..', 'build.h')):
-    # If a build.h exists in the project root mixxx/ directory then use that
-    # instead of writing our own. This is mostly since when we build Debian
-    # packages we don't have any of the Bazaar metadata so we can't write one
-    # ourselves.
-    shutil.copy(os.path.join('..', 'build.h'), 'build.h')
-else:
-    util.write_build_header('build.h')
-
 
 #Check for dependencies if we're not doing a clean...
 #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):


--- mixxx/src/SConscript	2012-09-07 21:48:19 +0000
+++ mixxx/src/SConscript	2012-09-13 04:47:25 +0000
@@ -12,8 +12,8 @@
 from build import util, depends
 
 mixxx_version = util.get_mixxx_version()
-branch_name = util.get_bzr_branch_name()
-bazaar_revision = util.get_bzr_revision()
+#branch_name = util.get_bzr_branch_name()
+#bazaar_revision = util.get_bzr_revision()
 print "WE ARE IN:", os.getcwd()
 
 plugins = []

--- mixxx/src/SConscript.env	2012-09-06 08:04:47 +0000
+++ mixxx/src/SConscript.env	2012-09-13 04:46:47 +0000
@@ -20,19 +20,6 @@
     print "Deleting deprecated build file: %s" % defs
     os.remove(defs)
 
-#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
-## instead, embed BZR version into build
-## Put version info into a file, so it doesn't force a rebuild of everything :)
-
-if os.path.exists(os.path.join('..', 'build.h')):
-    # If a build.h exists in the project root mixxx/ directory then use that
-    # instead of writing our own. This is mostly since when we build Debian
-    # packages we don't have any of the Bazaar metadata so we can't write one
-    # ourselves.
-    shutil.copy(os.path.join('..', 'build.h'), 'build.h')
-else:
-    util.write_build_header('build.h')
-
 
 #Check for dependencies if we're not doing a clean...
 #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):