Date: Sun, 16 Nov 2003 22:45:34 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59334: Update port: multimedia/libquicktime to 0.9.2 Message-ID: <20031116224534.4d356187.tkato@prontomail.com> Resent-Message-ID: <200311161350.hAGDoH8p059586@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59334
>Category: ports
>Synopsis: Update port: multimedia/libquicktime to 0.9.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 16 05:50:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.9.2
New file:
files/patch-include::lqt_fseek.h
files/patch-plugins::Makefile.in
Remove file:
files/patch-plugins::xanim::lqt_codec.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/multimedia/libquicktime/Makefile multimedia/libquicktime/Makefile
--- /usr/ports/multimedia/libquicktime/Makefile Mon May 19 12:49:46 2003
+++ multimedia/libquicktime/Makefile Thu Nov 13 00:34:20 2003
@@ -7,8 +7,7 @@
#
PORTNAME= libquicktime
-PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTVERSION= 0.9.2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,23 +17,25 @@
LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- dv.3:${PORTSDIR}/multimedia/libdv \
- png.5:${PORTSDIR}/graphics/png
+ png.5:${PORTSDIR}/graphics/png \
+ dv.3:${PORTSDIR}/multimedia/libdv
-USE_MESA= yes
-USE_GNOME= gtk12
-USE_REINPLACE= yes
+USE_GL= yes
+USE_GNOME= gnometarget gtk12
+USE_GMAKE= yes
USE_LIBTOOL= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS= --disable-firewire
MAN1= lqtplay.1
-CFLAGS+= -O0
+.include <bsd.port.pre.mk>
-post-patch:
- @${REINPLACE_CMD} -e 's|$$OPTIMIZE_CFLAGS $$COMMON_CFLAGS|$$CFLAGS|g' \
- ${WRKSRC}/configure
+.if defined(WITH_MMX) && (${ARCH} == "i386")
+CONFIGURE_ARGS+= --enable-mmx
+.else
+CONFIGURE_ARGS+= --disable-mmx
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/multimedia/libquicktime/distinfo multimedia/libquicktime/distinfo
--- /usr/ports/multimedia/libquicktime/distinfo Thu Jul 18 17:07:32 2002
+++ multimedia/libquicktime/distinfo Wed Nov 12 22:53:32 2003
@@ -1 +1 @@
-MD5 (libquicktime-0.9.1.tar.gz) = b34d8d85890444f569d07ed397aba9ec
+MD5 (libquicktime-0.9.2.tar.gz) = 1b42ca12966526647fa9a1b14fb947a1
diff -urN /usr/ports/multimedia/libquicktime/files/patch-configure multimedia/libquicktime/files/patch-configure
--- /usr/ports/multimedia/libquicktime/files/patch-configure Sun Aug 11 02:08:46 2002
+++ multimedia/libquicktime/files/patch-configure Thu Nov 13 00:07:54 2003
@@ -1,6 +1,6 @@
---- configure.orig Sat Jun 22 08:57:50 2002
-+++ configure Sat Aug 10 00:55:47 2002
-@@ -6591,6 +6591,7 @@
+--- configure.orig Sun Sep 7 02:15:25 2003
++++ configure Thu Nov 13 00:07:40 2003
+@@ -7674,6 +7674,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,12 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8985,7 +8986,7 @@
+ fi
+
+ case $compile_mode in
+-"optimize") CFLAGS="$OPTIMIZE_CFLAGS $COMMON_CFLAGS"; cat >>confdefs.h <<\_ACEOF
++"optimize") CFLAGS="$CFLAGS"; cat >>confdefs.h <<\_ACEOF
+ #define NDEBUG 1
+ _ACEOF
+ ;;
diff -urN /usr/ports/multimedia/libquicktime/files/patch-include::lqt_fseek.h multimedia/libquicktime/files/patch-include::lqt_fseek.h
--- /usr/ports/multimedia/libquicktime/files/patch-include::lqt_fseek.h Thu Jan 1 09:00:00 1970
+++ multimedia/libquicktime/files/patch-include::lqt_fseek.h Wed Nov 12 23:27:42 2003
@@ -0,0 +1,14 @@
+--- include/lqt_fseek.h.orig Thu Jan 23 03:04:20 2003
++++ include/lqt_fseek.h Wed Nov 12 23:27:17 2003
+@@ -16,6 +16,11 @@
+ #define ftello64(a) lqt_ftello64(a)
+ #endif
+
++#ifdef __FreeBSD__
++#define FTELL ftello
++#define FSEEK fseeko
++#else
+ #define FTELL ftello64
+ #define FSEEK fseeko64
++#endif
+
diff -urN /usr/ports/multimedia/libquicktime/files/patch-plugins::Makefile.in multimedia/libquicktime/files/patch-plugins::Makefile.in
--- /usr/ports/multimedia/libquicktime/files/patch-plugins::Makefile.in Thu Jan 1 09:00:00 1970
+++ multimedia/libquicktime/files/patch-plugins::Makefile.in Thu Nov 13 00:37:19 2003
@@ -0,0 +1,11 @@
+--- 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 -urN /usr/ports/multimedia/libquicktime/files/patch-plugins::xanim::lqt_codec.c multimedia/libquicktime/files/patch-plugins::xanim::lqt_codec.c
--- /usr/ports/multimedia/libquicktime/files/patch-plugins::xanim::lqt_codec.c Sun Aug 11 02:08:46 2002
+++ multimedia/libquicktime/files/patch-plugins::xanim::lqt_codec.c Thu Jan 1 09:00:00 1970
@@ -1,48 +0,0 @@
---- 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/multimedia/libquicktime/pkg-plist multimedia/libquicktime/pkg-plist
--- /usr/ports/multimedia/libquicktime/pkg-plist Sun Aug 11 02:08:46 2002
+++ multimedia/libquicktime/pkg-plist Wed Nov 12 23:46:02 2003
@@ -9,6 +9,8 @@
bin/qtstreamize
bin/qtyuv4toyuv
include/quicktime/colormodels.h
+include/quicktime/jpeg.h
+include/quicktime/libmjpeg.h
include/quicktime/lqt.h
include/quicktime/lqt1394_config.h
include/quicktime/lqt_codecapi.h
@@ -30,6 +32,9 @@
lib/libquicktime.a
lib/libquicktime.so
lib/libquicktime.so.0
+lib/libquicktime_mjpeg.a
+lib/libquicktime_mjpeg.so
+lib/libquicktime_mjpeg.so.0
share/aclocal/lqt.m4
@dirrm lib/libquicktime
@dirrm include/quicktime
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031116224534.4d356187.tkato>