diff --git a/0001-alsa-allow-configuration-of-fallback-device-strings.patch b/0001-alsa-allow-configuration-of-fallback-device-strings.patch
deleted file mode 100644
index 09d2e37..0000000
--- a/0001-alsa-allow-configuration-of-fallback-device-strings.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From 4f2a3cb6019d551ca98aa2034854985df2670a30 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Wed, 29 Apr 2009 01:58:18 +0200
-Subject: [PATCH] alsa: allow configuration of fallback device strings in profiles
-
-This has the benefit that we can properly support ALSA devices where
-only the raw 'hw' device exists but no 'front' although it's a proper
-2ch stereo device.
----
- src/modules/alsa/alsa-util.c |  126 +++++++++++++++++++++++++++++------------
- src/modules/alsa/alsa-util.h |    1 +
- 2 files changed, 90 insertions(+), 37 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index d2dc6e8..2ea0c3d 100644
---- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -526,7 +526,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) {
- 
- static const struct pa_alsa_profile_info device_table[] = {
-     {{ 1, { PA_CHANNEL_POSITION_MONO }},
--     "hw",
-+     "hw", NULL,
-      N_("Analog Mono"),
-      "analog-mono",
-      1,
-@@ -534,7 +534,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-      "Capture", "Mic" },
- 
-     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
--     "front",
-+     "front", "hw",
-      N_("Analog Stereo"),
-      "analog-stereo",
-      10,
-@@ -542,7 +542,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-      "Capture", "Mic" },
- 
-     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
--     "iec958",
-+     "iec958", NULL,
-      N_("Digital Stereo (IEC958)"),
-      "iec958-stereo",
-      5,
-@@ -550,7 +550,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-      "IEC958 In", NULL },
- 
-     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
--     "hdmi",
-+     "hdmi", NULL,
-      N_("Digital Stereo (HDMI)"),
-      "hdmi-stereo",
-      4,
-@@ -559,7 +559,7 @@ static const struct pa_alsa_profile_info device_table[] = {
- 
-     {{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }},
--     "surround40",
-+     "surround40", NULL,
-      N_("Analog Surround 4.0"),
-      "analog-surround-40",
-      7,
-@@ -568,7 +568,7 @@ static const struct pa_alsa_profile_info device_table[] = {
- 
-     {{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }},
--     "a52",
-+     "a52", NULL,
-      N_("Digital Surround 4.0 (IEC958/AC3)"),
-      "iec958-ac3-surround-40",
-      2,
-@@ -578,7 +578,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-     {{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_LFE }},
--     "surround41",
-+     "surround41", NULL,
-      N_("Analog Surround 4.1"),
-      "analog-surround-41",
-      7,
-@@ -588,7 +588,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-     {{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_CENTER }},
--     "surround50",
-+     "surround50", NULL,
-      N_("Analog Surround 5.0"),
-      "analog-surround-50",
-      7,
-@@ -598,7 +598,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-     {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE }},
--     "surround51",
-+     "surround51", NULL,
-      N_("Analog Surround 5.1"),
-      "analog-surround-51",
-      8,
-@@ -608,7 +608,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-     {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE}},
--     "a52",
-+     "a52", NULL,
-      N_("Digital Surround 5.1 (IEC958/AC3)"),
-      "iec958-ac3-surround-51",
-      3,
-@@ -619,16 +619,72 @@ static const struct pa_alsa_profile_info device_table[] = {
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE,
-             PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT }},
--     "surround71",
-+     "surround71", NULL,
-      N_("Analog Surround 7.1"),
-      "analog-surround-71",
-      7,
-      "Master", "PCM",
-      "Capture", "Mic" },
- 
--    {{ 0, { 0 }}, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL }
-+    {{ 0, { 0 }}, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL }
- };
- 
-+static snd_pcm_t *open_by_device_string_with_fallback(
-+        const char *prefix,
-+        const char *prefix_fallback,
-+        const char *dev_id,
-+        char **dev,
-+        pa_sample_spec *ss,
-+        pa_channel_map* map,
-+        int mode,
-+        uint32_t *nfrags,
-+        snd_pcm_uframes_t *period_size,
-+        snd_pcm_uframes_t tsched_size,
-+        pa_bool_t *use_mmap,
-+        pa_bool_t *use_tsched,
-+        pa_bool_t require_exact_channel_number) {
-+
-+    snd_pcm_t *pcm_handle;
-+    char *d;
-+
-+    d = pa_sprintf_malloc("%s:%s", prefix, dev_id);
-+
-+    pcm_handle = pa_alsa_open_by_device_string(
-+            d,
-+            dev,
-+            ss,
-+            map,
-+            mode,
-+            nfrags,
-+            period_size,
-+            tsched_size,
-+            use_mmap,
-+            use_tsched,
-+            require_exact_channel_number);
-+    pa_xfree(d);
-+
-+    if (!pcm_handle && prefix_fallback) {
-+
-+        d = pa_sprintf_malloc("%s:%s", prefix_fallback, dev_id);
-+
-+        pcm_handle = pa_alsa_open_by_device_string(
-+                d,
-+                dev,
-+                ss,
-+                map,
-+                mode,
-+                nfrags,
-+                period_size,
-+                tsched_size,
-+                use_mmap,
-+                use_tsched,
-+                require_exact_channel_number);
-+        pa_xfree(d);
-+    }
-+
-+    return pcm_handle;
-+}
-+
- snd_pcm_t *pa_alsa_open_by_device_id_auto(
-         const char *dev_id,
-         char **dev,
-@@ -669,14 +725,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
- 
-             pa_log_debug("Checking for %s (%s)", device_table[i].name, device_table[i].alsa_name);
- 
--            d = pa_sprintf_malloc("%s:%s", device_table[i].alsa_name, dev_id);
--
-             try_ss.channels = device_table[i].map.channels;
-             try_ss.rate = ss->rate;
-             try_ss.format = ss->format;
- 
--            pcm_handle = pa_alsa_open_by_device_string(
--                    d,
-+            pcm_handle = open_by_device_string_with_fallback(
-+                    device_table[i].alsa_name,
-+                    device_table[i].alsa_name_fallback,
-+                    dev_id,
-                     dev,
-                     &try_ss,
-                     map,
-@@ -688,8 +744,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
-                     use_tsched,
-                     TRUE);
- 
--            pa_xfree(d);
--
-             if (pcm_handle) {
- 
-                 *ss = try_ss;
-@@ -701,6 +755,7 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
- 
-                 return pcm_handle;
-             }
-+
-         }
- 
-         if (direction > 0) {
-@@ -773,7 +828,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
-         pa_bool_t *use_tsched,
-         const pa_alsa_profile_info *profile) {
- 
--    char *d;
-     snd_pcm_t *pcm_handle;
-     pa_sample_spec try_ss;
- 
-@@ -785,14 +839,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
-     pa_assert(period_size);
-     pa_assert(profile);
- 
--    d = pa_sprintf_malloc("%s:%s", profile->alsa_name, dev_id);
--
-     try_ss.channels = profile->map.channels;
-     try_ss.rate = ss->rate;
-     try_ss.format = ss->format;
- 
--    pcm_handle = pa_alsa_open_by_device_string(
--            d,
-+    pcm_handle = open_by_device_string_with_fallback(
-+            profile->alsa_name,
-+            profile->alsa_name_fallback,
-+            dev_id,
-             dev,
-             &try_ss,
-             map,
-@@ -804,8 +858,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
-             use_tsched,
-             TRUE);
- 
--    pa_xfree(d);
--
-     if (!pcm_handle)
-         return NULL;
- 
-@@ -858,6 +910,8 @@ snd_pcm_t *pa_alsa_open_by_device_string(
-             goto fail;
-         }
- 
-+        pa_log_debug("Managed to open %s", d);
-+
-         if ((err = pa_alsa_set_hw_params(pcm_handle, ss, nfrags, period_size, tsched_size, use_mmap, use_tsched, require_exact_channel_number)) < 0) {
- 
-             if (!reformat) {
-@@ -926,26 +980,25 @@ int pa_alsa_probe_profiles(
-         snd_pcm_t *pcm_i = NULL;
- 
-         if (i->alsa_name) {
--            char *id;
-             pa_sample_spec try_ss;
-             pa_channel_map try_map;
- 
-             pa_log_debug("Checking for playback on %s (%s)", i->name, i->alsa_name);
--            id = pa_sprintf_malloc("%s:%s", i->alsa_name, dev_id);
- 
-             try_ss = *ss;
-             try_ss.channels = i->map.channels;
-             try_map = i->map;
- 
--            pcm_i = pa_alsa_open_by_device_string(
--                    id, NULL,
-+            pcm_i = open_by_device_string_with_fallback(
-+                    i->alsa_name,
-+                    i->alsa_name_fallback,
-+                    dev_id,
-+                    NULL,
-                     &try_ss, &try_map,
-                     SND_PCM_STREAM_PLAYBACK,
-                     NULL, NULL, 0, NULL, NULL,
-                     TRUE);
- 
--            pa_xfree(id);
--
-             if (!pcm_i)
-                 continue;
-         }
-@@ -954,26 +1007,25 @@ int pa_alsa_probe_profiles(
-             snd_pcm_t *pcm_j = NULL;
- 
-             if (j->alsa_name) {
--                char *jd;
-                 pa_sample_spec try_ss;
-                 pa_channel_map try_map;
- 
-                 pa_log_debug("Checking for capture on %s (%s)", j->name, j->alsa_name);
--                jd = pa_sprintf_malloc("%s:%s", j->alsa_name, dev_id);
- 
-                 try_ss = *ss;
-                 try_ss.channels = j->map.channels;
-                 try_map = j->map;
- 
--                pcm_j = pa_alsa_open_by_device_string(
--                        jd, NULL,
-+                pcm_j = open_by_device_string_with_fallback(
-+                        j->alsa_name,
-+                        j->alsa_name_fallback,
-+                        dev_id,
-+                        NULL,
-                         &try_ss, &try_map,
-                         SND_PCM_STREAM_CAPTURE,
-                         NULL, NULL, 0, NULL, NULL,
-                         TRUE);
- 
--                pa_xfree(jd);
--
-                 if (!pcm_j)
-                     continue;
-             }
-diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
-index c8acc7c..c3a8117 100644
---- a/src/modules/alsa/alsa-util.h
-+++ b/src/modules/alsa/alsa-util.h
-@@ -56,6 +56,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min);
- typedef struct pa_alsa_profile_info {
-     pa_channel_map map;
-     const char *alsa_name;
-+    const char *alsa_name_fallback;
-     const char *description; /* internationalized */
-     const char *name;
-     unsigned priority;
--- 
-1.6.0.2
-
diff --git a/0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch b/0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch
deleted file mode 100644
index 3ccf220..0000000
--- a/0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c7ec01326190a0bcdcca77307728a7dabb9fb1d2 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 19 Apr 2009 19:02:16 +0200
-Subject: [PATCH] util: if NULL is passed to pa_path_get_filename() just hand it through
-
----
- src/pulse/util.c |    3 ++-
- src/pulse/util.h |    2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/pulse/util.c b/src/pulse/util.c
-index 54a188d..6f1e40a 100644
---- a/src/pulse/util.c
-+++ b/src/pulse/util.c
-@@ -219,7 +219,8 @@ char *pa_get_binary_name(char *s, size_t l) {
- char *pa_path_get_filename(const char *p) {
-     char *fn;
- 
--    pa_assert(p);
-+    if (!p)
-+        return NULL;
- 
-     if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
-         return fn+1;
-diff --git a/src/pulse/util.h b/src/pulse/util.h
-index f6dd40c..ad85653 100644
---- a/src/pulse/util.h
-+++ b/src/pulse/util.h
-@@ -51,7 +51,7 @@ char *pa_get_home_dir(char *s, size_t l);
- char *pa_get_binary_name(char *s, size_t l);
- 
- /** Return a pointer to the filename inside a path (which is the last
-- * component). */
-+ * component). If passed NULL will return NULL. */
- char *pa_path_get_filename(const char *p);
- 
- /** Wait t milliseconds */
--- 
-1.6.0.2
-
diff --git a/0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch b/0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch
deleted file mode 100644
index 4baf0db..0000000
--- a/0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a5fad31238a9379a589c7a5c629352a8c914f709 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 1 May 2009 04:11:30 +0200
-Subject: [PATCH] alsa: don't hit an assert when invalid module arguments are passed
-
----
- src/modules/alsa/alsa-sink.c   |    3 ++-
- src/modules/alsa/alsa-source.c |    3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
-index 2fbcd7b..360cb4d 100644
---- a/src/modules/alsa/alsa-sink.c
-+++ b/src/modules/alsa/alsa-sink.c
-@@ -1770,7 +1770,8 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
- 
- fail:
- 
--    userdata_free(u);
-+    if (u)
-+        userdata_free(u);
- 
-     return NULL;
- }
-diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
-index c59fc75..19c6cfc 100644
---- a/src/modules/alsa/alsa-source.c
-+++ b/src/modules/alsa/alsa-source.c
-@@ -1621,7 +1621,8 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
- 
- fail:
- 
--    userdata_free(u);
-+    if (u)
-+        userdata_free(u);
- 
-     return NULL;
- }
--- 
-1.6.0.2
-
diff --git a/0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch b/0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch
deleted file mode 100644
index 9d92798..0000000
--- a/0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5657be51e1aff934be7be723dd4c80deaae7cfb6 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 26 May 2009 22:29:33 +0200
-Subject: [PATCH] alsa: fix wording, we are speaking of card profiles, not output profiles
-
----
- src/modules/alsa/module-alsa-card.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
-index fdc952d..dd8636e 100644
---- a/src/modules/alsa/module-alsa-card.c
-+++ b/src/modules/alsa/module-alsa-card.c
-@@ -135,7 +135,7 @@ static void enumerate_cb(
-             bonus += 20000;
-     }
- 
--    pa_log_info("Found output profile '%s'", t);
-+    pa_log_info("Found profile '%s'", t);
- 
-     p = pa_card_profile_new(n, t, sizeof(struct profile_data));
- 
--- 
-1.6.0.2
-
diff --git a/0005-alsa-initialize-buffer-size-before-number-of-period.patch b/0005-alsa-initialize-buffer-size-before-number-of-period.patch
deleted file mode 100644
index 621972e..0000000
--- a/0005-alsa-initialize-buffer-size-before-number-of-period.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From fab8c8290dbfe5c24718afac033c2e11976e4754 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 1 May 2009 04:16:17 +0200
-Subject: [PATCH] alsa: initialize buffer size before number of periods to improve compat with some backends
-
----
- src/modules/alsa/alsa-util.c |   33 ++++++++++++++++++++-------------
- 1 files changed, 20 insertions(+), 13 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index 2ea0c3d..34cb6d6 100644
---- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -332,7 +332,6 @@ int pa_alsa_set_hw_params(
-     int ret = -1;
-     snd_pcm_uframes_t _period_size = period_size ? *period_size : 0;
-     unsigned int _periods = periods ? *periods : 0;
--    snd_pcm_uframes_t buffer_size;
-     unsigned int r = ss->rate;
-     unsigned int c = ss->channels;
-     pa_sample_format_t f = ss->format;
-@@ -388,39 +387,47 @@ int pa_alsa_set_hw_params(
-         goto finish;
- 
-     if (_period_size && tsched_size && _periods) {
-+
-         /* Adjust the buffer sizes, if we didn't get the rate we were asking for */
-         _period_size = (snd_pcm_uframes_t) (((uint64_t) _period_size * r) / ss->rate);
-         tsched_size = (snd_pcm_uframes_t) (((uint64_t) tsched_size * r) / ss->rate);
- 
-         if (_use_tsched) {
--            _period_size = tsched_size;
--            _periods = 1;
-+            snd_pcm_uframes_t buffer_size;
- 
-             pa_assert_se(snd_pcm_hw_params_get_buffer_size_max(hwparams, &buffer_size) == 0);
-             pa_log_debug("Maximum hw buffer size is %u ms", (unsigned) buffer_size * 1000 / r);
-+
-+            _period_size = tsched_size;
-+            _periods = 1;
-         }
- 
--        buffer_size = _periods * _period_size;
-+        if (_period_size > 0 && _periods > 0) {
-+            snd_pcm_uframes_t buffer_size;
-+
-+            buffer_size = _periods * _period_size;
-+
-+            if ((ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0)
-+                pa_log_info("snd_pcm_hw_params_set_buffer_size_near() failed: %s", pa_alsa_strerror(ret));
-+        }
- 
-         if (_periods > 0) {
- 
--            /* First we pass 0 as direction to get exactly what we asked
--             * for. That this is necessary is presumably a bug in ALSA */
-+            /* First we pass 0 as direction to get exactly what we
-+             * asked for. That this is necessary is presumably a bug
-+             * in ALSA. All in all this is mostly a hint to ALSA, so
-+             * we don't care if this fails. */
- 
-             dir = 0;
--            if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) {
-+            if (snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir) < 0) {
-                 dir = 1;
--                if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) {
-+                if (snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir) < 0) {
-                     dir = -1;
-                     if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0)
--                        goto finish;
-+                        pa_log_info("snd_pcm_hw_params_set_periods_near() failed: %s", pa_alsa_strerror(ret));
-                 }
-             }
-         }
--
--        if (_period_size > 0)
--            if ((ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0)
--                goto finish;
-     }
- 
-     if  ((ret = snd_pcm_hw_params(pcm_handle, hwparams)) < 0)
--- 
-1.6.0.2
-
diff --git a/0006-conf-remove-obsolete-module-idle-time-directive-fro.patch b/0006-conf-remove-obsolete-module-idle-time-directive-fro.patch
deleted file mode 100644
index e065ffb..0000000
--- a/0006-conf-remove-obsolete-module-idle-time-directive-fro.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 56f457c10d0bd45714a1d2d033ecedab9b46439a Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 7 Jun 2009 00:44:16 +0200
-Subject: [PATCH] conf: remove obsolete module-idle-time directive from default config file/man page
-
----
- man/pulse-daemon.conf.5.xml.in |    7 -------
- src/daemon/daemon.conf.in      |    1 -
- 2 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
-index afa7ca0..7d184a6 100644
---- a/man/pulse-daemon.conf.5.xml.in
-+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -228,13 +228,6 @@ USA.
-     </option>
- 
-     <option>
--      <p><opt>module-idle-time=</opt> Unload autoloaded modules after
--      being idle for this time in seconds. Defaults to 20. The
--      <opt>--module-idle-time</opt> command line option takes
--      precedence.</p>
--    </option>
--
--    <option>
-       <p><opt>scache-idle-time=</opt> Unload autoloaded sample cache
-       entries after being idle for this time in seconds. Defaults to
-       20. The <opt>--scache-idle-time</opt> command line option takes
-diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
-index fcd2513..ee71f85 100644
---- a/src/daemon/daemon.conf.in
-+++ b/src/daemon/daemon.conf.in
-@@ -35,7 +35,6 @@
- ; realtime-priority = 5
- 
- ; exit-idle-time = 20
--; module-idle-time = 20
- ; scache-idle-time = 20
- 
- ; dl-search-path = (depends on architecture)
--- 
-1.6.0.2
-
diff --git a/0007-core-make-sure-soft-mute-status-stays-in-sync-with.patch b/0007-core-make-sure-soft-mute-status-stays-in-sync-with.patch
deleted file mode 100644
index ed20b5e..0000000
--- a/0007-core-make-sure-soft-mute-status-stays-in-sync-with.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From d52262367aea179674762344cced386b7d5522f1 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Mon, 8 Jun 2009 00:02:15 +0200
-Subject: [PATCH] core: make sure soft mute status stays in sync with hw mute status
-
-This should close rhbz #494851, mandriva bz #51234.
-
-Probably the same as our own #572, launchpad #352732.
----
- src/modules/alsa/alsa-sink.c   |    2 +-
- src/modules/alsa/alsa-source.c |    2 +-
- src/pulsecore/sink.c           |    6 +++++-
- src/pulsecore/source.c         |    6 +++++-
- 4 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
-index 360cb4d..a544b58 100644
---- a/src/modules/alsa/alsa-sink.c
-+++ b/src/modules/alsa/alsa-sink.c
-@@ -1146,7 +1146,7 @@ fail:
- 
- static void sink_get_mute_cb(pa_sink *s) {
-     struct userdata *u = s->userdata;
--    int err, sw;
-+    int err, sw = 0;
- 
-     pa_assert(u);
-     pa_assert(u->mixer_elem);
-diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
-index 19c6cfc..5d8e349 100644
---- a/src/modules/alsa/alsa-source.c
-+++ b/src/modules/alsa/alsa-source.c
-@@ -1105,7 +1105,7 @@ fail:
- 
- static void source_get_mute_cb(pa_source *s) {
-     struct userdata *u = s->userdata;
--    int err, sw;
-+    int err, sw = 0;
- 
-     pa_assert(u);
-     pa_assert(u->mixer_elem);
-diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
-index 30fa557..c99f9a8 100644
---- a/src/pulsecore/sink.c
-+++ b/src/pulsecore/sink.c
-@@ -1272,8 +1272,12 @@ pa_bool_t pa_sink_get_mute(pa_sink *s, pa_bool_t force_refresh) {
- 
-         pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_MUTE, NULL, 0, NULL) == 0);
- 
--        if (old_muted != s->muted)
-+        if (old_muted != s->muted) {
-             pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
-+
-+            /* Make sure the soft mute status stays in sync */
-+            pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0);
-+        }
-     }
- 
-     return s->muted;
-diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
-index 2190250..0baaed1 100644
---- a/src/pulsecore/source.c
-+++ b/src/pulsecore/source.c
-@@ -757,8 +757,12 @@ pa_bool_t pa_source_get_mute(pa_source *s, pa_bool_t force_refresh) {
- 
-         pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_MUTE, NULL, 0, NULL) == 0);
- 
--        if (old_muted != s->muted)
-+        if (old_muted != s->muted) {
-             pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
-+
-+            /* Make sure the soft mute status stays in sync */
-+            pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0);
-+        }
-     }
- 
-     return s->muted;
--- 
-1.6.0.2
-
diff --git a/0008-endian-fix-LE-BE-order-for-24-bit-accessor-function.patch b/0008-endian-fix-LE-BE-order-for-24-bit-accessor-function.patch
deleted file mode 100644
index 10ac3bd..0000000
--- a/0008-endian-fix-LE-BE-order-for-24-bit-accessor-function.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 88181bec9544ed038b806d8ef1604f2535263efc Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 1 May 2009 04:13:15 +0200
-Subject: [PATCH] endian: fix LE/BE order for 24 bit accessor functions
-
----
- src/pulsecore/endianmacros.h |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/pulsecore/endianmacros.h b/src/pulsecore/endianmacros.h
-index 2257937..2b18cf8 100644
---- a/src/pulsecore/endianmacros.h
-+++ b/src/pulsecore/endianmacros.h
-@@ -45,27 +45,27 @@
- #define PA_UINT32_SWAP(x) ( (uint32_t) ( ((uint32_t) (x) >> 24) | ((uint32_t) (x) << 24) | (((uint32_t) (x) & 0xFF00) << 8) | ((((uint32_t) (x)) >> 8) & 0xFF00) ) )
- #endif
- 
--static inline uint32_t PA_READ24LE(const uint8_t *p) {
-+static inline uint32_t PA_READ24BE(const uint8_t *p) {
-     return
-         ((uint32_t) p[0] << 16) |
-         ((uint32_t) p[1] << 8) |
-         ((uint32_t) p[2]);
- }
- 
--static inline uint32_t PA_READ24BE(const uint8_t *p) {
-+static inline uint32_t PA_READ24LE(const uint8_t *p) {
-     return
-         ((uint32_t) p[2] << 16) |
-         ((uint32_t) p[1] << 8) |
-         ((uint32_t) p[0]);
- }
- 
--static inline void PA_WRITE24LE(uint8_t *p, uint32_t u) {
-+static inline void PA_WRITE24BE(uint8_t *p, uint32_t u) {
-     p[0] = (uint8_t) (u >> 16);
-     p[1] = (uint8_t) (u >> 8);
-     p[2] = (uint8_t) u;
- }
- 
--static inline void PA_WRITE24BE(uint8_t *p, uint32_t u) {
-+static inline void PA_WRITE24LE(uint8_t *p, uint32_t u) {
-     p[2] = (uint8_t) (u >> 16);
-     p[1] = (uint8_t) (u >> 8);
-     p[0] = (uint8_t) u;
--- 
-1.6.0.2
-
diff --git a/0009-log-print-file-name-only-when-we-have-it.patch b/0009-log-print-file-name-only-when-we-have-it.patch
deleted file mode 100644
index 2054caf..0000000
--- a/0009-log-print-file-name-only-when-we-have-it.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a3dba1c2e1667322b878ed22f75aa63f2f4afea5 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 19 Apr 2009 19:04:50 +0200
-Subject: [PATCH] log: print file name only when we have it
-
----
- src/pulsecore/log.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c
-index 60ea9c5..919ebe1 100644
---- a/src/pulsecore/log.c
-+++ b/src/pulsecore/log.c
-@@ -285,7 +285,7 @@ void pa_log_levelv_meta(
- 
-     if ((_flags & PA_LOG_PRINT_META) && file && line > 0 && func)
-         pa_snprintf(location, sizeof(location), "[%s:%i %s()] ", file, line, func);
--    else if (_flags & (PA_LOG_PRINT_META|PA_LOG_PRINT_FILE))
-+    else if ((_flags & (PA_LOG_PRINT_META|PA_LOG_PRINT_FILE)) && file)
-         pa_snprintf(location, sizeof(location), "%s: ", pa_path_get_filename(file));
-     else
-         location[0] = 0;
--- 
-1.6.0.2
-
diff --git a/0010-man-document-24bit-sample-types-in-man-page.patch b/0010-man-document-24bit-sample-types-in-man-page.patch
deleted file mode 100644
index 2ed6f40..0000000
--- a/0010-man-document-24bit-sample-types-in-man-page.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3c0c08d2aece256f7831d020474e386d41d8d451 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 7 Jun 2009 00:45:05 +0200
-Subject: [PATCH] man: document 24bit sample types in man page
-
----
- man/pulse-daemon.conf.5.xml.in |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
-index 7d184a6..b667291 100644
---- a/man/pulse-daemon.conf.5.xml.in
-+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -364,11 +364,13 @@ USA.
-     <option>
-       <p><opt>default-sample-format=</opt> The default sampling
-       format. Specify one of <opt>u8</opt>, <opt>s16le</opt>,
--      <opt>s16be</opt>, <opt>s32le</opt>,
--      <opt>s32be</opt>, <opt>float32le</opt>, <opt>float32be</opt>,
-+      <opt>s16be</opt>, <opt>s24le</opt>, <opt>s24be</opt>,
-+      <opt>s24-32le</opt>, <opt>s24-32be</opt>, <opt>s32le</opt>,
-+      <opt>s32be</opt> <opt>float32le</opt>, <opt>float32be</opt>,
-       <opt>ulaw</opt>, <opt>alaw</opt>. Depending on the endianess of
--      the CPU the
--      formats <opt>s16ne</opt>, <opt>s16re</opt>, <opt>s32ne</opt>, <opt>s32re</opt>,
-+      the CPU the formats <opt>s16ne</opt>, <opt>s16re</opt>,
-+      <opt>s24ne</opt>, <opt>s24re</opt>, <opt>s24-32ne</opt>,
-+      <opt>s24-32re</opt>, <opt>s32ne</opt>, <opt>s32re</opt>,
-       <opt>float32ne</opt>, <opt>float32re</opt> (for native,
-       resp. reverse endian) are available as aliases.</p>
-     </option>
--- 
-1.6.0.2
-
diff --git a/0011-man-document-log-related-daemon.conf-options.patch b/0011-man-document-log-related-daemon.conf-options.patch
deleted file mode 100644
index 3264d46..0000000
--- a/0011-man-document-log-related-daemon.conf-options.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c4a763d19a700c49a63509b0be576630ce408793 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 7 Jun 2009 00:44:49 +0200
-Subject: [PATCH] man: document log related daemon.conf options
-
----
- man/pulse-daemon.conf.5.xml.in |   21 +++++++++++++++++++--
- 1 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
-index b667291..94ee8fa 100644
---- a/man/pulse-daemon.conf.5.xml.in
-+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -260,9 +260,9 @@ USA.
-     </option>
- 
-     <option>
--      <p><opt>default-script-file=</opt> Load the default
-+      <p><opt>load-default-script-file=</opt> Load the default
-       configuration script file as specified
--      in <opt>default-script-file=</opt>. Defaults to "yes".</p>
-+      in <opt>default-script-file=</opt>. Defaults to <opt>yes</opt>.</p>
-     </option>
- 
-   </section>
-@@ -289,6 +289,23 @@ USA.
-       might alter this setting.</p>
-     </option>
- 
-+    <option>
-+      <p><opt>log-meta=</opt> With each logged message log the code
-+      location the message was generated from. Defaults to
-+      <opt>no</opt>.</p>
-+    </option>
-+
-+    <option>
-+      <p><opt>log-time=</opt> With each logged messages log the
-+      relative time since startup. Defaults to <opt>no</opt>.</p>
-+    </option>
-+
-+    <option>
-+      <p><opt>log-backtrace=</opt> When greater than 0, with each
-+      logged message log a code stack trace up the the specified
-+      number of stack frames. Defaults to <opt>0</opt>.</p>
-+    </option>
-+
-   </section>
- 
-   <section name="Resource Limits">
--- 
-1.6.0.2
-
diff --git a/0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch b/0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch
deleted file mode 100644
index 3802121..0000000
--- a/0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ecb72ee5387c9348dd2dff9cbbfca63bad393f0b Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 7 Jun 2009 00:45:21 +0200
-Subject: [PATCH] man: document that tsched doesn't use fragment settings
-
----
- man/pulse-daemon.conf.5.xml.in |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
-index 94ee8fa..1622f23 100644
---- a/man/pulse-daemon.conf.5.xml.in
-+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -413,7 +413,8 @@ USA.
-     these buffer metrics for machines with high scheduling
-     latencies. Not all possible values that may be configured here are
-     available in all hardware. The driver will to find the nearest
--    setting supported.</p>
-+    setting supported. Modern drivers that support timer-based
-+    scheduling ignore these options.</p>
- 
-     <option>
-       <p><opt>default-fragments=</opt> The default number of
--- 
-1.6.0.2
-
diff --git a/0013-mutex-when-we-fail-to-fill-in-mutex-into-static-mut.patch b/0013-mutex-when-we-fail-to-fill-in-mutex-into-static-mut.patch
deleted file mode 100644
index df33fe2..0000000
--- a/0013-mutex-when-we-fail-to-fill-in-mutex-into-static-mut.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c09d6b31b291d194f97f78a437e9717e8ebf228 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 21 Apr 2009 21:24:33 +0200
-Subject: [PATCH] mutex: when we fail to fill in mutex into static mutex ptr free it again
-
----
- src/pulsecore/mutex-posix.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/pulsecore/mutex-posix.c b/src/pulsecore/mutex-posix.c
-index b3e5256..0ff4bee 100644
---- a/src/pulsecore/mutex-posix.c
-+++ b/src/pulsecore/mutex-posix.c
-@@ -153,6 +153,8 @@ pa_mutex* pa_static_mutex_get(pa_static_mutex *s, pa_bool_t recursive, pa_bool_t
-     if ((pa_atomic_ptr_cmpxchg(&s->ptr, NULL, m)))
-         return m;
- 
-+    pa_mutex_free(m);
-+
-     /* Him, filling in failed, so someone else must have filled in
-      * already */
-     pa_assert_se(m = pa_atomic_ptr_load(&s->ptr));
--- 
-1.6.0.2
-
diff --git a/0014-oss-don-t-deadlock-when-we-try-to-resume-an-OSS-dev.patch b/0014-oss-don-t-deadlock-when-we-try-to-resume-an-OSS-dev.patch
deleted file mode 100644
index 6ce8f72..0000000
--- a/0014-oss-don-t-deadlock-when-we-try-to-resume-an-OSS-dev.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 14dd16ad13656d882245861a1f24ee36c3f6f072 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 26 May 2009 22:30:36 +0200
-Subject: [PATCH] oss: don't deadlock when we try to resume an OSS device that lacks a mixer
-
----
- src/modules/oss/module-oss.c |   11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
-index 9f7863f..aa5f918 100644
---- a/src/modules/oss/module-oss.c
-+++ b/src/modules/oss/module-oss.c
-@@ -477,6 +477,7 @@ static void build_pollfd(struct userdata *u) {
-     pollfd->revents = 0;
- }
- 
-+/* Called from IO context */
- static int suspend(struct userdata *u) {
-     pa_assert(u);
-     pa_assert(u->fd >= 0);
-@@ -526,6 +527,7 @@ static int suspend(struct userdata *u) {
-     return 0;
- }
- 
-+/* Called from IO context */
- static int unsuspend(struct userdata *u) {
-     int m;
-     pa_sample_spec ss, *ss_original;
-@@ -616,10 +618,10 @@ static int unsuspend(struct userdata *u) {
- 
-     build_pollfd(u);
- 
--    if (u->sink)
--        pa_sink_get_volume(u->sink, TRUE, FALSE);
--    if (u->source)
--        pa_source_get_volume(u->source, TRUE);
-+    if (u->sink && u->sink->get_volume)
-+        u->sink->get_volume(u->sink);
-+    if (u->source && u->source->get_volume)
-+        u->source->get_volume(u->source);
- 
-     pa_log_info("Resumed successfully...");
- 
-@@ -631,6 +633,7 @@ fail:
-     return -1;
- }
- 
-+/* Called from IO context */
- static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
-     struct userdata *u = PA_SINK(o)->userdata;
-     int ret;
--- 
-1.6.0.2
-
diff --git a/0015-simple-protocol-don-t-hit-an-assert-when-we-call-co.patch b/0015-simple-protocol-don-t-hit-an-assert-when-we-call-co.patch
deleted file mode 100644
index a590c95..0000000
--- a/0015-simple-protocol-don-t-hit-an-assert-when-we-call-co.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0660bc2dbd9c77792b6f42fea507b4cd8b4e860b Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Wed, 29 Apr 2009 04:13:07 +0200
-Subject: [PATCH] simple-protocol: don't hit an assert when we call connection_unlink() early
-
----
- src/pulsecore/protocol-simple.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/pulsecore/protocol-simple.c b/src/pulsecore/protocol-simple.c
-index 44fe597..776d74b 100644
---- a/src/pulsecore/protocol-simple.c
-+++ b/src/pulsecore/protocol-simple.c
-@@ -130,7 +130,7 @@ static void connection_unlink(connection *c) {
-         c->io = NULL;
-     }
- 
--    pa_assert_se(pa_idxset_remove_by_data(c->protocol->connections, c, NULL) == c);
-+    pa_idxset_remove_by_data(c->protocol->connections, c, NULL);
-     c->protocol = NULL;
-     connection_unref(c);
- }
--- 
-1.6.0.2
-
diff --git a/0016-idxset-add-enumeration-macro-PA_IDXSET_FOREACH.patch b/0016-idxset-add-enumeration-macro-PA_IDXSET_FOREACH.patch
deleted file mode 100644
index 1fa5480..0000000
--- a/0016-idxset-add-enumeration-macro-PA_IDXSET_FOREACH.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ad2d9386518c851d8ebfae6f8e02ac81679957e3 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Wed, 29 Apr 2009 01:46:12 +0200
-Subject: [PATCH] idxset: add enumeration macro PA_IDXSET_FOREACH
-
----
- src/pulsecore/idxset.h |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/pulsecore/idxset.h b/src/pulsecore/idxset.h
-index 7531ea3..6b9ff47 100644
---- a/src/pulsecore/idxset.h
-+++ b/src/pulsecore/idxset.h
-@@ -103,4 +103,8 @@ unsigned pa_idxset_size(pa_idxset*s);
- /* Return TRUE of the idxset is empty */
- pa_bool_t pa_idxset_isempty(pa_idxset *s);
- 
-+
-+#define PA_IDXSET_FOREACH(e, s, idx) \
-+    for ((e) = pa_idxset_first((s), &(idx)); (e); (e) = pa_idxset_next((s), &(idx)))
-+
- #endif
--- 
-1.6.0.2
-
diff --git a/0017-rescue-streams-when-one-stream-move-fails-try-to-co.patch b/0017-rescue-streams-when-one-stream-move-fails-try-to-co.patch
deleted file mode 100644
index 28a26d3..0000000
--- a/0017-rescue-streams-when-one-stream-move-fails-try-to-co.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d7b3dbff6cf97f63d88cb82d70cbcb10f6c1d36e Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 17 Apr 2009 20:30:09 +0200
-Subject: [PATCH] rescue-streams: when one stream move fails try to continue with the remaining ones
-
----
- src/modules/module-rescue-streams.c |   16 ++++++----------
- 1 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c
-index 4f616e0..7c99a9b 100644
---- a/src/modules/module-rescue-streams.c
-+++ b/src/modules/module-rescue-streams.c
-@@ -77,12 +77,10 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user
-     }
- 
-     while ((i = pa_idxset_first(sink->inputs, NULL))) {
--        if (pa_sink_input_move_to(i, target, FALSE) < 0) {
-+        if (pa_sink_input_move_to(i, target, FALSE) < 0)
-             pa_log_warn("Failed to move sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
--            return PA_HOOK_OK;
--        }
--
--        pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
-+        else
-+            pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
-     }
- 
- 
-@@ -121,12 +119,10 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void
-     pa_assert(target != source);
- 
-     while ((o = pa_idxset_first(source->outputs, NULL))) {
--        if (pa_source_output_move_to(o, target, FALSE) < 0) {
-+        if (pa_source_output_move_to(o, target, FALSE) < 0)
-             pa_log_warn("Failed to move source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
--            return PA_HOOK_OK;
--        }
--
--        pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
-+        else
-+            pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
-     }
- 
- 
--- 
-1.6.0.2
-
diff --git a/0018-sample-correctly-pass-s24-32-formats.patch b/0018-sample-correctly-pass-s24-32-formats.patch
deleted file mode 100644
index c0701a8..0000000
--- a/0018-sample-correctly-pass-s24-32-formats.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 26797456d340a9042dad0c4d62e36cf930a98c7c Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 1 May 2009 04:12:24 +0200
-Subject: [PATCH] sample: correctly pass s24-32 formats
-
----
- src/pulse/sample.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/pulse/sample.c b/src/pulse/sample.c
-index 1e67b03..ed7b1b0 100644
---- a/src/pulse/sample.c
-+++ b/src/pulse/sample.c
-@@ -231,13 +231,13 @@ pa_sample_format_t pa_parse_sample_format(const char *format) {
-     else if (strcasecmp(format, "s24re") == 0)
-         return PA_SAMPLE_S24RE;
-     else if (strcasecmp(format, "s24-32le") == 0)
--        return PA_SAMPLE_S24LE;
-+        return PA_SAMPLE_S24_32LE;
-     else if (strcasecmp(format, "s24-32be") == 0)
--        return PA_SAMPLE_S24BE;
-+        return PA_SAMPLE_S24_32BE;
-     else if (strcasecmp(format, "s24-32ne") == 0 || strcasecmp(format, "s24-32") == 0)
--        return PA_SAMPLE_S24NE;
-+        return PA_SAMPLE_S24_32NE;
-     else if (strcasecmp(format, "s24-32re") == 0)
--        return PA_SAMPLE_S24RE;
-+        return PA_SAMPLE_S24_32RE;
- 
-     return -1;
- }
--- 
-1.6.0.2
-
diff --git a/0019-sample-util-fix-iteration-loop-when-adjusting-volum.patch b/0019-sample-util-fix-iteration-loop-when-adjusting-volum.patch
deleted file mode 100644
index f696233..0000000
--- a/0019-sample-util-fix-iteration-loop-when-adjusting-volum.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a9c769c26ab18a716eeed01e20a1e81f11c64475 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 1 May 2009 04:14:40 +0200
-Subject: [PATCH] sample-util: fix iteration loop when adjusting volume of s24 samples
-
----
- src/pulsecore/sample-util.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
-index 3a9b384..a3e490b 100644
---- a/src/pulsecore/sample-util.c
-+++ b/src/pulsecore/sample-util.c
-@@ -831,9 +831,9 @@ void pa_volume_memchunk(
- 
-             calc_linear_integer_volume(linear, volume);
- 
--            e = (uint8_t*) ptr + c->length/3;
-+            e = (uint8_t*) ptr + c->length;
- 
--            for (channel = 0, d = ptr; d < e; d++) {
-+            for (channel = 0, d = ptr; d < e; d += 3) {
-                 int64_t t;
- 
-                 t = (int64_t)((int32_t) (PA_READ24NE(d) << 8));
-@@ -854,9 +854,9 @@ void pa_volume_memchunk(
- 
-             calc_linear_integer_volume(linear, volume);
- 
--            e = (uint8_t*) ptr + c->length/3;
-+            e = (uint8_t*) ptr + c->length;
- 
--            for (channel = 0, d = ptr; d < e; d++) {
-+            for (channel = 0, d = ptr; d < e; d += 3) {
-                 int64_t t;
- 
-                 t = (int64_t)((int32_t) (PA_READ24RE(d) << 8));
--- 
-1.6.0.2
-
diff --git a/0020-sample-util-properly-allocate-silence-block-for-s24.patch b/0020-sample-util-properly-allocate-silence-block-for-s24.patch
deleted file mode 100644
index 9146533..0000000
--- a/0020-sample-util-properly-allocate-silence-block-for-s24.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9c467514c504c294415de99655fb4c3630bf1e57 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 1 May 2009 04:14:02 +0200
-Subject: [PATCH] sample-util: properly allocate silence block for s24-32 formats
-
----
- src/pulsecore/sample-util.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
-index a3e490b..dda3883 100644
---- a/src/pulsecore/sample-util.c
-+++ b/src/pulsecore/sample-util.c
-@@ -1181,6 +1181,8 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool,
-             case PA_SAMPLE_S32BE:
-             case PA_SAMPLE_S24LE:
-             case PA_SAMPLE_S24BE:
-+            case PA_SAMPLE_S24_32LE:
-+            case PA_SAMPLE_S24_32RE:
-             case PA_SAMPLE_FLOAT32LE:
-             case PA_SAMPLE_FLOAT32BE:
-                 cache->blocks[PA_SAMPLE_S16LE] = b = silence_memblock_new(pool, 0);
-@@ -1189,6 +1191,8 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool,
-                 cache->blocks[PA_SAMPLE_S32BE] = pa_memblock_ref(b);
-                 cache->blocks[PA_SAMPLE_S24LE] = pa_memblock_ref(b);
-                 cache->blocks[PA_SAMPLE_S24BE] = pa_memblock_ref(b);
-+                cache->blocks[PA_SAMPLE_S24_32LE] = pa_memblock_ref(b);
-+                cache->blocks[PA_SAMPLE_S24_32BE] = pa_memblock_ref(b);
-                 cache->blocks[PA_SAMPLE_FLOAT32LE] = pa_memblock_ref(b);
-                 cache->blocks[PA_SAMPLE_FLOAT32BE] = pa_memblock_ref(b);
-                 break;
--- 
-1.6.0.2
-
diff --git a/0021-sconv-fix-a-few-minor-conversion-issues.patch b/0021-sconv-fix-a-few-minor-conversion-issues.patch
deleted file mode 100644
index 57f48a6..0000000
--- a/0021-sconv-fix-a-few-minor-conversion-issues.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d622b229871038b97681c465432e3da14bc85782 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 1 May 2009 04:22:08 +0200
-Subject: [PATCH] sconv: fix a few minor conversion issues
-
----
- src/pulsecore/sconv-s16le.c |   10 +++++-----
- src/pulsecore/sconv.c       |    2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/pulsecore/sconv-s16le.c b/src/pulsecore/sconv-s16le.c
-index 307ce7b..43b8cb3 100644
---- a/src/pulsecore/sconv-s16le.c
-+++ b/src/pulsecore/sconv-s16le.c
-@@ -370,7 +370,7 @@ void pa_sconv_s24_32le_to_s16ne(unsigned n, const uint32_t *a, int16_t *b) {
-     pa_assert(b);
- 
-     for (; n > 0; n--) {
--        *b = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8) >> 16);
-+        *b = (int16_t) (((int32_t) (UINT32_FROM(*a) << 8)) >> 16);
-         a++;
-         b++;
-     }
-@@ -416,8 +416,8 @@ void pa_sconv_s24_32le_to_float32ne(unsigned n, const uint32_t *a, float *b) {
-     pa_assert(b);
- 
-     for (; n > 0; n--) {
--        int32_t s = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8));
--        *b = ((float) s) / 0x7FFFFFFF;
-+        int32_t s = (int32_t) (UINT32_FROM(*a) << 8);
-+        *b = (float) s / (float) 0x7FFFFFFF;
-         a ++;
-         b ++;
-     }
-@@ -428,8 +428,8 @@ void pa_sconv_s24_32le_to_float32re(unsigned n, const uint32_t *a, float *b) {
-     pa_assert(b);
- 
-     for (; n > 0; n--) {
--        int32_t s = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8));
--        float k = ((float) s) / 0x7FFFFFFF;
-+        int32_t s = (int32_t) (UINT32_FROM(*a) << 8);
-+        float k = (float) s / (float) 0x7FFFFFFF;
-         *b = PA_FLOAT32_SWAP(k);
-         a ++;
-         b ++;
-diff --git a/src/pulsecore/sconv.c b/src/pulsecore/sconv.c
-index 29a9a45..d89f428 100644
---- a/src/pulsecore/sconv.c
-+++ b/src/pulsecore/sconv.c
-@@ -75,7 +75,7 @@ static void u8_from_s16ne(unsigned n, const int16_t *a, uint8_t *b) {
-     pa_assert(b);
- 
-     for (; n > 0; n--, a++, b++)
--        *b = (uint8_t) (*a / 0x100 + 0x80);
-+        *b = (uint8_t) ((uint16_t) *a >> 8) + (uint8_t) 0x80U;
- }
- 
- /* float32 */
--- 
-1.6.0.2
-
diff --git a/0022-alsa-be-a-bit-more-verbose-when-a-hwparam-call-fail.patch b/0022-alsa-be-a-bit-more-verbose-when-a-hwparam-call-fail.patch
deleted file mode 100644
index 455853f..0000000
--- a/0022-alsa-be-a-bit-more-verbose-when-a-hwparam-call-fail.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From a8bcf9b8435eddcc8bdaff7c5fd7d8a97d33dbd8 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 14 May 2009 01:25:07 +0200
-Subject: [PATCH] alsa: be a bit more verbose when a hwparam call fails
-
----
- src/modules/alsa/alsa-util.c |   45 ++++++++++++++++++++++++++++++++++-------
- 1 files changed, 37 insertions(+), 8 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index 34cb6d6..b3de415 100644
---- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -279,6 +279,11 @@ static int set_format(snd_pcm_t *pcm_handle, snd_pcm_hw_params_t *hwparams, pa_s
-     if ((ret = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format_trans[*f])) >= 0)
-         return ret;
- 
-+    pa_log_debug("snd_pcm_hw_params_set_format(%s) failed: %s",
-+                 snd_pcm_format_description(format_trans[*f]),
-+                 pa_alsa_strerror(ret));
-+
-+
-     if (*f == PA_SAMPLE_FLOAT32BE)
-         *f = PA_SAMPLE_FLOAT32LE;
-     else if (*f == PA_SAMPLE_FLOAT32LE)
-@@ -305,6 +310,10 @@ static int set_format(snd_pcm_t *pcm_handle, snd_pcm_hw_params_t *hwparams, pa_s
-     if ((ret = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format_trans[*f])) >= 0)
-         return ret;
- 
-+    pa_log_debug("snd_pcm_hw_params_set_format(%s) failed: %s",
-+                 snd_pcm_format_description(format_trans[*f]),
-+                 pa_alsa_strerror(ret));
-+
- try_auto:
- 
-     for (i = 0; try_order[i] != PA_SAMPLE_INVALID; i++) {
-@@ -312,6 +321,10 @@ try_auto:
- 
-         if ((ret = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format_trans[*f])) >= 0)
-             return ret;
-+
-+        pa_log_debug("snd_pcm_hw_params_set_format(%s) failed: %s",
-+                     snd_pcm_format_description(format_trans[*f]),
-+                     pa_alsa_strerror(ret));
-     }
- 
-     return -1;
-@@ -345,11 +358,15 @@ int pa_alsa_set_hw_params(
- 
-     snd_pcm_hw_params_alloca(&hwparams);
- 
--    if ((ret = snd_pcm_hw_params_any(pcm_handle, hwparams)) < 0)
-+    if ((ret = snd_pcm_hw_params_any(pcm_handle, hwparams)) < 0) {
-+        pa_log_debug("snd_pcm_hw_params_any() failed: %s", pa_alsa_strerror(ret));
-         goto finish;
-+    }
- 
--    if ((ret = snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams, 0)) < 0)
-+    if ((ret = snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams, 0)) < 0) {
-+        pa_log_debug("snd_pcm_hw_params_set_rate_resample() failed: %s", pa_alsa_strerror(ret));
-         goto finish;
-+    }
- 
-     if (_use_mmap) {
- 
-@@ -357,14 +374,18 @@ int pa_alsa_set_hw_params(
- 
-             /* mmap() didn't work, fall back to interleaved */
- 
--            if ((ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
-+            if ((ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
-+                pa_log_debug("snd_pcm_hw_params_set_access() failed: %s", pa_alsa_strerror(ret));
-                 goto finish;
-+            }
- 
-             _use_mmap = FALSE;
-         }
- 
--    } else if ((ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
-+    } else if ((ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
-+        pa_log_debug("snd_pcm_hw_params_set_access() failed: %s", pa_alsa_strerror(ret));
-         goto finish;
-+    }
- 
-     if (!_use_mmap)
-         _use_tsched = FALSE;
-@@ -372,19 +393,27 @@ int pa_alsa_set_hw_params(
-     if ((ret = set_format(pcm_handle, hwparams, &f)) < 0)
-         goto finish;
- 
--    if ((ret = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &r, NULL)) < 0)
-+    if ((ret = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &r, NULL)) < 0) {
-+        pa_log_debug("snd_pcm_hw_params_set_rate_near() failed: %s", pa_alsa_strerror(ret));
-         goto finish;
-+    }
- 
-     if (require_exact_channel_number) {
--        if ((ret = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, c)) < 0)
-+        if ((ret = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, c)) < 0) {
-+            pa_log_debug("snd_pcm_hw_params_set_channels() failed: %s", pa_alsa_strerror(ret));
-             goto finish;
-+        }
-     } else {
--        if ((ret = snd_pcm_hw_params_set_channels_near(pcm_handle, hwparams, &c)) < 0)
-+        if ((ret = snd_pcm_hw_params_set_channels_near(pcm_handle, hwparams, &c)) < 0) {
-+            pa_log_debug("snd_pcm_hw_params_set_channels_near() failed: %s", pa_alsa_strerror(ret));
-             goto finish;
-+        }
-     }
- 
--    if ((ret = snd_pcm_hw_params_set_periods_integer(pcm_handle, hwparams)) < 0)
-+    if ((ret = snd_pcm_hw_params_set_periods_integer(pcm_handle, hwparams)) < 0) {
-+        pa_log_debug("snd_pcm_hw_params_set_periods_integer() failed: %s", pa_alsa_strerror(ret));
-         goto finish;
-+    }
- 
-     if (_period_size && tsched_size && _periods) {
- 
--- 
-1.6.0.2
-
diff --git a/0023-rescue-make-we-don-t-end-up-in-an-endless-loop-when.patch b/0023-rescue-make-we-don-t-end-up-in-an-endless-loop-when.patch
deleted file mode 100644
index 6ecd5db..0000000
--- a/0023-rescue-make-we-don-t-end-up-in-an-endless-loop-when.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 7e664dc56a1f2ce385f6f7739209ef2413974d8f Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 14 May 2009 03:52:13 +0200
-Subject: [PATCH] rescue: make we don't end up in an endless loop when we can't move a sink input
-
----
- src/modules/module-rescue-streams.c |   38 +++++++++++++++++++---------------
- 1 files changed, 21 insertions(+), 17 deletions(-)
-
-diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c
-index 7c99a9b..c22711a 100644
---- a/src/modules/module-rescue-streams.c
-+++ b/src/modules/module-rescue-streams.c
-@@ -31,6 +31,7 @@
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
- #include <pulsecore/namereg.h>
-+#include <pulsecore/core-util.h>
- 
- #include "module-rescue-streams-symdef.h"
- 
-@@ -49,6 +50,7 @@ struct userdata {
- 
- static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* userdata) {
-     pa_sink_input *i;
-+    uint32_t idx;
-     pa_sink *target;
- 
-     pa_assert(c);
-@@ -58,15 +60,14 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user
-     if (c->state == PA_CORE_SHUTDOWN)
-         return PA_HOOK_OK;
- 
--    if (!pa_idxset_size(sink->inputs)) {
-+    if (pa_idxset_size(sink->inputs) <= 0) {
-         pa_log_debug("No sink inputs to move away.");
-         return PA_HOOK_OK;
-     }
- 
-     if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SINK)) || target == sink) {
--        uint32_t idx;
- 
--        for (target = pa_idxset_first(c->sinks, &idx); target; target = pa_idxset_next(c->sinks, &idx))
-+        PA_IDXSET_FOREACH(target, c->sinks, idx)
-             if (target != sink)
-                 break;
- 
-@@ -76,20 +77,24 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user
-         }
-     }
- 
--    while ((i = pa_idxset_first(sink->inputs, NULL))) {
-+    pa_assert(target != sink);
-+
-+    PA_IDXSET_FOREACH(i, sink->inputs, idx) {
-         if (pa_sink_input_move_to(i, target, FALSE) < 0)
--            pa_log_warn("Failed to move sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
-+            pa_log_info("Failed to move sink input %u \"%s\" to %s.", i->index,
-+                        pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name);
-         else
--            pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name);
-+            pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index,
-+                        pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name);
-     }
- 
--
-     return PA_HOOK_OK;
- }
- 
- static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void* userdata) {
-     pa_source_output *o;
-     pa_source *target;
-+    uint32_t idx;
- 
-     pa_assert(c);
-     pa_assert(source);
-@@ -98,15 +103,14 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void
-     if (c->state == PA_CORE_SHUTDOWN)
-         return PA_HOOK_OK;
- 
--    if (!pa_idxset_size(source->outputs)) {
-+    if (pa_idxset_size(source->outputs) <= 0) {
-         pa_log_debug("No source outputs to move away.");
-         return PA_HOOK_OK;
-     }
- 
-     if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SOURCE)) || target == source) {
--        uint32_t idx;
- 
--        for (target = pa_idxset_first(c->sources, &idx); target; target = pa_idxset_next(c->sources, &idx))
-+        PA_IDXSET_FOREACH(target, c->sources, idx)
-             if (target != source && !target->monitor_of == !source->monitor_of)
-                 break;
- 
-@@ -118,19 +122,20 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void
- 
-     pa_assert(target != source);
- 
--    while ((o = pa_idxset_first(source->outputs, NULL))) {
-+    PA_IDXSET_FOREACH(o, source->outputs, idx) {
-         if (pa_source_output_move_to(o, target, FALSE) < 0)
--            pa_log_warn("Failed to move source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
-+            pa_log_info("Failed to move source output %u \"%s\" to %s.", o->index,
-+                        pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME)), target->name);
-         else
--            pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name);
-+            pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index,
-+                        pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME)), target->name);
-     }
- 
--
-     return PA_HOOK_OK;
- }
- 
- int pa__init(pa_module*m) {
--    pa_modargs *ma = NULL;
-+    pa_modargs *ma;
-     struct userdata *u;
- 
-     pa_assert(m);
-@@ -153,10 +158,9 @@ void pa__done(pa_module*m) {
- 
-     pa_assert(m);
- 
--    if (!m->userdata)
-+    if (!(u = m->userdata))
-         return;
- 
--    u = m->userdata;
-     if (u->sink_slot)
-         pa_hook_slot_free(u->sink_slot);
-     if (u->source_slot)
--- 
-1.6.0.2
-
diff --git a/0024-core-introduce-pa_-sink-source-_set_fixed_latency.patch b/0024-core-introduce-pa_-sink-source-_set_fixed_latency.patch
deleted file mode 100644
index eb9fb18..0000000
--- a/0024-core-introduce-pa_-sink-source-_set_fixed_latency.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From c2a3d914804cd5c72463f41a21ff5cff5334b619 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 8 May 2009 01:56:21 +0200
-Subject: [PATCH] core: introduce pa_{sink,source}_set_fixed_latency()
-
-This allows us to forward the fixed latency directly from the sink to
-the monitor source withut having to wait for pa_sink_put().
----
- src/modules/alsa/alsa-sink.c                    |    4 ++--
- src/modules/alsa/alsa-source.c                  |    4 ++--
- src/modules/bluetooth/module-bluetooth-device.c |   12 ++++++------
- src/modules/module-pipe-sink.c                  |    2 +-
- src/modules/module-pipe-source.c                |    2 +-
- src/modules/module-sine-source.c                |    3 +--
- src/modules/oss/module-oss.c                    |    4 ++--
- src/pulsecore/sink.c                            |   16 ++++++++++++++++
- src/pulsecore/sink.h                            |    1 +
- src/pulsecore/source.c                          |   15 +++++++++++++++
- src/pulsecore/source.h                          |    1 +
- 11 files changed, 48 insertions(+), 16 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
-index a544b58..94e15df 100644
---- a/src/modules/alsa/alsa-sink.c
-+++ b/src/modules/alsa/alsa-sink.c
-@@ -473,7 +473,7 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle
-             u->since_start += frames * u->frame_size;
- 
- #ifdef DEBUG_TIMING
--            pa_log_debug("Wrote %lu bytes", (unsigned long) (frames * u->frame_size));
-+            pa_log_debug("Wrote %lu bytes (of possible %lu bytes)", (unsigned long) (frames * u->frame_size), (unsigned long) n_bytes);
- #endif
- 
-             if ((size_t) frames * u->frame_size >= n_bytes)
-@@ -1730,7 +1730,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
-         pa_log_info("Time scheduling watermark is %0.2fms",
-                     (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
-     } else
--        u->sink->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss);
-+        pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(u->hwbuf_size, &ss));
- 
-     reserve_update(u);
- 
-diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
-index 5d8e349..c2f905a 100644
---- a/src/modules/alsa/alsa-source.c
-+++ b/src/modules/alsa/alsa-source.c
-@@ -455,7 +455,7 @@ static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled
-             u->read_count += frames * u->frame_size;
- 
- #ifdef DEBUG_TIMING
--            pa_log_debug("Read %lu bytes", (unsigned long) (frames * u->frame_size));
-+            pa_log_debug("Read %lu bytes (of possible %lu bytes)", (unsigned long) (frames * u->frame_size), (unsigned long) n_bytes);
- #endif
- 
-             if ((size_t) frames * u->frame_size >= n_bytes)
-@@ -1582,7 +1582,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
-         pa_log_info("Time scheduling watermark is %0.2fms",
-                     (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
-     } else
--        u->source->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss);
-+        pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(u->hwbuf_size, &ss));
- 
-     reserve_update(u);
- 
-diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
-index 90f6486..3465b80 100644
---- a/src/modules/bluetooth/module-bluetooth-device.c
-+++ b/src/modules/bluetooth/module-bluetooth-device.c
-@@ -1608,9 +1608,9 @@ static int add_sink(struct userdata *u) {
-         u->sink->parent.process_msg = sink_process_msg;
- 
-         pa_sink_set_max_request(u->sink, u->block_size);
--        u->sink->fixed_latency =
--            (u->profile == PROFILE_A2DP ? FIXED_LATENCY_PLAYBACK_A2DP : FIXED_LATENCY_PLAYBACK_HSP) +
--            pa_bytes_to_usec(u->block_size, &u->sample_spec);
-+        pa_sink_set_fixed_latency(u->sink,
-+                                  (u->profile == PROFILE_A2DP ? FIXED_LATENCY_PLAYBACK_A2DP : FIXED_LATENCY_PLAYBACK_HSP) +
-+                                  pa_bytes_to_usec(u->block_size, &u->sample_spec));
-     }
- 
-     if (u->profile == PROFILE_HSP) {
-@@ -1659,9 +1659,9 @@ static int add_source(struct userdata *u) {
-         u->source->userdata = u;
-         u->source->parent.process_msg = source_process_msg;
- 
--        u->source->fixed_latency =
--            (/* u->profile == PROFILE_A2DP ? FIXED_LATENCY_RECORD_A2DP : */ FIXED_LATENCY_RECORD_HSP) +
--            pa_bytes_to_usec(u->block_size, &u->sample_spec);
-+        pa_source_set_fixed_latency(u->source,
-+                                    (/* u->profile == PROFILE_A2DP ? FIXED_LATENCY_RECORD_A2DP : */ FIXED_LATENCY_RECORD_HSP) +
-+                                    pa_bytes_to_usec(u->block_size, &u->sample_spec));
-     }
- 
-     if (u->profile == PROFILE_HSP) {
-diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
-index 9d3e55d..304d01c 100644
---- a/src/modules/module-pipe-sink.c
-+++ b/src/modules/module-pipe-sink.c
-@@ -293,7 +293,7 @@ int pa__init(pa_module*m) {
-     pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
-     pa_sink_set_rtpoll(u->sink, u->rtpoll);
-     pa_sink_set_max_request(u->sink, PIPE_BUF);
--    u->sink->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->sink->sample_spec);
-+    pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(PIPE_BUF, &u->sink->sample_spec));
- 
-     u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
-     pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
-diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
-index df72d79..6ed4fbf 100644
---- a/src/modules/module-pipe-source.c
-+++ b/src/modules/module-pipe-source.c
-@@ -277,7 +277,7 @@ int pa__init(pa_module*m) {
- 
-     pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
-     pa_source_set_rtpoll(u->source, u->rtpoll);
--    u->source->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec);
-+    pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec));
- 
-     u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
-     pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
-diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c
-index a5f1ce7..a6e15d8 100644
---- a/src/modules/module-sine-source.c
-+++ b/src/modules/module-sine-source.c
-@@ -264,8 +264,7 @@ int pa__init(pa_module*m) {
- 
-     pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
-     pa_source_set_rtpoll(u->source, u->rtpoll);
--    u->source->fixed_latency = u->block_usec;
--
-+    pa_source_set_fixed_latency(u->source, u->block_usec);
- 
-     if (!(u->thread = pa_thread_new(thread_func, u))) {
-         pa_log("Failed to create thread.");
-diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
-index aa5f918..d6f549c 100644
---- a/src/modules/oss/module-oss.c
-+++ b/src/modules/oss/module-oss.c
-@@ -1328,8 +1328,8 @@ int pa__init(pa_module*m) {
- 
-         pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
-         pa_source_set_rtpoll(u->source, u->rtpoll);
-+        pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(u->in_hwbuf_size, &u->source->sample_spec));
-         u->source->refresh_volume = TRUE;
--        u->source->fixed_latency = pa_bytes_to_usec(u->in_hwbuf_size, &u->source->sample_spec);
- 
-         if (use_mmap)
-             u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags);
-@@ -1390,8 +1390,8 @@ int pa__init(pa_module*m) {
- 
-         pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
-         pa_sink_set_rtpoll(u->sink, u->rtpoll);
-+        pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(u->out_hwbuf_size, &u->sink->sample_spec));
-         u->sink->refresh_volume = TRUE;
--        u->sink->fixed_latency = pa_bytes_to_usec(u->out_hwbuf_size, &u->sink->sample_spec);
- 
-         pa_sink_set_max_request(u->sink, u->out_hwbuf_size);
- 
-diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
-index c99f9a8..2225886 100644
---- a/src/pulsecore/sink.c
-+++ b/src/pulsecore/sink.c
-@@ -2054,6 +2054,22 @@ void pa_sink_set_latency_range_within_thread(pa_sink *s, pa_usec_t min_latency,
-     pa_source_set_latency_range_within_thread(s->monitor_source, min_latency, max_latency);
- }
- 
-+/* Called from main thread, before the sink is put */
-+void pa_sink_set_fixed_latency(pa_sink *s, pa_usec_t latency) {
-+    pa_sink_assert_ref(s);
-+
-+    pa_assert(pa_sink_get_state(s) == PA_SINK_INIT);
-+
-+    if (latency < ABSOLUTE_MIN_LATENCY)
-+        latency = ABSOLUTE_MIN_LATENCY;
-+
-+    if (latency > ABSOLUTE_MAX_LATENCY)
-+        latency = ABSOLUTE_MAX_LATENCY;
-+
-+    s->fixed_latency = latency;
-+    pa_source_set_fixed_latency(s->monitor_source, latency);
-+}
-+
- /* Called from main context */
- size_t pa_sink_get_max_rewind(pa_sink *s) {
-     size_t r;
-diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
-index 352282b..e33b3cf 100644
---- a/src/pulsecore/sink.h
-+++ b/src/pulsecore/sink.h
-@@ -229,6 +229,7 @@ void pa_sink_set_rtpoll(pa_sink *s, pa_rtpoll *p);
- void pa_sink_set_max_rewind(pa_sink *s, size_t max_rewind);
- void pa_sink_set_max_request(pa_sink *s, size_t max_request);
- void pa_sink_set_latency_range(pa_sink *s, pa_usec_t min_latency, pa_usec_t max_latency);
-+void pa_sink_set_fixed_latency(pa_sink *s, pa_usec_t latency);
- 
- void pa_sink_detach(pa_sink *s);
- void pa_sink_attach(pa_sink *s);
-diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
-index 0baaed1..e8deaf7 100644
---- a/src/pulsecore/source.c
-+++ b/src/pulsecore/source.c
-@@ -1280,6 +1280,21 @@ void pa_source_set_latency_range_within_thread(pa_source *s, pa_usec_t min_laten
-     pa_source_invalidate_requested_latency(s);
- }
- 
-+/* Called from main thread, before the source is put */
-+void pa_source_set_fixed_latency(pa_source *s, pa_usec_t latency) {
-+    pa_source_assert_ref(s);
-+
-+    pa_assert(pa_source_get_state(s) == PA_SOURCE_INIT);
-+
-+    if (latency < ABSOLUTE_MIN_LATENCY)
-+        latency = ABSOLUTE_MIN_LATENCY;
-+
-+    if (latency > ABSOLUTE_MAX_LATENCY)
-+        latency = ABSOLUTE_MAX_LATENCY;
-+
-+    s->fixed_latency = latency;
-+}
-+
- /* Called from main thread */
- size_t pa_source_get_max_rewind(pa_source *s) {
-     size_t r;
-diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h
-index b502c22..2978f57 100644
---- a/src/pulsecore/source.h
-+++ b/src/pulsecore/source.h
-@@ -210,6 +210,7 @@ void pa_source_set_rtpoll(pa_source *s, pa_rtpoll *p);
- 
- void pa_source_set_max_rewind(pa_source *s, size_t max_rewind);
- void pa_source_set_latency_range(pa_source *s, pa_usec_t min_latency, pa_usec_t max_latency);
-+void pa_source_set_fixed_latency(pa_source *s, pa_usec_t latency);
- 
- void pa_source_detach(pa_source *s);
- void pa_source_attach(pa_source *s);
--- 
-1.6.0.2
-
diff --git a/0025-core-cache-requested-latency-only-when-we-are-runni.patch b/0025-core-cache-requested-latency-only-when-we-are-runni.patch
deleted file mode 100644
index d37b7b0..0000000
--- a/0025-core-cache-requested-latency-only-when-we-are-runni.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e4b4d054871a506e8bcede10c917d887d2d6d6e3 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 8 May 2009 02:02:36 +0200
-Subject: [PATCH] core: cache requested latency only when we are running, not while we are still constructing
-
----
- src/pulsecore/sink.c   |    7 +++++--
- src/pulsecore/source.c |    7 +++++--
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
-index 2225886..161b7c9 100644
---- a/src/pulsecore/sink.c
-+++ b/src/pulsecore/sink.c
-@@ -1867,8 +1867,11 @@ pa_usec_t pa_sink_get_requested_latency_within_thread(pa_sink *s) {
-     if (result != (pa_usec_t) -1)
-         result = PA_CLAMP(result, s->thread_info.min_latency, s->thread_info.max_latency);
- 
--    s->thread_info.requested_latency = result;
--    s->thread_info.requested_latency_valid = TRUE;
-+    if (PA_SINK_IS_LINKED(s->thread_info.state)) {
-+        /* Only cache if properly initialized */
-+        s->thread_info.requested_latency = result;
-+        s->thread_info.requested_latency_valid = TRUE;
-+    }
- 
-     return result;
- }
-diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
-index e8deaf7..8a4c8c4 100644
---- a/src/pulsecore/source.c
-+++ b/src/pulsecore/source.c
-@@ -1122,8 +1122,11 @@ pa_usec_t pa_source_get_requested_latency_within_thread(pa_source *s) {
-     if (result != (pa_usec_t) -1)
-         result = PA_CLAMP(result, s->thread_info.min_latency, s->thread_info.max_latency);
- 
--    s->thread_info.requested_latency = result;
--    s->thread_info.requested_latency_valid = TRUE;
-+    if (PA_SOURCE_IS_LINKED(s->thread_info.state)) {
-+        /* Only cache this if we are fully set up */
-+        s->thread_info.requested_latency = result;
-+        s->thread_info.requested_latency_valid = TRUE;
-+    }
- 
-     return result;
- }
--- 
-1.6.0.2
-
diff --git a/0026-sample-fix-build-on-BE-archs.patch b/0026-sample-fix-build-on-BE-archs.patch
deleted file mode 100644
index 0f40195..0000000
--- a/0026-sample-fix-build-on-BE-archs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 758aac63b97d6f5a3a6a5d74d7d0af12cd46cd3d Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Mon, 8 Jun 2009 18:22:19 +0200
-Subject: [PATCH] sample: fix build on BE archs
-
----
- src/pulsecore/sample-util.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
-index dda3883..5b8ccf5 100644
---- a/src/pulsecore/sample-util.c
-+++ b/src/pulsecore/sample-util.c
-@@ -1182,7 +1182,7 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool,
-             case PA_SAMPLE_S24LE:
-             case PA_SAMPLE_S24BE:
-             case PA_SAMPLE_S24_32LE:
--            case PA_SAMPLE_S24_32RE:
-+            case PA_SAMPLE_S24_32BE:
-             case PA_SAMPLE_FLOAT32LE:
-             case PA_SAMPLE_FLOAT32BE:
-                 cache->blocks[PA_SAMPLE_S16LE] = b = silence_memblock_new(pool, 0);
--- 
-1.6.0.2
-
diff --git a/0027-alsa-properly-convert-return-values-of-snd_strerror.patch b/0027-alsa-properly-convert-return-values-of-snd_strerror.patch
deleted file mode 100644
index ca85046..0000000
--- a/0027-alsa-properly-convert-return-values-of-snd_strerror.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-From 253737477009343027213b7ede0d745a9bf5cf09 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 19 Apr 2009 19:22:51 +0200
-Subject: [PATCH] alsa: properly convert return values of snd_strerror() to utf8
-
----
- src/modules/alsa/alsa-sink.c        |   28 ++++++------
- src/modules/alsa/alsa-source.c      |   24 +++++-----
- src/modules/alsa/alsa-util.c        |   83 ++++++++++++++++++++++++-----------
- src/modules/alsa/alsa-util.h        |    2 +
- src/modules/alsa/module-alsa-card.c |    2 +-
- 5 files changed, 86 insertions(+), 53 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
-index 94e15df..44c6219 100644
---- a/src/modules/alsa/alsa-sink.c
-+++ b/src/modules/alsa/alsa-sink.c
-@@ -281,7 +281,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
-     pa_assert(call);
-     pa_assert(err < 0);
- 
--    pa_log_debug("%s: %s", call, snd_strerror(err));
-+    pa_log_debug("%s: %s", call, pa_alsa_strerror(err));
- 
-     pa_assert(err != -EAGAIN);
- 
-@@ -289,7 +289,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
-         pa_log_debug("%s: Buffer underrun!", call);
- 
-     if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
--        pa_log("%s: %s", call, snd_strerror(err));
-+        pa_log("%s: %s", call, pa_alsa_strerror(err));
-         return -1;
-     }
- 
-@@ -636,12 +636,12 @@ static void update_smoother(struct userdata *u) {
-     /* Let's update the time smoother */
- 
-     if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, &delay, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
--        pa_log_warn("Failed to query DSP status data: %s", snd_strerror(err));
-+        pa_log_warn("Failed to query DSP status data: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-     if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0))
--        pa_log_warn("Failed to get timestamp: %s", snd_strerror(err));
-+        pa_log_warn("Failed to get timestamp: %s", pa_alsa_strerror(err));
-     else {
-         snd_htimestamp_t htstamp = { 0, 0 };
-         snd_pcm_status_get_htstamp(status, &htstamp);
-@@ -764,7 +764,7 @@ static int update_sw_params(struct userdata *u) {
-     pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
- 
-     if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
--        pa_log("Failed to set software parameters: %s", snd_strerror(err));
-+        pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
-         return err;
-     }
- 
-@@ -792,7 +792,7 @@ static int unsuspend(struct userdata *u) {
-                             SND_PCM_NO_AUTO_RESAMPLE|
-                             SND_PCM_NO_AUTO_CHANNELS|
-                             SND_PCM_NO_AUTO_FORMAT)) < 0) {
--        pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
-+        pa_log("Error opening PCM device %s: %s", u->device_name, pa_alsa_strerror(err));
-         goto fail;
-     }
- 
-@@ -803,7 +803,7 @@ static int unsuspend(struct userdata *u) {
-     d = u->use_tsched;
- 
-     if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
--        pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
-+        pa_log("Failed to set hardware parameters: %s", pa_alsa_strerror(err));
-         goto fail;
-     }
- 
-@@ -1030,7 +1030,7 @@ static void sink_get_volume_cb(pa_sink *s) {
-     return;
- 
- fail:
--    pa_log_error("Unable to read volume: %s", snd_strerror(err));
-+    pa_log_error("Unable to read volume: %s", pa_alsa_strerror(err));
- }
- 
- static void sink_set_volume_cb(pa_sink *s) {
-@@ -1141,7 +1141,7 @@ static void sink_set_volume_cb(pa_sink *s) {
-     return;
- 
- fail:
--    pa_log_error("Unable to set volume: %s", snd_strerror(err));
-+    pa_log_error("Unable to set volume: %s", pa_alsa_strerror(err));
- }
- 
- static void sink_get_mute_cb(pa_sink *s) {
-@@ -1152,7 +1152,7 @@ static void sink_get_mute_cb(pa_sink *s) {
-     pa_assert(u->mixer_elem);
- 
-     if ((err = snd_mixer_selem_get_playback_switch(u->mixer_elem, 0, &sw)) < 0) {
--        pa_log_error("Unable to get switch: %s", snd_strerror(err));
-+        pa_log_error("Unable to get switch: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-@@ -1167,7 +1167,7 @@ static void sink_set_mute_cb(pa_sink *s) {
-     pa_assert(u->mixer_elem);
- 
-     if ((err = snd_mixer_selem_set_playback_switch_all(u->mixer_elem, !s->muted)) < 0) {
--        pa_log_error("Unable to set switch: %s", snd_strerror(err));
-+        pa_log_error("Unable to set switch: %s", pa_alsa_strerror(err));
-         return;
-     }
- }
-@@ -1206,7 +1206,7 @@ static int process_rewind(struct userdata *u) {
-     pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes);
- 
-     if (PA_UNLIKELY((unused = pa_alsa_safe_avail(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
--        pa_log("snd_pcm_avail() failed: %s", snd_strerror((int) unused));
-+        pa_log("snd_pcm_avail() failed: %s", pa_alsa_strerror((int) unused));
-         return -1;
-     }
- 
-@@ -1228,7 +1228,7 @@ static int process_rewind(struct userdata *u) {
-         in_frames = (snd_pcm_sframes_t) (rewind_nbytes / u->frame_size);
-         pa_log_debug("before: %lu", (unsigned long) in_frames);
-         if ((out_frames = snd_pcm_rewind(u->pcm_handle, (snd_pcm_uframes_t) in_frames)) < 0) {
--            pa_log("snd_pcm_rewind() failed: %s", snd_strerror((int) out_frames));
-+            pa_log("snd_pcm_rewind() failed: %s", pa_alsa_strerror((int) out_frames));
-             return -1;
-         }
-         pa_log_debug("after: %lu", (unsigned long) out_frames);
-@@ -1359,7 +1359,7 @@ static void thread_func(void *userdata) {
-             pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
- 
-             if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
--                pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
-+                pa_log("snd_pcm_poll_descriptors_revents() failed: %s", pa_alsa_strerror(err));
-                 goto fail;
-             }
- 
-diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
-index c2f905a..ba29738 100644
---- a/src/modules/alsa/alsa-source.c
-+++ b/src/modules/alsa/alsa-source.c
-@@ -278,7 +278,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
-     pa_assert(call);
-     pa_assert(err < 0);
- 
--    pa_log_debug("%s: %s", call, snd_strerror(err));
-+    pa_log_debug("%s: %s", call, pa_alsa_strerror(err));
- 
-     pa_assert(err != -EAGAIN);
- 
-@@ -286,7 +286,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
-         pa_log_debug("%s: Buffer overrun!", call);
- 
-     if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
--        pa_log("%s: %s", call, snd_strerror(err));
-+        pa_log("%s: %s", call, pa_alsa_strerror(err));
-         return -1;
-     }
- 
-@@ -606,12 +606,12 @@ static void update_smoother(struct userdata *u) {
-     /* Let's update the time smoother */
- 
-     if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, &delay, u->hwbuf_size, &u->source->sample_spec)) < 0)) {
--        pa_log_warn("Failed to get delay: %s", snd_strerror(err));
-+        pa_log_warn("Failed to get delay: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-     if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0))
--        pa_log_warn("Failed to get timestamp: %s", snd_strerror(err));
-+        pa_log_warn("Failed to get timestamp: %s", pa_alsa_strerror(err));
-     else {
-         snd_htimestamp_t htstamp = { 0, 0 };
-         snd_pcm_status_get_htstamp(status, &htstamp);
-@@ -721,7 +721,7 @@ static int update_sw_params(struct userdata *u) {
-     pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
- 
-     if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
--        pa_log("Failed to set software parameters: %s", snd_strerror(err));
-+        pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
-         return err;
-     }
- 
-@@ -747,7 +747,7 @@ static int unsuspend(struct userdata *u) {
-                             SND_PCM_NO_AUTO_RESAMPLE|
-                             SND_PCM_NO_AUTO_CHANNELS|
-                             SND_PCM_NO_AUTO_FORMAT)) < 0) {
--        pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
-+        pa_log("Error opening PCM device %s: %s", u->device_name, pa_alsa_strerror(err));
-         goto fail;
-     }
- 
-@@ -758,7 +758,7 @@ static int unsuspend(struct userdata *u) {
-     d = u->use_tsched;
- 
-     if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
--        pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
-+        pa_log("Failed to set hardware parameters: %s", pa_alsa_strerror(err));
-         goto fail;
-     }
- 
-@@ -988,7 +988,7 @@ static void source_get_volume_cb(pa_source *s) {
-     return;
- 
- fail:
--    pa_log_error("Unable to read volume: %s", snd_strerror(err));
-+    pa_log_error("Unable to read volume: %s", pa_alsa_strerror(err));
- }
- 
- static void source_set_volume_cb(pa_source *s) {
-@@ -1100,7 +1100,7 @@ static void source_set_volume_cb(pa_source *s) {
-     return;
- 
- fail:
--    pa_log_error("Unable to set volume: %s", snd_strerror(err));
-+    pa_log_error("Unable to set volume: %s", pa_alsa_strerror(err));
- }
- 
- static void source_get_mute_cb(pa_source *s) {
-@@ -1111,7 +1111,7 @@ static void source_get_mute_cb(pa_source *s) {
-     pa_assert(u->mixer_elem);
- 
-     if ((err = snd_mixer_selem_get_capture_switch(u->mixer_elem, 0, &sw)) < 0) {
--        pa_log_error("Unable to get switch: %s", snd_strerror(err));
-+        pa_log_error("Unable to get switch: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-@@ -1126,7 +1126,7 @@ static void source_set_mute_cb(pa_source *s) {
-     pa_assert(u->mixer_elem);
- 
-     if ((err = snd_mixer_selem_set_capture_switch_all(u->mixer_elem, !s->muted)) < 0) {
--        pa_log_error("Unable to set switch: %s", snd_strerror(err));
-+        pa_log_error("Unable to set switch: %s", pa_alsa_strerror(err));
-         return;
-     }
- }
-@@ -1218,7 +1218,7 @@ static void thread_func(void *userdata) {
-             pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
- 
-             if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
--                pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
-+                pa_log("snd_pcm_poll_descriptors_revents() failed: %s", pa_alsa_strerror(err));
-                 goto fail;
-             }
- 
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index b3de415..98710d4 100644
---- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -33,6 +33,7 @@
- #include <pulse/timeval.h>
- #include <pulse/util.h>
- #include <pulse/i18n.h>
-+#include <pulse/utf8.h>
- 
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-@@ -40,6 +41,7 @@
- #include <pulsecore/atomic.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/once.h>
-+#include <pulsecore/thread.h>
- 
- #include "alsa-util.h"
- 
-@@ -106,7 +108,7 @@ static void io_cb(pa_mainloop_api*a, pa_io_event* e, int fd, pa_io_event_flags_t
-     pa_assert(i != fdl->num_fds);
- 
-     if ((err = snd_mixer_poll_descriptors_revents(fdl->mixer, fdl->work_fds, fdl->num_fds, &revents)) < 0) {
--        pa_log_error("Unable to get poll revent: %s", snd_strerror(err));
-+        pa_log_error("Unable to get poll revent: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-@@ -129,7 +131,7 @@ static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) {
-     a->defer_enable(fdl->defer, 0);
- 
-     if ((n = snd_mixer_poll_descriptors_count(fdl->mixer)) < 0) {
--        pa_log("snd_mixer_poll_descriptors_count() failed: %s", snd_strerror(n));
-+        pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
-         return;
-     }
-     num_fds = (unsigned) n;
-@@ -146,7 +148,7 @@ static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) {
-     memset(fdl->work_fds, 0, sizeof(struct pollfd) * num_fds);
- 
-     if ((err = snd_mixer_poll_descriptors(fdl->mixer, fdl->work_fds, num_fds)) < 0) {
--        pa_log_error("Unable to get poll descriptors: %s", snd_strerror(err));
-+        pa_log_error("Unable to get poll descriptors: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-@@ -518,42 +520,42 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) {
-     snd_pcm_sw_params_alloca(&swparams);
- 
-     if ((err = snd_pcm_sw_params_current(pcm, swparams) < 0)) {
--        pa_log_warn("Unable to determine current swparams: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to determine current swparams: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_period_event(pcm, swparams, 0)) < 0) {
--        pa_log_warn("Unable to disable period event: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to disable period event: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_tstamp_mode(pcm, swparams, SND_PCM_TSTAMP_ENABLE)) < 0) {
--        pa_log_warn("Unable to enable time stamping: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to enable time stamping: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_get_boundary(swparams, &boundary)) < 0) {
--        pa_log_warn("Unable to get boundary: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to get boundary: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_stop_threshold(pcm, swparams, boundary)) < 0) {
--        pa_log_warn("Unable to set stop threshold: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to set stop threshold: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_start_threshold(pcm, swparams, (snd_pcm_uframes_t) -1)) < 0) {
--        pa_log_warn("Unable to set start threshold: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to set start threshold: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_avail_min(pcm, swparams, avail_min)) < 0) {
--        pa_log_error("snd_pcm_sw_params_set_avail_min() failed: %s", snd_strerror(err));
-+        pa_log_error("snd_pcm_sw_params_set_avail_min() failed: %s", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params(pcm, swparams)) < 0) {
--        pa_log_warn("Unable to set sw params: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to set sw params: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-@@ -942,7 +944,7 @@ snd_pcm_t *pa_alsa_open_by_device_string(
-                                 SND_PCM_NO_AUTO_RESAMPLE|
-                                 SND_PCM_NO_AUTO_CHANNELS|
-                                 (reformat ? 0 : SND_PCM_NO_AUTO_FORMAT))) < 0) {
--            pa_log_info("Error opening PCM device %s: %s", d, snd_strerror(err));
-+            pa_log_info("Error opening PCM device %s: %s", d, pa_alsa_strerror(err));
-             goto fail;
-         }
- 
-@@ -972,7 +974,7 @@ snd_pcm_t *pa_alsa_open_by_device_string(
-                 continue;
-             }
- 
--            pa_log_info("Failed to set hardware parameters on %s: %s", d, snd_strerror(err));
-+            pa_log_info("Failed to set hardware parameters on %s: %s", d, pa_alsa_strerror(err));
-             snd_pcm_close(pcm_handle);
- 
-             goto fail;
-@@ -1088,17 +1090,17 @@ int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev) {
-     pa_assert(dev);
- 
-     if ((err = snd_mixer_attach(mixer, dev)) < 0) {
--        pa_log_info("Unable to attach to mixer %s: %s", dev, snd_strerror(err));
-+        pa_log_info("Unable to attach to mixer %s: %s", dev, pa_alsa_strerror(err));
-         return -1;
-     }
- 
-     if ((err = snd_mixer_selem_register(mixer, NULL, NULL)) < 0) {
--        pa_log_warn("Unable to register mixer: %s", snd_strerror(err));
-+        pa_log_warn("Unable to register mixer: %s", pa_alsa_strerror(err));
-         return -1;
-     }
- 
-     if ((err = snd_mixer_load(mixer)) < 0) {
--        pa_log_warn("Unable to load mixer: %s", snd_strerror(err));
-+        pa_log_warn("Unable to load mixer: %s", pa_alsa_strerror(err));
-         return -1;
-     }
- 
-@@ -1224,7 +1226,7 @@ int pa_alsa_find_mixer_and_elem(
-     }
- 
-     if ((err = snd_mixer_open(&m, 0)) < 0) {
--        pa_log("Error opening mixer: %s", snd_strerror(err));
-+        pa_log("Error opening mixer: %s", pa_alsa_strerror(err));
-         return -1;
-     }
- 
-@@ -1426,7 +1428,7 @@ void pa_alsa_dump(pa_log_level_t level, snd_pcm_t *pcm) {
-     pa_assert_se(snd_output_buffer_open(&out) == 0);
- 
-     if ((err = snd_pcm_dump(pcm, out)) < 0)
--        pa_logl(level, "snd_pcm_dump(): %s", snd_strerror(err));
-+        pa_logl(level, "snd_pcm_dump(): %s", pa_alsa_strerror(err));
-     else {
-         char *s = NULL;
-         snd_output_buffer_string(out, &s);
-@@ -1450,7 +1452,7 @@ void pa_alsa_dump_status(snd_pcm_t *pcm) {
-     pa_assert_se(snd_pcm_status(pcm, status) == 0);
- 
-     if ((err = snd_pcm_status_dump(status, out)) < 0)
--        pa_log_debug("snd_pcm_dump(): %s", snd_strerror(err));
-+        pa_log_debug("snd_pcm_dump(): %s", pa_alsa_strerror(err));
-     else {
-         char *s = NULL;
-         snd_output_buffer_string(out, &s);
-@@ -1612,7 +1614,7 @@ void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm, snd_m
-     snd_pcm_info_alloca(&info);
- 
-     if ((err = snd_pcm_hw_params_current(pcm, hwparams)) < 0)
--        pa_log_warn("Error fetching hardware parameter info: %s", snd_strerror(err));
-+        pa_log_warn("Error fetching hardware parameter info: %s", pa_alsa_strerror(err));
-     else {
- 
-         if ((bits = snd_pcm_hw_params_get_sbits(hwparams)) >= 0)
-@@ -1623,7 +1625,7 @@ void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm, snd_m
-         pa_proplist_sets(p, "alsa.mixer_element", snd_mixer_selem_get_name(elem));
- 
-     if ((err = snd_pcm_info(pcm, info)) < 0)
--        pa_log_warn("Error fetching PCM info: %s", snd_strerror(err));
-+        pa_log_warn("Error fetching PCM info: %s", pa_alsa_strerror(err));
-     else
-         pa_alsa_init_proplist_pcm_info(c, p, info);
- }
-@@ -1656,14 +1658,14 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
- 
-         case SND_PCM_STATE_XRUN:
-             if ((err = snd_pcm_recover(pcm, -EPIPE, 1)) != 0) {
--                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and XRUN: %s", snd_strerror(err));
-+                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and XRUN: %s", pa_alsa_strerror(err));
-                 return -1;
-             }
-             break;
- 
-         case SND_PCM_STATE_SUSPENDED:
-             if ((err = snd_pcm_recover(pcm, -ESTRPIPE, 1)) != 0) {
--                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and SUSPENDED: %s", snd_strerror(err));
-+                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and SUSPENDED: %s", pa_alsa_strerror(err));
-                 return -1;
-             }
-             break;
-@@ -1673,7 +1675,7 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
-             snd_pcm_drop(pcm);
- 
-             if ((err = snd_pcm_prepare(pcm)) < 0) {
--                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP with snd_pcm_prepare(): %s", snd_strerror(err));
-+                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP with snd_pcm_prepare(): %s", pa_alsa_strerror(err));
-                 return -1;
-             }
-             break;
-@@ -1690,7 +1692,7 @@ pa_rtpoll_item* pa_alsa_build_pollfd(snd_pcm_t *pcm, pa_rtpoll *rtpoll) {
-     pa_assert(pcm);
- 
-     if ((n = snd_pcm_poll_descriptors_count(pcm)) < 0) {
--        pa_log("snd_pcm_poll_descriptors_count() failed: %s", snd_strerror(n));
-+        pa_log("snd_pcm_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
-         return NULL;
-     }
- 
-@@ -1698,7 +1700,7 @@ pa_rtpoll_item* pa_alsa_build_pollfd(snd_pcm_t *pcm, pa_rtpoll *rtpoll) {
-     pollfd = pa_rtpoll_item_get_pollfd(item, NULL);
- 
-     if ((err = snd_pcm_poll_descriptors(pcm, pollfd, (unsigned) n)) < 0) {
--        pa_log("snd_pcm_poll_descriptors() failed: %s", snd_strerror(err));
-+        pa_log("snd_pcm_poll_descriptors() failed: %s", pa_alsa_strerror(err));
-         pa_rtpoll_item_free(item);
-         return NULL;
-     }
-@@ -1907,3 +1909,32 @@ pa_bool_t pa_alsa_pcm_is_modem(snd_pcm_t *pcm) {
- 
-     return snd_pcm_info_get_class(info) == SND_PCM_CLASS_MODEM;
- }
-+
-+PA_STATIC_TLS_DECLARE(cstrerror, pa_xfree);
-+
-+const char* pa_alsa_strerror(int errnum) {
-+    const char *original = NULL;
-+    char *translated, *t;
-+    char errbuf[128];
-+
-+    if ((t = PA_STATIC_TLS_GET(cstrerror)))
-+        pa_xfree(t);
-+
-+    errnum = EINVAL;
-+    PA_DEBUG_TRAP;
-+    original = snd_strerror(errnum);
-+
-+    if (!original) {
-+        pa_snprintf(errbuf, sizeof(errbuf), "Unknown error %i", errnum);
-+        original = errbuf;
-+    }
-+
-+    if (!(translated = pa_locale_to_utf8(original))) {
-+        pa_log_warn("Unable to convert error string to locale, filtering.");
-+        translated = pa_utf8_filter(original);
-+    }
-+
-+    PA_STATIC_TLS_SET(cstrerror, translated);
-+
-+    return translated;
-+}
-diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
-index c3a8117..4c5d336 100644
---- a/src/modules/alsa/alsa-util.h
-+++ b/src/modules/alsa/alsa-util.h
-@@ -147,4 +147,6 @@ pa_bool_t pa_alsa_pcm_is_hw(snd_pcm_t *pcm);
- 
- pa_bool_t pa_alsa_pcm_is_modem(snd_pcm_t *pcm);
- 
-+const char* pa_alsa_strerror(int errnum);
-+
- #endif
-diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
-index dd8636e..d894b9c 100644
---- a/src/modules/alsa/module-alsa-card.c
-+++ b/src/modules/alsa/module-alsa-card.c
-@@ -304,7 +304,7 @@ int pa__init(pa_module *m) {
-     u->modargs = ma;
- 
-     if ((alsa_card_index = snd_card_get_index(u->device_id)) < 0) {
--        pa_log("Card '%s' doesn't exist: %s", u->device_id, snd_strerror(alsa_card_index));
-+        pa_log("Card '%s' doesn't exist: %s", u->device_id, pa_alsa_strerror(alsa_card_index));
-         goto fail;
-     }
- 
--- 
-1.6.0.2
-
diff --git a/0028-alsa-remove-debug-code.patch b/0028-alsa-remove-debug-code.patch
deleted file mode 100644
index 73674c2..0000000
--- a/0028-alsa-remove-debug-code.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dce6af5fefbcd68d52f6ff42509213406f62c57f Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 19 Apr 2009 19:25:42 +0200
-Subject: [PATCH] alsa: remove debug code
-
----
- src/modules/alsa/alsa-util.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index 98710d4..aae38bc 100644
---- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -1920,8 +1920,6 @@ const char* pa_alsa_strerror(int errnum) {
-     if ((t = PA_STATIC_TLS_GET(cstrerror)))
-         pa_xfree(t);
- 
--    errnum = EINVAL;
--    PA_DEBUG_TRAP;
-     original = snd_strerror(errnum);
- 
-     if (!original) {
--- 
-1.6.0.2
-
diff --git a/default.pa-for-gdm b/default.pa-for-gdm
new file mode 100644
index 0000000..62d820b
--- /dev/null
+++ b/default.pa-for-gdm
@@ -0,0 +1,12 @@
+load-module module-device-restore
+load-module module-card-restore
+load-module module-udev-detect
+load-module module-native-protocol-unix
+load-module module-default-device-restore
+load-module module-rescue-streams
+load-module module-always-sink
+load-module module-intended-roles
+load-module module-suspend-on-idle
+load-module module-console-kit
+load-module module-position-event-sounds
+
diff --git a/pulseaudio-0.9.15.tar.bz2 b/pulseaudio-0.9.15.tar.bz2
deleted file mode 100644
index 339b8cf..0000000
--- a/pulseaudio-0.9.15.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b10eefbd5d08bcfc9168c6456444e5010ff8699cd82f2b78c5d5c6342804d2c
-size 1195310
diff --git a/pulseaudio-0.9.16-test7.tar.bz2 b/pulseaudio-0.9.16-test7.tar.bz2
new file mode 100644
index 0000000..cbc4c0b
--- /dev/null
+++ b/pulseaudio-0.9.16-test7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91a45769871c34c1cef98a1c91039d9c8731bf1b2ab8fc45b01ba44587d8248f
+size 1361557
diff --git a/pulseaudio-am111.patch b/pulseaudio-am111.patch
deleted file mode 100644
index 90ce3e6..0000000
--- a/pulseaudio-am111.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pulseaudio-0.9.15/configure.ac
-===================================================================
---- pulseaudio-0.9.15.orig/configure.ac
-+++ pulseaudio-0.9.15/configure.ac
-@@ -1294,7 +1294,7 @@ fi
- AC_ARG_WITH(
-         [module-dir],
-         AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINORMICRO}/modules/]),
--        [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINORMICRO}/modules/"])
-+        [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINORMICRO}/modules"])
- 
- AC_SUBST(modlibexecdir)
- 
diff --git a/pulseaudio-bnc480113-default-sink.patch b/pulseaudio-bnc480113-default-sink.patch
deleted file mode 100644
index f69c029..0000000
--- a/pulseaudio-bnc480113-default-sink.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: pulseaudio-0.9.15/src/pulsecore/namereg.c
-===================================================================
---- pulseaudio-0.9.15.orig/src/pulsecore/namereg.c
-+++ pulseaudio-0.9.15/src/pulsecore/namereg.c
-@@ -244,14 +244,35 @@ pa_source* pa_namereg_set_default_source
- 
- pa_sink *pa_namereg_get_default_sink(pa_core *c) {
-     pa_sink *s;
-+    pa_sink *best_sink;
-+    uint32_t idx;
- 
-     pa_assert(c);
- 
-+    pa_log_info ("Enter - pa_namereg_get_default_sink");
-     if (c->default_sink)
-         return c->default_sink;
- 
--    if ((s = pa_idxset_first(c->sinks, NULL)))
-+    pa_log_info ("trying to chose best default sink");
-+    s = NULL;
-+    for (best_sink = pa_idxset_first(c->sinks, &idx); best_sink; best_sink = pa_idxset_next(c->sinks, &idx)) {
-+        char * proplist = pa_proplist_to_string(best_sink->proplist);
-+        pa_log_info ("%s", proplist);
-+        if (!strstr(proplist, "HDMI") && !strstr(proplist, "SPDIF") && !strstr(proplist, "Digital")) {
-+            pa_log_info ("found non HDMI and non SPDIF and non Digital");
-+            s = best_sink;
-+            pa_xfree(proplist);
-+            break;
-+        }
-+        pa_xfree(proplist);
-+    }
-+    if (s)
-         return pa_namereg_set_default_sink(c, s);
-+    else
-+    {
-+        if ((s = pa_idxset_first(c->sinks, NULL)))
-+            return pa_namereg_set_default_sink(c, s);
-+    }
- 
-     return NULL;
- }
diff --git a/pulseaudio-work-with-old-alsa.patch b/pulseaudio-work-with-old-alsa.patch
deleted file mode 100644
index 24a63ae..0000000
--- a/pulseaudio-work-with-old-alsa.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pulseaudio-0.9.15/configure.ac
-===================================================================
---- pulseaudio-0.9.15.orig/configure.ac
-+++ pulseaudio-0.9.15/configure.ac
-@@ -648,7 +648,7 @@ AC_ARG_ENABLE([alsa],
-         [alsa=auto])
- 
- if test "x${alsa}" != xno ; then
--    PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.19 ],
-+    PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.18 ],
-         [
-             HAVE_ALSA=1
-             AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?])
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 69b3beb..5d6fbd8 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep  2 23:23:47 CEST 2009 - sreeves@novell.com
+
+- Update to version 0.9.16-test7
+  Please see Changelog for full details
+- Remove uneeded patches (functionality  already in 0.9.16)
+    set of recommended backported patches (00*.patch)
+    pulseaudio-am111.patch
+    pulseaudio-bnc480113-default-sink.patch
+- Remove pulseaudio-work-with-old-alsa.patch
+- Add package pulseaudio-gdm-hooks
+
 -------------------------------------------------------------------
 Mon Aug 24 14:16:24 CEST 2009 - coolo@novell.com
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index cf2ecbf..6fac0a0 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package pulseaudio (Version 0.9.15)
+# spec file for package pulseaudio (Version 0.9.16)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,73 +17,38 @@
 
 # norootforbuild
 
+%define drvver 0.9.16
 
 Name:           pulseaudio
-%define drvver 0.9.15
 Summary:        A Networked Sound Server
-Version:        0.9.15
-Release:        5
+Version:        0.9.16
+Release:        1
 License:        GPL v2 or later ; LGPL v2.1 or later
 Group:          System/Sound Daemons
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}-test7.tar.bz2
+Source1:        default.pa-for-gdm
 Source2:        setup-pulseaudio
-# PATCH-FIX-UPSTREAM pulseaudio-bnc480113-default-sink.patch bnc#480113 sreeves@novell.com
-Patch1:         pulseaudio-bnc480113-default-sink.patch 
-# PATCH-FIX-OPENSUSE pulseaudio-work-with-old-alsa.patch
-Patch2:         pulseaudio-work-with-old-alsa.patch
-# PATCH-FIX-UPSTREAM pulseaudio-am111.patch automake 1.11 support coolo@novell.com
-Patch0:         pulseaudio-am111.patch
-# These 28 patches are backported from upstream git. Drop them when we move to 0.9.16
-Patch3:         0001-alsa-allow-configuration-of-fallback-device-strings.patch
-Patch4:         0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch
-Patch5:         0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch
-Patch6:         0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch
-Patch7:         0005-alsa-initialize-buffer-size-before-number-of-period.patch
-Patch8:         0006-conf-remove-obsolete-module-idle-time-directive-fro.patch
-Patch9:         0007-core-make-sure-soft-mute-status-stays-in-sync-with.patch
-Patch10:        0008-endian-fix-LE-BE-order-for-24-bit-accessor-function.patch
-Patch11:        0009-log-print-file-name-only-when-we-have-it.patch
-Patch12:        0010-man-document-24bit-sample-types-in-man-page.patch
-Patch13:        0011-man-document-log-related-daemon.conf-options.patch
-Patch14:        0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch
-Patch15:        0013-mutex-when-we-fail-to-fill-in-mutex-into-static-mut.patch
-Patch16:        0014-oss-don-t-deadlock-when-we-try-to-resume-an-OSS-dev.patch
-Patch17:        0015-simple-protocol-don-t-hit-an-assert-when-we-call-co.patch
-Patch18:        0016-idxset-add-enumeration-macro-PA_IDXSET_FOREACH.patch
-Patch19:        0017-rescue-streams-when-one-stream-move-fails-try-to-co.patch
-Patch20:        0018-sample-correctly-pass-s24-32-formats.patch
-Patch21:        0019-sample-util-fix-iteration-loop-when-adjusting-volum.patch
-Patch22:        0020-sample-util-properly-allocate-silence-block-for-s24.patch
-Patch23:        0021-sconv-fix-a-few-minor-conversion-issues.patch
-Patch24:        0022-alsa-be-a-bit-more-verbose-when-a-hwparam-call-fail.patch
-Patch25:        0023-rescue-make-we-don-t-end-up-in-an-endless-loop-when.patch
-Patch26:        0024-core-introduce-pa_-sink-source-_set_fixed_latency.patch
-Patch27:        0025-core-cache-requested-latency-only-when-we-are-runni.patch
-Patch28:        0026-sample-fix-build-on-BE-archs.patch
-Patch29:        0027-alsa-properly-convert-return-values-of-snd_strerror.patch
-Patch30:        0028-alsa-remove-debug-code.patch
 Url:            http://pulseaudio.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  PolicyKit-devel
 BuildRequires:  alsa-devel
 BuildRequires:  bluez-devel
 BuildRequires:  doxygen
 BuildRequires:  gconf2-devel
-BuildRequires:  gdbm-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  hal-devel
 BuildRequires:  intltool
 BuildRequires:  jack-devel
 BuildRequires:  libatomic-ops-devel
 BuildRequires:  libavahi-devel
-BuildRequires:  liboil-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  libtool
+BuildRequires:  libtdb-devel
+#our libtdb-devel does not have a .pc file
+BuildRequires:  gdbm-devel
 BuildRequires:  lirc-devel
-BuildRequires:  libudev-devel
+BuildRequires:  libudev-devel >= 143
 BuildRequires:  speex-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
@@ -91,6 +56,9 @@ BuildRequires:  xorg-x11-devel
 PreReq:         pwdutils
 Recommends:     alsa-plugins-pulse
 Requires:       %{name}-lang = %{version}
+Requires:       udev >= 146
+Requires:       rtkit
+Requires:       kernel >= 2.6.30
 Obsoletes:      libpulsecore9 <= 0.9.14
 Obsoletes:      libpulsecore7 <= 0.9.12
 
@@ -163,17 +131,13 @@ This package includes support for Jack-based applications.
 
 %package module-bluetooth
 License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Bluetooth proximity support for the PulseAudio sound server
+Summary:        Bluetooth support for the PulseAudio sound server
 Group:          System/Sound Daemons
 Requires:       %{name} = %{version}
 Requires:       bluez >= 4.34
 
 %description module-bluetooth
-pulseaudio is a networked sound server for Linux and other Unix like
-operating systems and Microsoft Windows. It is intended to be an
-improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
-
-This package includes support for Bluetooth-based sound devices.
+Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server.
 
 %package module-gconf
 License:        GPL v2 or later ; LGPL v2.1 or later
@@ -258,45 +222,23 @@ pulseaudio is a networked sound server for Linux and other Unix like
 operating systems and Microsoft Windows. It is intended to be an
 improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
 
+%package gdm-hooks
+Summary:        PulseAudio GDM integration
+License:        GPL v2 or later ; LGPL v2.1 or later
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+Requires:       gdm >= 2.22
+#for the gdm user
+Requires(pre): gdm
+
+%description gdm-hooks
+This package contains GDM integration hooks for the PulseAudio sound server.
+
 %lang_package
 %prep
-%setup -q -T -b0
-%patch1 -p1
-%patch2 -p1
-%patch0 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
+%setup -q -T -b0 -n pulseaudio-0.9.16-test7
 
 %build
-%if %suse_version >= 1110
-autoreconf -fi
-%endif
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 # libpulse and libpulsecommon need each other - no way with as-needed
 export SUSE_ASNEEDED=0
@@ -305,8 +247,8 @@ export SUSE_ASNEEDED=0
         --disable-rpath \
         --with-system-user=pulse \
         --with-system-group=pulse \
-        --with-realtime-group=pulse-rt \
-        --with-access-group=pulse-access
+        --with-access-group=pulse-access \
+        --disable-hal
 make %{?jobs:-j%jobs}
 make doxygen
 
@@ -317,9 +259,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 %suse_update_desktop_file pulseaudio
 %find_lang %{name}
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio
 install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/setup-pulseaudio
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse
+cp $RPM_SOURCE_DIR/default.pa-for-gdm $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
 ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
 
 %clean
@@ -329,7 +272,6 @@ rm -rf $RPM_BUILD_ROOT
 groupadd -r pulse &>/dev/null || :
 useradd -r -c 'PulseAudio daemon' \
     -s /sbin/nologin -d /var/lib/pulseaudio -g pulse -G audio pulse &>/dev/null || :
-groupadd -r pulse-rt &>/dev/null || :
 groupadd -r pulse-access &>/dev/null || :
 
 %post -n libpulse0 -p /sbin/ldconfig
@@ -355,7 +297,7 @@ groupadd -r pulse-access &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
 %config(noreplace) %{_sysconfdir}/pulse/system.pa
-#%attr(4755,root,root) %{_bindir}/pulseaudio
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf
 %{_bindir}/pulseaudio
 %{_bindir}/setup-pulseaudio
 %dir %{_libdir}/pulse-%{drvver}/
@@ -379,6 +321,7 @@ groupadd -r pulse-access &>/dev/null || :
 %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-unix.so
 %{_libdir}/pulse-%{drvver}/modules/module-cli.so
 %{_libdir}/pulse-%{drvver}/modules/module-combine.so
+%{_libdir}/pulse-%{drvver}/modules/module-loopback.so
 %{_libdir}/pulse-%{drvver}/modules/module-console-kit.so
 %{_libdir}/pulse-%{drvver}/modules/module-detect.so
 %{_libdir}/pulse-%{drvver}/modules/module-device-restore.so
@@ -418,13 +361,20 @@ groupadd -r pulse-access &>/dev/null || :
 %{_libdir}/pulse-%{drvver}/modules/module-augment-properties.so
 %{_libdir}/pulse-%{drvver}/modules/module-cork-music-on-phone.so
 %{_libdir}/pulse-%{drvver}/modules/module-sine-source.so
-%if %suse_version >= 1100
-%{_datadir}/PolicyKit/policy/org.pulseaudio.policy
-%endif
+%{_libdir}/pulse-%{drvver}/modules/module-intended-roles.so
+%{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so
+%{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so
+%dir %{_datadir}/pulseaudio
+%dir %{_datadir}/pulseaudio/alsa-mixer
+%dir %{_datadir}/pulseaudio/alsa-mixer/paths
+%dir %{_datadir}/pulseaudio/alsa-mixer/profile-sets
+%{_datadir}/pulseaudio/alsa-mixer/paths/*
+%{_datadir}/pulseaudio/alsa-mixer/profile-sets/*
 %{_mandir}/man1/pulseaudio.1.gz
 %{_mandir}/man5/default.pa.5.gz
 %{_mandir}/man5/pulse-client.conf.5.gz
 %{_mandir}/man5/pulse-daemon.conf.5.gz
+/lib/udev/rules.d/90-pulseaudio.rules
 
 %files esound-compat
 %defattr(-,root,root)
@@ -510,6 +460,8 @@ groupadd -r pulse-access &>/dev/null || :
 %{_bindir}/pactl
 %{_bindir}/paplay
 %{_bindir}/parec
+%{_bindir}/pamon
+%{_bindir}/parecord
 %{_bindir}/pax11publish
 %{_bindir}/padsp
 %{_bindir}/pasuspender
@@ -522,6 +474,12 @@ groupadd -r pulse-access &>/dev/null || :
 %{_mandir}/man1/padsp.1.gz
 %{_mandir}/man1/pax11publish.1.gz
 
+%files gdm-hooks
+%defattr(-,root,root)
+%dir %{_localstatedir}/lib/gdm
+%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse
+%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
+
 %files lang -f %{name}.lang
 
 %changelog