6 files changed, 85 insertions, 37 deletions

diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index cf9dc81e0abc..4a8641b97b28 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,24 +7,26 @@
 #
 
 PORTNAME=	libquicktime
-PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTVERSION=	0.9.3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ahze@ahze.net
 COMMENT=	A library for reading and writing quicktime files
 
-LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
+		mp3lame.0:${PORTSDIR}/audio/lame \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		dv.4:${PORTSDIR}/multimedia/libdv
 
+INSTALLS_SHLIB=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-firewire
diff --git a/multimedia/libquicktime/distinfo b/multimedia/libquicktime/distinfo
index 9c5a1c075d9b..f06cc4942f89 100644
--- a/multimedia/libquicktime/distinfo
+++ b/multimedia/libquicktime/distinfo
@@ -1,2 +1,2 @@
-MD5 (libquicktime-0.9.2.tar.gz) = 1b42ca12966526647fa9a1b14fb947a1
-SIZE (libquicktime-0.9.2.tar.gz) = 666586
+MD5 (libquicktime-0.9.3.tar.gz) = 38d9dbe8a75ea0be13ffa16b858502ae
+SIZE (libquicktime-0.9.3.tar.gz) = 755988
diff --git a/multimedia/libquicktime/files/patch-configure b/multimedia/libquicktime/files/patch-configure
index 899abb0458e2..5700be5681a5 100644
--- a/multimedia/libquicktime/files/patch-configure
+++ b/multimedia/libquicktime/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Sep  7 02:15:25 2003
-+++ configure	Thu Nov 13 00:07:40 2003
-@@ -7674,6 +7674,7 @@
+--- configure.orig	Mon Jul 19 14:57:49 2004
++++ configure	Wed Jul 21 22:56:59 2004
+@@ -18443,6 +18443,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8985,7 +8986,7 @@
+@@ -20113,7 +20114,7 @@
  fi
  
  case $compile_mode in
@@ -17,3 +17,56 @@
  #define NDEBUG 1
  _ACEOF
  ;;
+@@ -24392,7 +24393,6 @@
+ 
+ have_libavcodec=false
+ 
+-AVCODEC_REQUIRED="0.4.8acl"
+ 
+ 
+   succeeded=no
+@@ -24446,42 +24446,13 @@
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+-     PKG_CONFIG_MIN_VERSION=0.9.0
+-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for avcodec_acl = $AVCODEC_REQUIRED" >&5
+-echo $ECHO_N "checking for avcodec_acl = $AVCODEC_REQUIRED... $ECHO_C" >&6
+-
+-        if $PKG_CONFIG --exists "avcodec_acl = $AVCODEC_REQUIRED" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-            succeeded=yes
+-
+-            echo "$as_me:$LINENO: checking AVCODEC_CFLAGS" >&5
+-echo $ECHO_N "checking AVCODEC_CFLAGS... $ECHO_C" >&6
+-            AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "avcodec_acl = $AVCODEC_REQUIRED"`
+-            echo "$as_me:$LINENO: result: $AVCODEC_CFLAGS" >&5
+-echo "${ECHO_T}$AVCODEC_CFLAGS" >&6
+-
+-            echo "$as_me:$LINENO: checking AVCODEC_LIBS" >&5
+-echo $ECHO_N "checking AVCODEC_LIBS... $ECHO_C" >&6
+-            AVCODEC_LIBS=`$PKG_CONFIG --libs "avcodec_acl = $AVCODEC_REQUIRED"`
+-            echo "$as_me:$LINENO: result: $AVCODEC_LIBS" >&5
+-echo "${ECHO_T}$AVCODEC_LIBS" >&6
+-        else
+             AVCODEC_CFLAGS=""
+-            AVCODEC_LIBS=""
++            AVCODEC_LIBS="-lavcodec"
++            succeeded="yes"
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+             AVCODEC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "avcodec_acl = $AVCODEC_REQUIRED"`
+ 
+-        fi
+-
+-
+-
+-     else
+-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+-     fi
+   fi
+ 
+   if test $succeeded = yes; then
diff --git a/multimedia/libquicktime/files/patch-include::lqt_fseek.h b/multimedia/libquicktime/files/patch-include::lqt_fseek.h
deleted file mode 100644
index 1847ef6a6e60..000000000000
--- a/multimedia/libquicktime/files/patch-include::lqt_fseek.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/lqt_fseek.h.orig	Thu Jan 23 03:04:20 2003
-+++ include/lqt_fseek.h	Wed Nov 12 23:27:17 2003
-@@ -16,6 +16,11 @@
- #define ftello64(a) lqt_ftello64(a)
- #endif
- 
-+#ifdef __FreeBSD__
-+#define FTELL ftello
-+#define FSEEK fseeko
-+#else
- #define FTELL ftello64
- #define FSEEK fseeko64
-+#endif
- 
diff --git a/multimedia/libquicktime/files/patch-ltmain.sh b/multimedia/libquicktime/files/patch-ltmain.sh
new file mode 100644
index 000000000000..fc420ce7c05d
--- /dev/null
+++ b/multimedia/libquicktime/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Wed Jul 21 23:06:52 2004
++++ ltmain.sh	Wed Jul 21 23:07:10 2004
+@@ -5428,10 +5428,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/multimedia/libquicktime/pkg-plist b/multimedia/libquicktime/pkg-plist
index 27f467aba5b0..a5f7fc246d91 100644
--- a/multimedia/libquicktime/pkg-plist
+++ b/multimedia/libquicktime/pkg-plist
@@ -1,16 +1,14 @@
 bin/libquicktime_config
 bin/lqt-config
+bin/lqt_transcode
 bin/lqtplay
 bin/qtdechunk
 bin/qtdump
 bin/qtinfo
 bin/qtrechunk
-bin/qtrecover
 bin/qtstreamize
 bin/qtyuv4toyuv
 include/quicktime/colormodels.h
-include/quicktime/jpeg.h
-include/quicktime/libmjpeg.h
 include/quicktime/lqt.h
 include/quicktime/lqt1394_config.h
 include/quicktime/lqt_codecapi.h
@@ -18,23 +16,17 @@ include/quicktime/lqt_codecinfo.h
 include/quicktime/lqt_version.h
 include/quicktime/qtprivate.h
 include/quicktime/quicktime.h
+lib/libquicktime.so
+lib/libquicktime.so.0
 lib/libquicktime/lqt_audiocodec.so
 lib/libquicktime/lqt_dv.so
-lib/libquicktime/lqt_ferguson.so
+lib/libquicktime/lqt_lame.so
 lib/libquicktime/lqt_mjpeg.so
 lib/libquicktime/lqt_opendivx.so
 lib/libquicktime/lqt_png.so
 lib/libquicktime/lqt_rtjpeg.so
-lib/libquicktime/lqt_svq.so
 lib/libquicktime/lqt_videocodec.so
 lib/libquicktime/lqt_vorbis.so
-lib/libquicktime/lqt_xanim.so
-lib/libquicktime.a
-lib/libquicktime.so
-lib/libquicktime.so.0
-lib/libquicktime_mjpeg.a
-lib/libquicktime_mjpeg.so
-lib/libquicktime_mjpeg.so.0
 share/aclocal/lqt.m4
 @dirrm lib/libquicktime
 @dirrm include/quicktime