[SCM] ardour3/master: Add patch to print to stdout instead of stderr

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Fri Jul 11 18:22:13 UTC 2014


The following commit has been merged in the master branch:
commit 091c7594327eb25ba4c9bf0f51261b27be32e0a9
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jul 11 12:46:29 2014 -0400

    Add patch to print to stdout instead of stderr

diff --git a/debian/patches/log-stdout.patch b/debian/patches/log-stdout.patch
new file mode 100644
index 0000000..3b2c498
--- /dev/null
+++ b/debian/patches/log-stdout.patch
@@ -0,0 +1,25 @@
+Description: Log waf messages to stdout, not stderr
+ The buildds kill the build if they don't see messages in stdout for a
+ long time. Unfortunately, waf defaults to printing such messages to
+ stderr, so ardour takes too long on slower archs. Work around that
+ by printing to stdout.
+Author: Felipe Sateler <fsateler at debian.org>
+Forwarded: no
+--- ardour3-3.5.380~dfsg.orig/wscript
++++ ardour3-3.5.380~dfsg/wscript
+@@ -777,6 +777,15 @@ const char* const ardour_config_info = "
+ def build(bld):
+     create_stored_revision()
+ 
++    # Log command executions to stdout, not err
++    def our_log(msg):
++        if not msg:
++            return
++        sys.stdout.write(str(msg))
++        sys.stdout.flush()
++
++    bld.to_log = our_log
++
+     # add directories that contain only headers, to workaround an issue with waf
+ 
+     bld.path.find_dir ('libs/evoral/evoral')
diff --git a/debian/patches/series b/debian/patches/series
index d292fcf..c8a0a54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 waf.patch
 wscript.patch
+log-stdout.patch

-- 
ardour3 packaging



More information about the pkg-multimedia-commits mailing list