diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-11-17 21:07:15 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-11-17 21:07:15 +0000 |
| commit | b4340bf78e847ef8579e957b7854229cce8cc8bf (patch) | |
| tree | 768e9772fd4466b4b9297f281ce87d829baf8913 /audio/csound/files/patch-Top_csound.c | |
| parent | Update to 4.0.10 (diff) | |
Move audio/csound6 -> audio/csound
Having the version in its name doesn't make sense because this is a stable package.
Notes
Notes:
svn path=/head/; revision=485197
Diffstat (limited to 'audio/csound/files/patch-Top_csound.c')
| -rw-r--r-- | audio/csound/files/patch-Top_csound.c | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/audio/csound/files/patch-Top_csound.c b/audio/csound/files/patch-Top_csound.c new file mode 100644 index 000000000000..e5b3f6e4fd2a --- /dev/null +++ b/audio/csound/files/patch-Top_csound.c @@ -0,0 +1,65 @@ +--- Top/csound.c.orig 2018-11-07 14:05:23 UTC ++++ Top/csound.c +@@ -60,10 +60,14 @@ + //#include "cs_par_dispatch.h" + #include "find_opcode.h" + +-#if defined(linux)||defined(__HAIKU__)|| defined(__EMSCRIPTEN__)||defined(__CYGWIN__) ++#if defined(linux) || defined(__FreeBSD__) || defined(__HAIKU__)|| defined(__EMSCRIPTEN__)||defined(__CYGWIN__) + #define PTHREAD_SPINLOCK_INITIALIZER 0 + #endif + ++#if defined(__FreeBSD__) ++#include <sys/sysctl.h> ++#endif ++ + #include "csound_standard_types.h" + + #include "csdebug.h" +@@ -405,7 +409,7 @@ static const CSOUND cenviron_ = { + rewriteheader, + csoundLoadSoundFile, + fdrecord, +- fdclose, ++ fd__close, + csoundCreateFileHandle, + csoundGetFileName, + csoundFileClose, +@@ -3755,7 +3759,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 +@@ -3768,6 +3772,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]; + +@@ -3803,9 +3814,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 */ |