[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-8-5-gea0590a
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Thu May 6 14:13:51 UTC 2010
The following commit has been merged in the master branch:
commit ea0590aeeaf5c429614ba2f10f950d300acaaae5
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Thu May 6 16:08:02 2010 +0200
Fix kfreebsd patch. Now builds on Linux again.
diff --git a/debian/patches/kfreebsd-fix b/debian/patches/kfreebsd-fix
index 51475ac..a88ac5e 100644
--- a/debian/patches/kfreebsd-fix
+++ b/debian/patches/kfreebsd-fix
@@ -1,7 +1,7 @@
Index: jack-audio-connection-kit/common/jack/systemdeps.h
===================================================================
---- jack-audio-connection-kit.orig/common/jack/systemdeps.h 2010-05-05 16:36:31.000000000 +0200
-+++ jack-audio-connection-kit/common/jack/systemdeps.h 2010-05-05 16:36:55.000000000 +0200
+--- jack-audio-connection-kit.orig/common/jack/systemdeps.h 2010-05-06 16:06:04.000000000 +0200
++++ jack-audio-connection-kit/common/jack/systemdeps.h 2010-05-06 16:07:11.000000000 +0200
@@ -53,7 +53,7 @@
#endif /* WIN32 */
@@ -13,8 +13,8 @@ Index: jack-audio-connection-kit/common/jack/systemdeps.h
#include <sys/types.h>
Index: jack-audio-connection-kit/linux/cycles.h
===================================================================
---- jack-audio-connection-kit.orig/linux/cycles.h 2010-05-05 16:37:14.000000000 +0200
-+++ jack-audio-connection-kit/linux/cycles.h 2010-05-05 16:38:04.000000000 +0200
+--- jack-audio-connection-kit.orig/linux/cycles.h 2010-05-06 16:07:11.000000000 +0200
++++ jack-audio-connection-kit/linux/cycles.h 2010-05-06 16:07:11.000000000 +0200
@@ -119,4 +119,17 @@
#endif
@@ -35,13 +35,14 @@ Index: jack-audio-connection-kit/linux/cycles.h
#endif /* __jack_cycles_h__ */
Index: jack-audio-connection-kit/wscript
===================================================================
---- jack-audio-connection-kit.orig/wscript 2010-05-05 16:35:25.000000000 +0200
-+++ jack-audio-connection-kit/wscript 2010-05-05 16:35:46.000000000 +0200
-@@ -79,6 +79,7 @@
+--- jack-audio-connection-kit.orig/wscript 2010-05-06 16:07:11.000000000 +0200
++++ jack-audio-connection-kit/wscript 2010-05-06 16:07:32.000000000 +0200
+@@ -78,7 +78,7 @@
+ def configure(conf):
platform = Utils.detect_platform()
conf.env['IS_MACOSX'] = platform == 'darwin'
- conf.env['IS_LINUX'] = platform == 'linux'
-+ conf.env['IS_LINUX'] = platform == 'posix'
+- conf.env['IS_LINUX'] = platform == 'linux'
++ conf.env['IS_LINUX'] = platform == 'linux' or platform == 'posix'
conf.env['IS_SUN'] = platform == 'sunos'
if conf.env['IS_LINUX']:
--
Debian packaging for jack-audio-connection-kit
More information about the pkg-multimedia-commits
mailing list