1 files changed, 99 insertions, 16 deletions

diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 38ac68e3843b..f2a175dbe9b5 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libquicktime
-PORTVERSION=	1.0.0
-PORTREVISION=	5
+PORTVERSION=	1.0.2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,17 +14,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A library for reading and writing quicktime files
 
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		dv.4:${PORTSDIR}/multimedia/libdv \
-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		faad.0:${PORTSDIR}/audio/faad \
-		x264.50:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
-USE_GL=		yes
 USE_GNOME=	gnometarget gnomehack pkgconfig
 WANT_GNOME=	yes
 USE_GMAKE=	yes
@@ -33,11 +24,19 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lintl"
-CONFIGURE_ARGS=	--disable-firewire --with-x --enable-gpl
+CONFIGURE_ARGS=	--with-x --enable-gpl
 CFLAGS+=	-fPIC
 MAN1=		lqtplay.1
 
 OPTIONS=	LAME "Enable Lame mp3 encoding support" Off \
+		OPENGL "Enable OpenGL support" On \
+		DV "Enable libdv support for digital cameras" On \
+		JPEG "Enable JPEG support" On \
+		PNG "Enable PNG support" On \
+		FFMPEG "Enable FFmpeg support" On \
+		FAAC "Enable FAAC support" Off \
+		FAAD "Enable FAAD support" On \
+		X264 "Enable X264 codec support" On \
 		GTK2 "Enable Gtk+2 Frontend" Off \
 		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
 
@@ -49,22 +48,95 @@ PORTDOCS=	api_usage.html codecs.html qt4l_building.html \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITH_OPTIMIZED_CFLAGS)
-CONFIGURE_ARGS+=--without-cpuflags
+CONFIGURE_ARGS+=	--without-cpuflags
 .endif
 
 .if ${HAVE_GNOME:Mgtk20}!="" && defined(WITH_GTK2)
 USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=	--with-gtk
 PLIST_SUB+=	GTK=""
 .else
-CONFIGURE_ARGS+=--without-gtk
+CONFIGURE_ARGS+=	--without-gtk
 PLIST_SUB+=	GTK="@comment "
 .endif
 
-.if defined(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.a)
+.if defined(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 PLIST_SUB+=	LAME=""
+CONFIGURE_ARGS+=	--with-lame
 .else
 PLIST_SUB+=	LAME="@comment "
+CONFIGURE_ARGS+=	--without-lame
+.endif
+
+.if !defined(WITHOUT_OPENGL)
+USE_GL=		yes
+CONFIGURE_ARGS+=	--with-opengl
+.else
+CONFIGURE_ARGS+=	--without-opengl
+.endif
+
+.if !defined(WITHOUT_DV)
+LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
+PLIST_SUB+=	DV=""
+CONFIGURE_ARGS+=	--with-libdv
+.else
+PLIST_SUB+=	DV="@comment "
+CONFIGURE_ARGS+=	--without-libdv
+.endif
+
+.if !defined(WITHOUT_JPEG)
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=	JPEG=""
+CONFIGURE_ARGS+=	--with-libjpeg
+.else
+PLIST_SUB+=	JPEG="@comment "
+CONFIGURE_ARGS+=	--without-libjpeg
+.endif
+
+.if !defined(WITHOUT_PNG)
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=	PNG=""
+CONFIGURE_ARGS+=	--with-libpng
+.else
+PLIST_SUB+=	PNG="@comment "
+CONFIGURE_ARGS+=	--without-libpng
+.endif
+
+.if !defined(WITHOUT_FFMPEG)
+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+PLIST_SUB+=	FFMPEG=""
+CONFIGURE_ARGS+=	--with-ffmpeg
+.else
+PLIST_SUB+=	FFMPEG="@comment "
+CONFIGURE_ARGS+=	--without-ffmpeg
+.endif
+
+.if defined(WITH_FAAC)
+LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+PLIST_SUB+=	FAAC=""
+CONFIGURE_ARGS+=	--with-faac
+.else
+PLIST_SUB+=	FAAC="@comment "
+CONFIGURE_ARGS+=	--without-faac
+.endif
+
+.if !defined(WITHOUT_FAAD)
+LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+PLIST_SUB+=	FAAD=""
+CONFIGURE_ARGS+=	--with-faad2
+.else
+PLIST_SUB+=	FAAD="@comment "
+CONFIGURE_ARGS+=	--without-faad2
+.endif
+
+.if !defined(WITHOUT_X264)
+LIB_DEPENDS+=	x264.50:${PORTSDIR}/multimedia/x264
+PLIST_SUB+=	X264=""
+CONFIGURE_ARGS+=	--with-x264
+.else
+PLIST_SUB+=	X264="@comment "
+CONFIGURE_ARGS+=	--without-x264
 .endif
 
 .if ${MACHINE_CPU:Mmmx}
@@ -73,6 +145,14 @@ CONFIGURE_ARGS+=	--enable-mmx
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
 		${WRKSRC}/plugins/audiocodec/* \
@@ -81,8 +161,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-DG.*_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/configure*
 
-post-install:
+pre-configure:
+	@${CHMOD} +x ${WRKSRC}/configure
+
 .if !defined(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}