6 files changed, 32 insertions, 90 deletions

diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 92ccc648f87e..dc07049992f6 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libquicktime
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,9 +25,9 @@ LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_GL=		yes
-USE_GNOME=	gnometarget gtk12
+USE_GNOME=	gnometarget gtk12 gnomehack pkgconfig
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-firewire
@@ -49,31 +48,13 @@ PORTDOCS=	codecs.html \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-WITHOUT_MMX=	yes
-WITHOUT_JPEGMMX=yes
-.endif
-
-.if !defined(WITHOUT_MMX) && (${ARCH} == "i386")
+.if ${MACHINE_CPU:Mmmx}
 CONFIGURE_ARGS+=	--enable-mmx
+LIB_DEPENDS+=	jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx
 .else
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
-.if !defined(WITHOUT_MMX) && !defined(WITHOUT_JPEGMMX)
-LIB_DEPENDS+=	jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_MMX)
-	@${ECHO_MSG} "===> Define WITHOUT_MMX if your system does not support MMX"
-	@${ECHO_MSG} "===>"
-.endif
-.if !defined(WITHOUT_JPEGMMX)
-	@${ECHO_MSG} "===> Define WITHOUT_JPEGMMX to disable graphics/jpeg-mmx support"
-	@${ECHO_MSG} "===>"
-.endif
-
 post-extract:
 	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
 		${WRKSRC}/plugins/audiocodec/* \
diff --git a/multimedia/libquicktime/distinfo b/multimedia/libquicktime/distinfo
index f06cc4942f89..1c52a9230c64 100644
--- a/multimedia/libquicktime/distinfo
+++ b/multimedia/libquicktime/distinfo
@@ -1,2 +1,2 @@
-MD5 (libquicktime-0.9.3.tar.gz) = 38d9dbe8a75ea0be13ffa16b858502ae
-SIZE (libquicktime-0.9.3.tar.gz) = 755988
+MD5 (libquicktime-0.9.4.tar.gz) = 8d93e4e3393942edc35511dd2e51a32d
+SIZE (libquicktime-0.9.4.tar.gz) = 782651
diff --git a/multimedia/libquicktime/files/patch-configure b/multimedia/libquicktime/files/patch-configure
index 5700be5681a5..c19ae9d39446 100644
--- a/multimedia/libquicktime/files/patch-configure
+++ b/multimedia/libquicktime/files/patch-configure
@@ -1,14 +1,6 @@
---- 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"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -20113,7 +20114,7 @@
+--- configure.orig	Wed Jan 12 17:17:29 2005
++++ configure	Wed Jan 12 20:19:58 2005
+@@ -21041,7 +21041,7 @@
  fi
  
  case $compile_mode in
@@ -17,47 +9,39 @@
  #define NDEBUG 1
  _ACEOF
  ;;
-@@ -24392,7 +24393,6 @@
- 
- have_libavcodec=false
- 
--AVCODEC_REQUIRED="0.4.8acl"
- 
- 
-   succeeded=no
-@@ -24446,42 +24446,13 @@
+@@ -26120,42 +26120,12 @@
       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
+-        echo "$as_me:$LINENO: checking for avcodec_acl >= \"0.4.8acl\"" >&5
+-echo $ECHO_N "checking for avcodec_acl >= \"0.4.8acl\"... $ECHO_C" >&6
 -
--        if $PKG_CONFIG --exists "avcodec_acl = $AVCODEC_REQUIRED" ; then
+-        if $PKG_CONFIG --exists "avcodec_acl >= "0.4.8acl"" ; 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_ACL_CFLAGS" >&5
+-echo $ECHO_N "checking AVCODEC_ACL_CFLAGS... $ECHO_C" >&6
+-            AVCODEC_ACL_CFLAGS=`$PKG_CONFIG --cflags "avcodec_acl >= "0.4.8acl""`
+-            echo "$as_me:$LINENO: result: $AVCODEC_ACL_CFLAGS" >&5
+-echo "${ECHO_T}$AVCODEC_ACL_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
+-            echo "$as_me:$LINENO: checking AVCODEC_ACL_LIBS" >&5
+-echo $ECHO_N "checking AVCODEC_ACL_LIBS... $ECHO_C" >&6
+-            AVCODEC_ACL_LIBS=`$PKG_CONFIG --libs "avcodec_acl >= "0.4.8acl""`
+-            echo "$as_me:$LINENO: result: $AVCODEC_ACL_LIBS" >&5
+-echo "${ECHO_T}$AVCODEC_ACL_LIBS" >&6
 -        else
-             AVCODEC_CFLAGS=""
--            AVCODEC_LIBS=""
-+            AVCODEC_LIBS="-lavcodec"
-+            succeeded="yes"
+             AVCODEC_ACL_CFLAGS=""
+-            AVCODEC_ACL_LIBS=""
++            AVCODEC_ACL_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"`
+-            AVCODEC_ACL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "avcodec_acl >= "0.4.8acl""`
  
 -        fi
 -
diff --git a/multimedia/libquicktime/files/patch-ltmain.sh b/multimedia/libquicktime/files/patch-ltmain.sh
deleted file mode 100644
index fc420ce7c05d..000000000000
--- a/multimedia/libquicktime/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/patch-plugins::Makefile.in b/multimedia/libquicktime/files/patch-plugins::Makefile.in
deleted file mode 100644
index 9455f1cc53ec..000000000000
--- a/multimedia/libquicktime/files/patch-plugins::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/Makefile.in.orig	Sun Sep  7 02:15:35 2003
-+++ plugins/Makefile.in	Thu Nov 13 00:37:05 2003
-@@ -152,7 +152,7 @@
- @HAVE_VORBIS_TRUE@vorbis_subdirs = vorbis
- @HAVE_VORBIS_FALSE@vorbis_subdirs = 
- 
--@HAVE_LIBAVCODEC_TRUE@libavcodec_subdirs = ffmpeg
-+@HAVE_LIBAVCODEC_TRUE@libavcodec_subdirs =
- @HAVE_LIBAVCODEC_FALSE@libavcodec = 
- 
- SUBDIRS = $(base_subdirs) $(jpeg_subdirs) $(dv_subdirs) \
diff --git a/multimedia/libquicktime/pkg-plist b/multimedia/libquicktime/pkg-plist
index a5f7fc246d91..49285a2d20c5 100644
--- a/multimedia/libquicktime/pkg-plist
+++ b/multimedia/libquicktime/pkg-plist
@@ -2,6 +2,7 @@ bin/libquicktime_config
 bin/lqt-config
 bin/lqt_transcode
 bin/lqtplay
+bin/lqtvrplay
 bin/qtdechunk
 bin/qtdump
 bin/qtinfo
@@ -16,6 +17,7 @@ include/quicktime/lqt_codecinfo.h
 include/quicktime/lqt_version.h
 include/quicktime/qtprivate.h
 include/quicktime/quicktime.h
+lib/libquicktime.a
 lib/libquicktime.so
 lib/libquicktime.so.0
 lib/libquicktime/lqt_audiocodec.so
@@ -27,6 +29,7 @@ lib/libquicktime/lqt_png.so
 lib/libquicktime/lqt_rtjpeg.so
 lib/libquicktime/lqt_videocodec.so
 lib/libquicktime/lqt_vorbis.so
+libdata/pkgconfig/libquicktime.pc
 share/aclocal/lqt.m4
 @dirrm lib/libquicktime
 @dirrm include/quicktime