[SCM] VLC media player packaging branch, sid, updated. debian/1.0.4-1-5-g8bfca08

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit c1b35fb46615154c281f40851f9831d0070b832e
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Mon Jan 4 21:45:23 2010 +0100

    Add patch taken from upstream to fix jack input with jack2
    
    Patch taken from the BTS by upstream
    
    Thanks: Adrian Knoth
    Closes: #532339

diff --git a/debian/patches/503_jack_input.diff b/debian/patches/503_jack_input.diff
new file mode 100644
index 0000000..02622be
--- /dev/null
+++ b/debian/patches/503_jack_input.diff
@@ -0,0 +1,42 @@
+commit 1ee02b3dea0e3d3ac6a00253e8656117a07cca0a
+Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+Date:   Mon Jun 8 18:05:29 2009 +0200
+
+    JACK input support for jack2
+
+    When you try to capture from JACK, this is only possible with the
+    "oldstyle" jackd-0.x. If you want to use the newer, SMP-capable jack2,
+    the VLC inputs cannot be connected:
+
+    Cannot connect ports owned by inactive clients: "vlc-input-26611" is not
+    active
+    Cannot connect ports owned by inactive clients: "vlc-input-26611" is not
+    active
+
+    Unlike jack1, jack2 expects the process callback function to return 0.
+
+    The attached patch fixes this problem. It's been already fixed the same
+    way in the jack output plugin (see modules/audio_output/jack.c:290).
+
+    Taken from Debian bug #532339
+    (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532339)
+The attached patch fixes this problem. It's been already fixed the same
+    way in the jack output plugin (see modules/audio_output/jack.c:290).
+
+    Taken from Debian bug #532339
+    (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532339)
+
+    Signed-off-by: Christophe Mutricy <xtophe at videolan.org>
+
+diff --git a/modules/access/jack.c b/modules/access/jack.c
+index 217b6e4..1e08c4c 100644
+--- a/modules/access/jack.c
++++ b/modules/access/jack.c
+@@ -444,7 +444,7 @@ int Process( jack_nframes_t i_frames, void *p_arg )
+         }
+     }
+
+-    return 1;
++    return 0;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 5fb4fc7..f2bfcc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 401_i420_mmx_pic.diff
 501_decrease_alsa_buffer.diff
 502_fix_typo.patch
+503_jack_input.diff

-- 
VLC media player packaging