Update to mjpegtools-1.6.1.93. I haven't been able to find a list of changes,

what I've found from diffing since 1.6.1.90 are mostly bug fixes.

While here, disable GTK support, so that we don't get a dependancy on GTK 1
when installing GNOME2.  This only removes the 'glav' program anyway, which
may be later added in an independant package if needed.

5 files changed, 83 insertions, 55 deletions

diff --git a/graphics/mjpegtools/Makefile b/graphics/mjpegtools/Makefile
index 155d4a265ed..a677528a365 100644
--- a/graphics/mjpegtools/Makefile
+++ b/graphics/mjpegtools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 10:54:08 jmmv Exp $
 
-DISTNAME=	mjpegtools-1.6.1.90
-PKGREVISION=	3
+DISTNAME=	mjpegtools-1.6.1.93
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
@@ -16,7 +15,7 @@ USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 
 USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/ltmain.sh
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	mjpegtools.pc.in
 
 GNU_CONFIGURE=		yes
@@ -30,7 +29,10 @@ CONFIGURE_ARGS+=	--without-avifile
 #.include "../../graphics/avifile/buildlink2.mk"
 .include "../../graphics/ImageMagick/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+# GTK+ support is disabled to avoid a dependancy on GTK+ when building GNOME2.
+# This only disables the "glav" program.  If you really need it, please add an
+# external package for it.
+#.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mjpegtools/PLIST b/graphics/mjpegtools/PLIST
index c55233ab928..4b0974149ec 100644
--- a/graphics/mjpegtools/PLIST
+++ b/graphics/mjpegtools/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/16 07:26:49 recht Exp $
-bin/glav
-bin/img2mpg
+@comment $NetBSD: PLIST,v 1.4 2004/01/24 10:54:08 jmmv Exp $
 bin/jpeg2yuv
+bin/lav2avi.sh
 bin/lav2mpeg
 bin/lav2wav
 bin/lav2yuv
@@ -21,22 +20,28 @@ bin/pgmtoy4m
 bin/png2yuv
 bin/ppmtoy4m
 bin/transist.flt
+bin/y4mblack
 bin/y4mcolorbars
 bin/y4mshift
 bin/y4mtoppm
+bin/y4mtoyuv
 bin/ypipe
 bin/yuv2lav
+bin/yuv4mpeg
 bin/yuvcorrect
 bin/yuvcorrect_tune
 bin/yuvdenoise
 bin/yuvfps
+bin/yuvinactive
 bin/yuvkineco
 bin/yuvmedianfilter
 bin/yuvplay
 bin/yuvscaler
 bin/yuvycsnoise
 include/mjpegtools/audiolib.h
+include/mjpegtools/avilib.h
 include/mjpegtools/editlist.h
+include/mjpegtools/format_codes.h
 include/mjpegtools/frequencies.h
 include/mjpegtools/jpegutils.h
 include/mjpegtools/lav_io.h
@@ -44,36 +49,71 @@ include/mjpegtools/liblavplay.h
 include/mjpegtools/liblavrec.h
 include/mjpegtools/mjpeg_logging.h
 include/mjpegtools/mjpeg_types.h
+include/mjpegtools/mpeg2enc/elemstrmwriter.hh
+include/mjpegtools/mpeg2enc/encoderparams.hh
+include/mjpegtools/mpeg2enc/macroblock.hh
+include/mjpegtools/mpeg2enc/mpeg2coder.hh
+include/mjpegtools/mpeg2enc/mpeg2encoder.hh
+include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
+include/mjpegtools/mpeg2enc/mpeg2encparams.h
+include/mjpegtools/mpeg2enc/picture.hh
+include/mjpegtools/mpeg2enc/picturereader.hh
+include/mjpegtools/mpeg2enc/predict_ref.h
+include/mjpegtools/mpeg2enc/quantize.hh
+include/mjpegtools/mpeg2enc/quantize_ref.h
+include/mjpegtools/mpeg2enc/ratectl.hh
+include/mjpegtools/mpeg2enc/seqencoder.hh
+include/mjpegtools/mpeg2enc/synchrolib.h
+include/mjpegtools/mpeg2enc/syntaxconsts.h
 include/mjpegtools/mpegconsts.h
 include/mjpegtools/mpegtimecode.h
