[Pkg-pulseaudio-devel] r110 - in /pulseaudio/trunk/debian: ./ patches/
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Thu May 24 21:08:54 UTC 2007
Author: neurocyte-guest
Date: Thu May 24 21:08:54 2007
New Revision: 110
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/?sc=1&rev=110
Log:
Move to quilt for patch handling
Refresh all patches to upstream versions and convert from dpatch to quilt.
Added:
pulseaudio/trunk/debian/patches/ifexists-else-endif.patch
- copied, changed from r103, pulseaudio/trunk/debian/patches/02_ifexists_else_endif.dpatch
pulseaudio/trunk/debian/patches/r1352-work-around-bug-in-firefox-in-padsp.patch
pulseaudio/trunk/debian/patches/r1373-implement-a-few-more-ioctls-in-padsp.patch
- copied, changed from r103, pulseaudio/trunk/debian/patches/04_r1373_JavaSound_support.dpatch
pulseaudio/trunk/debian/patches/r1412-support-reversed-endian-floats.patch
pulseaudio/trunk/debian/patches/r1433-handle-suspended-alsa-devices.patch
pulseaudio/trunk/debian/patches/series
pulseaudio/trunk/debian/patches/use-ifexists-in-default-pa.patch
- copied, changed from r103, pulseaudio/trunk/debian/patches/01_use_ifexists_in_default_pa.dpatch
Removed:
pulseaudio/trunk/debian/patches/00list
pulseaudio/trunk/debian/patches/01_use_ifexists_in_default_pa.dpatch
pulseaudio/trunk/debian/patches/02_ifexists_else_endif.dpatch
pulseaudio/trunk/debian/patches/03_r1352_firefox_workaround.dpatch
pulseaudio/trunk/debian/patches/04_r1373_JavaSound_support.dpatch
pulseaudio/trunk/debian/patches/05_t28_wrong-endian-convert.dpatch
pulseaudio/trunk/debian/patches/06_pulseaudio-0.9.5-suspend.dpatch
Modified:
pulseaudio/trunk/debian/changelog
pulseaudio/trunk/debian/control
pulseaudio/trunk/debian/rules
Modified: pulseaudio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/changelog?rev=110&op=diff
==============================================================================
--- pulseaudio/trunk/debian/changelog (original)
+++ pulseaudio/trunk/debian/changelog Thu May 24 21:08:54 2007
@@ -1,3 +1,14 @@
+pulseaudio (0.9.5-8) UNRELEASED; urgency=low
+
+ * debian/patches: Rework patch series for quilt.
+ * debian/patches: r1433-handle-suspended-alsa-devices
+ + Refreshed. Updated to the version commited upstream. This adds support
+ for suspended alsa sources.
+ * debian/patches: r1412-support-reversed-endian-floats
+ + Refreshed. Updated to the version commited upstream.
+
+ -- CJ van den Berg <cj at vdbonline.com> Tue, 15 May 2007 12:53:58 +0200
+
pulseaudio (0.9.5-7) unstable; urgency=low
* debian/control: Make pulseaudio-module-hal depend on hal, not just
Modified: pulseaudio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/control?rev=110&op=diff
==============================================================================
--- pulseaudio/trunk/debian/control (original)
+++ pulseaudio/trunk/debian/control Thu May 24 21:08:54 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: CJ van den Berg <cj at vdbonline.com>
Uploaders: Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, m4, libltdl3-dev,
+Build-Depends: debhelper (>= 5), quilt, autotools-dev, m4, libltdl3-dev,
liboil0.3-dev (>= 0.3.0) | liboil-dev, libsamplerate-dev,
libsndfile1-dev (>= 1.0.10) | libsndfile-dev, libx11-dev,
x11proto-core-dev, libxt-dev, libcap-dev, libasound-dev, libglib2.0-dev,
Copied: pulseaudio/trunk/debian/patches/ifexists-else-endif.patch (from r103, pulseaudio/trunk/debian/patches/02_ifexists_else_endif.dpatch)
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/ifexists-else-endif.patch?rev=110&op=diff
==============================================================================
--- pulseaudio/trunk/debian/patches/02_ifexists_else_endif.dpatch (original)
+++ pulseaudio/trunk/debian/patches/ifexists-else-endif.patch Thu May 24 21:08:54 2007
@@ -1,14 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_ifexists_else_endif.dpatch by CJ van den Berg <cj at vdbonline.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add support for .ifexists, .else and .endif meta commands
+Add support for .ifexists, .else and .endif meta commands
- at DPATCH@
+From: CJ van den Berg <cj at vdbonline.com>
-diff -Nru pulseaudio-0.9.5-orig/src/pulsecore/cli-command.c pulseaudio-0.9.5/src/pulsecore/cli-command.c
---- pulseaudio-0.9.5-orig/src/pulsecore/cli-command.c 2006-08-19 18:25:38.000000000 +0200
-+++ pulseaudio-0.9.5/src/pulsecore/cli-command.c 2006-10-06 02:08:00.446876784 +0200
+
+---
+
+ src/pulsecore/cli-command.c | 54 +++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 52 insertions(+), 2 deletions(-)
+
+diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
+index 8ea9262..18428cf 100644
+--- a/src/pulsecore/cli-command.c
++++ b/src/pulsecore/cli-command.c
@@ -28,6 +28,7 @@
#include <assert.h>
#include <stdlib.h>
@@ -17,7 +20,7 @@
#include <pulse/xmalloc.h>
-@@ -63,6 +64,13 @@
+@@ -63,6 +64,13 @@ struct command {
#define INCLUDE_META ".include"
#define FAIL_META ".fail"
#define NOFAIL_META ".nofail"
@@ -31,7 +34,7 @@
/* Prototypes for all available commands */
static int pa_cli_command_exit(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, int *fail);
-@@ -953,7 +961,7 @@
+@@ -953,7 +961,7 @@ static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, PA_G
return 0;
}
@@ -40,7 +43,7 @@
const char *cs;
cs = s+strspn(s, whitespace);
-@@ -961,6 +969,25 @@
+@@ -961,6 +969,25 @@ int pa_cli_command_execute_line(pa_core *c, const char *s, pa_strbuf *buf, int *
if (*cs == '#' || !*cs)
return 0;
else if (*cs == '.') {
@@ -66,7 +69,7 @@
if (!strcmp(cs, FAIL_META))
*fail = 1;
else if (!strcmp(cs, NOFAIL_META))
-@@ -974,6 +1001,21 @@
+@@ -974,6 +1001,21 @@ int pa_cli_command_execute_line(pa_core *c, const char *s, pa_strbuf *buf, int *
if (pa_cli_command_execute_file(c, filename, buf, fail) < 0)
if (*fail) return -1;
@@ -88,7 +91,7 @@
} else {
pa_strbuf_printf(buf, "Invalid meta command: %s\n", cs);
if (*fail) return -1;
-@@ -984,6 +1026,9 @@
+@@ -984,6 +1026,9 @@ int pa_cli_command_execute_line(pa_core *c, const char *s, pa_strbuf *buf, int *
int unknown = 1;
size_t l;
@@ -98,7 +101,7 @@
l = strcspn(cs, whitespace);
for (command = commands; command->name; command++)
-@@ -1011,9 +1056,14 @@
+@@ -1011,9 +1056,14 @@ int pa_cli_command_execute_line(pa_core *c, const char *s, pa_strbuf *buf, int *
return 0;
}
@@ -113,7 +116,7 @@
int ret = -1;
assert(c && fn && buf);
-@@ -1028,7 +1078,7 @@
+@@ -1028,7 +1078,7 @@ int pa_cli_command_execute_file(pa_core *c, const char *fn, pa_strbuf *buf, int
char *e = line + strcspn(line, linebreak);
*e = 0;
Added: pulseaudio/trunk/debian/patches/r1352-work-around-bug-in-firefox-in-padsp.patch
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/r1352-work-around-bug-in-firefox-in-padsp.patch?rev=110&op=file
==============================================================================
--- pulseaudio/trunk/debian/patches/r1352-work-around-bug-in-firefox-in-padsp.patch (added)
+++ pulseaudio/trunk/debian/patches/r1352-work-around-bug-in-firefox-in-padsp.patch Thu May 24 21:08:54 2007
@@ -1,0 +1,30 @@
+work around bug in firefox which apparently misuses access() as NULL
+
+From: Lennart Poettering <lennart at fefdeb5f-60dc-0310-8127-8f9354f1896f>
+
+pointer test. Original patch by "alon". (Closes #27)
+
+git-svn-id: svn://svn.0pointer.net/pulseaudio/trunk@1352 fefdeb5f-60dc-0310-8127-8f9354f1896f
+---
+
+ src/utils/padsp.c | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/src/utils/padsp.c b/src/utils/padsp.c
+index 32cb5f9..ffe3974 100644
+--- a/src/utils/padsp.c
++++ b/src/utils/padsp.c
+@@ -2121,6 +2121,13 @@ int close(int fd) {
+ }
+
+ int access(const char *pathname, int mode) {
++
++ if (!pathname) {
++ /* Firefox needs this. See #27 */
++ errno = EFAULT;
++ return -1;
++ }
++
+ debug(DEBUG_LEVEL_VERBOSE, __FILE__": access(%s)\n", pathname);
+
+ if (strcmp(pathname, "/dev/dsp") != 0 &&
Copied: pulseaudio/trunk/debian/patches/r1373-implement-a-few-more-ioctls-in-padsp.patch (from r103, pulseaudio/trunk/debian/patches/04_r1373_JavaSound_support.dpatch)
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/r1373-implement-a-few-more-ioctls-in-padsp.patch?rev=110&op=diff
==============================================================================
--- pulseaudio/trunk/debian/patches/04_r1373_JavaSound_support.dpatch (original)
+++ pulseaudio/trunk/debian/patches/r1373-implement-a-few-more-ioctls-in-padsp.patch Thu May 24 21:08:54 2007
@@ -1,14 +1,24 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_r1373_JavaSound_support.dpatch by Lennart Poettering <mzcnihpbageby at 0pointer.de>
-##
-## DP: implement a few more ioctl()s, including a subset of
-## DP: SNDCTL_DSP_GETOPTR. Just enough to make JavaSound work.
+implement a few more ioctl()s, including a subset of SNDCTL_DSP_GETOPTR.
- at DPATCH@
-diff -urNad pulseaudio~/src/utils/padsp.c pulseaudio/src/utils/padsp.c
---- pulseaudio~/src/utils/padsp.c 2006-10-19 00:16:53.841869981 +0200
-+++ pulseaudio/src/utils/padsp.c 2006-10-19 00:17:03.458470981 +0200
-@@ -88,6 +88,8 @@
+From: Lennart Poettering <lennart at fefdeb5f-60dc-0310-8127-8f9354f1896f>
+
+Just enough to make JavaSound work.
+
+git-svn-id: svn://svn.0pointer.net/pulseaudio/trunk@1373 fefdeb5f-60dc-0310-8127-8f9354f1896f
+---
+
+ src/utils/padsp | 0
+ src/utils/padsp.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 72 insertions(+), 5 deletions(-)
+
+diff --git a/src/utils/padsp b/src/utils/padsp
+old mode 100644
+new mode 100755
+diff --git a/src/utils/padsp.c b/src/utils/padsp.c
+index ffe3974..dbbb9d5 100644
+--- a/src/utils/padsp.c
++++ b/src/utils/padsp.c
+@@ -88,6 +88,8 @@ struct fd_info {
pa_cvolume sink_volume, source_volume;
uint32_t sink_index, source_index;
int volume_modify_count;
@@ -17,7 +27,7 @@
PA_LLIST_FIELDS(fd_info);
};
-@@ -574,6 +576,7 @@
+@@ -574,6 +576,7 @@ static fd_info* fd_info_new(fd_info_type_t type, int *_errno) {
i->volume_modify_count = 0;
i->sink_index = (uint32_t) -1;
i->source_index = (uint32_t) -1;
@@ -25,7 +35,7 @@
PA_LLIST_INIT(fd_info, i);
reset_params(i);
-@@ -1947,6 +1950,8 @@
+@@ -1947,6 +1950,8 @@ static int dsp_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno)
free_streams(i);
dsp_flush_socket(i);
reset_params(i);
@@ -34,7 +44,7 @@
pa_threaded_mainloop_unlock(i->mainloop);
break;
-@@ -2035,14 +2040,76 @@
+@@ -2035,14 +2040,76 @@ static int dsp_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno)
break;
}
Added: pulseaudio/trunk/debian/patches/r1412-support-reversed-endian-floats.patch
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/r1412-support-reversed-endian-floats.patch?rev=110&op=file
==============================================================================
--- pulseaudio/trunk/debian/patches/r1412-support-reversed-endian-floats.patch (added)
+++ pulseaudio/trunk/debian/patches/r1412-support-reversed-endian-floats.patch Thu May 24 21:08:54 2007
@@ -1,0 +1,68 @@
+Support reversed endian floats. (closes #28) (closes #35)
+
+From: Pierre Ossman <ossman at fefdeb5f-60dc-0310-8127-8f9354f1896f>
+
+git-svn-id: svn://svn.0pointer.net/pulseaudio/trunk@1412 fefdeb5f-60dc-0310-8127-8f9354f1896f
+---
+
+ src/pulsecore/sample-util.c | 1 +
+ src/pulsecore/sconv.c | 20 ++++++++++++++++++++
+ 2 files changed, 21 insertions(+), 0 deletions(-)
+
+diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
+index d902b4b..a7a5ed8 100644
+--- a/src/pulsecore/sample-util.c
++++ b/src/pulsecore/sample-util.c
+@@ -68,6 +68,7 @@ void pa_silence_memory(void *p, size_t length, const pa_sample_spec *spec) {
+ case PA_SAMPLE_S16LE:
+ case PA_SAMPLE_S16BE:
+ case PA_SAMPLE_FLOAT32:
++ case PA_SAMPLE_FLOAT32RE:
+ c = 0;
+ break;
+ case PA_SAMPLE_ALAW:
+diff --git a/src/pulsecore/sconv.c b/src/pulsecore/sconv.c
+index ff2a011..2e5e2db 100644
+--- a/src/pulsecore/sconv.c
++++ b/src/pulsecore/sconv.c
+@@ -72,6 +72,22 @@ static void float32ne_from_float32ne(unsigned n, const float *a, void *b) {
+ oil_memcpy(b, a, sizeof(float) * n);
+ }
+
++static void float32re_to_float32ne(unsigned n, const void *a, float *b) {
++ assert(a);
++ assert(b);
++
++ while (n-- > 0)
++ ((uint32_t *)b)[n] = UINT32_SWAP (((uint32_t *)a)[n]);
++}
++
++static void float32re_from_float32ne(unsigned n, const float *a, void *b) {
++ assert(a);
++ assert(b);
++
++ while (n-- > 0)
++ ((uint32_t *)b)[n] = UINT32_SWAP (((uint32_t *)a)[n]);
++}
++
+ static void ulaw_to_float32ne(unsigned n, const void *a, float *b) {
+ const uint8_t *ca = a;
+
+@@ -140,6 +156,8 @@ pa_convert_to_float32ne_func_t pa_get_convert_to_float32ne_function(pa_sample_fo
+ return pa_sconv_s16be_to_float32ne;
+ case PA_SAMPLE_FLOAT32NE:
+ return float32ne_to_float32ne;
++ case PA_SAMPLE_FLOAT32RE:
++ return float32re_to_float32ne;
+ case PA_SAMPLE_ALAW:
+ return alaw_to_float32ne;
+ case PA_SAMPLE_ULAW:
+@@ -159,6 +177,8 @@ pa_convert_from_float32ne_func_t pa_get_convert_from_float32ne_function(pa_sampl
+ return pa_sconv_s16be_from_float32ne;
+ case PA_SAMPLE_FLOAT32NE:
+ return float32ne_from_float32ne;
++ case PA_SAMPLE_FLOAT32RE:
++ return float32re_from_float32ne;
+ case PA_SAMPLE_ALAW:
+ return alaw_from_float32ne;
+ case PA_SAMPLE_ULAW:
Added: pulseaudio/trunk/debian/patches/r1433-handle-suspended-alsa-devices.patch
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/r1433-handle-suspended-alsa-devices.patch?rev=110&op=file
==============================================================================
--- pulseaudio/trunk/debian/patches/r1433-handle-suspended-alsa-devices.patch (added)
+++ pulseaudio/trunk/debian/patches/r1433-handle-suspended-alsa-devices.patch Thu May 24 21:08:54 2007
@@ -1,0 +1,138 @@
+Handle suspended alsa devices. Based on patch by ranma. (closes #26)
+
+From: Pierre Ossman <ossman at fefdeb5f-60dc-0310-8127-8f9354f1896f>
+
+git-svn-id: svn://svn.0pointer.net/pulseaudio/trunk@1433 fefdeb5f-60dc-0310-8127-8f9354f1896f
+---
+
+ src/modules/module-alsa-sink.c | 38 +++++++++++++++++++++++++++++++++++++
+ src/modules/module-alsa-source.c | 39 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 77 insertions(+), 0 deletions(-)
+
+diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
+index 6ff9a6e..acf116d 100644
+--- a/src/modules/module-alsa-sink.c
++++ b/src/modules/module-alsa-sink.c
+@@ -138,6 +138,33 @@ static int xrun_recovery(struct userdata *u) {
+ return ret;
+ }
+
++static int suspend_recovery(struct userdata *u) {
++ int ret;
++ assert(u);
++
++ pa_log_info("*** ALSA-SUSPEND (playback) ***");
++
++ if ((ret = snd_pcm_resume(u->pcm_handle)) < 0) {
++ if (ret == -EAGAIN)
++ return -1;
++
++ if (ret != -ENOSYS)
++ pa_log("snd_pcm_resume() failed: %s", snd_strerror(-ret));
++ else {
++ if ((ret = snd_pcm_prepare(u->pcm_handle)) < 0)
++ pa_log("snd_pcm_prepare() failed: %s", snd_strerror(-ret));
++ }
++
++ if (ret < 0) {
++ clear_up(u);
++ pa_module_unload_request(u->module);
++ return -1;
++ }
++ }
++
++ return ret;
++}
++
+ static void do_write(struct userdata *u) {
+ assert(u);
+
+@@ -169,6 +196,13 @@ static void do_write(struct userdata *u) {
+ continue;
+ }
+
++ if (frames == -ESTRPIPE) {
++ if (suspend_recovery(u) < 0)
++ return;
++
++ continue;
++ }
++
+ pa_log("snd_pcm_writei() failed: %s", snd_strerror(-frames));
+
+ clear_up(u);
+@@ -200,6 +234,10 @@ static void fdl_callback(void *userdata) {
+ if (xrun_recovery(u) < 0)
+ return;
+
++ if (snd_pcm_state(u->pcm_handle) == SND_PCM_STATE_SUSPENDED)
++ if (suspend_recovery(u) < 0)
++ return;
++
+ do_write(u);
+ }
+
+diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
+index aa0666f..e1741c9 100644
+--- a/src/modules/module-alsa-source.c
++++ b/src/modules/module-alsa-source.c
+@@ -140,6 +140,34 @@ static int xrun_recovery(struct userdata *u) {
+ return 0;
+ }
+
++
++static int suspend_recovery(struct userdata *u) {
++ int ret;
++ assert(u);
++
++ pa_log_info("*** ALSA-SUSPEND (capture) ***");
++
++ if ((ret = snd_pcm_resume(u->pcm_handle)) < 0) {
++ if (ret == -EAGAIN)
++ return -1;
++
++ if (ret != -ENOSYS)
++ pa_log("snd_pcm_resume() failed: %s", snd_strerror(-ret));
++ else {
++ if ((ret = snd_pcm_prepare(u->pcm_handle)) < 0)
++ pa_log("snd_pcm_prepare() failed: %s", snd_strerror(-ret));
++ }
++
++ if (ret < 0) {
++ clear_up(u);
++ pa_module_unload_request(u->module);
++ return -1;
++ }
++ }
++
++ return ret;
++}
++
+ static void do_read(struct userdata *u) {
+ assert(u);
+
+@@ -172,6 +200,13 @@ static void do_read(struct userdata *u) {
+ continue;
+ }
+
++ if (frames == -ESTRPIPE) {
++ if (suspend_recovery(u) < 0)
++ return;
++
++ continue;
++ }
++
+ pa_log("snd_pcm_readi() failed: %s", snd_strerror(-frames));
+
+ clear_up(u);
+@@ -207,6 +242,10 @@ static void fdl_callback(void *userdata) {
+ if (xrun_recovery(u) < 0)
+ return;
+
++ if (snd_pcm_state(u->pcm_handle) == SND_PCM_STATE_SUSPENDED)
++ if (suspend_recovery(u) < 0)
++ return;
++
+ do_read(u);
+ }
+
Added: pulseaudio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/series?rev=110&op=file
==============================================================================
--- pulseaudio/trunk/debian/patches/series (added)
+++ pulseaudio/trunk/debian/patches/series Thu May 24 21:08:54 2007
@@ -1,0 +1,7 @@
+# This series applies on GIT commit 2cf3c9da45ac80ba341eb9319b9a8f764ab0bba5
+use-ifexists-in-default-pa.patch
+ifexists-else-endif.patch
+r1352-work-around-bug-in-firefox-in-padsp.patch
+r1373-implement-a-few-more-ioctls-in-padsp.patch
+r1412-support-reversed-endian-floats.patch
+r1433-handle-suspended-alsa-devices.patch
Copied: pulseaudio/trunk/debian/patches/use-ifexists-in-default-pa.patch (from r103, pulseaudio/trunk/debian/patches/01_use_ifexists_in_default_pa.dpatch)
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/use-ifexists-in-default-pa.patch?rev=110&op=diff
==============================================================================
--- pulseaudio/trunk/debian/patches/01_use_ifexists_in_default_pa.dpatch (original)
+++ pulseaudio/trunk/debian/patches/use-ifexists-in-default-pa.patch Thu May 24 21:08:54 2007
@@ -1,14 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_use_ifexists_in_default_pa.dpatch by CJ van den Berg <cj at vdbonline.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use .ifexists meta command to load optional modules only if available
+Use .ifexists meta command to load optional modules only if available
- at DPATCH@
+From: CJ van den Berg <cj at vdbonline.com>
-diff -Nru pulseaudio-0.9.5-orig/src/daemon/default.pa.in pulseaudio-0.9.5/src/daemon/default.pa.in
---- pulseaudio-0.9.5-orig/src/daemon/default.pa.in 2006-08-25 14:08:11.000000000 +0200
-+++ pulseaudio-0.9.5/src/daemon/default.pa.in 2006-10-06 02:32:56.761435138 +0200
+
+---
+
+ src/daemon/default.pa.in | 16 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
+index 0312266..aa36375 100755
+--- a/src/daemon/default.pa.in
++++ b/src/daemon/default.pa.in
@@ -26,12 +26,18 @@
#load-module module-null-sink
#load-module module-pipe-sink
@@ -29,7 +32,7 @@
### Load audio drivers automatically on access
#add-autoload-sink output module-oss device="/dev/dsp" sink_name=output source_name=input
-@@ -41,8 +47,14 @@
+@@ -41,8 +47,14 @@ load-module module-hal-detect
#add-autoload-sink output module-alsa-sink sink_name=output
#add-autoload-source input module-alsa-source source_name=input
Modified: pulseaudio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/rules?rev=110&op=diff
==============================================================================
--- pulseaudio/trunk/debian/rules (original)
+++ pulseaudio/trunk/debian/rules Thu May 24 21:08:54 2007
@@ -53,12 +53,14 @@
patch: patch-stamp
patch-stamp:
- dpatch apply-all
+ QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null push -a \
+ || test $$? = 2
touch patch-stamp
unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
+ QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null pop -a -R \
+ || test $$? = 2
+ rm -rf patch-stamp .pc
install: install-indep install-arch
install-indep:
More information about the Pkg-pulseaudio-devel
mailing list