On Wed, Apr 29, 2009 at 10:49:54PM +0200, Matthias Kilian wrote:
> [cc'ing that unpatient guy from the netherlands]
*grin*
> On Fri, Apr 17, 2009 at 03:36:37AM -0400, Brad wrote:
> > Here is a better diff...
>
> Thanks!
>
> > I also noticed when I updated the PLIST that these filenames
> > changed again..
> >
> > -share/doc/libquicktime/apiref/dir_0a70fb752e570db7e4769bf6875d092b.html
> > -share/doc/libquicktime/apiref/dir_ff6747d8cab86565d2336361f48ae3c0.html
> > +share/doc/libquicktime/apiref/dir_87cc7ecf49a4309d7f875e5c73572dd4.html
> > +share/doc/libquicktime/apiref/dir_d17a0b62b91abbf6936aec5ebd620f21.html
>
> See comment before the updated updated diff below.
>
> > There is also the issue of the unconditional use of the GCC visibility
> > #pragma's in some of libquicktime' headers which cause annoying warnings
> > for pretty much every file compiled in libquicktime.
>
> I'd really prefer to leeve this to someone else, since I'm not very
> intersted in all this video stuff, and (still) don't have much time.
> You know, I've that huge pile of Ms in my tree for guile-related
> ports, and I had no chance to spend time to finish it for several
> weeks now :-(
>
> Ciao,
> Kili
diff reads good and unbreaks the port here. ok with me.
cheers,
jasper
> Unbreak after the x264 update (problem first noticed by naddy@, no
> cookies for me).
>
> Dependency improvements (x264 and doxygen) and whitespace cleanups
> from Brad.
>
> DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC} trick pointed out by simon@
> (tested with two builds using different WRKOBJDIRs).
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/libquicktime/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 4 Mar 2009 20:21:57 -0000 1.16
> +++ Makefile 29 Apr 2009 20:31:45 -0000
> @@ -4,10 +4,9 @@
> SHARED_ONLY= Yes
>
> COMMENT= library for reading and writing quicktime files
> -DISTNAME= libquicktime-1.0.2
> -PKGNAME= ${DISTNAME}p2
> +DISTNAME= libquicktime-1.1.1
> CATEGORIES= multimedia
> -SHARED_LIBS= quicktime 3.0
> +SHARED_LIBS= quicktime 4.0
>
> HOMEPAGE= http://libquicktime.sourceforge.net/
>
> @@ -17,30 +16,36 @@ PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
>
> -WANTLIB += GL ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp
> -WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xv a52 atk-1.0
> -WANTLIB += c cairo expat faac faad fontconfig freetype gio-2.0
> -WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 m ogg ossaudio
> -WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
> -WANTLIB += pthread theora x264 z
> +WANTLIB= GL ICE SM X11 Xau Xaw Xcomposite Xcursor \
> + Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
> + Xrender Xt Xv a52 atk-1.0 c cairo expat \
> + faac faad fontconfig freetype gio-2.0 \
> + glib-2.0 glitz gmodule-2.0 gobject-2.0 m \
> + ogg ossaudio pango-1.0 pangocairo-1.0 \
> + pangoft2-1.0 pcre pixman-1 pthread theora \
> + 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 \
> +BUILD_DEPENDS= :doxygen-*:devel/doxygen
> +LIB_DEPENDS= avcodec.>=11,avutil.>=5,swscale.>=1::graphics/ffmpeg \
> dv.>=4::multimedia/libdv \
> +
> gtk-x11-2.0.>=800.8,gdk-x11-2.0.>=800.8,gdk_pixbuf-2.0.>=800.8::x11/gtk+2 \
> + jpeg.>=9::graphics/jpeg \
> mp3lame::audio/lame \
> - avcodec.>=11,avutil.>=5,swscale.>=1::graphics/ffmpeg \
> -
> gtk-x11-2.0.>=800.8,gdk-x11-2.0.>=800.8,gdk_pixbuf-2.0.>=800.8::x11/gtk+2
> + png.>=4::graphics/png \
> +
> vorbis.>=3,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \
> + x264::multimedia/x264
>
> VMEM_WARNING= Yes
> USE_X11= Yes
> USE_LIBTOOL= Yes
> LIBTOOL_FLAGS+= --tag=disable-static
>
> +MAKE_ENV= DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
> +
> CONFIGURE_STYLE= gnu
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include
> -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> @@ -48,6 +53,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}
>
> CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
> --enable-gpl \
> + --with-libdv \
> --without-alsa
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/multimedia/libquicktime/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 26 Jan 2008 02:02:50 -0000 1.6
> +++ distinfo 29 Apr 2009 20:31:45 -0000
> @@ -1,5 +1,5 @@
> -MD5 (libquicktime-1.0.2.tar.gz) = SkOkStz77DmKkcVtHty9wQ==
> -RMD160 (libquicktime-1.0.2.tar.gz) = ilm1yMb3jXfhET6c6oXwG4h1ZAs=
> -SHA1 (libquicktime-1.0.2.tar.gz) = UWu5GveoNm07olCQiSlAV1ri1/o=
> -SHA256 (libquicktime-1.0.2.tar.gz) =
> 0/PJ3hM+DxtcfO2vbmtTXtfVg9YntSBWBsYvDTUo5bg=
> -SIZE (libquicktime-1.0.2.tar.gz) = 1131731
> +MD5 (libquicktime-1.1.1.tar.gz) = iN+DikULbGdogZ1FuswJJg==
> +RMD160 (libquicktime-1.1.1.tar.gz) = 0Ci3xh0hjeiRA9MiUZQhYH6IzXA=
> +SHA1 (libquicktime-1.1.1.tar.gz) = E2Zve4LYBFoD6SWWbPgJhnSBQEE=
> +SHA256 (libquicktime-1.1.1.tar.gz) =
> kO+hqDYTNoBmnKx0O3JmCHIK2POq3Ntx/x4p5RC9DRM=
> +SIZE (libquicktime-1.1.1.tar.gz) = 1009816
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/multimedia/libquicktime/patches/patch-configure,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-configure
> --- patches/patch-configure 9 Jul 2008 02:13:01 -0000 1.7
> +++ patches/patch-configure 29 Apr 2009 20:31:45 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure,v 1.7 2008/07/09 02:13:01 jakemsr Exp $
> ---- configure.orig Tue Jan 8 14:00:53 2008
> -+++ configure Sat Jun 21 12:16:30 2008
> -@@ -24861,7 +24861,7 @@ fi
> +--- configure.orig Wed Dec 17 12:13:49 2008
> ++++ configure Thu Apr 16 21:58:48 2009
> +@@ -25174,7 +25174,7 @@ fi
> VORBIS_LIBS="-L$prefix/lib"
> fi
>
> @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.7 2008/07/
> VORBISFILE_LIBS="-lvorbisfile"
> VORBISENC_LIBS="-lvorbisenc"
>
> -@@ -25076,11 +25076,11 @@ if test "x$with_lame" != "xno"; then
> +@@ -25389,11 +25389,11 @@ if test "x$with_lame" != "xno"; then
> OLD_CFLAGS=$CFLAGS
> OLD_LIBS=$LIBS
>
> @@ -26,30 +26,39 @@ $OpenBSD: patch-configure,v 1.7 2008/07/
>
>
> { echo "$as_me:$LINENO: checking for lame" >&5
> -@@ -27562,7 +27562,7 @@ cat >>conftest.$ac_ext <<_ACEOF
> +@@ -27956,7 +27956,7 @@ cat confdefs.h >>conftest.$ac_ext
> + cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h. */
>
> - #include <stdio.h>
> -- #include <ffmpeg/avcodec.h>
> -+ #include <libavcodec/avcodec.h>
> - int main()
> - {
> - FILE * output;
> -@@ -27728,7 +27728,7 @@ cat >>conftest.$ac_ext <<_ACEOF
> +-#include <ffmpeg/avcodec.h>
> ++#include <libavcodec/avcodec.h>
> + int
> + main ()
> + {
> +@@ -27982,7 +27982,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> + test -z "$ac_c_werror_flag" ||
> + test ! -s conftest.err
> + } && test -s conftest.$ac_objext; then
> +- found_header="true";AVCODEC_HEADER="<ffmpeg/avcodec.h>"
> ++ found_header="true";AVCODEC_HEADER="<libavcodec/avcodec.h>"
> + else
> + echo "$as_me: failed program was:" >&5
> + sed 's/^/| /' conftest.$ac_ext >&5
> +@@ -28258,7 +28258,7 @@ cat confdefs.h >>conftest.$ac_ext
> + cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h. */
>
> - #include <stdio.h>
> -- #include <ffmpeg/avcodec.h>
> -+ #include <libavcodec/avcodec.h>
> - int main()
> - {
> - FILE * output;
> -@@ -27893,7 +27893,7 @@ cat >>conftest.$ac_ext <<_ACEOF
> - /* end confdefs.h. */
> -
> - #include <stdio.h>
> -- #include <ffmpeg/avcodec.h>
> -+ #include <libavcodec/avcodec.h>
> - int main()
> - {
> - FILE * output;
> +-#include <ffmpeg/avcodec.h>
> ++#include <libavcodec/avcodec.h>
> + int
> + main ()
> + {
> +@@ -28284,7 +28284,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> + test -z "$ac_c_werror_flag" ||
> + test ! -s conftest.err
> + } && test -s conftest.$ac_objext; then
> +- found_header="true";AVCODEC_HEADER="<ffmpeg/avcodec.h>"
> ++ found_header="true";AVCODEC_HEADER="<libavcodec/avcodec.h>"
> + else
> + echo "$as_me: failed program was:" >&5
> + sed 's/^/| /' conftest.$ac_ext >&5
> Index: patches/patch-plugins_ffmpeg_ffmpeg_h
> ===================================================================
> RCS file: patches/patch-plugins_ffmpeg_ffmpeg_h
> diff -N patches/patch-plugins_ffmpeg_ffmpeg_h
> --- patches/patch-plugins_ffmpeg_ffmpeg_h 9 Jul 2008 02:13:01 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-plugins_ffmpeg_ffmpeg_h,v 1.1 2008/07/09 02:13:01 jakemsr
> Exp $
> ---- plugins/ffmpeg/ffmpeg.h.orig Sat Jun 21 12:40:00 2008
> -+++ plugins/ffmpeg/ffmpeg.h Sat Jun 21 12:40:12 2008
> -@@ -26,7 +26,7 @@
> - #define QUICKTIME_FFMPEG_H
> -
> - #include <quicktime/qtprivate.h>
> --#include <ffmpeg/avcodec.h>
> -+#include <libavcodec/avcodec.h>
> -
> - void quicktime_init_video_codec_ffmpeg(quicktime_video_map_t *vtrack,
> - AVCodec *encoder, AVCodec *decoder);
> Index: patches/patch-plugins_ffmpeg_params_c
> ===================================================================
> RCS file: patches/patch-plugins_ffmpeg_params_c
> diff -N patches/patch-plugins_ffmpeg_params_c
> --- patches/patch-plugins_ffmpeg_params_c 9 Jul 2008 02:13:01 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-plugins_ffmpeg_params_c,v 1.1 2008/07/09 02:13:01 jakemsr
> Exp $
> ---- plugins/ffmpeg/params.c.orig Sat Jun 21 12:40:39 2008
> -+++ plugins/ffmpeg/params.c Sat Jun 21 12:40:50 2008
> -@@ -24,7 +24,7 @@
> -
> - #include "lqt_private.h"
> - #include "params.h"
> --#include <ffmpeg/avcodec.h>
> -+#include <libavcodec/avcodec.h>
> - #include <string.h>
> -
> - typedef struct
> Index: patches/patch-plugins_ffmpeg_video_c
> ===================================================================
> RCS file: patches/patch-plugins_ffmpeg_video_c
> diff -N patches/patch-plugins_ffmpeg_video_c
> --- patches/patch-plugins_ffmpeg_video_c 9 Jul 2008 02:13:01 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-plugins_ffmpeg_video_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp
> $
> ---- plugins/ffmpeg/video.c.orig Sat Jun 21 21:02:38 2008
> -+++ plugins/ffmpeg/video.c Sat Jun 21 21:02:53 2008
> -@@ -32,7 +32,7 @@
> - #define LOG_DOMAIN "ffmpeg_video"
> -
> - #ifdef HAVE_LIBSWSCALE
> --#include <swscale.h>
> -+#include <libswscale/swscale.h>
> - #endif
> -
> - // Enable interlaced encoding (experimental)
> Index: patches/patch-utils_lqtplay_c
> ===================================================================
> RCS file: /cvs/ports/multimedia/libquicktime/patches/patch-utils_lqtplay_c,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-utils_lqtplay_c
> --- patches/patch-utils_lqtplay_c 26 Jan 2008 02:02:50 -0000 1.4
> +++ patches/patch-utils_lqtplay_c 29 Apr 2009 20:31:45 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-utils_lqtplay_c,v 1.4 2008/01/26 02:02:50 jakemsr Exp $
> ---- utils/lqtplay.c.orig Sat Nov 10 16:38:12 2007
> -+++ utils/lqtplay.c Sat Jan 19 21:06:11 2008
> -@@ -937,7 +937,7 @@ static void qt_init(FILE *fp, char *filename)
> +--- utils/lqtplay.c.orig Sat Aug 2 20:40:00 2008
> ++++ utils/lqtplay.c Thu Apr 16 21:55:32 2009
> +@@ -978,7 +978,7 @@ static void qt_init(FILE *fp, char *filename)
> qt_hasaudio = 0;}
> }
> else {
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/multimedia/libquicktime/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 9 Jul 2008 02:13:01 -0000 1.7
> +++ pkg/PLIST 29 Apr 2009 20:31:45 -0000
> @@ -53,8 +53,8 @@ share/doc/libquicktime/
> share/doc/libquicktime/apiref/
> share/doc/libquicktime/apiref/annotated.html
> share/doc/libquicktime/apiref/colormodels_8h-source.html
> -share/doc/libquicktime/apiref/dir_53292056a2aca918f7f93eaa35ab24bb.html
> -share/doc/libquicktime/apiref/dir_ac6d6cfc5ba22cfe0e9bc6c52513f95c.html
> +share/doc/libquicktime/apiref/dir_2c23d5540d2a668b0550fa40aa20e858.html
> +share/doc/libquicktime/apiref/dir_4abde00ac62fef88430208d846181602.html
> share/doc/libquicktime/apiref/dirs.html
> share/doc/libquicktime/apiref/doxygen.css
> share/doc/libquicktime/apiref/doxygen.png
> @@ -83,6 +83,7 @@ share/doc/libquicktime/apiref/group__mul
> share/doc/libquicktime/apiref/group__text.html
> share/doc/libquicktime/apiref/group__text__decode.html
> share/doc/libquicktime/apiref/group__text__encode.html
> +share/doc/libquicktime/apiref/group__timecodes.html
> share/doc/libquicktime/apiref/group__video.html
> share/doc/libquicktime/apiref/group__video__codecs.html
> share/doc/libquicktime/apiref/group__video__decode.html
> @@ -95,7 +96,7 @@ share/doc/libquicktime/apiref/lqt__codec
> share/doc/libquicktime/apiref/modules.html
> share/doc/libquicktime/apiref/quicktime_8h-source.html
> share/doc/libquicktime/apiref/quicktime_8h.html
> -share/doc/libquicktime/apiref/structlqt__codec__info__t.html
> +share/doc/libquicktime/apiref/structlqt__codec__info__s.html
> share/doc/libquicktime/apiref/structlqt__parameter__info__t.html
> share/doc/libquicktime/apiref/structquicktime__clap__t.html
> share/doc/libquicktime/apiref/structquicktime__colr__t.html
--
"Intelligence should guide our actions, but in harmony with the
texture of the situation at hand"
-- Francisco Varela
