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 --- audio/csound6/files/patch-Top-csound.c | 55 ---------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 audio/csound6/files/patch-Top-csound.c (limited to 'audio/csound6/files/patch-Top-csound.c') diff --git a/audio/csound6/files/patch-Top-csound.c b/audio/csound6/files/patch-Top-csound.c deleted file mode 100644 index 25e11ee4875a..000000000000 --- a/audio/csound6/files/patch-Top-csound.c +++ /dev/null @@ -1,55 +0,0 @@ ---- Top/csound.c.orig 2015-04-25 19:06:23 UTC -+++ Top/csound.c -@@ -60,10 +60,13 @@ - #include "cs_par_dispatch.h" - #include "csound_orc_semantics.h" - --#if defined(linux) || defined(__HAIKU__) || defined(__EMSCRIPTEN__) -+#if defined(linux) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) - #define PTHREAD_SPINLOCK_INITIALIZER 0 - #endif - -+#if defined(__FreeBSD__) -+#include -+#endif - #if defined(USE_OPENMP) - #include - #endif /* USE_OPENMP */ -@@ -3495,7 +3498,7 @@ void csoundNotifyFileOpened(CSOUND* csou - /* ------------------------------------ */ - - #if defined(HAVE_RDTSC) --#if !(defined(LINUX) && defined(__GNUC__) && defined(__i386__)) -+#if !(defined(LINUX) && defined(__GNUC__) && defined(__i386__)) || !(defined(__FreeBSD__) && defined(__i386__)) - #undef HAVE_RDTSC - #endif - #endif -@@ -3508,6 +3511,13 @@ static double timeResolutionSeconds = -1 - static int getTimeResolution(void) - { - #if defined(HAVE_RDTSC) -+#if defined(__FreeBSD__) -+ size_t size; -+ int timeResolutionSeconds; -+ size = sizeof timeResolutionSeconds; -+ sysctlbyname("hw.clockrate", &timeResolutionSeconds, &size, NULL, 0); -+ -+#else - FILE *f; - char buf[256]; - -@@ -3543,9 +3553,14 @@ static int getTimeResolution(void) - } - } - fclose(f); -+#endif /* __FreeBSD__ */ - if (UNLIKELY(timeResolutionSeconds <= 0.0)) { - fprintf(stderr, Str("No valid CPU frequency entry " -+#if defined(__FreeBSD__) -+ "was found.\n")); -+#else - "was found in /proc/cpuinfo.\n")); -+#endif /* __FreeBSD__ */ - return -1; - } - /* MHz -> seconds */ -- cgit v1.2.3