From 7c516af64176620d71058f6003ef19209cc20c12 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Mar 2014 18:13:06 +0100 Subject: gnu: pulseaudio: Upgrade to 5.0. * gnu/packages/pulseaudio.scm (pulseaudio): Upgrade to 5.0. Remove patches. * gnu/packages/patches/pulseaudio-test-timeouts.patch, gnu/packages/patches/pulseaudio-volume-test.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. --- .../patches/pulseaudio-test-timeouts.patch | 19 -------------- gnu/packages/patches/pulseaudio-volume-test.patch | 29 ---------------------- gnu/packages/pulseaudio.scm | 7 ++---- 3 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 gnu/packages/patches/pulseaudio-test-timeouts.patch delete mode 100644 gnu/packages/patches/pulseaudio-volume-test.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/pulseaudio-test-timeouts.patch b/gnu/packages/patches/pulseaudio-test-timeouts.patch deleted file mode 100644 index ab818ad0aa..0000000000 --- a/gnu/packages/patches/pulseaudio-test-timeouts.patch +++ /dev/null @@ -1,19 +0,0 @@ -Increase the timeout of the thread test. Hydra was intermittedly -failing this test due to premature timeout, and slower machines -consistently fail. - -Patch by Mark H Weaver . - ---- pulseaudio/src/tests/thread-test.c.orig 2012-09-26 07:27:01.000000000 -0400 -+++ pulseaudio/src/tests/thread-test.c 2013-10-31 22:53:23.224000184 -0400 -@@ -152,6 +152,10 @@ - s = suite_create("Thread"); - tc = tcase_create("thread"); - tcase_add_test(tc, thread_test); -+ /* the default timeout is too small, -+ * set it to a reasonable large one. -+ */ -+ tcase_set_timeout(tc, 60 * 60); - suite_add_tcase(s, tc); - - sr = srunner_create(s); diff --git a/gnu/packages/patches/pulseaudio-volume-test.patch b/gnu/packages/patches/pulseaudio-volume-test.patch deleted file mode 100644 index 2cfa0cd6ca..0000000000 --- a/gnu/packages/patches/pulseaudio-volume-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix seemingly random failures of 'volume-test' in particular on 32-bit -machines. See for -details. - -From 27e47c72a25846e107b6e450c3a1480a2742382e Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen -Date: Sat, 14 Dec 2013 07:21:22 +0000 -Subject: volume-test: Increase the allowed number of rouding errors - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=72374 ---- -diff --git a/src/tests/volume-test.c b/src/tests/volume-test.c -index a2daf3e..1ab0b5c 100644 ---- a/src/tests/volume-test.c -+++ b/src/tests/volume-test.c -@@ -138,7 +138,13 @@ START_TEST (volume_test) { - pa_log("max deviation: %lu n=%lu", (unsigned long) md, (unsigned long) mdn); - - fail_unless(md <= 1); -- fail_unless(mdn <= 251); -+ -+ /* mdn counts the times there were rounding errors during the test. The -+ * number of rounding errors seems to vary slightly depending on the -+ * hardware. The original limit was 251 errors, but it was increased to 253 -+ * when the test was failing on Tanu's laptop. -+ * See https://bugs.freedesktop.org/show_bug.cgi?id=72374 */ -+ fail_unless(mdn <= 253); - } - END_TEST diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 8bf48c2a89..db7e752ee6 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -134,7 +134,7 @@ (define json-c (define pulseaudio (package (name "pulseaudio") - (version "4.0") + (version "5.0") (source (origin (method url-fetch) (uri (string-append @@ -142,10 +142,7 @@ (define pulseaudio version ".tar.xz")) (sha256 (base32 - "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim")) - (patches (map search-patch - '("pulseaudio-test-timeouts.patch" - "pulseaudio-volume-test.patch"))))) + "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--localstatedir=/var" ;"--sysconfdir=/etc" -- cgit v1.2.3