Update to 1.6.2

PR:		64721
Submitted by:	Koop Mast <kwm@rainbow-runner.nl>

7 files changed, 82 insertions, 160 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 8b71e636cdf5..db114e03a21a 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mjpegtools
-PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTVERSION=	1.6.2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mjpeg
@@ -19,29 +18,34 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GNOME=	glib12
+USE_GNOME=	glib12 lthack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS:S/"//g}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS:S/"//g}"
+CONFIGURE_ARGS= --program-transform-name=""
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 WANT_GNOME=	yes
 WANT_SDL=	yes
 
-MAN1=	divxdec.1 jpeg2yuv.1 lav2divx.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
+INFO=	mjpeg-howto
+MAN1=	jpeg2yuv.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
 	lavpipe.1 lavplay.1 lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 \
-	mpeg2enc.1 mplex.1 ppmtoy4m.1 y4mcolorbars.1 y4mtoppm.1 \
-	yuv2divx.1 yuv2lav.1 yuvdenoise.1 yuvkineco.1 yuvmedianfilter.1 \
-	yuvplay.1 yuvscaler.1 yuvycsnoise.1
+	mpeg2enc.1 mplex.1 pgmtoy4m.1 ppmtoy4m.1 y4mcolorbars.1 y4mtoppm.1 \
+	yuv2lav.1 yuvdenoise.1 yuvfps.1 yuvinactive.1 yuvkineco.1 \
+	yuvmedianfilter.1 yuvplay.1 yuvscaler.1 yuvycsnoise.1
 MAN5=	yuv4mpeg.5
 
 DOC_FILES=	AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS \
 		PLANS README README.DV README.avilib README.glav \
+		README.AltiVec \
 		README.lavpipe README.transist TODO
 
