Update to 1.6.1.90 -- needed for newer versions of transcode.

There is no ChangeLog info.

9 files changed, 31 insertions, 132 deletions

diff --git a/graphics/mjpegtools/Makefile b/graphics/mjpegtools/Makefile
index 12f21e8dbef..8335bbb88b4 100644
--- a/graphics/mjpegtools/Makefile
+++ b/graphics/mjpegtools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/08/02 05:22:57 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/31 21:58:23 mycroft Exp $
 
-DISTNAME=	mjpegtools-1.6.1
-PKGREVISION=	2
+DISTNAME=	mjpegtools-1.6.1.90
+#PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
@@ -16,7 +16,7 @@ USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/ltmain.sh
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-large-file
diff --git a/graphics/mjpegtools/PLIST b/graphics/mjpegtools/PLIST
index 39923011b57..4f1be09496c 100644
--- a/graphics/mjpegtools/PLIST
+++ b/graphics/mjpegtools/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/23 07:08:29 mrg Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/31 21:58:23 mycroft Exp $
 bin/glav
+bin/img2mpg
 bin/jpeg2yuv
 bin/lav2mpeg
 bin/lav2wav
@@ -16,13 +17,19 @@ bin/mpeg2enc
 bin/mpegtranscode
 bin/mplex
 bin/multiblend.flt
+bin/pgmtoy4m
+bin/png2yuv
 bin/ppmtoy4m
 bin/transist.flt
 bin/y4mcolorbars
+bin/y4mshift
 bin/y4mtoppm
 bin/ypipe
 bin/yuv2lav
+bin/yuvcorrect
+bin/yuvcorrect_tune
 bin/yuvdenoise
+bin/yuvfps
 bin/yuvkineco
 bin/yuvmedianfilter
 bin/yuvplay
@@ -40,29 +47,34 @@ include/mjpegtools/mjpeg_types.h
 include/mjpegtools/mpegconsts.h
 include/mjpegtools/mpegtimecode.h
 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
-lib/liblavfile-1.6.so.1.1
+lib/liblavfile-1.6.so.1.90
+lib/liblavfile-1.6.so.1.90.1.90
 lib/liblavfile.a
 lib/liblavfile.la
 lib/liblavfile.so
 lib/liblavjpeg-1.6.so
-lib/liblavjpeg-1.6.so.1
-lib/liblavjpeg-1.6.so.1.1
+lib/liblavjpeg-1.6.so.1.90
+lib/liblavjpeg-1.6.so.1.90.1.90
 lib/liblavjpeg.a
 lib/liblavjpeg.la
 lib/liblavjpeg.so
 lib/liblavplay-1.6.so
-lib/liblavplay-1.6.so.1
-lib/liblavplay-1.6.so.1.1
+lib/liblavplay-1.6.so.1.90
+lib/liblavplay-1.6.so.1.90.1.90
 lib/liblavplay.a
 lib/liblavplay.la
 lib/liblavplay.so
 lib/libmjpegutils.a
+lib/libmmxsse.a
+lib/libmotion.a
 lib/pkgconfig/mjpegtools.pc
-man/man1/divxdec.1
 man/man1/jpeg2yuv.1
-man/man1/lav2divx.1
+man/man1/img2mpg.1
 man/man1/lav2mpeg.1
 man/man1/lav2wav.1
 man/man1/lav2yuv.1
@@ -77,9 +89,9 @@ man/man1/mplex.1
 man/man1/ppmtoy4m.1
 man/man1/y4mcolorbars.1
 man/man1/y4mtoppm.1
-man/man1/yuv2divx.1
 man/man1/yuv2lav.1
 man/man1/yuvdenoise.1
+man/man1/yuvfps.1
 man/man1/yuvkineco.1
 man/man1/yuvmedianfilter.1
 man/man1/yuvplay.1
diff --git a/graphics/mjpegtools/distinfo b/graphics/mjpegtools/distinfo
index 48504574965..1790cd308fe 100644
--- a/graphics/mjpegtools/distinfo
+++ b/graphics/mjpegtools/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/08/02 16:42:44 mrg Exp $
+$NetBSD: distinfo,v 1.4 2003/08/31 21:58:23 mycroft Exp $
 
