From a28a1142b4467171d6609f3ac9176c4d58c097a2 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Fri, 20 Jul 2012 03:03:56 +0000 Subject: - Update to 1.0.25 - Convert to new options framework - alsa-plugins: - Add option: ARIFF_OSS for FreeBSD-specific patch - Revert ports/165247 per regression in ports/169767 - Unbreak arcam-av and usb_stream plugins - While I'm here, pet portlint by removing ABI version number from LIB_DEPENDS Changes: http://www.alsa-project.org/main/index.php/Changes_v1.0.24_v1.0.25 http://www.alsa-project.org/main/index.php/Changes_v1.0.23_v1.0.24 PR: ports/169841 Submitted by: Jan Beich (maintainer) --- audio/alsa-lib/files/patch-alsa-lib | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'audio/alsa-lib/files/patch-alsa-lib') diff --git a/audio/alsa-lib/files/patch-alsa-lib b/audio/alsa-lib/files/patch-alsa-lib index 79a6c46a1152..4bae5afd8627 100644 --- a/audio/alsa-lib/files/patch-alsa-lib +++ b/audio/alsa-lib/files/patch-alsa-lib @@ -102,7 +102,7 @@ typedef __compar_fn_t comparison_fn_t; --- include/sound/asound.h.orig 2009-09-09 20:34:54.000000000 +0800 +++ include/sound/asound.h 2009-09-15 00:44:37.000000000 +0800 -@@ -62,6 +62,31 @@ +@@ -62,6 +62,33 @@ #include #endif @@ -110,6 +110,8 @@ +#define ESTRPIPE 0x7a69 /* Linux PCM suspend errno, fehh?! */ +#define EBADFD EBADF + ++typedef uint64_t __u64; ++ +#define bswap_16(x) bswap16(x) +#define bswap_32(x) bswap32(x) +#define bswap_64(x) bswap64(x) @@ -182,6 +184,20 @@ #include #define __USE_GNU +--- src/conf.c.orig ++++ src/conf.c +@@ -428,7 +428,11 @@ beginning:

+ + #ifdef HAVE_LIBPTHREAD + static pthread_mutex_t snd_config_update_mutex = ++#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP + PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++#else ++ PTHREAD_MUTEX_INITIALIZER; ++#endif + #endif + + struct _snd_config { --- src/pcm/pcm.c.orig 2009-09-09 20:34:54.000000000 +0800 +++ src/pcm/pcm.c 2009-09-15 00:19:09.000000000 +0800 @@ -630,7 +630,9 @@ -- cgit v1.2.3