5 files changed, 91 insertions, 32 deletions

diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index face8fcabab9..2cc9cc3ef889 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,16 +16,25 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		png:${PORTSDIR}/graphics/png \
-		dv:${PORTSDIR}/graphics/libdv
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		dv.1:${PORTSDIR}/graphics/libdv \
+		png.5:${PORTSDIR}/graphics/png
 
+USE_MESA=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	glib12 gtk12
+USE_GNOME=	gtk12
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=	lqtplay.1
 
+CFLAGS+=	-O0
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|CFLAGS=".*-O3|CFLAGS="\$$CFLAGS|g ; \
+		 s|CFLAGS=".*-O6|CFLAGS="\$$CFLAGS|g' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/multimedia/libquicktime/files/patch-configure b/multimedia/libquicktime/files/patch-configure
new file mode 100644
index 000000000000..3b4e44b8ab70
--- /dev/null
+++ b/multimedia/libquicktime/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Jun 22 08:57:50 2002
++++ configure	Sat Aug 10 00:55:47 2002
+@@ -6591,6 +6591,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/multimedia/libquicktime/files/patch-plugins::rtjpeg::RTjpeg.h b/multimedia/libquicktime/files/patch-plugins::rtjpeg::RTjpeg.h
new file mode 100644
index 000000000000..11551e8204a8
--- /dev/null
+++ b/multimedia/libquicktime/files/patch-plugins::rtjpeg::RTjpeg.h
@@ -0,0 +1,15 @@
+--- plugins/rtjpeg/RTjpeg.h.orig	Tue Jun  4 05:04:22 2002
++++ plugins/rtjpeg/RTjpeg.h	Sat Aug 10 03:35:52 2002
+@@ -31,8 +31,12 @@
+ 		South Africa
+ */
+ 
++#ifdef HAVE_STDINT_H
+ #ifndef _STDINT_H
+ #include <stdint.h>
++#endif
++#else
++#include <inttypes.h>
+ #endif
+ 
+ #ifdef __RTJPEG_INTERNAL__
diff --git a/multimedia/libquicktime/files/patch-plugins::xanim::lqt_codec.c b/multimedia/libquicktime/files/patch-plugins::xanim::lqt_codec.c
new file mode 100644
index 000000000000..0aca3b5b676c
--- /dev/null
+++ b/multimedia/libquicktime/files/patch-plugins::xanim::lqt_codec.c
@@ -0,0 +1,48 @@
+--- plugins/xanim/lqt_codec.c.orig	Tue Jun 11 09:17:44 2002
++++ plugins/xanim/lqt_codec.c	Sat Aug 10 07:42:38 2002
+@@ -10,17 +10,15 @@
+                              int track)
+   {
+   int compressed_size, result, bpp, i, use_temp;
+-  int video_width, video_height;
+-
+-  fprintf(stderr, "Decode video_1\n");
+-  
+-  quicktime_trak_t *trak = file->vtracks[track].track;
+-  video_height = trak->tkhd.track_height;
+-  video_width = trak->tkhd.track_width;
+   
+   quicktime_video_map_t *vtrack = &(file->vtracks[track]);
++  quicktime_trak_t *trak = file->vtracks[track].track;
++  int video_height = trak->tkhd.track_height;
++  int video_width = trak->tkhd.track_width;
+   lqt_xanim_codec_1_t * codec = (lqt_xanim_codec_1_t*)(((quicktime_codec_t*)vtrack->codec)->priv);
+   
++  fprintf(stderr, "Decode video_1\n");
++
+   quicktime_set_video_position(file, vtrack->current_position, track);
+   compressed_size =
+     quicktime_frame_size(file, vtrack->current_position, track);
+@@ -127,16 +125,15 @@
+ 
+ void lqt_xanim_init_vcodec_1(quicktime_t * file, int track)
+   {
+-  int video_width, video_height, i;
+-
+-  init_xanimcodecs();
+-  
+-  quicktime_trak_t *trak = file->vtracks[track].track;
+-  video_height = trak->tkhd.track_height;
+-  video_width = trak->tkhd.track_width;
++  int i;
+ 
+   quicktime_video_map_t *vtrack = &(file->vtracks[track]);
++  quicktime_trak_t *trak = file->vtracks[track].track;
++  int video_height = trak->tkhd.track_height;
++  int video_width = trak->tkhd.track_width;
+   lqt_xanim_codec_1_t * codec = (lqt_xanim_codec_1_t*)(((quicktime_codec_t*)vtrack->codec)->priv);
++
++  init_xanimcodecs();
+ 
+   codec->info.cmd = 0;                                         /* decode or query */
+   codec->info.skip_flag = 0;                                   /* skip_flag */
diff --git a/multimedia/libquicktime/pkg-plist b/multimedia/libquicktime/pkg-plist
index 6eed17c8f911..0da82093d26b 100644
--- a/multimedia/libquicktime/pkg-plist
+++ b/multimedia/libquicktime/pkg-plist
@@ -16,43 +16,20 @@ include/quicktime/lqt_codecinfo.h
 include/quicktime/lqt_version.h
 include/quicktime/qtprivate.h
 include/quicktime/quicktime.h
-@dirrm include/quicktime
-lib/libquicktime/lqt_audiocodec.a
-lib/libquicktime/lqt_audiocodec.la
 lib/libquicktime/lqt_audiocodec.so
-lib/libquicktime/lqt_dv.a
-lib/libquicktime/lqt_dv.la
 lib/libquicktime/lqt_dv.so
-lib/libquicktime/lqt_ferguson.a
-lib/libquicktime/lqt_ferguson.la
 lib/libquicktime/lqt_ferguson.so
-lib/libquicktime/lqt_mjpeg.a
-lib/libquicktime/lqt_mjpeg.la
 lib/libquicktime/lqt_mjpeg.so
-lib/libquicktime/lqt_opendivx.a
-lib/libquicktime/lqt_opendivx.la
 lib/libquicktime/lqt_opendivx.so
-lib/libquicktime/lqt_png.a
-lib/libquicktime/lqt_png.la
 lib/libquicktime/lqt_png.so
-lib/libquicktime/lqt_rtjpeg.a
-lib/libquicktime/lqt_rtjpeg.la
 lib/libquicktime/lqt_rtjpeg.so
-lib/libquicktime/lqt_svq.a
-lib/libquicktime/lqt_svq.la
 lib/libquicktime/lqt_svq.so
-lib/libquicktime/lqt_videocodec.a
-lib/libquicktime/lqt_videocodec.la
 lib/libquicktime/lqt_videocodec.so
-lib/libquicktime/lqt_vorbis.a
-lib/libquicktime/lqt_vorbis.la
 lib/libquicktime/lqt_vorbis.so
-lib/libquicktime/lqt_xanim.a
-lib/libquicktime/lqt_xanim.la
 lib/libquicktime/lqt_xanim.so
 lib/libquicktime.a
-lib/libquicktime.la
 lib/libquicktime.so
 lib/libquicktime.so.0
-@dirrm lib/libquicktime
 share/aclocal/lqt.m4
+@dirrm lib/libquicktime
+@dirrm include/quicktime