From 9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Tue, 26 Jul 2016 16:51:15 +0000 Subject: Cleanup patches, a* categories. Rename them to follow the make makepatch naming, and regenerate them. With hat: portmgr Sponsored by: Absolight --- .../files/patch-src__bindings__fluid_rtkit.c | 39 ---------------------- .../files/patch-src__drivers__fluid_alsa.c | 17 ---------- .../files/patch-src__drivers__fluid_oss.c | 15 --------- .../files/patch-src_bindings_fluid__rtkit.c | 39 ++++++++++++++++++++++ .../files/patch-src_drivers_fluid__alsa.c | 20 +++++++++++ .../files/patch-src_drivers_fluid__oss.c | 15 +++++++++ 6 files changed, 74 insertions(+), 71 deletions(-) delete mode 100644 audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c delete mode 100644 audio/fluidsynth/files/patch-src__drivers__fluid_alsa.c delete mode 100644 audio/fluidsynth/files/patch-src__drivers__fluid_oss.c create mode 100644 audio/fluidsynth/files/patch-src_bindings_fluid__rtkit.c create mode 100644 audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c create mode 100644 audio/fluidsynth/files/patch-src_drivers_fluid__oss.c (limited to 'audio/fluidsynth/files') diff --git a/audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c b/audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c deleted file mode 100644 index 47478bd79733..000000000000 --- a/audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c +++ /dev/null @@ -1,39 +0,0 @@ ---- src/bindings/fluid_rtkit.c.orig 2011-09-04 16:38:58.000000000 +0900 -+++ src/bindings/fluid_rtkit.c 2011-09-05 17:07:06.000000000 +0900 -@@ -34,7 +34,7 @@ - #include "fluid_rtkit.h" - - --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) - - #ifndef _GNU_SOURCE - #define _GNU_SOURCE -@@ -44,12 +44,27 @@ - #include - #include - #include -+#include - #include - #include -+#include - -+#if defined(__FreeBSD__) -+#include -+#endif - - static pid_t _gettid(void) { -+#if defined(__FreeBSD__) -+#if __FreeBSD__version > 900030 -+ return pthread_getthreadid_np(); -+#else -+ long tid; -+ syscall(SYS_thr_self, &tid); -+ return tid; -+#endif -+#else - return (pid_t) syscall(SYS_gettid); -+#endif - } - - static int translate_error(const char *name) { diff --git a/audio/fluidsynth/files/patch-src__drivers__fluid_alsa.c b/audio/fluidsynth/files/patch-src__drivers__fluid_alsa.c deleted file mode 100644 index 26d07b59f84a..000000000000 --- a/audio/fluidsynth/files/patch-src__drivers__fluid_alsa.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/drivers/fluid_alsa.c 2012-08-16 00:01:13.000000000 -0400 -+++ src/drivers/fluid_alsa.c 2014-12-20 12:59:44.000000000 -0500 -@@ -348,5 +348,4 @@ - snd_pcm_wait(pcm, 1); - break; -- case -EPIPE: - case -EBADFD: - if (snd_pcm_prepare(pcm) != 0) { -@@ -355,5 +354,8 @@ - } - break; -+ case -EPIPE: -+#if EPIPE != ESTRPIPE - case -ESTRPIPE: -+#endif - if ((snd_pcm_resume(pcm) != 0) && (snd_pcm_prepare(pcm) != 0)) { - FLUID_LOG(FLUID_ERR, "Failed to resume the audio device"); diff --git a/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c b/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c deleted file mode 100644 index dea1fe2b54a9..000000000000 --- a/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/drivers/fluid_oss.c.orig 2012-08-16 13:01:13.000000000 +0900 -+++ src/drivers/fluid_oss.c 2012-08-18 04:12:09.000000000 +0900 -@@ -45,9 +45,9 @@ - #define BUFFER_LENGTH 512 - - // Build issue on some systems (OSS 4.0)? --#ifdef SNDCTL_DSP_CHANNELS -- #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS --#endif -+// #ifdef SNDCTL_DSP_CHANNELS -+// #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS -+// #endif - - /** fluid_oss_audio_driver_t - * diff --git a/audio/fluidsynth/files/patch-src_bindings_fluid__rtkit.c b/audio/fluidsynth/files/patch-src_bindings_fluid__rtkit.c new file mode 100644 index 000000000000..2a36fb3bd018 --- /dev/null +++ b/audio/fluidsynth/files/patch-src_bindings_fluid__rtkit.c @@ -0,0 +1,39 @@ +--- src/bindings/fluid_rtkit.c.orig 2012-08-16 04:01:13 UTC ++++ src/bindings/fluid_rtkit.c +@@ -34,7 +34,7 @@ + #include "fluid_rtkit.h" + + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) + + #ifndef _GNU_SOURCE + #define _GNU_SOURCE +@@ -44,12 +44,27 @@ + #include + #include + #include ++#include + #include + #include ++#include + ++#if defined(__FreeBSD__) ++#include ++#endif + + static pid_t _gettid(void) { ++#if defined(__FreeBSD__) ++#if __FreeBSD__version > 900030 ++ return pthread_getthreadid_np(); ++#else ++ long tid; ++ syscall(SYS_thr_self, &tid); ++ return tid; ++#endif ++#else + return (pid_t) syscall(SYS_gettid); ++#endif + } + + static int translate_error(const char *name) { diff --git a/audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c b/audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c new file mode 100644 index 000000000000..bfa0dfb93968 --- /dev/null +++ b/audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c @@ -0,0 +1,20 @@ +--- src/drivers/fluid_alsa.c.orig 2012-08-16 04:01:13 UTC ++++ src/drivers/fluid_alsa.c +@@ -347,14 +347,16 @@ static int fluid_alsa_handle_write_error + case -EAGAIN: + snd_pcm_wait(pcm, 1); + break; +- case -EPIPE: + case -EBADFD: + if (snd_pcm_prepare(pcm) != 0) { + FLUID_LOG(FLUID_ERR, "Failed to prepare the audio device"); + return FLUID_FAILED; + } + break; ++ case -EPIPE: ++#if EPIPE != ESTRPIPE + case -ESTRPIPE: ++#endif + if ((snd_pcm_resume(pcm) != 0) && (snd_pcm_prepare(pcm) != 0)) { + FLUID_LOG(FLUID_ERR, "Failed to resume the audio device"); + return FLUID_FAILED; diff --git a/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c b/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c new file mode 100644 index 000000000000..dc5089f4b636 --- /dev/null +++ b/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c @@ -0,0 +1,15 @@ +--- src/drivers/fluid_oss.c.orig 2012-08-16 04:01:13 UTC ++++ src/drivers/fluid_oss.c +@@ -45,9 +45,9 @@ + #define BUFFER_LENGTH 512 + + // Build issue on some systems (OSS 4.0)? +-#ifdef SNDCTL_DSP_CHANNELS +- #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS +-#endif ++// #ifdef SNDCTL_DSP_CHANNELS ++// #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS ++// #endif + + /** fluid_oss_audio_driver_t + * -- cgit v1.2.3