From owner-freebsd-ports Fri Aug 9 20:54:35 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8673C37B409 for ; Fri, 9 Aug 2002 20:53:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31D0643E9C for ; Fri, 9 Aug 2002 20:53:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A3qpJU039479 for ; Fri, 9 Aug 2002 20:52:51 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7A3qpkl039478; Fri, 9 Aug 2002 20:52:51 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA4F737B401 for ; Fri, 9 Aug 2002 20:41:43 -0700 (PDT) Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66D8E43E42 for ; Fri, 9 Aug 2002 20:41:43 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A3fhOT099415 for ; Fri, 9 Aug 2002 20:41:43 -0700 (PDT) (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.4/8.12.4/Submit) id g7A3fhS4099414; Fri, 9 Aug 2002 20:41:43 -0700 (PDT) Message-Id: <200208100341.g7A3fhS4099414@www.freebsd.org> Date: Fri, 9 Aug 2002 20:41:43 -0700 (PDT) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/41503: Update port: graphics/libquicktime Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41503 >Category: ports >Synopsis: Update port: graphics/libquicktime >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 09 20:52:51 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6-RELEASE i386 >Organization: >Environment: >Description: - Fix build on -stable - Support CFLAGS properly - Do not install .la files New file: files/patch-configure files/patch-plugins::rtjpeg::RTjpeg.h files/patch-plugins::xanim::lqt_codec.c >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/libquicktime/Makefile graphics/libquicktime/Makefile --- /usr/ports/graphics/libquicktime/Makefile Mon Jul 22 20:48:55 2002 +++ graphics/libquicktime/Makefile Sat Aug 10 05:37:31 2002 @@ -8,7 +8,7 @@ PORTNAME= libquicktime PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,16 +16,25 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis \ - jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png \ - dv:${PORTSDIR}/graphics/libdv + jpeg.9:${PORTSDIR}/graphics/jpeg \ + dv.1:${PORTSDIR}/graphics/libdv \ + png.5:${PORTSDIR}/graphics/png +USE_MESA= yes USE_GNOMENG= yes -USE_GNOME= glib12 gtk12 +USE_GNOME= gtk12 +USE_REINPLACE= yes USE_LIBTOOL= yes -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lstdc++" +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" MAN1= lqtplay.1 + +CFLAGS+= -O0 + +post-patch: + @${REINPLACE_CMD} -e 's|CFLAGS=".*-O3|CFLAGS="\$$CFLAGS|g ; \ + s|CFLAGS=".*-O6|CFLAGS="\$$CFLAGS|g' ${WRKSRC}/configure .include diff -urN /usr/ports/graphics/libquicktime/files/patch-configure graphics/libquicktime/files/patch-configure --- /usr/ports/graphics/libquicktime/files/patch-configure Thu Jan 1 09:00:00 1970 +++ graphics/libquicktime/files/patch-configure Sat Aug 10 00:56:02 2002 @@ -0,0 +1,10 @@ +--- configure.orig Sat Jun 22 08:57:50 2002 ++++ configure Sat Aug 10 00:55:47 2002 +@@ -6591,6 +6591,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' diff -urN /usr/ports/graphics/libquicktime/files/patch-plugins::rtjpeg::RTjpeg.h graphics/libquicktime/files/patch-plugins::rtjpeg::RTjpeg.h --- /usr/ports/graphics/libquicktime/files/patch-plugins::rtjpeg::RTjpeg.h Thu Jan 1 09:00:00 1970 +++ graphics/libquicktime/files/patch-plugins::rtjpeg::RTjpeg.h Sat Aug 10 03:37:36 2002 @@ -0,0 +1,15 @@ +--- plugins/rtjpeg/RTjpeg.h.orig Tue Jun 4 05:04:22 2002 ++++ plugins/rtjpeg/RTjpeg.h Sat Aug 10 03:35:52 2002 +@@ -31,8 +31,12 @@ + South Africa + */ + ++#ifdef HAVE_STDINT_H + #ifndef _STDINT_H + #include ++#endif ++#else ++#include + #endif + + #ifdef __RTJPEG_INTERNAL__ diff -urN /usr/ports/graphics/libquicktime/files/patch-plugins::xanim::lqt_codec.c graphics/libquicktime/files/patch-plugins::xanim::lqt_codec.c --- /usr/ports/graphics/libquicktime/files/patch-plugins::xanim::lqt_codec.c Thu Jan 1 09:00:00 1970 +++ graphics/libquicktime/files/patch-plugins::xanim::lqt_codec.c Sat Aug 10 07:44:33 2002 @@ -0,0 +1,48 @@ +--- plugins/xanim/lqt_codec.c.orig Tue Jun 11 09:17:44 2002 ++++ plugins/xanim/lqt_codec.c Sat Aug 10 07:42:38 2002 +@@ -10,17 +10,15 @@ + int track) + { + int compressed_size, result, bpp, i, use_temp; +- int video_width, video_height; +- +- fprintf(stderr, "Decode video_1\n"); +- +- quicktime_trak_t *trak = file->vtracks[track].track; +- video_height = trak->tkhd.track_height; +- video_width = trak->tkhd.track_width; + + quicktime_video_map_t *vtrack = &(file->vtracks[track]); ++ quicktime_trak_t *trak = file->vtracks[track].track; ++ int video_height = trak->tkhd.track_height; ++ int video_width = trak->tkhd.track_width; + lqt_xanim_codec_1_t * codec = (lqt_xanim_codec_1_t*)(((quicktime_codec_t*)vtrack->codec)->priv); + ++ fprintf(stderr, "Decode video_1\n"); ++ + quicktime_set_video_position(file, vtrack->current_position, track); + compressed_size = + quicktime_frame_size(file, vtrack->current_position, track); +@@ -127,16 +125,15 @@ + + void lqt_xanim_init_vcodec_1(quicktime_t * file, int track) + { +- int video_width, video_height, i; +- +- init_xanimcodecs(); +- +- quicktime_trak_t *trak = file->vtracks[track].track; +- video_height = trak->tkhd.track_height; +- video_width = trak->tkhd.track_width; ++ int i; + + quicktime_video_map_t *vtrack = &(file->vtracks[track]); ++ quicktime_trak_t *trak = file->vtracks[track].track; ++ int video_height = trak->tkhd.track_height; ++ int video_width = trak->tkhd.track_width; + lqt_xanim_codec_1_t * codec = (lqt_xanim_codec_1_t*)(((quicktime_codec_t*)vtrack->codec)->priv); ++ ++ init_xanimcodecs(); + + codec->info.cmd = 0; /* decode or query */ + codec->info.skip_flag = 0; /* skip_flag */ diff -urN /usr/ports/graphics/libquicktime/pkg-plist graphics/libquicktime/pkg-plist --- /usr/ports/graphics/libquicktime/pkg-plist Thu Jul 18 17:07:32 2002 +++ graphics/libquicktime/pkg-plist Sat Aug 10 07:45:14 2002 @@ -16,43 +16,20 @@ include/quicktime/lqt_version.h include/quicktime/qtprivate.h include/quicktime/quicktime.h -@dirrm include/quicktime -lib/libquicktime/lqt_audiocodec.a -lib/libquicktime/lqt_audiocodec.la lib/libquicktime/lqt_audiocodec.so -lib/libquicktime/lqt_dv.a -lib/libquicktime/lqt_dv.la lib/libquicktime/lqt_dv.so -lib/libquicktime/lqt_ferguson.a -lib/libquicktime/lqt_ferguson.la lib/libquicktime/lqt_ferguson.so -lib/libquicktime/lqt_mjpeg.a -lib/libquicktime/lqt_mjpeg.la lib/libquicktime/lqt_mjpeg.so -lib/libquicktime/lqt_opendivx.a -lib/libquicktime/lqt_opendivx.la lib/libquicktime/lqt_opendivx.so -lib/libquicktime/lqt_png.a -lib/libquicktime/lqt_png.la lib/libquicktime/lqt_png.so -lib/libquicktime/lqt_rtjpeg.a -lib/libquicktime/lqt_rtjpeg.la lib/libquicktime/lqt_rtjpeg.so -lib/libquicktime/lqt_svq.a -lib/libquicktime/lqt_svq.la lib/libquicktime/lqt_svq.so -lib/libquicktime/lqt_videocodec.a -lib/libquicktime/lqt_videocodec.la lib/libquicktime/lqt_videocodec.so -lib/libquicktime/lqt_vorbis.a -lib/libquicktime/lqt_vorbis.la lib/libquicktime/lqt_vorbis.so -lib/libquicktime/lqt_xanim.a -lib/libquicktime/lqt_xanim.la lib/libquicktime/lqt_xanim.so lib/libquicktime.a -lib/libquicktime.la lib/libquicktime.so lib/libquicktime.so.0 -@dirrm lib/libquicktime share/aclocal/lqt.m4 +@dirrm lib/libquicktime +@dirrm include/quicktime >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message