6 files changed, 48 insertions, 69 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 70dbfd0cede5..889de875e56f 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mjpegtools
-DISTVERSION=	1.8.0
-PORTREVISION=	6
+DISTVERSION=	1.9.0rc1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mjpeg
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index 5600ca62f6bd..6119d54c7c35 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (mjpegtools-1.8.0.tar.gz) = 6fd98362310480bdaf7171e9659f165f
-SHA256 (mjpegtools-1.8.0.tar.gz) = d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
-SIZE (mjpegtools-1.8.0.tar.gz) = 1475998
+MD5 (mjpegtools-1.9.0rc1.tar.gz) = 35359d4e0947602f2851e7351f574ac9
+SHA256 (mjpegtools-1.9.0rc1.tar.gz) = 50439edf61e58da8ef7143529bce86ed1f5a4711497bd5ea0f026ec9ec77ee81
+SIZE (mjpegtools-1.9.0rc1.tar.gz) = 2339752
diff --git a/multimedia/mjpegtools/files/patch-gcc41 b/multimedia/mjpegtools/files/patch-gcc41
deleted file mode 100644
index 5e840fc5ec40..000000000000
--- a/multimedia/mjpegtools/files/patch-gcc41
+++ /dev/null
@@ -1,11 +0,0 @@
---- y4mdenoise/Region2D.hh.orig	Tue Jan 30 16:27:22 2007
-+++ y4mdenoise/Region2D.hh	Tue Jan 30 16:27:36 2007
-@@ -16,7 +16,7 @@
- 
- #include "Status_t.h"
- #include <iostream>
--
-+#include <cassert>
- 
- 
- // The 2-dimensional region class.  Parameterized by the numeric type
diff --git a/multimedia/mjpegtools/files/patch-lavtools_lav_io.c b/multimedia/mjpegtools/files/patch-lavtools_lav_io.c
deleted file mode 100644
index ec4c5668eaea..000000000000
--- a/multimedia/mjpegtools/files/patch-lavtools_lav_io.c
+++ /dev/null
@@ -1,18 +0,0 @@
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/lavtools/lav_io.c,v
-retrieving revision 1.74
-retrieving revision 1.78
-diff -u -r1.74 -r1.78
---- lavtools/lav_io.c	2005/10/24 03:17:56	1.74
-+++ lavtools/lav_io.c	2005/12/04 19:59:47	1.78
-@@ -1395,8 +1395,8 @@
-          break;
- #ifdef HAVE_LIBQUICKTIME
-       case 'q':
--         res = fileno(((quicktime_t *)lav_file->qt_fd)->stream);
--         break;
-+	res = lqt_fileno((quicktime_t *)lav_file->qt_fd);
-+	break;
- #endif
-       default:
-          res = -1;
diff --git a/multimedia/mjpegtools/files/patch-mplex_main.cpp b/multimedia/mjpegtools/files/patch-mplex_main.cpp
index f9444738a3b5..4ac18785ae52 100644
--- a/multimedia/mjpegtools/files/patch-mplex_main.cpp
+++ b/multimedia/mjpegtools/files/patch-mplex_main.cpp
@@ -1,5 +1,5 @@
---- mplex/main.cpp.orig	Thu Dec  9 21:13:26 2004
-+++ mplex/main.cpp	Mon Jul 18 21:11:07 2005
+--- mplex/main.cpp.orig	Wed Jun 20 13:40:39 2007
++++ mplex/main.cpp	Wed Jun 20 13:41:49 2007
 @@ -38,6 +38,7 @@
  #endif
  #include <ctype.h>
@@ -8,43 +8,47 @@
  #include "cpu_accel.h"
  #include "mjpeg_types.h"
  #include "mjpeg_logging.h"
-@@ -107,6 +108,13 @@
+@@ -107,6 +108,14 @@
+ 	{
  		mjpeg_error_exit1( "Could not open for writing: %s", cur_filename );
  	}
