- Update to 0.9.8

- Switch WITH_GTK to WITH_GTK2 to be on the same page as ports/KNOBS

5 files changed, 13 insertions, 51 deletions

diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index a6a0a3ac9267..0197d930bb98 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libquicktime
-PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTVERSION=	0.9.8
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,15 +28,14 @@ USE_GNOME=	gnometarget gnomehack pkgconfig
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--disable-firewire
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--disable-firewire --with-x
 CFLAGS+=	-fPIC
+MAN1=	lqtplay.1
 
 OPTIONS=	LAME "Enable Lame mp3 encoding support" Off \
-		GTK "Enable Gtk+2 Frontend" Off
-
-MAN1=	lqtplay.1
+		GTK2 "Enable Gtk+2 Frontend" Off
 
 PORTDOCS=	api_usage.html codecs.html qt4l_building.html \
 		qt4l_codecs.html qt4l_firewire.html qt4l_index.html \
@@ -46,7 +44,7 @@ PORTDOCS=	api_usage.html codecs.html qt4l_building.html \
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgtk20}!="" || defined(WITH_GTK)
+.if ${HAVE_GNOME:Mgtk20}!="" || defined(WITH_GTK2)
 USE_GNOME+=	gtk20
 PLIST_SUB+=	GTK=""
 .else
diff --git a/multimedia/libquicktime/distinfo b/multimedia/libquicktime/distinfo
index f50f653af769..d4b7bfaf0f3b 100644
--- a/multimedia/libquicktime/distinfo
+++ b/multimedia/libquicktime/distinfo
@@ -1,3 +1,3 @@
-MD5 (libquicktime-0.9.7.tar.gz) = e5c977567df59c876c50ac191bb1caf6
-SHA256 (libquicktime-0.9.7.tar.gz) = 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e
-SIZE (libquicktime-0.9.7.tar.gz) = 765719
+MD5 (libquicktime-0.9.8.tar.gz) = 2efb64ed0e1ccae66d0cadc1e806935a
+SHA256 (libquicktime-0.9.8.tar.gz) = 88fae8ea8e1f9e3a4ee36c28f7d235ab6f39ef7700ef83eff50cc3d7a7b491f5
+SIZE (libquicktime-0.9.8.tar.gz) = 858173
diff --git a/multimedia/libquicktime/files/patch-src::lqt_codecs.c b/multimedia/libquicktime/files/patch-src::lqt_codecs.c
deleted file mode 100644
index c328eb7034e8..000000000000
--- a/multimedia/libquicktime/files/patch-src::lqt_codecs.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/lqt_codecs.c.orig	Wed Mar  2 03:10:55 2005
-+++ src/lqt_codecs.c	Wed Mar  2 03:11:08 2005
-@@ -787,7 +787,6 @@
- 	((quicktime_codec_t*)file->vtracks[track].codec)->flush(file, track);
- }
- 
--#if 0
- int64_t quicktime_samples_to_bytes(quicktime_trak_t *track, long samples)
- {
- 	char *compressor = track->mdia.minf.stbl.stsd.table[0].format;
-@@ -802,7 +801,6 @@
- /* Default use the sample size specification for TWOS and RAW */
- 	return samples * channels * track->mdia.minf.stbl.stsd.table[0].sample_size / 8;
- }
--#endif
- int quicktime_codecs_flush(quicktime_t *file)
- {
- 	int result = 0;
diff --git a/multimedia/libquicktime/files/patch-src::lqt_quicktime.c b/multimedia/libquicktime/files/patch-src::lqt_quicktime.c
deleted file mode 100644
index f8d89bf2d5b7..000000000000
--- a/multimedia/libquicktime/files/patch-src::lqt_quicktime.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/lqt_quicktime.c.orig	Wed Mar  2 03:01:19 2005
-+++ src/lqt_quicktime.c	Wed Mar  2 03:01:34 2005
-@@ -1018,7 +1018,6 @@
-         return result;
- }
- 
--#if 0 /* This function is obsolete as it makes no sense for compressed codecs */
- long quicktime_read_audio(quicktime_t *file, char *audio_buffer, long samples, int track)
- {
- 	int64_t chunk_sample, chunk;
-@@ -1058,7 +1057,6 @@
- 	if(result) return 0;
- 	return total_bytes;
- }
--#endif
- 
- int quicktime_read_chunk(quicktime_t *file, char *output, int track, int64_t chunk, int64_t byte_start, int64_t byte_len)
- {
diff --git a/multimedia/libquicktime/pkg-plist b/multimedia/libquicktime/pkg-plist
index 710608b364a6..e1f06e34d150 100644
--- a/multimedia/libquicktime/pkg-plist
+++ b/multimedia/libquicktime/pkg-plist
@@ -2,7 +2,6 @@
 bin/lqt-config
 bin/lqt_transcode
 bin/lqtplay
-bin/lqtvrplay
 bin/qtdechunk
 bin/qtdump
 bin/qtinfo
@@ -11,17 +10,18 @@ bin/qtstreamize
 bin/qtyuv4toyuv
 include/lqt/colormodels.h
 include/lqt/lqt.h
-include/lqt/lqt1394_config.h
+include/lqt/lqt_atoms.h
 include/lqt/lqt_codecapi.h
 include/lqt/lqt_codecinfo.h
+include/lqt/lqt_qtvr.h
 include/lqt/lqt_version.h
-include/lqt/qtprivate.h
 include/lqt/quicktime.h
 lib/libquicktime.a
 lib/libquicktime.so
 lib/libquicktime.so.0
 lib/libquicktime/lqt_audiocodec.so
 lib/libquicktime/lqt_dv.so
+lib/libquicktime/lqt_ffmpeg.so
 %%LAME%%lib/libquicktime/lqt_lame.so
 lib/libquicktime/lqt_mjpeg.so
 lib/libquicktime/lqt_opendivx.so