+include/mjpegtools/mplex/audiostrm.hpp
+include/mjpegtools/mplex/aunit.hpp
+include/mjpegtools/mplex/bits.hpp
+include/mjpegtools/mplex/buffer.hpp
+include/mjpegtools/mplex/inputstrm.hpp
+include/mjpegtools/mplex/interact.hpp
+include/mjpegtools/mplex/mplexconsts.hpp
+include/mjpegtools/mplex/multiplexor.hpp
+include/mjpegtools/mplex/outputstrm.hpp
+include/mjpegtools/mplex/padstrm.hpp
+include/mjpegtools/mplex/stillsstream.hpp
+include/mjpegtools/mplex/stream_params.hpp
+include/mjpegtools/mplex/systems.hpp
+include/mjpegtools/mplex/vector.hpp
+include/mjpegtools/mplex/videostrm.hpp
 include/mjpegtools/yuv4mpeg.h
 info/mjpeg-howto.info
 info/mjpeg-howto.info-1
 info/mjpeg-howto.info-2
 info/mjpeg-howto.info-3
 lib/liblavfile-1.6.so
-lib/liblavfile-1.6.so.1.90
-lib/liblavfile-1.6.so.1.90.1.90
-lib/liblavfile.a
+lib/liblavfile-1.6.so.1
+lib/liblavfile-1.6.so.1.1
 lib/liblavfile.la
 lib/liblavfile.so
 lib/liblavjpeg-1.6.so
-lib/liblavjpeg-1.6.so.1.90
-lib/liblavjpeg-1.6.so.1.90.1.90
-lib/liblavjpeg.a
+lib/liblavjpeg-1.6.so.1
+lib/liblavjpeg-1.6.so.1.1
 lib/liblavjpeg.la
 lib/liblavjpeg.so
 lib/liblavplay-1.6.so
-lib/liblavplay-1.6.so.1.90
-lib/liblavplay-1.6.so.1.90.1.90
-lib/liblavplay.a
+lib/liblavplay-1.6.so.1
+lib/liblavplay-1.6.so.1.1
 lib/liblavplay.la
 lib/liblavplay.so
 lib/libmjpegutils.a
-lib/libmmxsse.a
-lib/libmotion.a
+lib/libmpeg2encpp-1.6.so
+lib/libmpeg2encpp-1.6.so.1
+lib/libmpeg2encpp-1.6.so.1.1
+lib/libmpeg2encpp.la
+lib/libmpeg2encpp.so
+lib/libmplex2-1.6.so
+lib/libmplex2-1.6.so.1
+lib/libmplex2-1.6.so.1.1
+lib/libmplex2.la
+lib/libmplex2.so
 lib/pkgconfig/mjpegtools.pc
-man/man1/img2mpg.1
 man/man1/jpeg2yuv.1
 man/man1/lav2mpeg.1
 man/man1/lav2wav.1
@@ -86,16 +126,20 @@ man/man1/mjpegtools.1
 man/man1/mp2enc.1
 man/man1/mpeg2enc.1
 man/man1/mplex.1
+man/man1/pgmtoy4m.1
 man/man1/ppmtoy4m.1
 man/man1/y4mcolorbars.1
 man/man1/y4mtoppm.1
 man/man1/yuv2lav.1
 man/man1/yuvdenoise.1
 man/man1/yuvfps.1
+man/man1/yuvinactive.1
 man/man1/yuvkineco.1
 man/man1/yuvmedianfilter.1
 man/man1/yuvplay.1
 man/man1/yuvscaler.1
 man/man1/yuvycsnoise.1
 man/man5/yuv4mpeg.5
+@dirrm include/mjpegtools/mplex
+@dirrm include/mjpegtools/mpeg2enc
 @dirrm include/mjpegtools
