5 files changed, 18 insertions, 56 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 0ba7cd4e5fd5..91113c2c7082 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mjpegtools
-PORTVERSION=	1.9.0
-PORTREVISION=	2
+PORTVERSION=	2.0.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
 
@@ -30,7 +29,7 @@ WANT_GNOME=	yes
 WANT_SDL=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index d15b37545c10..95dd6b860809 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,3 +1,2 @@
-MD5 (mjpegtools-1.9.0.tar.gz) = 309a6fcf0900a010d6a9c1e91afc2f5c
-SHA256 (mjpegtools-1.9.0.tar.gz) = a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711
-SIZE (mjpegtools-1.9.0.tar.gz) = 1718063
+SHA256 (mjpegtools-2.0.0.tar.gz) = bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97
+SIZE (mjpegtools-2.0.0.tar.gz) = 1749671
diff --git a/multimedia/mjpegtools/files/patch-lavtools__jpegutils.c b/multimedia/mjpegtools/files/patch-lavtools__jpegutils.c
deleted file mode 100644
index ec367318628c..000000000000
--- a/multimedia/mjpegtools/files/patch-lavtools__jpegutils.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
-Patch by: Salah Coronya
-
-http://bugs.gentoo.org/show_bug.cgi?id=293919
-
---- lavtools/jpegutils.c
-+++ lavtools/jpegutils.c
-@@ -502,6 +502,7 @@
- 
-    jpeg_read_header (&dinfo, TRUE);
-    dinfo.raw_data_out = TRUE;
-+   dinfo.do_fancy_upsampling = FALSE;
-    dinfo.out_color_space = JCS_YCbCr;
-    dinfo.dct_method = JDCT_IFAST;
-    guarantee_huff_tables(&dinfo);
-@@ -599,6 +600,7 @@
-       if (field > 0) {
-          jpeg_read_header (&dinfo, TRUE);
-          dinfo.raw_data_out = TRUE;
-+         dinfo.do_fancy_upsampling = FALSE;
-          dinfo.out_color_space = JCS_YCbCr;
-          dinfo.dct_method = JDCT_IFAST;
-          jpeg_start_decompress (&dinfo);
diff --git a/multimedia/mjpegtools/files/patch-mplex__lpcmstrm_in.cpp b/multimedia/mjpegtools/files/patch-mplex__lpcmstrm_in.cpp
deleted file mode 100644
index 5c7c2f51e4ef..000000000000
--- a/multimedia/mjpegtools/files/patch-mplex__lpcmstrm_in.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mplex/lpcmstrm_in.cpp.orig	2005-10-14 01:43:10.000000000 +0900
-+++ mplex/lpcmstrm_in.cpp	2010-01-09 17:12:17.000000000 +0900
-@@ -53,7 +53,7 @@
- 
- bool LPCMStream::Probe(IBitStream &bs )
- {
--    char *last_dot = strrchr( bs.StreamName(), '.' );
-+    const char *last_dot = strrchr( bs.StreamName(), '.' );
-     return 
-         last_dot != NULL 
-         && strcmp( last_dot+1, "lpcm") == 0;
diff --git a/multimedia/mjpegtools/pkg-plist b/multimedia/mjpegtools/pkg-plist
index 8fe8cf7b3356..d4c7809d7326 100644
--- a/multimedia/mjpegtools/pkg-plist
+++ b/multimedia/mjpegtools/pkg-plist
@@ -73,9 +73,8 @@ 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/ontheflyratectlpass2.hh
+include/mjpegtools/mpeg2enc/ontheflyratectlpass1.hh
 include/mjpegtools/mpeg2enc/picture.hh
 include/mjpegtools/mpeg2enc/picturereader.hh
 include/mjpegtools/mpeg2enc/predict_ref.h
@@ -104,33 +103,33 @@ include/mjpegtools/mplex/stream_params.hpp
 include/mjpegtools/mplex/systems.hpp
 include/mjpegtools/mplex/videostrm.hpp
 include/mjpegtools/yuv4mpeg.h
-lib/liblavfile-1.9.so
-lib/liblavfile-1.9.so.0
+lib/liblavfile-2.0.so
+lib/liblavfile-2.0.so.0
 lib/liblavfile.a
 lib/liblavfile.la
 lib/liblavfile.so
-lib/liblavjpeg-1.9.so
-lib/liblavjpeg-1.9.so.0
+lib/liblavjpeg-2.0.so
+lib/liblavjpeg-2.0.so.0
 lib/liblavjpeg.a
 lib/liblavjpeg.la
 lib/liblavjpeg.so
-%%SDL:%%lib/liblavplay-1.9.so
-%%SDL:%%lib/liblavplay-1.9.so.0
+%%SDL:%%lib/liblavplay-2.0.so
+%%SDL:%%lib/liblavplay-2.0.so.0
 %%SDL:%%lib/liblavplay.a
 %%SDL:%%lib/liblavplay.la
 %%SDL:%%lib/liblavplay.so
-lib/libmjpegutils-1.9.so
-lib/libmjpegutils-1.9.so.0
+lib/libmjpegutils-2.0.so
+lib/libmjpegutils-2.0.so.0
 lib/libmjpegutils.a
 lib/libmjpegutils.la
 lib/libmjpegutils.so
-lib/libmpeg2encpp-1.9.so
-lib/libmpeg2encpp-1.9.so.0
+lib/libmpeg2encpp-2.0.so
+lib/libmpeg2encpp-2.0.so.0
 lib/libmpeg2encpp.a
 lib/libmpeg2encpp.la
 lib/libmpeg2encpp.so
-lib/libmplex2-1.9.so
-lib/libmplex2-1.9.so.0
+lib/libmplex2-2.0.so
+lib/libmplex2-2.0.so.0
 lib/libmplex2.a
 lib/libmplex2.la
 lib/libmplex2.so