- 
-+	{
-+		int	flags;
++       {
++               int     flags;
 +
-+		(void)fcntl(fileno(strm), F_GETFL, &flags);
-+		(void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
-+	}
++               (void)fcntl(fileno(strm), F_GETFL, &flags);
++               (void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
++       }
 +
++
+ 
  	return 0;
  }
- 
-@@ -144,6 +152,12 @@
- 	{
+@@ -143,6 +152,13 @@
  		mjpeg_error_exit1( "Could not open for writing: %s", cur_filename );
  	}
-+	{
-+		int	flags;
+     segment_len = 0;
++       {
++               int     flags;
++
++               (void)fcntl(fileno(strm), F_GETFL, &flags);
++               (void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
++       }
 +
-+		(void)fcntl(fileno(strm), F_GETFL, &flags);
-+		(void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
-+	}
  }
  
  void
-@@ -200,6 +214,14 @@
+@@ -200,6 +216,14 @@
  	{
  		mjpeg_error_exit1( "Unable to open file %s for reading.", bs_filename);
  	}
 +
-+	{
-+		int	flags;
++       {
++               int     flags;
 +
-+		(void)fcntl(fileno(fileh), F_GETFL, &flags);
-+		(void)fcntl(fileno(fileh), F_SETFL, flags & ~O_NONBLOCK);
-+	}
++               (void)fcntl(fileno(fileh), F_GETFL, &flags);
++               (void)fcntl(fileno(fileh), F_SETFL, flags & ~O_NONBLOCK);
++       }
 +
  	filename = strcpy( new char[strlen(bs_filename)+1], bs_filename );
+     streamname = filename;
+ 
diff --git a/multimedia/mjpegtools/pkg-plist b/multimedia/mjpegtools/pkg-plist
index b2378cb8ffbb..58e7ba09b88d 100644
--- a/multimedia/mjpegtools/pkg-plist
+++ b/multimedia/mjpegtools/pkg-plist
@@ -10,6 +10,7 @@ bin/lavinfo
 bin/lavpipe
 %%SDL:%%bin/lavplay
 bin/lavtrans
+bin/lavtc.sh
 bin/matteblend.flt
 bin/mjpeg_simd_helper
 bin/mp2enc
@@ -23,6 +24,7 @@ bin/pnmtoy4m
 bin/ppmtoy4m
 bin/transist.flt
 bin/y4mblack
+bin/y4mivtc
 bin/y4mcolorbars
 bin/y4mdenoise
 bin/y4mhist
@@ -69,6 +71,9 @@ include/mjpegtools/mpeg2enc/mpeg2encoder.hh
 include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
 include/mjpegtools/mpeg2enc/mpeg2encparams.h
 include/mjpegtools/mpeg2enc/mpeg2syntaxcodes.h
+include/mjpegtools/mpeg2enc/ontheflyratectl.hh
+include/mjpegtools/mpeg2enc/pass1ratectl.hh
+include/mjpegtools/mpeg2enc/pass2ratectl.hh
 include/mjpegtools/mpeg2enc/picture.hh
 include/mjpegtools/mpeg2enc/picturereader.hh
 include/mjpegtools/mpeg2enc/predict_ref.h
@@ -97,33 +102,33 @@ include/mjpegtools/mplex/stream_params.hpp
 include/mjpegtools/mplex/systems.hpp
 include/mjpegtools/mplex/videostrm.hpp
 include/mjpegtools/yuv4mpeg.h
-lib/liblavfile-1.8.so
-lib/liblavfile-1.8.so.0
+lib/liblavfile-1.9.so
+lib/liblavfile-1.9.so.1
 lib/liblavfile.a
 lib/liblavfile.la
 lib/liblavfile.so
-lib/liblavjpeg-1.8.so
-lib/liblavjpeg-1.8.so.0
+lib/liblavjpeg-1.9.so
+lib/liblavjpeg-1.9.so.1
 lib/liblavjpeg.a
 lib/liblavjpeg.la
 lib/liblavjpeg.so
-%%SDL:%%lib/liblavplay-1.8.so
-%%SDL:%%lib/liblavplay-1.8.so.0
+%%SDL:%%lib/liblavplay-1.9.so
+%%SDL:%%lib/liblavplay-1.9.so.1
 %%SDL:%%lib/liblavplay.a
 %%SDL:%%lib/liblavplay.la
 %%SDL:%%lib/liblavplay.so
-lib/libmjpegutils-1.8.so
-lib/libmjpegutils-1.8.so.0
+lib/libmjpegutils-1.9.so
+lib/libmjpegutils-1.9.so.1
 lib/libmjpegutils.a
 lib/libmjpegutils.la
 lib/libmjpegutils.so
-lib/libmpeg2encpp-1.8.so
-lib/libmpeg2encpp-1.8.so.0
+lib/libmpeg2encpp-1.9.so
+lib/libmpeg2encpp-1.9.so.1
 lib/libmpeg2encpp.a
 lib/libmpeg2encpp.la
 lib/libmpeg2encpp.so
-lib/libmplex2-1.8.so
-lib/libmplex2-1.8.so.0
+lib/libmplex2-1.9.so
+lib/libmplex2-1.9.so.1
 lib/libmplex2.a
 lib/libmplex2.la
 lib/libmplex2.so