diff -Nru jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/changelog jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/changelog --- jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/changelog 2012-11-10 11:46:58.000000000 +0100 +++ jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/changelog 2013-02-22 14:51:58.000000000 +0100 @@ -1,3 +1,11 @@ +jackd2 (1.9.8~dfsg.4+20121110git67ac4440-1ubuntu1) raring; urgency=low + + * wscript-Even-more-Wl-as-needed-fixes.patch: + Fix FTBFS (LP: #1131613) + * fix_bus_error_arm.patch: Fix bus error on armhf (LP: #1074673) + + -- David Henningsson Fri, 22 Feb 2013 09:16:04 +0100 + jackd2 (1.9.8~dfsg.4+20121110git67ac4440-1) experimental; urgency=low * Imported Upstream version 1.9.8~dfsg.4+20121110git67ac4440 diff -Nru jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/fix_bus_error_arm.patch jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/fix_bus_error_arm.patch --- jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/fix_bus_error_arm.patch 1970-01-01 01:00:00.000000000 +0100 +++ jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/fix_bus_error_arm.patch 2013-02-22 14:49:40.000000000 +0100 @@ -0,0 +1,31 @@ +Origin: http://jack-audio.10948.n7.nabble.com/Jack-Devel-jack2-on-ARM-patch-td15962.html +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1074673 +Forwarded: Not-needed (already discussed upstream) +Index: jackd2-1.9.8~dfsg.4+20121110git67ac4440/common/jack/systemdeps.h +=================================================================== +--- jackd2-1.9.8~dfsg.4+20121110git67ac4440.orig/common/jack/systemdeps.h 2012-11-08 15:07:45.000000000 +0100 ++++ jackd2-1.9.8~dfsg.4+20121110git67ac4440/common/jack/systemdeps.h 2013-02-22 14:48:03.145340652 +0100 +@@ -121,3 +121,8 @@ + #endif /* __APPLE__ || __linux__ || __sun__ || sun */ + + #endif ++ ++#ifdef __ARMEL__ ++ #undef POST_PACKED_STRUCTURE ++ #define POST_PACKED_STRUCTURE ++#endif +Index: jackd2-1.9.8~dfsg.4+20121110git67ac4440/posix/JackCompilerDeps_os.h +=================================================================== +--- jackd2-1.9.8~dfsg.4+20121110git67ac4440.orig/posix/JackCompilerDeps_os.h 2012-11-08 15:07:45.000000000 +0100 ++++ jackd2-1.9.8~dfsg.4+20121110git67ac4440/posix/JackCompilerDeps_os.h 2013-02-22 14:48:51.697339931 +0100 +@@ -58,5 +58,10 @@ + #define POST_PACKED_STRUCTURE + #endif + ++#ifdef __ARMEL__ ++ #undef POST_PACKED_STRUCTURE ++ #define POST_PACKED_STRUCTURE ++#endif ++ + #endif + diff -Nru jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/series jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/series --- jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/series 2012-11-10 11:46:13.000000000 +0100 +++ jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/series 2013-02-22 14:47:08.000000000 +0100 @@ -1 +1,3 @@ no-selfconnect.patch +wscript-Even-more-Wl-as-needed-fixes.patch +fix_bus_error_arm.patch diff -Nru jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/wscript-Even-more-Wl-as-needed-fixes.patch jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/wscript-Even-more-Wl-as-needed-fixes.patch --- jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/wscript-Even-more-Wl-as-needed-fixes.patch 1970-01-01 01:00:00.000000000 +0100 +++ jackd2-1.9.8~dfsg.4+20121110git67ac4440/debian/patches/wscript-Even-more-Wl-as-needed-fixes.patch 2013-02-22 14:43:38.000000000 +0100 @@ -0,0 +1,25 @@ +From 48180257390d13588563e4f90190a0ff3ad92a7b Mon Sep 17 00:00:00 2001 +From: Adrian Knoth +Date: Wed, 14 Nov 2012 10:33:00 +0100 +Subject: [PATCH] [wscript] Even more -Wl,--as-needed fixes + +--- + example-clients/wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/example-clients/wscript b/example-clients/wscript +index e4ed4f3..de4b033 100644 +--- a/example-clients/wscript ++++ b/example-clients/wscript +@@ -65,7 +65,7 @@ def build(bld): + os_incdir = ['../solaris', '../posix'] + for example_program, example_program_source in list(example_programs.items()): + if example_program == 'jack_server_control': +- use = ['serverlib'] ++ use = ['serverlib', 'STDC++'] + elif example_program == 'jack_net_slave': + if not bld.env['BUILD_NETLIB']: + continue +-- +1.8.1.2 +