[SCM] mixxx/master: Refresh 30-disable_soundsourcem4a.patch patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Feb 27 10:23:36 UTC 2011


The following commit has been merged in the master branch:
commit fa7df3f01da600a51bbf67d852f75ae1332356c5
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 27 11:23:13 2011 +0100

    Refresh 30-disable_soundsourcem4a.patch patch.

diff --git a/debian/patches/30-disable_soundsourcem4a.patch b/debian/patches/30-disable_soundsourcem4a.patch
index 53b1032..b3c3371 100644
--- a/debian/patches/30-disable_soundsourcem4a.patch
+++ b/debian/patches/30-disable_soundsourcem4a.patch
@@ -2,18 +2,21 @@ Description: Disable soundsourcem4a plugin.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: not-needed
 ---
- plugins/SConscript |    2 --
- 1 file changed, 2 deletions(-)
+ plugins/SConscript |    6 ------
+ 1 file changed, 6 deletions(-)
 
 --- mixxx.orig/plugins/SConscript
 +++ mixxx/plugins/SConscript
-@@ -5,9 +5,7 @@ Import('build_dir')
- Import('env', 'flags', 'platformString')
+@@ -5,12 +5,6 @@ Import('build')
  
- plugins = [] 
--soundsourcem4a = SConscript(File('soundsourcem4a/SConscript'), build_dir=Dir(build_dir + "/m4a"), duplicate=0, exports=['env','flags', 'platformString']) 
- soundsourcewv = SConscript(File('soundsourcewv/SConscript'), build_dir=Dir(build_dir + "/wv"), duplicate=0, exports=['env','flags', 'platformString'])
--plugins.extend(soundsourcem4a)
- plugins.extend(soundsourcewv)
+ plugins = []
  
- Return("plugins")
+-soundsourcem4a = SConscript(
+-    File('soundsourcem4a/SConscript'),
+-    build_dir=Dir(build.build_dir + "/m4a"),
+-    duplicate=0, exports=['build'])
+-plugins.extend(soundsourcem4a)
+-
+ soundsourcewv = SConscript(
+     File('soundsourcewv/SConscript'),
+     build_dir=Dir(build.build_dir + "/wv"),

-- 
mixxx packaging



More information about the pkg-multimedia-commits mailing list