aboutsummaryrefslogtreecommitdiff
path: root/multimedia/gavl
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-07-22 08:46:59 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-07-22 08:46:59 +0000
commitf0b1bac694b16aba1e508e72ba7eda2db9001612 (patch)
treefceed1d9c88db9a6b7ae0ef7cb549d1668496812 /multimedia/gavl
parent1c43feef109b2f695671632d8c4cf07154937c9b (diff)
downloadports-f0b1bac694b16aba1e508e72ba7eda2db9001612.tar.gz
ports-f0b1bac694b16aba1e508e72ba7eda2db9001612.zip
Notes
Diffstat (limited to 'multimedia/gavl')
-rw-r--r--multimedia/gavl/Makefile23
-rw-r--r--multimedia/gavl/distinfo4
-rw-r--r--multimedia/gavl/files/patch-gavl-timer.c17
-rw-r--r--multimedia/gavl/pkg-plist2
4 files changed, 18 insertions, 28 deletions
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index e8f7bd573134..6f4ffcf94e4c 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -6,17 +6,13 @@
#
PORTNAME= gavl
-PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTVERSION= 1.4.0
CATEGORIES= multimedia
MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= A library for handling uncompressed video and audio data
-LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
- samplerate.1:${PORTSDIR}/audio/libsamplerate
-
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
@@ -26,21 +22,30 @@ MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --without-cpuflags --without-doxygen
+CONFIGURE_ARGS= --with-cpuflags=none --without-doxygen
PORTDOCS= README
-OPTIONS= OPTIMIZED_CFLAGS "Additional optimizations" off
+OPTIONS_DEFINE= OPTIMIZED_CFLAGS PNG
+OPTIONS_DEFAULT= OPTIMIZED_CFLAGS PNG
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPNG}
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
+.else
+CONFIGURE_ARGS+= --disable-libpng
+.endif
.include <bsd.port.pre.mk>
-.if defined(WITH_OPTIMIZED_CFLAGS) && ${ARCH} == i386 && ${OSVERSION} < 700000
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && ${ARCH} == i386 && ${OSVERSION} < 700000
# Build fails on FreeBSD-6.3 i386 with optimized cflags with gcc 3.4
USE_GCC= 4.2+
.endif
post-patch:
-.if !defined(WITH_OPTIMIZED_CFLAGS)
+.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
@${REINPLACE_CMD} -e \
's|-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math||g' \
${WRKSRC}/configure
diff --git a/multimedia/gavl/distinfo b/multimedia/gavl/distinfo
index 8e36854734d8..fea464393e17 100644
--- a/multimedia/gavl/distinfo
+++ b/multimedia/gavl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gavl-1.2.0.tar.gz) = 814120339f7a99d35c36e0eb61ba6cf60bd939ee4a47d73a17f3ba1438c5f88e
-SIZE (gavl-1.2.0.tar.gz) = 4589139
+SHA256 (gavl-1.4.0.tar.gz) = 51aaac41391a915bd9bad07710957424b046410a276e7deaff24a870929d33ce
+SIZE (gavl-1.4.0.tar.gz) = 4592701
diff --git a/multimedia/gavl/files/patch-gavl-timer.c b/multimedia/gavl/files/patch-gavl-timer.c
deleted file mode 100644
index b68cb0b34090..000000000000
--- a/multimedia/gavl/files/patch-gavl-timer.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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;
- }
-
diff --git a/multimedia/gavl/pkg-plist b/multimedia/gavl/pkg-plist
index a93f69420857..c907714c2a27 100644
--- a/multimedia/gavl/pkg-plist
+++ b/multimedia/gavl/pkg-plist
@@ -4,6 +4,8 @@ include/gavl/gavl_version.h
include/gavl/gavldefs.h
include/gavl/gavldsp.h
include/gavl/gavltime.h
+include/gavl/metatags.h
+include/gavl/metadata.h
include/gavl/timecode.h
lib/libgavl.la
lib/libgavl.so