[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update: multimedia/libquicktime



attached is a diff to update multimedia/libquicktime to version 0.9.7.

source changes:
   many small bugfixes
   many compilation fixes for gcc4
   compilation now works with newer ffmpeg versions (a step in
     allowing me to update graphics/ffmpeg, which has been
     requested by jsg@)
   many gcc warnings fixed
   all audio decoders should now decode up to the last sample
   header files are now installed into $prefix/include/lqt to
     avoid conflicts with the native Quicktime API on OSX
   now encodes AVI files. For audio, you can use the mp3, sowt
     (uncompressed PCM) or ulaw codecs. For Video, you can use
     FFMPEG MSMpeg 4v3 (playable by the Divx codec on windows)
     or FFMPEG MJPEG. MJPEG AVIs are bidirectional compatible
     with blender.
   decode AVIs, but mostly those created by libquicktime
   some encoders were disabled to prevent spreading of horribly
     incompatible files
   support for reading and writing QuicktimeVR V1.0 object movies
     and single-node panoramas. Use lqtvrplay to test them.
   en-/decoding of Quicktime files with nonconstant framerates.
   2vuy en-/decoding 

port changes:
  no more USE_GMAKE
  USE_LIBTOOL=Yes
  SEPARATE_BUILD=concurrent
  CONFIGURE_STYLE=autoconf
  use my @openbsd.org email address

note, this will break multimedia/mjpegtools,-quicktime.  an update
for mjpegtools that fixes this will follow shortly.
multimedia/transcode,-quicktime, the only other port depending on
libquicktime will work with this update without any changes (doesn't
even need a WANTLIB update).

tested by me on i386 and amd64.  should be OK on macppc since that's
where most of the libquicktime development occurs, albeit under OSX
and linux.

OK?

-- 
<jakemsr_(_at_)_jakemsr_(_dot_)_com>
Index: multimedia/libquicktime/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- multimedia/libquicktime/Makefile	9 Feb 2005 23:41:43 -0000	1.3
+++ multimedia/libquicktime/Makefile	17 Dec 2005 20:48:12 -0000
@@ -4,13 +4,12 @@
 SHARED_ONLY=		Yes
 
 COMMENT=		library for reading and writing quicktime files
-DISTNAME=		libquicktime-0.9.3
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		libquicktime-0.9.7
 CATEGORIES=		multimedia
 
 HOMEPAGE=		http://libquicktime.sourceforge.net/
 
-MAINTAINER=		Jacob Meuser <jakemsr_(_at_)_jakemsr_(_dot_)_com>
+MAINTAINER=		Jacob Meuser <jakemsr_(_at_)_openbsd_(_dot_)_org>
 
 # LGPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -18,9 +17,12 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		GL GLU ICE SM X11 Xaw Xext Xi Xt Xv a52 c gdk \
-			glib gmodule gtk iconv intl m mp3lame ogg \
-			ossaudio pthread z
+WANTLIB=		GL GLU ICE SM X11 Xaw Xext Xrender Xt Xv \
+			atk-1.0.1011.3 c cairo fontconfig freetype \
+			glib-2.0.800.3 glitz gmodule-2.0.800.3 \
+			gobject-2.0.800.3 iconv intl \
+			m mp3lame ogg ossaudio pango-1.0.1001.1 \
+			pangocairo-1.0.1001.1 pangoft2-1.0.1001.1 pthread z
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libquicktime/}
 
@@ -28,14 +30,19 @@
 			jpeg.9::graphics/jpeg \
 			png.4::graphics/png \
 			dv.4::multimedia/libdv \
-			avcodec.4::graphics/ffmpeg
+			avcodec.4::graphics/ffmpeg \
+			gtk-x11-2.0.800.8,gdk-x11-2.0.800.8,gdk_pixbuf-2.0.800.8::x11/gtk+2
 
-USE_GMAKE=		Yes
 VMEM_WARNING=		Yes
 
-CONFIGURE_STYLE=	gnu
+AUTOCONF_VERSION=	2.59
+USE_LIBTOOL=		Yes
+
+SEPARATE_BUILD=		concurrent
+CONFIGURE_STYLE=	autoconf
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=		--disable-firewire
+CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
+			--disable-firewire
 
 .include <bsd.port.mk>