-SHA1 (mjpegtools-1.6.1.tar.gz) = af3705a1ef92c9ccd3e2d6db6c6b50e33f18b838
-Size (mjpegtools-1.6.1.tar.gz) = 976241 bytes
-SHA1 (patch-aa) = 71d5c53e4fcbabb110153b57bdba49621551f0a7
-SHA1 (patch-ab) = 3bbb6d45e3999db47c4dc853c2d2ad609a0fdda3
-SHA1 (patch-ac) = f900d8efe93d0e6c873533804495d3213427ddbb
-SHA1 (patch-ad) = 6c6c53bacb76185019c72b72ce65977f5c1ec49e
-SHA1 (patch-ae) = 077a87101a5c0fd7ddd8ba037d4769e30ff379b6
-SHA1 (patch-af) = 5409fabee90a9f907652d0950aab96b966ed94cc
+SHA1 (mjpegtools-1.6.1.90.tar.gz) = c66ed5ba3cb5b8835facaeeb80b05bb9f5014206
+Size (mjpegtools-1.6.1.90.tar.gz) = 1168921 bytes
+SHA1 (patch-aa) = 446e3c8a3ef385ca4244c0826435737e51fa0225
+SHA1 (patch-ab) = de6d7fd8a307141ef7d3d160ca2cdb955e8e5154
diff --git a/graphics/mjpegtools/patches/patch-aa b/graphics/mjpegtools/patches/patch-aa
deleted file mode 100644
index 973b295c74f..00000000000
--- a/graphics/mjpegtools/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/08/02 05:22:58 mrg Exp $
-
---- mplex/multplex.cc.orig	2002-04-30 00:36:00.000000000 +1000
-+++ mplex/multplex.cc	2003-06-28 23:53:58.000000000 +1000
-@@ -3,6 +3,7 @@
- #include <math.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <assert.h>
- 
- #include <mjpeg_types.h>
- #include <mjpeg_logging.h>
diff --git a/graphics/mjpegtools/patches/patch-ab b/graphics/mjpegtools/patches/patch-ab
deleted file mode 100644
index d9c0d048b70..00000000000
--- a/graphics/mjpegtools/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/08/02 05:22:59 mrg Exp $
-
---- mplex/systems.cc.orig	2002-04-30 00:36:01.000000000 +1000
-+++ mplex/systems.cc	2003-06-28 23:54:51.000000000 +1000
-@@ -2,6 +2,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <assert.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- #include "systems.hh"
diff --git a/graphics/mjpegtools/patches/patch-ac b/graphics/mjpegtools/patches/patch-ac
deleted file mode 100644
index 126a9bd7a1b..00000000000
--- a/graphics/mjpegtools/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/08/02 05:22:59 mrg Exp $
-
---- mplex/vector.cc.orig	2003-06-29 00:05:01.000000000 +1000
-+++ mplex/vector.cc	2003-06-29 00:05:07.000000000 +1000
-@@ -9,7 +9,7 @@
- AUStream::AUStream() : 
- 	cur_rd( 0 ), cur_wr(0), totalctr(0), size(0), buf(0)
- {
--	buf = new (Aunit*)[AUStream::BUF_SIZE];
-+	buf = new Aunit *[AUStream::BUF_SIZE];
- }
- 
- 
diff --git a/graphics/mjpegtools/patches/patch-ad b/graphics/mjpegtools/patches/patch-ad
deleted file mode 100644
index ddf02464df9..00000000000
--- a/graphics/mjpegtools/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/08/02 05:23:00 mrg Exp $
-
---- mplex/stillsstream.cc.orig	2002-04-18 14:32:02.000000000 +1000
-+++ mplex/stillsstream.cc	2003-06-29 00:05:37.000000000 +1000
-@@ -22,6 +22,7 @@
- 
- 
- #include <format_codes.h>
-+#include <assert.h>
- 
- #include "stillsstream.hh"
- #include "interact.hh"
diff --git a/graphics/mjpegtools/patches/patch-ae b/graphics/mjpegtools/patches/patch-ae
deleted file mode 100644
index 865127a05f9..00000000000
--- a/graphics/mjpegtools/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/08/02 05:23:00 mrg Exp $
-
---- yuvdenoise/Makefile.in.orig	2002-12-09 23:58:03.000000000 +1100
-+++ yuvdenoise/Makefile.in	2003-06-29 00:27:52.000000000 +1000
-@@ -134,7 +134,7 @@
- EXTRA_DIST = .cvsignore
- MAINTAINERCLEANFILES = Makefile.in
- INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
--AM_CFLAGS = -funroll-all-loops -finline-functions -ffast-math -frerun-cse-after-loop -frerun-loop-opt -fexpensive-optimizations -fmove-all-movables -Werror
-+AM_CFLAGS = -funroll-all-loops -finline-functions -ffast-math -frerun-cse-after-loop -frerun-loop-opt -fexpensive-optimizations -fmove-all-movables
- 
- bin_PROGRAMS = yuvdenoise
- yuvdenoise_SOURCES = main.c deinterlace.c deinterlace.h denoise.c denoise.h motion.c motion.h global.h
diff --git a/graphics/mjpegtools/patches/patch-af b/graphics/mjpegtools/patches/patch-af
deleted file mode 100644
index 51a02cacb40..00000000000
--- a/graphics/mjpegtools/patches/patch-af
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/08/02 16:42:45 mrg Exp $
-
---- yuvdenoise/motion.c.orig	2002-09-12 06:13:03.000000000 +1000
-+++ yuvdenoise/motion.c	2003-08-03 02:17:04.000000000 +1000
-@@ -244,6 +244,7 @@
- calc_SAD_uv_mmx (uint8_t * frm, uint8_t * ref)
- {
-   static uint16_t a[4];
-+  int32_t w = denoiser.frame.w/2;
-   
- #ifdef HAVE_ASM_MMX
-   __asm__ __volatile__
-@@ -273,7 +274,7 @@
-     "                                      /*                                                    */\n"
-     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
-     :"=m" (a)     
--    :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
-+    :"m" (frm), "m" (ref), "m" (w)
-     :"%eax", "%ebx", "%ecx"
-     );
- #endif
-@@ -290,6 +291,7 @@
- calc_SAD_uv_mmxe (uint8_t * frm, uint8_t * ref)
- {
-   static uint32_t a;
-+  int32_t w = denoiser.frame.w/2;
- 
- #ifdef HAVE_ASM_MMX
-   __asm__ __volatile__
-@@ -310,7 +312,7 @@
-     "                                      /*                                                    */\n"
-     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
-     :"=m" (a)     
--    :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
-+    :"m" (frm), "m" (ref), "m" (w)
-     :"%eax", "%ebx", "%ecx"
-     );
- #endif
-@@ -383,7 +385,7 @@
- 	  "                                      /*                                                    */"
- 	  " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */"
- 	  :"=m" (a)     
--	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask)
-+	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask[0])
- 	  :"%eax", "%ebx", "%ecx", "%edx"
- 	  );
- #endif