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

Re: update: multimedia/libquicktime



On Sat, Dec 17, 2005 at 01:20:35PM -0800, Jacob Meuser wrote:
> attached is a diff to update multimedia/libquicktime to version 0.9.7.

here is another one, taking into account SHARED_LIBS and the gtk+2
changes.  also fixes a couple things I had not noticed.

-- 
<jakemsr_(_at_)_jakemsr_(_dot_)_com>

Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	8 Jan 2006 23:48:36 -0000	1.4
+++ Makefile	23 Jan 2006 07:24:20 -0000
@@ -1,17 +1,16 @@
-# $OpenBSD: Makefile,v 1.4 2006/01/08 23:48:36 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.3 2005/02/09 23:41:43 naddy Exp $
 # $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $
 
 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
-SHARED_LIBS=		quicktime	1.0
+SHARED_LIBS=		quicktime	2.0
 
 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
@@ -19,26 +18,37 @@
 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 Xft Xrender Xt Xv \
+			a52 atk-1.0.1011.3 c fontconfig freetype \
+			glib-2.0.800.3 gmodule-2.0.800.3 gobject-2.0.800.3 \
+			m mp3lame ogg ossaudio pango-1.0.1001.1 \
+			pangox-1.0.1001.1 pangoxft-1.0.1001.1 \
+			pangoft2-1.0.1001.1 pthread z
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libquicktime/}
 
+MODULES=		devel/gettext
+
 LIB_DEPENDS=		vorbis.3,vorbisfile.4,vorbisenc.2::audio/libvorbis \
 			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
+AUTOCONF_VERSION=	2.59
 USE_LIBTOOL=		Yes
 LIBTOOL_FLAGS+=		--tag=disable-static
-VMEM_WARNING=		Yes
 
