diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2004-03-10 12:21:15 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2004-03-10 12:21:15 +0000 |
| commit | 12b79940f231cf8de08902d3539cd2dde8f64271 (patch) | |
| tree | 68d53eb0c5087353569dcd19dca846ea2bdc3143 /audio/jack | |
| parent | Declare CONFLICTS with earlier versions of qt3.x. (diff) | |
Remove BROKEN, my soundcard was locked by arts *sigh*
Really fix the cpu MHz detection.
Notes
Notes:
svn path=/head/; revision=103520
Diffstat (limited to 'audio/jack')
| -rw-r--r-- | audio/jack/Makefile | 2 | ||||
| -rw-r--r-- | audio/jack/files/patch-client.c | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 93a8d5677a2c..6ab2ed6b247c 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -17,8 +17,6 @@ COMMENT= JACK is a low-latency audio server LIB_DEPENDS= portaudio.0:${PORTSDIR}/audio/portaudio \ sndfile.1:${PORTSDIR}/audio/libsndfile -BROKEN= "Work in progress" - CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" GNU_CONFIGURE= yes diff --git a/audio/jack/files/patch-client.c b/audio/jack/files/patch-client.c index bd2fe8768ddf..edbe8e4d1bfa 100644 --- a/audio/jack/files/patch-client.c +++ b/audio/jack/files/patch-client.c @@ -1,5 +1,5 @@ --- libjack/client.c.orig Sun Jan 11 20:07:14 2004 -+++ libjack/client.c Wed Mar 10 12:32:47 2004 ++++ libjack/client.c Wed Mar 10 13:13:55 2004 @@ -26,20 +26,23 @@ #else #include <sys/poll.h> @@ -79,7 +79,7 @@ FILE *f = fopen("/proc/cpuinfo", "r"); if (f == 0) { -@@ -1803,6 +1823,24 @@ +@@ -1803,6 +1823,25 @@ return (jack_time_t)mhz; } } @@ -88,6 +88,7 @@ + int64_t tsc_start, tsc_end; + struct timeval tv_start, tv_end; + int usec_delay; ++ jack_time_t mhz; + + tsc_start = rdtsc(); + gettimeofday(&tv_start, NULL); @@ -97,9 +98,9 @@ + + usec_delay = 1000000 * (tv_end.tv_sec - tv_start.tv_sec) + + (tv_end.tv_usec - tv_start.tv_usec); -+ -+ printf("cpu MHz\t\t: %.3f\n", -+ (double)(tsc_end-tsc_start) / usec_delay); ++ mhz = (tsc_end - tsc_start) / usec_delay; ++ printf("cpu MHz:\t %.3f\n",(double) mhz); ++ return mhz; +#endif } |