diff options
| -rw-r--r-- | multimedia/gavl/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/gavl/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/gavl/files/patch-gavl-time.c | 24 | ||||
| -rw-r--r-- | multimedia/gavl/files/patch-gavl-timer.c | 17 |
4 files changed, 45 insertions, 8 deletions
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile index 6a3cda525f70..e9eca89505e4 100644 --- a/multimedia/gavl/Makefile +++ b/multimedia/gavl/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gavl -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} @@ -37,9 +36,6 @@ USE_GCC= 4.2+ .endif post-patch: - # This is possibly wrong, but benchmark does not affect library functionality, so - @${REINPLACE_CMD} -e 's|CLOCK_PROCESS_CPUTIME_ID|CLOCK_PROF|g' \ - ${WRKSRC}/src/benchmark.c .if !defined(WITH_OPTIMIZED_CFLAGS) @${REINPLACE_CMD} -e \ 's|-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math||g' \ diff --git a/multimedia/gavl/distinfo b/multimedia/gavl/distinfo index dfc5ebf788bc..dc9e6fd69e76 100644 --- a/multimedia/gavl/distinfo +++ b/multimedia/gavl/distinfo @@ -1,3 +1,3 @@ -MD5 (gavl-1.1.1.tar.gz) = dc37718ab20ed6728eb9e10d5bb3ad17 -SHA256 (gavl-1.1.1.tar.gz) = f29cce4a428a699a71705606ee13407e32a7fd3be825588f856d62877c6ca52a -SIZE (gavl-1.1.1.tar.gz) = 4550848 +MD5 (gavl-1.1.2.tar.gz) = 4a4e8b661a053c70f6842dc7a80f3d05 +SHA256 (gavl-1.1.2.tar.gz) = f30117056b24e876e7eb1224ec603c37b28b73e6377ad2238acef1de1d274ae5 +SIZE (gavl-1.1.2.tar.gz) = 4584326 diff --git a/multimedia/gavl/files/patch-gavl-time.c b/multimedia/gavl/files/patch-gavl-time.c new file mode 100644 index 000000000000..a436568a1769 --- /dev/null +++ b/multimedia/gavl/files/patch-gavl-time.c @@ -0,0 +1,24 @@ +--- gavl/time.c.orig 2010-01-14 19:32:51.000000000 +0100 ++++ gavl/time.c 2010-03-30 13:55:24.113853853 +0200 +@@ -44,7 +44,7 @@ + + + /* Sleep for a specified time */ +-#ifdef HAVE_CLOCK_MONOTONIC ++#if defined(HAVE_CLOCK_MONOTONIC) || defined(__FreeBSD__) + void gavl_time_delay(gavl_time_t * t) + { + struct timespec tm; +@@ -53,8 +53,12 @@ + tm.tv_sec = *t / 1000000; + tm.tv_nsec = (*t % 1000000)*1000; + ++#if defined(__FreeBSD__) ++ while(nanosleep(&tm, &rem)) ++#else + while(clock_nanosleep(CLOCK_MONOTONIC, 0, + &tm, &rem)) ++#endif + { + if(errno == EINTR) + { diff --git a/multimedia/gavl/files/patch-gavl-timer.c b/multimedia/gavl/files/patch-gavl-timer.c new file mode 100644 index 000000000000..b68cb0b34090 --- /dev/null +++ b/multimedia/gavl/files/patch-gavl-timer.c @@ -0,0 +1,17 @@ +--- gavl/timer.c.orig 2010-03-30 13:33:59.510537263 +0200 ++++ gavl/timer.c 2010-03-30 13:33:49.571212409 +0200 +@@ -109,7 +109,14 @@ + uint64_t gavl_benchmark_get_time(int config_flags) + { + struct timespec ts; ++#if defined(CLOCK_PROCESS_CPUTIME_ID) + clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts); ++#elif defined(CLOCK_PROF) ++ clock_gettime(CLOCK_PROF, &ts); ++#else ++ clock_gettime(CLOCK_REALTIME, &ts); ++#endif ++ + return (uint64_t)(ts.tv_sec) * 1000000000 + ts.tv_nsec; + } + |