Index: multimedia/libquicktime/distinfo
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- multimedia/libquicktime/distinfo	5 Jan 2005 17:05:06 -0000	1.3
+++ multimedia/libquicktime/distinfo	17 Dec 2005 20:48:12 -0000
@@ -1,4 +1,4 @@
-MD5 (libquicktime-0.9.3.tar.gz) = 38d9dbe8a75ea0be13ffa16b858502ae
-RMD160 (libquicktime-0.9.3.tar.gz) = 0c9ab22887ef6980162385968a73b2cf210d1465
-SHA1 (libquicktime-0.9.3.tar.gz) = 42d40e6cf9df3efe2e56fb82edffa8775b3a3782
-SIZE (libquicktime-0.9.3.tar.gz) = 755988
+MD5 (libquicktime-0.9.7.tar.gz) = e5c977567df59c876c50ac191bb1caf6
+RMD160 (libquicktime-0.9.7.tar.gz) = a886cbc714306d94977616de7221a19298fa251d
+SHA1 (libquicktime-0.9.7.tar.gz) = 93346b8a9a411a4bdf97283fbf3ac8ed52252c73
+SIZE (libquicktime-0.9.7.tar.gz) = 765719
Index: multimedia/libquicktime/patches/patch-configure
===================================================================
RCS file: multimedia/libquicktime/patches/patch-configure
diff -N multimedia/libquicktime/patches/patch-configure
--- multimedia/libquicktime/patches/patch-configure	9 Feb 2005 23:41:43 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,130 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2005/02/09 23:41:43 naddy Exp $
---- configure.orig	Mon Jul 19 11:57:49 2004
-+++ configure	Mon Aug  9 03:17:56 2004
-@@ -3500,12 +3500,10 @@ nto-qnx)
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   fi
-   ;;
- 
-@@ -10040,6 +10038,21 @@ if test -z "$aix_libpath"; then aix_libp
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+      # C++ shared libraries are fairly broken
-+      ld_shlibs=no
-+      ;;
-+  openbsd*)
-+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+      hardcode_direct_CXX=yes
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+        archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+        export_dynamic_flag_spec_CXX='${wl}-E'
-+        whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      fi
-+      output_verbose_link_cmd='echo'
-+      ;;
-   osf3*)
-     case $cc_basename in
-       KCC)
-@@ -19822,11 +19835,11 @@ ASFLAGS=
- 
- 
- 
--COMMON_CFLAGS=" -finline-functions -Wall -Wno-unused -Winline"
-+COMMON_CFLAGS="$CFLAGS -finline-functions -Wall -Wno-unused -Winline"
- PROFILE_CFLAGS=" -pg -fprofile-arcs -ftest-coverage"
- DEBUG_CFLAGS=" -g3"
- 
--
-+if test "x$OPTIMIZE" = "xyes"; then
- OPTIMIZE_CFLAGS="-O3"
- 
- echo "$as_me:$LINENO: checking if $CC supports -funroll-all-loops flags" >&5
-@@ -20069,6 +20082,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-     else
-         :
-     fi
-+fi # OPTIMIZE = yes
- 
- # -Wno-unused-variable -Wno-unused-parameter
- # -std=gnu99
-@@ -20373,7 +20387,7 @@ fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_pthread_create" = no; then
-   for ac_lib in gthread pthread c_r; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+    LIBS="-$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -20409,7 +20423,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_search_pthread_create="-l$ac_lib"
-+  ac_cv_search_pthread_create="-$ac_lib"
- break
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23354,7 +23368,7 @@ fi;
-     VORBIS_LIBS="-L$libdir"
-   fi
- 
--  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
-+  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -logg -lm"
-   VORBISFILE_LIBS="-lvorbisfile"
-   VORBISENC_LIBS="-lvorbisenc"
- 
-@@ -23547,7 +23561,7 @@ if test "${ac_cv_lib_mp3lame_lame_decode
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmp3lame  -lm -lvorbis $LIBS"
-+LIBS="-lmp3lame  -lm -lvorbis -logg $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -24448,6 +24462,7 @@ fi
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+       if test X$with_ffmpeg_acl = Xyes ; then
-         echo "$as_me:$LINENO: checking for avcodec_acl = $AVCODEC_REQUIRED" >&5
- echo $ECHO_N "checking for avcodec_acl = $AVCODEC_REQUIRED... $ECHO_C" >&6
- 
-@@ -24476,8 +24491,13 @@ echo "${ECHO_T}$AVCODEC_LIBS" >&6
- 
-         fi
- 
-+      else
-+        echo "$as_me:$LINENO: result: yes" >&5
-+        echo "${ECHO_T}yes" >&6
-+        succeeded=yes
-+        AVCODEC_LIBS="-lavcodec -lmp3lame -la52 -lvorbisenc -lvorbis -logg -lm -lz -pthread"
-+      fi # ffmpeg_acl
- 
--
-      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";
-@@ -24682,7 +24702,7 @@ fi
- 
- # Set CPU specific compiler options
- 
--if test "x$RPM_OPT_FLAGS" = "x" ; then
-+if test "x$OPTIMIZE" = "xyes" ; then
-     # detect Athlon CPU
-     # the idea is to use -mcpu=athlon to get the important optimization
-     # but keep -march=${host_cpu} from the command line. -march=i686
Index: multimedia/libquicktime/patches/patch-configure_ac
===================================================================
RCS file: multimedia/libquicktime/patches/patch-configure_ac
diff -N multimedia/libquicktime/patches/patch-configure_ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ multimedia/libquicktime/patches/patch-configure_ac	17 Dec 2005 20:48:12 -0000
@@ -0,0 +1,91 @@
+$OpenBSD$
+--- configure.ac.orig	Thu May 26 06:35:22 2005
++++ configure.ac	Mon Dec  5 23:30:21 2005
+@@ -104,8 +104,10 @@ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(z, inflateEnd)
+ AC_CHECK_LIB(m, cos)
+ 
+-AC_SEARCH_LIBS(pthread_create, [gthread pthread c_r])
++dnl AC_SEARCH_LIBS(pthread_create, [gthread pthread c_r])
+ 
++LIBS="$LIBS -pthread"
++
+ AC_SUBST(LIBS)
+ 
+ AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h soundcard.h stddef.h)
+@@ -138,6 +140,9 @@ VORBIS_REQUIRED="1.0"
+  
+ have_vorbis=false
+ AH_TEMPLATE([HAVE_VORBIS], [Vorbis libraries are there])
++
++OLD_LIBS="$LIBS"
++LIBS="$LIBS -logg"
+   
+ XIPH_PATH_VORBIS(have_vorbis=true)
+ AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis = xtrue)
+@@ -145,7 +150,9 @@ AM_CONDITIONAL(HAVE_VORBIS, test x$have_
+ if test x$have_vorbis = xtrue; then
+ AC_DEFINE(HAVE_VORBIS)
+ fi
+- 
++
++LIBS="$OLD_LIBS"
++
+ AC_SUBST(VORBIS_REQUIRED)
+ 
+ dnl
+@@ -159,7 +166,7 @@ OLD_CFLAGS=$CFLAGS
+ OLD_LIBS=$LIBS
+ 
+ if test x$have_vorbis = xtrue; then
+-LIBS="$LIBS -lmp3lame -lvorbis -lm"
++LIBS="$LIBS -lmp3lame -lvorbis -logg -lm"
+ else
+ LIBS="$LIBS -lmp3lame -lm"
+ fi
+@@ -235,9 +242,9 @@ fi
+ ALSA_CFLAGS="$ALSA_CFLAGS"
+ AC_SUBST(ALSA_CFLAGS)
+ 
+-# NetBSD 2.0 (for whatever reason) moved the audio routines to a new place
+-AH_TEMPLATE([HAVE_LIBOSSAUDIO], [Have -lossaudio for NetBSD 2.x?])
+-AC_CHECK_LIB(ossaudio, _oss_ioctl)
++# NetBSD and OpenBSD have an OSS compatability library
++AH_TEMPLATE([HAVE_LIBOSSAUDIO], [Have -lossaudio for NetBSD and OpenBSD])
++AC_CHECK_LIB(ossaudio, _oss_ioctl, [have_libossaudio=true])
+ if test x$have_libossaudio = xtrue; then
+ AC_DEFINE(HAVE_LIBOSSAUDIO,1)
+ OSSAUDIO_LIBS=-lossaudio
+@@ -457,9 +464,14 @@ have_libavcodec=false
+ 
+ AVCODEC_BUILD="4734"
+ 
++OLD_LIBS="$LIBS"
++LIBS="$LIBS -lvorbis -lvorbisenc -logg -la52 -lmp3lame"
++
+ dnl PKG_CHECK_MODULES(AVCODEC, avcodec_acl = $AVCODEC_REQUIRED, have_libavcodec="true", have_libavcodec="false")
+ ACL_PATH_AVCODEC($AVCODEC_BUILD , have_libavcodec="true", have_libavcodec="false")
+ 
++LIBS="$OLD_LIBS"
++
+ AVCODEC_REQUIRED=$AVCODEC_VERSION
+ 
+ AM_CONDITIONAL(HAVE_LIBAVCODEC, test x$have_libavcodec = xtrue)
+@@ -581,7 +593,7 @@ COMMON_CFLAGS="-finline-functions -Wall 
+ 
+ dnl Optimizing flags
+ 
+-LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
++dnl LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
+ 
+ AH_TEMPLATE([NDEBUG],
+             [Causes debug code to e removed])
+@@ -590,7 +602,7 @@ if test x$LQT_DEBUG != xtrue; then
+ AC_DEFINE(NDEBUG)
+ fi
+ 
+-CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS"
++CFLAGS="$CFLAGS $OPT_CFLAGS $COMMON_CFLAGS"
+ 
+ # -L is required so that linker can find libquicktime when DESTDIR is used.
+ # libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404
Index: multimedia/libquicktime/patches/patch-ltmain_sh
===================================================================
RCS file: multimedia/libquicktime/patches/patch-ltmain_sh
diff -N multimedia/libquicktime/patches/patch-ltmain_sh
--- multimedia/libquicktime/patches/patch-ltmain_sh	4 Dec 2004 21:44:34 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,76 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2004/12/04 21:44:34 sturm Exp $
---- ltmain.sh.orig	Mon Jul 19 11:57:44 2004
-+++ ltmain.sh	Mon Aug  9 03:09:03 2004
-@@ -1354,6 +1354,17 @@ EOF
- 
-       -o) prev=output ;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd* | *-*-freebsd*)
-+	  # These systems use the -pthread flag for pthreads.
-+	  deplibs="$deplibs $arg"
-+	  continue
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-       -release)
- 	prev=release
- 	continue
-@@ -1898,6 +1909,22 @@ EOF
- 	  esac # linkmode
- 	  continue
- 	  ;; # -L
-+        -pthread)
-+	  case $host in
-+	  *-*-openbsd* | *-*-freebsd*)
-+	    # These systems use the -pthread flag for pthreads.
-+	    if test "$linkmode,$pass" = "prog,link"; then
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      deplibs="$deplib $deplibs"
-+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    continue
-+	    ;;
-+	  esac
-+          continue
-+	  ;;
- 	-R*)
- 	  if test "$pass" = link; then
- 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-@@ -1918,7 +1945,21 @@ EOF
- 	  fi
- 	  case $linkmode in
- 	  lib)
--	    if test "$deplibs_check_method" != pass_all; then
-+	    valid_a_lib=no
-+	    case $deplibs_check_method in
-+	      match_pattern*)
-+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+		if eval $echo \"$deplib\" 2>/dev/null \
-+		    | ${SED} 10q \
-+		    | ${EGREP} "$match_pattern_regex" > /dev/null; then
-+		  valid_a_lib=yes
-+		fi
-+		;;
-+	      pass_all)
-+		valid_a_lib=yes
-+		;;
-+            esac
-+	    if test "$valid_a_lib" != yes; then
- 	      $echo
- 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
- 	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -2403,7 +2444,7 @@ EOF
- 	    add_dir=
- 	    add=
- 	    # Finalize command for both is simple: just hardcode it.
--	    if test "$hardcode_direct" = yes; then
-+	    if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
- 	      add="$libdir/$linklib"
- 	    elif test "$hardcode_minus_L" = yes; then
- 	      add_dir="-L$libdir"
Index: multimedia/libquicktime/patches/patch-plugins_Makefile_in
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_Makefile_in
diff -N multimedia/libquicktime/patches/patch-plugins_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ multimedia/libquicktime/patches/patch-plugins_Makefile_in	17 Dec 2005 20:48:12 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- plugins/Makefile.in.orig	Thu May 26 18:57:30 2005
++++ plugins/Makefile.in	Sun Jul 31 14:26:54 2005
+@@ -58,7 +58,7 @@ RECURSIVE_TARGETS = all-recursive check-
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = audiocodec videocodec opendivx rtjpeg mjpeg dv png \
++DIST_SUBDIRS = audiocodec videocodec rtjpeg mjpeg dv png \
+ 	vorbis ffmpeg lame
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+@@ -242,7 +242,6 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ base_subdirs = audiocodec \
+ videocodec \
+-opendivx \
+ rtjpeg
+ 
+ @HAVE_LIBJPEG_FALSE_(_at_)_jpeg_subdirs = 
Index: multimedia/libquicktime/patches/patch-plugins_audiocodec_ulaw_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_audiocodec_ulaw_c
diff -N multimedia/libquicktime/patches/patch-plugins_audiocodec_ulaw_c
--- multimedia/libquicktime/patches/patch-plugins_audiocodec_ulaw_c	4 Dec 2004 21:44:34 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-plugins_audiocodec_ulaw_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
---- plugins/audiocodec/ulaw.c.orig	Mon Aug  9 03:20:47 2004
-+++ plugins/audiocodec/ulaw.c	Mon Aug  9 03:21:06 2004
-@@ -1,7 +1,9 @@
- #include "funcprotos.h"
- #include "quicktime.h"
- #include "ulaw.h"
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- 
- typedef struct
- {
Index: multimedia/libquicktime/patches/patch-plugins_mjpeg_libmjpeg_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_mjpeg_libmjpeg_c
diff -N multimedia/libquicktime/patches/patch-plugins_mjpeg_libmjpeg_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ multimedia/libquicktime/patches/patch-plugins_mjpeg_libmjpeg_c	17 Dec 2005 20:48:12 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- plugins/mjpeg/libmjpeg.c.orig	Sun Jul 31 15:19:29 2005
++++ plugins/mjpeg/libmjpeg.c	Sun Jul 31 15:19:49 2005
+@@ -19,7 +19,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>	/* for memcpy & bzero prototypes */
+-#include "colormodels.h"
++#include <quicktime/colormodels.h>
+ #include "libmjpeg.h"
+ 
+ /* JPEG MARKERS */
Index: multimedia/libquicktime/patches/patch-plugins_rtjpeg_RTjpeg_h
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_rtjpeg_RTjpeg_h
diff -N multimedia/libquicktime/patches/patch-plugins_rtjpeg_RTjpeg_h
--- multimedia/libquicktime/patches/patch-plugins_rtjpeg_RTjpeg_h	4 Dec 2004 21:44:34 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-plugins_rtjpeg_RTjpeg_h,v 1.1 2004/12/04 21:44:34 sturm Exp $
---- plugins/rtjpeg/RTjpeg.h.orig	Mon Jun  3 13:04:22 2002
-+++ plugins/rtjpeg/RTjpeg.h	Mon Aug  9 02:49:14 2004
-@@ -31,8 +31,12 @@ Foundation, Inc., 59 Temple Place, Suite
- 		South Africa
- */
- 
-+#ifdef HAVE_STDINT_H
- #ifndef _STDINT_H
- #include <stdint.h>
-+#endif
-+#else
-+#include <inttypes.h>
- #endif
- 
- #ifdef __RTJPEG_INTERNAL__
Index: multimedia/libquicktime/patches/patch-plugins_videocodec_v308_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_videocodec_v308_c
diff -N multimedia/libquicktime/patches/patch-plugins_videocodec_v308_c
--- multimedia/libquicktime/patches/patch-plugins_videocodec_v308_c	4 Dec 2004 21:44:34 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-plugins_videocodec_v308_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
---- plugins/videocodec/v308.c.orig	Mon Aug  9 03:21:32 2004
-+++ plugins/videocodec/v308.c	Mon Aug  9 03:21:53 2004
-@@ -4,7 +4,9 @@
- #include <workarounds.h>
- #include "v308.h"
- 
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include <stdlib.h>
- 
- 
Index: multimedia/libquicktime/patches/patch-plugins_videocodec_v408_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_videocodec_v408_c
diff -N multimedia/libquicktime/patches/patch-plugins_videocodec_v408_c
--- multimedia/libquicktime/patches/patch-plugins_videocodec_v408_c	4 Dec 2004 21:44:34 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-plugins_videocodec_v408_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
---- plugins/videocodec/v408.c.orig	Mon Aug  9 03:22:15 2004
-+++ plugins/videocodec/v408.c	Mon Aug  9 03:22:37 2004
-@@ -4,7 +4,9 @@
- #include <workarounds.h>
- #include "v408.h"
- 
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include <stdlib.h>
- 
- typedef struct
Index: multimedia/libquicktime/patches/patch-plugins_videocodec_v410_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_videocodec_v410_c
diff -N multimedia/libquicktime/patches/patch-plugins_videocodec_v410_c
--- multimedia/libquicktime/patches/patch-plugins_videocodec_v410_c	4 Dec 2004 21:44:34 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-plugins_videocodec_v410_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
---- plugins/videocodec/v410.c.orig	Mon Aug  9 03:22:55 2004
-+++ plugins/videocodec/v410.c	Mon Aug  9 03:23:14 2004
-@@ -4,7 +4,9 @@
- #include <workarounds.h>
- #include "v410.h"
- 
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include <stdlib.h>
- 
- typedef struct
Index: multimedia/libquicktime/patches/patch-plugins_videocodec_yuv2_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_videocodec_yuv2_c
diff -N multimedia/libquicktime/patches/patch-plugins_videocodec_yuv2_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ multimedia/libquicktime/patches/patch-plugins_videocodec_yuv2_c	17 Dec 2005 20:48:12 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- plugins/videocodec/yuv2.c.orig	Sun Jul 31 15:13:13 2005
++++ plugins/videocodec/yuv2.c	Sun Jul 31 15:17:36 2005
+@@ -1,6 +1,6 @@
+ #include "funcprotos.h"
+ #include <quicktime/colormodels.h>
+-#include "quicktime.h"
++#include <quicktime/quicktime.h>
+ #include "yuv2.h"
+ 
+ /* U V values are signed but Y R G B values are unsigned! */
Index: multimedia/libquicktime/patches/patch-plugins_videocodec_yuv4_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-plugins_videocodec_yuv4_c
diff -N multimedia/libquicktime/patches/patch-plugins_videocodec_yuv4_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ multimedia/libquicktime/patches/patch-plugins_videocodec_yuv4_c	17 Dec 2005 20:48:12 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- plugins/videocodec/yuv4.c.orig	Sun Jul 31 15:18:07 2005
++++ plugins/videocodec/yuv4.c	Sun Jul 31 15:18:19 2005
+@@ -1,6 +1,6 @@
+ #include "funcprotos.h"
+ #include <quicktime/colormodels.h>
+-#include "quicktime.h"
++#include <quicktime/quicktime.h>
+ #include "yuv4.h"
+ 
+ /* U V values are signed but Y R G B values are unsigned! */
Index: multimedia/libquicktime/patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-src_Makefile_in
--- multimedia/libquicktime/patches/patch-src_Makefile_in	9 Feb 2005 23:41:43 -0000	1.2
+++ multimedia/libquicktime/patches/patch-src_Makefile_in	17 Dec 2005 20:48:12 -0000
@@ -1,21 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2005/02/09 23:41:43 naddy Exp $
---- src/Makefile.in.orig	Mon Jul 19 11:57:53 2004
-+++ src/Makefile.in	Thu Jan 27 21:27:58 2005
-@@ -211,7 +211,7 @@ lib_LTLIBRARIES = libquicktime.la
+$OpenBSD$
+--- src/Makefile.in.orig	Thu May 26 18:57:34 2005
++++ src/Makefile.in	Sun Jul 31 14:26:54 2005
+@@ -286,7 +286,7 @@ lib_LTLIBRARIES = libquicktime.la
  # Library dependencies are emtpy no
  # Maybe we need zlib to read compressed quicktime headers
  #
 -libquicktime_la_LDFLAGS = -export-dynamic
-+libquicktime_la_LDFLAGS = -export-dynamic -version-info 1:0:0
++libquicktime_la_LDFLAGS = -export-dynamic -version-info 2:0:0
  @HAVE_FSEEKO_FALSE_(_at_)_FSEEKO_SRC = lqt_fseeko.c
  
- 
-@@ -392,7 +392,7 @@ clean-libLTLIBRARIES:
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libquicktime.la: $(libquicktime_la_OBJECTS) $(libquicktime_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(libquicktime_la_LDFLAGS) $(libquicktime_la_OBJECTS) $(libquicktime_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libquicktime_la_LDFLAGS) $(libquicktime_la_OBJECTS) $(libquicktime_la_LIBADD)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
+ # build only the files, which can be compiled
Index: multimedia/libquicktime/patches/patch-utils_Makefile_in
===================================================================
RCS file: multimedia/libquicktime/patches/patch-utils_Makefile_in
diff -N multimedia/libquicktime/patches/patch-utils_Makefile_in
--- multimedia/libquicktime/patches/patch-utils_Makefile_in	4 Dec 2004 21:44:34 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-utils_Makefile_in,v 1.2 2004/12/04 21:44:34 sturm Exp $
---- utils/Makefile.in.orig	Mon Jul 19 11:57:53 2004
-+++ utils/Makefile.in	Mon Aug  9 02:49:14 2004
-@@ -253,7 +253,7 @@ qtyuv4toyuv_LDADD = @UTIL_LIBADD@
- 
- lqtplay_SOURCES = lqtplay.c
- lqtplay_LDADD = @UTIL_LIBADD@ @X_LIBS@ -lXaw -lXt @X_PRE_LIBS@ -lXext \
--	-lXv -lGLU -lGL -lX11 @X_EXTRA_LIBS@ -lm
-+	-lXv -lGLU -lGL -lX11 @X_EXTRA_LIBS@ -lossaudio -lm
- 
- 
- INCLUDES = -I$(top_srcdir)/include @X_CFLAGS@
Index: multimedia/libquicktime/patches/patch-utils_lqtplay_c
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/patches/patch-utils_lqtplay_c,v
retrieving revision 1.2
diff -u -r1.2 patch-utils_lqtplay_c
--- multimedia/libquicktime/patches/patch-utils_lqtplay_c	4 Dec 2004 21:44:34 -0000	1.2
+++ multimedia/libquicktime/patches/patch-utils_lqtplay_c	17 Dec 2005 20:48:12 -0000
@@ -1,24 +1,12 @@
-$OpenBSD: patch-utils_lqtplay_c,v 1.2 2004/12/04 21:44:34 sturm Exp $
---- utils/lqtplay.c.orig	Tue Jan 20 20:32:30 2004
-+++ utils/lqtplay.c	Mon Aug  9 02:56:37 2004
-@@ -19,8 +19,10 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <sys/ioctl.h>
--#ifdef	HAVE_SOUNDCARD_H
-+#ifdef	HAVE_SYS_SOUNDCARD_H
- #include <sys/soundcard.h>
-+#else
-+#include <soundcard.h>
- #endif
- 
- #include <X11/Xlib.h>
-@@ -656,7 +658,7 @@ static void qt_init(FILE *fp, char *file
- 	qt_hasaudio = 1;
- 	if (quicktime_track_channels(qt,0) > 1)
- 	    qt_stereo = 1;
--	if (-1 == oss_init("/dev/dsp", qt_stereo ? 2 : 1,
-+	if (-1 == oss_init("/dev/audio", qt_stereo ? 2 : 1,
- 			   quicktime_sample_rate(qt,0)))
- 	    qt_hasaudio = 0;
-     }
+$OpenBSD$
+--- utils/lqtplay.c.orig	Mon May 23 06:33:55 2005
++++ utils/lqtplay.c	Sun Jul 31 14:26:54 2005
+@@ -912,7 +912,7 @@ static void qt_init(FILE *fp, char *file
+            qt_hasaudio = 0;}
+   }
+   else {
+-  	if (-1 == oss_init("/dev/dsp", qt_channels,
++  	if (-1 == oss_init("/dev/audio", qt_channels,
+                            qt_sample_rate))
+            qt_hasaudio = 0;
+   }
Index: multimedia/libquicktime/patches/patch-utils_qtinfo_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-utils_qtinfo_c
diff -N multimedia/libquicktime/patches/patch-utils_qtinfo_c
--- multimedia/libquicktime/patches/patch-utils_qtinfo_c	4 Dec 2004 21:44:34 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-utils_qtinfo_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
---- utils/qtinfo.c.orig	Mon Aug  9 03:31:15 2004
-+++ utils/qtinfo.c	Mon Aug  9 03:33:25 2004
-@@ -1,6 +1,7 @@
- /* 	Qtinfo by Elliot Lee <sopwith_(_at_)_redhat_(_dot_)_com> */
- 
--#include <quicktime/quicktime.h>
-+/* #include <quicktime/quicktime.h> */
-+#include <quicktime/lqt.h>
- 
- static void file_info(char *filename);
- 
Index: multimedia/libquicktime/patches/patch-utils_testqt_c
===================================================================
RCS file: multimedia/libquicktime/patches/patch-utils_testqt_c
diff -N multimedia/libquicktime/patches/patch-utils_testqt_c
--- multimedia/libquicktime/patches/patch-utils_testqt_c	4 Dec 2004 21:44:34 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-utils_testqt_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
---- utils/testqt.c.orig	Mon Aug  9 03:37:58 2004
-+++ utils/testqt.c	Mon Aug  9 03:38:59 2004
-@@ -134,7 +134,7 @@ int main(int argc, char** argv)
- 							sizeof( int16_t ),
- 							pxAudioOutputs[i] );
- 				}
--				printf( "a %d(%d) < %d ", iFrameNum*iSamplesPerFrame, iSamplesPerFrame, quicktime_audio_length( pxQuicktimeInput, 0 ) );
-+				printf( "a %d(%d) < %ld ", iFrameNum*iSamplesPerFrame, iSamplesPerFrame, quicktime_audio_length( pxQuicktimeInput, 0 ) );
- 			}
- 
- 			printf( "At frame #%d\n", iFrameNum );
Index: multimedia/libquicktime/patches/patch-utils_yuv4toyuv_c
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/patches/patch-utils_yuv4toyuv_c,v
retrieving revision 1.1
diff -u -r1.1 patch-utils_yuv4toyuv_c
--- multimedia/libquicktime/patches/patch-utils_yuv4toyuv_c	4 Dec 2004 21:44:34 -0000	1.1
+++ multimedia/libquicktime/patches/patch-utils_yuv4toyuv_c	17 Dec 2005 20:48:12 -0000
@@ -1,8 +1,9 @@
-$OpenBSD: patch-utils_yuv4toyuv_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
---- utils/yuv4toyuv.c.orig	Fri Aug 29 08:48:22 2003
-+++ utils/yuv4toyuv.c	Mon Aug  9 03:47:49 2004
-@@ -1,4 +1,5 @@
- #include <quicktime/quicktime.h>
+$OpenBSD$
+--- utils/yuv4toyuv.c.orig	Mon Dec  6 09:15:48 2004
++++ utils/yuv4toyuv.c	Sun Jan 16 18:44:29 2005
+@@ -1,5 +1,6 @@
+ #include <quicktime/lqt.h>
+ #include <lqt_funcprotos.h>
 +#include "funcprotos.h"
  
  int usage(void)
Index: multimedia/libquicktime/pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- multimedia/libquicktime/pkg/PLIST	4 Dec 2004 21:44:35 -0000	1.3
+++ multimedia/libquicktime/pkg/PLIST	17 Dec 2005 20:48:12 -0000
@@ -3,43 +3,53 @@
 bin/lqt-config
 bin/lqt_transcode
 bin/lqtplay
+bin/lqtvrplay
 bin/qtdechunk
 bin/qtdump
 bin/qtinfo
 bin/qtrechunk
 bin/qtstreamize
 bin/qtyuv4toyuv
-include/quicktime/
-include/quicktime/colormodels.h
-include/quicktime/lqt.h
-include/quicktime/lqt1394_config.h
-include/quicktime/lqt_codecapi.h
-include/quicktime/lqt_codecinfo.h
-include/quicktime/lqt_version.h
-include/quicktime/qtprivate.h
-include/quicktime/quicktime.h
+include/lqt/
+include/lqt/colormodels.h
+include/lqt/lqt.h
+include/lqt/lqt1394_config.h
+include/lqt/lqt_codecapi.h
+include/lqt/lqt_codecinfo.h
+include/lqt/lqt_version.h
+include/lqt/qtprivate.h
+include/lqt/quicktime.h
 lib/libquicktime/
+lib/libquicktime.a
 lib/libquicktime.la
-_(_at_)_lib lib/libquicktime.so.1.0
+_(_at_)_lib lib/libquicktime.so.2.0
+_(_at_)_comment lib/libquicktime/lqt_audiocodec.a
 @comment lib/libquicktime/lqt_audiocodec.la
 lib/libquicktime/lqt_audiocodec.so
+_(_at_)_comment lib/libquicktime/lqt_dv.a
 @comment lib/libquicktime/lqt_dv.la
 lib/libquicktime/lqt_dv.so
+_(_at_)_comment lib/libquicktime/lqt_ffmpeg.a
 @comment lib/libquicktime/lqt_ffmpeg.la
 lib/libquicktime/lqt_ffmpeg.so
+_(_at_)_comment lib/libquicktime/lqt_lame.a
 @comment lib/libquicktime/lqt_lame.la
 lib/libquicktime/lqt_lame.so
+_(_at_)_comment lib/libquicktime/lqt_mjpeg.a
 @comment lib/libquicktime/lqt_mjpeg.la
 lib/libquicktime/lqt_mjpeg.so
-_(_at_)_comment lib/libquicktime/lqt_opendivx.la
-lib/libquicktime/lqt_opendivx.so
+_(_at_)_comment lib/libquicktime/lqt_png.a
 @comment lib/libquicktime/lqt_png.la
 lib/libquicktime/lqt_png.so
+_(_at_)_comment lib/libquicktime/lqt_rtjpeg.a
 @comment lib/libquicktime/lqt_rtjpeg.la
 lib/libquicktime/lqt_rtjpeg.so
+_(_at_)_comment lib/libquicktime/lqt_videocodec.a
 @comment lib/libquicktime/lqt_videocodec.la
 lib/libquicktime/lqt_videocodec.so
+_(_at_)_comment lib/libquicktime/lqt_vorbis.a
 @comment lib/libquicktime/lqt_vorbis.la
 lib/libquicktime/lqt_vorbis.so
+lib/pkgconfig/libquicktime.pc
 @man man/man1/lqtplay.1
 share/aclocal/lqt.m4