aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/libquicktime
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/libquicktime')
-rw-r--r--multimedia/libquicktime/Makefile21
1 files changed, 2 insertions, 19 deletions
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 3be2815ea55e..1cdf501479ef 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libquicktime
PORTVERSION= 1.1.5
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -42,7 +42,6 @@ OPTIONS= OPENGL "Enable OpenGL support" On \
FAAC "Enable FAAC support" Off \
FAAD "Enable FAAD support" On \
X264 "Enable X264 codec support" On \
- X264_DEV "Require X264 from multimedia/x264-devel" Off \
SCHROEDINGER "Enable dirac support" On \
GTK2 "Enable Gtk+2 Frontend" Off \
OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
@@ -135,25 +134,9 @@ CONFIGURE_ARGS+= --without-faad2
.endif
.if !defined(WITHOUT_X264)
+LIB_DEPENDS+= x264.98:${PORTSDIR}/multimedia/x264
PLIST_SUB+= X264=""
CONFIGURE_ARGS+= --with-x264
-
-# Automatically choose the multimedia/x264-devel port if installed
-. if !defined(WITH_X264_DEV)
-. if exists(${LOCALBASE}/include/x264.h)
-X264_BUILD!= ${GREP} "define X264_BUILD .." ${LOCALBASE}/include/x264.h | ${AWK} '{ print $$3 }'
-. if ${X264_BUILD} == "93"
-_WANT_X264_DEVEL= yes
-. endif
-. endif
-. else
-_WANT_X264_DEVEL=yes
-. endif
-. if defined(_WANT_X264_DEVEL)
-LIB_DEPENDS+= x264.93:${PORTSDIR}/multimedia/x264-devel
-. else
-LIB_DEPENDS+= x264.85:${PORTSDIR}/multimedia/x264
-. endif
.else
PLIST_SUB+= X264="@comment "
CONFIGURE_ARGS+= --without-x264