-CONFIGURE_STYLE=	gnu
+SEPARATE_BUILD=		concurrent
+CONFIGURE_STYLE=	autoconf
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=		--disable-firewire
+			LDFLAGS="-L${LOCALBASE}/lib" \
+			AVCODEC_LIBS="-lavcodec -lmp3lame -la52 -lvorbisenc -lvorbis -logg"
+CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
+			--disable-firewire \
+			--with-avcodec="${LOCALBASE}" \
+			--with-vorbis-libraries="${LOCALBASE}/lib -logg"
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	5 Jan 2005 17:05:06 -0000	1.3
+++ distinfo	23 Jan 2006 07:24:20 -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: patches/patch-acinclude_m4
===================================================================
RCS file: patches/patch-acinclude_m4
diff -N patches/patch-acinclude_m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-acinclude_m4	23 Jan 2006 07:24:20 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- acinclude.m4.orig	Sun Jan 22 22:33:47 2006
++++ acinclude.m4	Sun Jan 22 22:41:38 2006
+@@ -427,7 +427,8 @@ dnl
+ 
+ if test "x$avcodec_prefix" != x; then
+ AVCODEC_CFLAGS="-I$avcodec_prefix/include"
+-AVCODEC_LIBS="-L$avcodec_prefix/lib -lavcodec"
++dnl AVCODEC_LIBS="-L$avcodec_prefix/lib -lavcodec"
++AVCODEC_LIBS="$AVCODEC_LIBS"
+ ACL_CHECK_AVCODEC([$1])
+   if test "x$avcodec_ok" = "xtrue"; then
+     avcodec_done="true"
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure	8 Jan 2006 23:48:37 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,93 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2006/01/08 23:48:37 jakemsr Exp $
---- configure.orig	Mon Jul 19 11:57:49 2004
-+++ configure	Mon Aug  9 03:17:56 2004
-@@ -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: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac	23 Jan 2006 07:24:20 -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: patches/patch-plugins_Makefile_in
===================================================================
RCS file: patches/patch-plugins_Makefile_in
diff -N patches/patch-plugins_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_Makefile_in	23 Jan 2006 07:24:20 -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: patches/patch-plugins_audiocodec_ulaw_c
===================================================================
RCS file: patches/patch-plugins_audiocodec_ulaw_c
diff -N patches/patch-plugins_audiocodec_ulaw_c
--- 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: patches/patch-plugins_mjpeg_libmjpeg_c
===================================================================
RCS file: patches/patch-plugins_mjpeg_libmjpeg_c
diff -N patches/patch-plugins_mjpeg_libmjpeg_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_mjpeg_libmjpeg_c	23 Jan 2006 07:24:20 -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: patches/patch-plugins_rtjpeg_RTjpeg_h
===================================================================
RCS file: patches/patch-plugins_rtjpeg_RTjpeg_h
diff -N patches/patch-plugins_rtjpeg_RTjpeg_h
--- 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: patches/patch-plugins_videocodec_v308_c
===================================================================
RCS file: patches/patch-plugins_videocodec_v308_c
diff -N patches/patch-plugins_videocodec_v308_c
--- 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: patches/patch-plugins_videocodec_v408_c
===================================================================
RCS file: patches/patch-plugins_videocodec_v408_c
diff -N patches/patch-plugins_videocodec_v408_c
--- 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: patches/patch-plugins_videocodec_v410_c
===================================================================
RCS file: patches/patch-plugins_videocodec_v410_c
diff -N patches/patch-plugins_videocodec_v410_c
--- 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: patches/patch-plugins_videocodec_yuv2_c
===================================================================
RCS file: patches/patch-plugins_videocodec_yuv2_c
diff -N patches/patch-plugins_videocodec_yuv2_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_videocodec_yuv2_c	23 Jan 2006 07:24:20 -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: patches/patch-plugins_videocodec_yuv4_c
===================================================================
RCS file: patches/patch-plugins_videocodec_yuv4_c
diff -N patches/patch-plugins_videocodec_yuv4_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_videocodec_yuv4_c	23 Jan 2006 07:24:20 -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: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in	8 Jan 2006 23:48:37 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.3 2006/01/08 23:48:37 jakemsr Exp $
---- src/Makefile.in.orig	Mon Jul 19 11:57:53 2004
-+++ src/Makefile.in	Thu Jan 27 21:27:58 2005
-@@ -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
Index: patches/patch-utils_Makefile_in
===================================================================
RCS file: patches/patch-utils_Makefile_in
diff -N patches/patch-utils_Makefile_in
--- 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: 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
--- patches/patch-utils_lqtplay_c	4 Dec 2004 21:44:34 -0000	1.2
+++ patches/patch-utils_lqtplay_c	23 Jan 2006 07:24:20 -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: patches/patch-utils_qtinfo_c
===================================================================
RCS file: patches/patch-utils_qtinfo_c
diff -N patches/patch-utils_qtinfo_c
--- 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: patches/patch-utils_testqt_c
===================================================================
RCS file: patches/patch-utils_testqt_c
diff -N patches/patch-utils_testqt_c
--- 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: 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
--- patches/patch-utils_yuv4toyuv_c	4 Dec 2004 21:44:34 -0000	1.1
+++ patches/patch-utils_yuv4toyuv_c	23 Jan 2006 07:24:20 -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: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST	8 Jan 2006 23:48:37 -0000	1.4
+++ pkg/PLIST	23 Jan 2006 07:24:20 -0000
@@ -1,23 +1,24 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.4 2006/01/08 23:48:37 jakemsr Exp $
+_(_at_)_comment $OpenBSD: PLIST,v 1.3 2004/12/04 21:44:35 sturm Exp $
 bin/libquicktime_config
 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.la
 @lib lib/libquicktime.so.${LIBquicktime_VERSION}
@@ -31,8 +32,6 @@
 lib/libquicktime/lqt_lame.so
 @comment lib/libquicktime/lqt_mjpeg.la
 lib/libquicktime/lqt_mjpeg.so
-_(_at_)_comment lib/libquicktime/lqt_opendivx.la
-lib/libquicktime/lqt_opendivx.so
 @comment lib/libquicktime/lqt_png.la
 lib/libquicktime/lqt_png.so
 @comment lib/libquicktime/lqt_rtjpeg.la
@@ -41,5 +40,6 @@
 lib/libquicktime/lqt_videocodec.so
 @comment lib/libquicktime/lqt_vorbis.la
 lib/libquicktime/lqt_vorbis.so
+lib/pkgconfig/libquicktime.pc
 @man man/man1/lqtplay.1
 share/aclocal/lqt.m4