diff --git a/graphics/mjpegtools/buildlink2.mk b/graphics/mjpegtools/buildlink2.mk
index cd33a0ebd44..5ff53403e20 100644
--- a/graphics/mjpegtools/buildlink2.mk
+++ b/graphics/mjpegtools/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/01/24 10:54:08 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use mjpegtools.
 #
@@ -14,18 +14,9 @@ BUILDLINK_PKGSRCDIR.mjpegtools?=		../../graphics/mjpegtools
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.mjpegtools=mjpegtools
 BUILDLINK_PREFIX.mjpegtools_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/audiolib.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/editlist.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/frequencies.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/jpegutils.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/lav_io.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/liblavplay.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/liblavrec.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/mjpeg_logging.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/mjpeg_types.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/mpegconsts.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/mpegtimecode.h
-BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/yuv4mpeg.h
+BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/*
+BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/mpeg2enc/*
+BUILDLINK_FILES.mjpegtools+=	include/mjpegtools/mplex/*
 BUILDLINK_FILES.mjpegtools+=	lib/liblavfile-1.6.*
 BUILDLINK_FILES.mjpegtools+=	lib/liblavfile.*
 BUILDLINK_FILES.mjpegtools+=	lib/liblavjpeg-1.6.*
diff --git a/graphics/mjpegtools/distinfo b/graphics/mjpegtools/distinfo
index 1b7f4439ffc..a9b890ea18b 100644
--- a/graphics/mjpegtools/distinfo
+++ b/graphics/mjpegtools/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/12/16 07:26:49 recht Exp $
+$NetBSD: distinfo,v 1.6 2004/01/24 10:54:08 jmmv Exp $
 
-SHA1 (mjpegtools-1.6.1.90.tar.gz) = c66ed5ba3cb5b8835facaeeb80b05bb9f5014206
-Size (mjpegtools-1.6.1.90.tar.gz) = 1168921 bytes
-SHA1 (patch-ab) = 5562496d75bc470ffe6030e9fea02c94a22855e7
+SHA1 (mjpegtools-1.6.1.93.tar.gz) = f8d327c43139a5b21a64aa265b9e6511683e76f2
+Size (mjpegtools-1.6.1.93.tar.gz) = 1253561 bytes
+SHA1 (patch-aa) = b47aaacdbe02a3254c1ff58213448d63b39e5a34
+SHA1 (patch-ab) = 392bc09ca0142fb1e435b219e598a70ae4bf258f
diff --git a/graphics/mjpegtools/patches/patch-ab b/graphics/mjpegtools/patches/patch-ab
index 9426287587a..65c441f7f6a 100644
--- a/graphics/mjpegtools/patches/patch-ab
+++ b/graphics/mjpegtools/patches/patch-ab
@@ -1,23 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2003/12/16 07:26:49 recht Exp $
+$NetBSD: patch-ab,v 1.5 2004/01/24 10:54:08 jmmv Exp $
 
---- lavtools/Makefile.in.orig	2003-08-23 07:21:53.000000000 -0700
-+++ lavtools/Makefile.in	2003-12-15 18:00:39.000000000 -0800
-@@ -220,7 +220,7 @@
- 
- yuv2lav_SOURCES = yuv2lav.c $(lav_headers)
- yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
--		 liblavfile.la liblavjpeg.la
-+		 liblavfile.la liblavjpeg.la -lm
- 
- 
- transist_flt_SOURCES = transist.flt.c ${lav_headers}
-@@ -235,7 +235,8 @@
- lavplay_SOURCES = lavplay.c ${lav_headers}
+--- lavtools/Makefile.in.orig	2004-01-16 12:22:10.000000000 +0100
++++ lavtools/Makefile.in
+@@ -340,7 +340,7 @@ multiblend_flt_LDADD = $(top_builddir)/u
+ lavplay_SOURCES = lavplay.c
  lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
  	liblavplay.la liblavjpeg.la liblavfile.la \
--	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11
-+	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11 \
-+	${LIBOSSAUDIO}
+-	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS)
++	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS) $(LIBOSSAUDIO)
  
  
- lavrec_SOURCES = lavrec.c $(lav_headers)
+ lavrec_SOURCES = lavrec.c