aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/gpac-libgpac
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2012-05-19 15:17:23 +0800
committermm <mm@FreeBSD.org>2012-05-19 15:17:23 +0800
commitd8bdaba2017e76a354d49f901a355d70256c1312 (patch)
treedd6273c31adf1bf4cd81d18441940ff76b85c8d6 /multimedia/gpac-libgpac
parent608644dab8c24bd853c104564812cecaee32b700 (diff)
downloadfreebsd-ports-gnome-d8bdaba2017e76a354d49f901a355d70256c1312.tar.gz
freebsd-ports-gnome-d8bdaba2017e76a354d49f901a355d70256c1312.tar.zst
freebsd-ports-gnome-d8bdaba2017e76a354d49f901a355d70256c1312.zip
Fix X11 support
Disable OpenGL support by default (nobody complained with a broken X11) Enable optional libXv support
Diffstat (limited to 'multimedia/gpac-libgpac')
-rw-r--r--multimedia/gpac-libgpac/Makefile42
1 files changed, 26 insertions, 16 deletions
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index c9ce28762b4b..abb222824ada 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpac
PORTVERSION= 0.4.5
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
@@ -29,22 +29,44 @@ LIBVER= 1
OPTIONS= IPV6 "IPv6 support" on \
JPEG "JPEG support" on \
- OPENGL "OpenGL support" on \
+ OPENGL "OpenGL support" off \
OPENSSL "OpenSSL support" on \
- PNG "PNG support" on
+ PNG "PNG support" on \
+ XVIDEO "Xvideo support (libXv)" off
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --cc="${CC}" --X11-path="${X11BASE}" \
+CONFIGURE_ARGS= --cc="${CC}" --X11-path="${LOCALBASE}" \
--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \
--enable-pic \
+ --disable-wx \
--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \
--use-ft=no --use-mad=no --use-ogg=no \
--use-openjpeg=no --use-theora=no --usr-vorbis=no
CONFIGURE_ENV+= LIBVER="${LIBVER}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_OPENSSL)
+USE_OPENSSL= yes
+.else
+CONFIGURE_ARGS+= --disable-ssl
+.endif
+
+.if defined(WITH_OPENGL)
+USE_GL= gl glu
+.else
+CONFIGURE_ARGS+= --disable-opengl
+.endif
+
+.if defined(WITH_XVIDEO)
+LIB_DEPENDS+= Xv.1:${PORTSDIR}/x11/libXv
+.else
+CONFIGURE_ARGS+= --disable-x11-xv --disable-x11-shm
+.endif
+
.include <bsd.port.pre.mk>
.if defined(WITHOUT_IPV6)
@@ -58,18 +80,6 @@ CONFIGURE_ARGS+= --use-jpeg=local
CONFIGURE_ARGS+= --use-jpeg=no
.endif
-.if defined(WITHOUT_OPENGL)
-CONFIGURE_ARGS+= --disable-opengl
-.else
-USE_GL= gl glu
-.endif
-
-.if !defined(WITHOUT_OPENSSL)
-USE_OPENSSL= yes
-.else
-CONFIGURE_ARGS+= --disable-ssl
-.endif
-
.if !defined(WITHOUT_PNG)
LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --use-png=local