From b0d0165dcbb63df308d6ab5ac66bcc00812851a5 Mon Sep 17 00:00:00 2001
From: Jeremy Messenger <mezz@FreeBSD.org>
Date: Wed, 3 Jan 2007 04:47:53 +0000
Subject: [PATCH] -Update to 0.9.10. -Add WITH_OPTIMIZED_CFLAGS knob, off by
 default. -Respect the CFLAGS/CPUTYPE.

Reviewed by:	ahze
---
 multimedia/libquicktime/Makefile  | 21 ++++++++++++++++-----
 multimedia/libquicktime/distinfo  |  6 +++---
 multimedia/libquicktime/pkg-plist |  2 --
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 7742e0065bbb..71be2231fbed 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libquicktime
-PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTVERSION=	0.9.10
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -31,10 +30,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-firewire --with-x
 CFLAGS+=	-fPIC
-MAN1=	lqtplay.1
+MAN1=		lqtplay.1
 
 OPTIONS=	LAME "Enable Lame mp3 encoding support" Off \
-		GTK2 "Enable Gtk+2 Frontend" Off
+		GTK2 "Enable Gtk+2 Frontend" Off \
+		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
 
 PORTDOCS=	api_usage.html codecs.html qt4l_building.html \
 		qt4l_codecs.html qt4l_firewire.html qt4l_index.html \
@@ -43,6 +43,10 @@ PORTDOCS=	api_usage.html codecs.html qt4l_building.html \
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+CONFIGURE_ARGS+=--without-cpuflags
+.endif
+
 .if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a)
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
 PLIST_SUB+=	FFMPEG=""
@@ -71,10 +75,17 @@ CONFIGURE_ARGS+=	--enable-mmx
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
-post-extract:
+post-patch:
 	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
 		${WRKSRC}/plugins/audiocodec/* \
 		${WRKSRC}/plugins/videocodec/*
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+	@${REINPLACE_CMD} -e 's|-O3 -funroll-all-loops -fomit-frame-pointer|${CFLAGS}|' \
+		${WRKSRC}/configure
+.else
+	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS} -O3|' \
+		${WRKSRC}/configure
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/libquicktime/distinfo b/multimedia/libquicktime/distinfo
index 5186f07ef3fe..02bea26df15e 100644
--- a/multimedia/libquicktime/distinfo
+++ b/multimedia/libquicktime/distinfo
@@ -1,3 +1,3 @@
-MD5 (libquicktime-0.9.9.tar.gz) = 4ac23264f22a22ff013722aa9d188190
-SHA256 (libquicktime-0.9.9.tar.gz) = b92f08e8e9a9e4be36dd5cdd4b1c5d31f0cc821569623b2f5f79b3e7ba8ed3da
-SIZE (libquicktime-0.9.9.tar.gz) = 926280
+MD5 (libquicktime-0.9.10.tar.gz) = 5ff99f1a7b22f9e1ed85240f736fd14c
+SHA256 (libquicktime-0.9.10.tar.gz) = 7b7335721957a2e37dbc427daa2753f1c16b7e7f8877e6e9b629b1dd011d1ecd
+SIZE (libquicktime-0.9.10.tar.gz) = 851578
diff --git a/multimedia/libquicktime/pkg-plist b/multimedia/libquicktime/pkg-plist
index 288a570ced9e..9c011f7c6e07 100644
--- a/multimedia/libquicktime/pkg-plist
+++ b/multimedia/libquicktime/pkg-plist
@@ -29,8 +29,6 @@ lib/libquicktime/lqt_dv.so
 %%FFMPEG%%lib/libquicktime/lqt_ffmpeg.so
 lib/libquicktime/lqt_mjpeg.la
 lib/libquicktime/lqt_mjpeg.so
-lib/libquicktime/lqt_opendivx.la
-lib/libquicktime/lqt_opendivx.so
 lib/libquicktime/lqt_png.la
 lib/libquicktime/lqt_png.so
 lib/libquicktime/lqt_rtjpeg.la