[Demudi-commits] r1366 - in jack-audio-connection-kit/trunk/debian: . patches

[free-guest at alioth.debian.org]

Author: free-guest
Date: 2007-05-17 08:24:45 +0000 (Thu, 17 May 2007)
New Revision: 1366

Added:
   jack-audio-connection-kit/trunk/debian/patches/09_kbsd.patch
Modified:
   jack-audio-connection-kit/trunk/debian/changelog
   jack-audio-connection-kit/trunk/debian/control
   jack-audio-connection-kit/trunk/debian/rules
Log:
releasing version 0.103.0-5

Modified: jack-audio-connection-kit/trunk/debian/changelog
===================================================================
--- jack-audio-connection-kit/trunk/debian/changelog	2007-05-15 21:52:21 UTC (rev 1365)
+++ jack-audio-connection-kit/trunk/debian/changelog	2007-05-17 08:24:45 UTC (rev 1366)
@@ -1,3 +1,16 @@
+jack-audio-connection-kit (0.103.0-5) unstable; urgency=low
+
+  * debian/control:
+     - build-depend on libfreebob0-dev only on Linux systems, to
+       solve FTBFS on GNU/kFreeBSD (closes: #423895)
+  * debian/patches:
+     - added 09_kbsd.patch, thanks to Petr Salinger
+  * debian/rules:
+     - removed enable-capabilities, as it was causing excessive
+       CPU load when using audacity 1.3.0 with jack via portaudio
+
+ -- Free Ekanayaka <freee at debian.org>  Thu, 17 May 2007 02:03:28 +0200
+
 jack-audio-connection-kit (0.103.0-4) unstable; urgency=low
 
   * debian/rules:

Modified: jack-audio-connection-kit/trunk/debian/control
===================================================================
--- jack-audio-connection-kit/trunk/debian/control	2007-05-15 21:52:21 UTC (rev 1365)
+++ jack-audio-connection-kit/trunk/debian/control	2007-05-17 08:24:45 UTC (rev 1366)
@@ -6,7 +6,8 @@
 Build-Depends: cdbs (>= 0.4.26-2), type-handling (>= 0.2.5), debhelper (>= 4.1.0), patchutils (>= 0.2.25), dh-buildinfo, 
  libasound2-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libsndfile1-dev, doxygen, 
  libcap-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], autotools-dev, libreadline5-dev,
- libraw1394-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libfreebob0-dev, chrpath
+ libraw1394-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], 
+ libfreebob0-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], chrpath
 Build-Conflicts: libcap2-dev
 Standards-Version: 3.7.2
 

Added: jack-audio-connection-kit/trunk/debian/patches/09_kbsd.patch
===================================================================
--- jack-audio-connection-kit/trunk/debian/patches/09_kbsd.patch	                        (rev 0)
+++ jack-audio-connection-kit/trunk/debian/patches/09_kbsd.patch	2007-05-17 08:24:45 UTC (rev 1366)
@@ -0,0 +1,30 @@
+diff -ur config/os/generic/time.h config/os/generic/time.h
+--- config/os/generic/time.h	2006-05-26 04:45:16.000000000 +0200
++++ config/os/generic/time.h	2007-05-14 23:02:22.000000000 +0200
+@@ -24,7 +24,9 @@
+ 
+ #include <jack/internal.h>
+ 
+-inline jack_time_t
++extern jack_time_t jack_get_microseconds_from_system();
++
++static inline jack_time_t
+ jack_get_microseconds (void) {
+ 	return jack_get_microseconds_from_system ();
+ }
+diff -ur libjack/midiport.c libjack/midiport.c
+--- libjack/midiport.c	2007-01-17 01:48:45.000000000 +0100
++++ libjack/midiport.c	2007-05-14 22:49:46.000000000 +0200
+@@ -77,8 +77,11 @@
+ 		(jack_midi_port_info_private_t *) port_buffer;
+ 	
+ 	if (event_idx >= info->event_count)
++#if defined(ENODATA)	
+ 		return ENODATA;
+-	
++#else
++		return ENOENT;
++#endif				
+ 	port_event = (jack_midi_port_internal_event_t *) (info + 1);
+ 	port_event += event_idx;
+ 	event->time = port_event->time;

Modified: jack-audio-connection-kit/trunk/debian/rules
===================================================================
--- jack-audio-connection-kit/trunk/debian/rules	2007-05-15 21:52:21 UTC (rev 1365)
+++ jack-audio-connection-kit/trunk/debian/rules	2007-05-17 08:24:45 UTC (rev 1366)
@@ -40,7 +40,7 @@
 endif
 
 ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
-  DEB_CONFIGURE_EXTRA_FLAGS += --enable-capabilities --with-default-tmpdir=/dev/shm 
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-default-tmpdir=/dev/shm 
 endif
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))