[149848] trunk/dports/audio/jack

[jeremyhu at macports.org]

Revision: 149848
          https://trac.macports.org/changeset/149848
Author:   jeremyhu at macports.org
Date:     2016-07-03 23:06:21 -0700 (Sun, 03 Jul 2016)
Log Message:
-----------
jack: Fix a Sierra build failure

Modified Paths:
--------------
    trunk/dports/audio/jack/Portfile

Added Paths:
-----------
    trunk/dports/audio/jack/files/clock_nanosleep_check.patch

Modified: trunk/dports/audio/jack/Portfile
===================================================================
--- trunk/dports/audio/jack/Portfile	2016-07-03 18:00:49 UTC (rev 149847)
+++ trunk/dports/audio/jack/Portfile	2016-07-04 06:06:21 UTC (rev 149848)
@@ -30,7 +30,8 @@
 
 patchfiles-append \
     carbon.patch \
-    deploymenttarget.patch
+    deploymenttarget.patch \
+    clock_nanosleep_check.patch
 
 platform darwin {
     if {${os.major} >= 12} {

Added: trunk/dports/audio/jack/files/clock_nanosleep_check.patch
===================================================================
--- trunk/dports/audio/jack/files/clock_nanosleep_check.patch	                        (rev 0)
+++ trunk/dports/audio/jack/files/clock_nanosleep_check.patch	2016-07-04 06:06:21 UTC (rev 149848)
@@ -0,0 +1,47 @@
+--- configure.ac
++++ configure.ac
+@@ -285,6 +285,20 @@ AC_CHECK_FUNC(clock_gettime,
+ 	   ])
+ )
+ 
++AC_CHECK_FUNC(clock_nanosleep,
++       [
++           AC_DEFINE(HAVE_CLOCK_NANOSLEEP,0,"Whether or not clock_nanosleep can be found in system libraries")
++       ],
++       #
++       # if not found, check librt specifically
++       #
++       AC_CHECK_LIB(rt, clock_nanosleep,
++           [
++              AC_DEFINE(HAVE_CLOCK_NANOSLEEP,1,"Whether or not clock_nanosleep can be found in system libraries")
++	      OS_LDFLAGS="$OS_LDFLAGS -lrt"
++	   ])
++)
++
+ # should we use mlockall() on this platform?
+ if test "x$JACK_DO_NOT_MLOCK" = "x"; then
+     AC_CHECK_HEADER(sys/mman.h,
+--- drivers/dummy.orig/dummy_driver.c	2016-07-03 23:01:57.000000000 -0700
++++ drivers/dummy/dummy_driver.c	2016-07-03 23:02:47.000000000 -0700
+@@ -73,7 +73,7 @@ FakeVideoSync( dummy_driver_t *driver )
+         }
+ }
+ 
+-#ifdef HAVE_CLOCK_GETTIME
++#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_NANOSLEEP)
+ static inline unsigned long long ts_to_nsec(struct timespec ts)
+ {
+     return ts.tv_sec * 1000000000LL + ts.tv_nsec;
+--- drivers/dummy.orig/dummy_driver.h	2016-07-03 23:01:57.000000000 -0700
++++ drivers/dummy/dummy_driver.h	2016-07-03 23:02:50.000000000 -0700
+@@ -44,7 +44,7 @@ struct _dummy_driver
+     jack_nframes_t  period_size;
+     unsigned long   wait_time;
+ 
+-#ifdef HAVE_CLOCK_GETTIME
++#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_NANOSLEEP)
+     struct timespec next_wakeup;
+ #else
+     jack_time_t     next_time;
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160703/34eadafc/attachment.html>