+PORTDOCS=	${DOC_FILES}
+
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -136,10 +140,6 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|^(pkgconfigdir = )\$$\(libdir\)/(pkgconfig)|\1${PREFIX}/libdata/\2|' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|' \
-		${WRKSRC}/lavtools/lav2divx.cpp \
-		${WRKSRC}/lavtools/yuv2divx.cpp \
-		${WRKSRC}/lavtools/divxdec.cpp
 	@${REINPLACE_CMD} -E -e 's@(-l(jpeg|openquicktime|png))@-L${LOCALBASE}/lib \1@; \
 		s|(-I) (\$$with_quicktime)|\1\2/include/openquicktime|; \
 		s|(-L\$$with_quicktime) |\1/lib |; \
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index 609773e8cc2e..bc4cdb9d5b86 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (mjpegtools-1.6.1.tar.gz) = fa2aeec19deafe86d22b34eda329f9f4
-SIZE (mjpegtools-1.6.1.tar.gz) = 976241
+MD5 (mjpegtools-1.6.2.tar.gz) = 01c0120b0182de67f182ef99ad855daa
+SIZE (mjpegtools-1.6.2.tar.gz) = 1256280
diff --git a/multimedia/mjpegtools/files/patch-configure b/multimedia/mjpegtools/files/patch-configure
deleted file mode 100644
index 8bd3a5055e2a..000000000000
--- a/multimedia/mjpegtools/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Jul 17 00:34:59 2002
-+++ configure	Wed Jul 17 00:35:47 2002
-@@ -7297,6 +7297,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 --git a/multimedia/mjpegtools/files/patch-gcc3-yuvdenoise::motion.c b/multimedia/mjpegtools/files/patch-gcc3-yuvdenoise::motion.c
deleted file mode 100644
index e93d36a07ec9..000000000000
--- a/multimedia/mjpegtools/files/patch-gcc3-yuvdenoise::motion.c
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -uNr yuvdenoise/motion.c yuvdenoise/motion.c.orig
---- yuvdenoise/motion.c	2002-05-06 04:13:37.000000000 -0400
-+++ yuvdenoise/motion.c.orig	2003-07-25 01:52:38.339744992 -0400
-@@ -251,6 +251,9 @@
-     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-     " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
-     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
-+	" shrl         $1    , %%ecx;          /* shift width to scale it in the asm.                */\n"
-+	"                                      /* why? we need an lvalue as input... gcc33...        */\n"
-+	"                                      /* (carrbc1@wfu.edu)                                  */\n"
-     "                                      /*                                                    */\n"
-     ".rept 4                    ;          /* Loop for 4 lines                                   */\n"
-     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
-@@ -270,7 +273,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" (denoiser.frame.w)
-     :"%eax", "%ebx", "%ecx"
-     );
- #endif
-@@ -295,7 +298,10 @@
-     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-     " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
-     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
--    "                           ;          /*                                                    */\n"
-+	" shrl         $1    , %%ecx;          /* shift width to scale it in the asm.                */\n"
-+	"                                      /* why? we need an lvalue as input... gcc33...        */\n"
-+	"                                      /* (carrbc1@wfu.edu)                                  */\n"
-+    "                                      /*                                                    */\n"
-     " .rept 4                   ;          /*                                                    */\n"
-     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
-     " movd        (%%ebx), %%mm2;          /* 4 Pixels from filtered frame to mm2                */\n"
-@@ -307,7 +313,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" (denoiser.frame.w)
-     :"%eax", "%ebx", "%ecx"
-     );
- #endif
-@@ -349,6 +355,7 @@
-   static uint32_t a;
- #ifdef HAVE_ASM_MMX
-   static uint32_t bit_mask[2] = {0x7f7f7f7f,0x7f7f7f7f};
-+  static uint32_t* bit_mask_addr = bit_mask;
- 
-   __asm__ __volatile__
-       (
-@@ -380,7 +387,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_addr)
- 	  :"%eax", "%ebx", "%ecx", "%edx"
- 	  );
- #endif
diff --git a/multimedia/mjpegtools/files/patch-lavtools::divxdec.cpp b/multimedia/mjpegtools/files/patch-lavtools::divxdec.cpp
deleted file mode 100644
index 27772b647f76..000000000000
--- a/multimedia/mjpegtools/files/patch-lavtools::divxdec.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- lavtools/divxdec.cpp.orig	Wed May 29 19:02:12 2002
-+++ lavtools/divxdec.cpp	Wed May 29 20:08:34 2002
-@@ -1284,7 +1284,7 @@
- 	exit (1);
- }
- 
--FILE* real_stdout;
-+FILE real_stdout;
- 
- int
- main (int argc, char **argv)
-@@ -1309,8 +1309,8 @@
- 	std::cout.rdbuf ( std::cerr.rdbuf () );
- 	//
- 	// 4. keep old stdout FILE, and use stderr in its place (for printf ("...") ; )
--	real_stdout = stdout ;
--	stdout = stderr;
-+	real_stdout = *stdout ;
-+	*stdout = *stderr;
- 
- 	displayGreeting();
- 
-@@ -1733,7 +1733,7 @@
- 		if ( 0 == strcmp ( "-", filenameYUV ) )
- 		{
- 			//output.fdYUV = FD_STDOUT;
--			output.fdYUV = fileno ( real_stdout );
-+			output.fdYUV = fileno ( &real_stdout );
- 		}
- 		else
- 		{
-@@ -2042,7 +2042,7 @@
- 	freeAll ();
- 	// reassign cout, stdout to their original values.
- 	std::cout.rdbuf ( real_cout );
--	stdout = real_stdout;
-+	*stdout = real_stdout;
- 
- 	mjpeg_info ( " " );
- 	mjpeg_info ( "Done. %i frames", output.processedFrames );
diff --git a/multimedia/mjpegtools/files/patch-mplex::systems.hh b/multimedia/mjpegtools/files/patch-mplex::systems.hh
deleted file mode 100644
index dd9705824d84..000000000000
--- a/multimedia/mjpegtools/files/patch-mplex::systems.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- mplex/systems.hh.orig	Thu Mar  4 01:45:50 2004
-+++ mplex/systems.hh	Thu Mar  4 01:46:04 2004
-@@ -4,6 +4,8 @@
- #include <sys/param.h>
- #include "inputstrm.hh"
- 
-+#include <cassert>
-+
- #include <vector>
- 
- using std::vector;
diff --git a/multimedia/mjpegtools/pkg-plist b/multimedia/mjpegtools/pkg-plist
index 1ea34a1bfa75..fb43ae24366d 100644
--- a/multimedia/mjpegtools/pkg-plist
+++ b/multimedia/mjpegtools/pkg-plist
@@ -1,7 +1,6 @@
-%%DIVX%%bin/divxdec
 %%GTK%%bin/glav
 bin/jpeg2yuv
-%%DIVX%%bin/lav2divx
+bin/lav2avi.sh
 bin/lav2mpeg
 bin/lav2wav
 bin/lav2yuv
@@ -17,21 +16,32 @@ bin/mpeg2enc
 bin/mpegtranscode
 bin/mplex
 bin/multiblend.flt
+bin/pgmtoy4m
+bin/png2yuv
 bin/ppmtoy4m
 bin/transist.flt
+bin/y4mblack
 bin/y4mcolorbars
+bin/y4mshift
 bin/y4mtoppm
+bin/y4mtoyuv
 bin/ypipe
-%%DIVX%%bin/yuv2divx
 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
@@ -39,35 +49,68 @@ 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
-lib/liblavfile-1.6.so.1
+lib/liblavfile-1.6.so
+lib/liblavfile-1.6.so.2
 lib/liblavfile.a
+lib/liblavfile.la
 lib/liblavfile.so
-lib/liblavjpeg-1.6.so.1
+lib/liblavjpeg-1.6.so
+lib/liblavjpeg-1.6.so.2
 lib/liblavjpeg.a
+lib/liblavjpeg.la
 lib/liblavjpeg.so
-lib/liblavplay-1.6.so.1
+lib/liblavplay-1.6.so
+lib/liblavplay-1.6.so.2
 lib/liblavplay.a
+lib/liblavplay.la
 lib/liblavplay.so
 lib/libmjpegutils.a
+lib/libmpeg2encpp-1.6.so
+lib/libmpeg2encpp-1.6.so.2
+lib/libmpeg2encpp.a
+lib/libmpeg2encpp.la
+lib/libmpeg2encpp.so
+lib/libmplex2-1.6.so
+lib/libmplex2-1.6.so.2
+lib/libmplex2.a
+lib/libmplex2.la
+lib/libmplex2.so
 libdata/pkgconfig/mjpegtools.pc
-%%PORTDOCS%%share/doc/mjpegtools/AUTHORS
-%%PORTDOCS%%share/doc/mjpegtools/BUGS
-%%PORTDOCS%%share/doc/mjpegtools/CHANGES
-%%PORTDOCS%%share/doc/mjpegtools/COPYING
-%%PORTDOCS%%share/doc/mjpegtools/ChangeLog
-%%PORTDOCS%%share/doc/mjpegtools/HINTS
-%%PORTDOCS%%share/doc/mjpegtools/NEWS
-%%PORTDOCS%%share/doc/mjpegtools/PLANS
-%%PORTDOCS%%share/doc/mjpegtools/README
-%%PORTDOCS%%share/doc/mjpegtools/README.DV
-%%PORTDOCS%%share/doc/mjpegtools/README.avilib
-%%PORTDOCS%%share/doc/mjpegtools/README.glav
-%%PORTDOCS%%share/doc/mjpegtools/README.lavpipe
-%%PORTDOCS%%share/doc/mjpegtools/README.transist
-%%PORTDOCS%%share/doc/mjpegtools/TODO
-%%PORTDOCS%%@dirrm share/doc/mjpegtools
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+@dirrm include/mjpegtools/mplex
+@dirrm include/mjpegtools/mpeg2enc
 @dirrm include/mjpegtools