[pulseaudio] 04/07: Remove all patches: applied upstream
Felipe Sateler
fsateler at moszumanska.debian.org
Wed Dec 24 00:36:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
fsateler pushed a commit to branch debian/experimental
in repository pulseaudio.
commit d0ee3e4b5814a0074048c6418a741cf14e9cba7a
Author: Felipe Sateler <fsateler at debian.org>
Date: Tue Dec 23 21:22:50 2014 -0300
Remove all patches: applied upstream
---
debian/changelog | 1 +
.../disable-srbchannel-test-non-linux.patch | 49 -------
debian/patches/gnu-kfreebsd.patch | 149 ---------------------
debian/patches/series | 2 -
4 files changed, 1 insertion(+), 200 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index de3bd21..3087cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
pulseaudio (5.99.2-1) UNRELEASED; urgency=medium
* New upstream release candidate
+ * Remove all patches: applied upstream
-- Felipe Sateler <fsateler at debian.org> Tue, 23 Dec 2014 21:16:10 -0300
diff --git a/debian/patches/disable-srbchannel-test-non-linux.patch b/debian/patches/disable-srbchannel-test-non-linux.patch
deleted file mode 100644
index f64b2a3..0000000
--- a/debian/patches/disable-srbchannel-test-non-linux.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: David Henningsson <david.henningsson at canonical.com>
-To: pulseaudio-discuss at lists.freedesktop.org
-Cc: fsateler at debian.org,
- David Henningsson <david.henningsson at canonical.com>
-Subject: [PATCH] build-sys: Don't build srbchannel-test on targets without srbchannel
-Date: Tue, 2 Dec 2014 09:31:11 +0100
-Message-Id: <1417509071-9050-1-git-send-email-david.henningsson at canonical.com>
-X-Mailer: git-send-email 1.9.1
-
-Reported-by: Felipe Sateler <fsateler at debian.org>
-Signed-off-by: David Henningsson <david.henningsson at canonical.com>
----
-
-So, I prefer having skipping the srbchannel test instead of having a succeding one
-in case there is no srbchannel functionality. Felipe, does this patch your issue?
-
- configure.ac | 1 +
- src/Makefile.am | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -449,6 +449,7 @@ AC_CHECK_HEADERS_ONCE([execinfo.h])
- AC_CHECK_HEADERS_ONCE([langinfo.h])
- AC_CHECK_HEADERS_ONCE([regex.h pcreposix.h])
-
-+AM_CONDITIONAL(HAVE_SYS_EVENTFD_H, test "x$ac_cv_header_sys_eventfd_h" = "xyes")
-
- #### Typdefs, structures, etc. ####
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -288,11 +288,15 @@ TESTS_daemon = \
-
- if !OS_IS_WIN32
- TESTS_default += \
-- srbchannel-test \
- sigbus-test \
- usergroup-test
- endif
-
-+if HAVE_SYS_EVENTFD_H
-+TESTS_default += \
-+ srbchannel-test
-+endif
-+
- if !OS_IS_DARWIN
- TESTS_default += \
- once-test
diff --git a/debian/patches/gnu-kfreebsd.patch b/debian/patches/gnu-kfreebsd.patch
deleted file mode 100644
index e606583..0000000
--- a/debian/patches/gnu-kfreebsd.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-commit 5b68e29061f3b8de676f36b68db1f9b6c163b677
-Author: Felipe Sateler <fsateler at debian.org>
-Date: Sun Aug 3 17:37:03 2014 -0400
-
- Fix #defines for Debian GNU/kFreeBSD
-
- Because debian does not run with the freebsd libc, but rather uses the
- GNU one, it chose to not define __FreeBSD__, but rather
- __FreeBSD_kernel__.
- Use the alternative when the functionality tested is for kernel
- features, and keep the __FreeBSD__ one when using freebsd libc headers.
-
---- a/src/pulsecore/atomic.h
-+++ b/src/pulsecore/atomic.h
-@@ -180,7 +180,7 @@ static inline bool pa_atomic_ptr_cmpxchg
- return r == old_p;
- }
-
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-
- #include <sys/cdefs.h>
- #include <sys/types.h>
---- a/src/pulsecore/sconv_sse.c
-+++ b/src/pulsecore/sconv_sse.c
-@@ -33,7 +33,7 @@
- #include "cpu-x86.h"
- #include "sconv.h"
-
--#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
-
- static const PA_DECLARE_ALIGNED (16, float, scale[4]) = { 0x8000, 0x8000, 0x8000, 0x8000 };
-
-@@ -163,7 +163,7 @@ static void pa_sconv_s16le_from_f32ne_ss
- #endif /* defined (__i386__) || defined (__amd64__) */
-
- void pa_convert_func_init_sse(pa_cpu_x86_flag_t flags) {
--#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
-
- if (flags & PA_CPU_X86_SSE2) {
- pa_log_info("Initialising SSE2 optimized conversions.");
---- a/src/pulsecore/svolume_mmx.c
-+++ b/src/pulsecore/svolume_mmx.c
-@@ -34,7 +34,7 @@
-
- #include "sample-util.h"
-
--#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
- /* in s: 2 int16_t samples
- * in v: 2 int32_t volumes, fixed point 16:16
- * out s: contains scaled and clamped int16_t samples.
-@@ -240,15 +240,15 @@ static void pa_volume_s16re_mmx(int16_t
- );
- }
-
--#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
-+#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
-
- void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) {
--#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
- if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) {
- pa_log_info("Initialising MMX optimized volume functions.");
-
- pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_mmx);
- pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_mmx);
- }
--#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
-+#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
- }
---- a/src/pulsecore/svolume_sse.c
-+++ b/src/pulsecore/svolume_sse.c
-@@ -34,7 +34,7 @@
-
- #include "sample-util.h"
-
--#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
-
- #define VOLUME_32x16(s,v) /* .. | vh | vl | */ \
- " pxor %%xmm4, %%xmm4 \n\t" /* .. | 0 | 0 | */ \
-@@ -251,15 +251,15 @@ static void pa_volume_s16re_sse2(int16_t
- );
- }
-
--#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
-+#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
-
- void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) {
--#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
- if (flags & PA_CPU_X86_SSE2) {
- pa_log_info("Initialising SSE2 optimized volume functions.");
-
- pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_sse2);
- pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_sse2);
- }
--#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
-+#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
- }
---- a/src/tests/once-test.c
-+++ b/src/tests/once-test.c
-@@ -24,8 +24,10 @@
- #ifdef HAVE_PTHREAD
- #include <pthread.h>
- #ifdef HAVE_PTHREAD_SETAFFINITY_NP
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#ifdef __FreeBSD__
- #include <pthread_np.h>
-+#endif
- #include <sys/param.h>
- #include <sys/cpuset.h>
- #endif
-@@ -63,7 +65,7 @@ static void thread_func(void *data) {
-
- #ifdef HAVE_PTHREAD_SETAFFINITY_NP
- static pa_atomic_t i_cpu = PA_ATOMIC_INIT(0);
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- cpuset_t mask;
- #else
- cpu_set_t mask;
---- a/src/tests/rtstutter.c
-+++ b/src/tests/rtstutter.c
-@@ -31,8 +31,10 @@
- #ifdef HAVE_PTHREAD
- #include <pthread.h>
- #ifdef HAVE_PTHREAD_SETAFFINITY_NP
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#ifdef __FreeBSD__
- #include <pthread_np.h>
-+#endif
- #include <sys/param.h>
- #include <sys/cpuset.h>
- #endif
-@@ -61,7 +63,7 @@ static void work(void *p) {
-
- #ifdef HAVE_PTHREAD_SETAFFINITY_NP
- {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- cpuset_t mask;
- #else
- cpu_set_t mask;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cbbeeed..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-gnu-kfreebsd.patch
-disable-srbchannel-test-non-linux.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git
More information about the pkg-pulseaudio-devel
mailing list