13 files changed, 32 insertions, 68 deletions

diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 1a39e4bbb237..94252323e3a5 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bombono
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/bombono/bombono-dvd/1.0
 DISTNAME=	bombono-dvd-${PORTVERSION}
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index f96162d13142..97550c56734c 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.0.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=--disable-speex
 .endif
 
 .if !defined(WITHOUT_MJPEGTOOLS)
-LIB_DEPENDS+=	lavjpeg-1.9.0:${PORTSDIR}/multimedia/mjpegtools
+LIB_DEPENDS+=	lavjpeg-2.0.0:${PORTSDIR}/multimedia/mjpegtools
 .else
 CONFIGURE_ARGS+=--disable-mjpegtools
 .endif
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 9dc24267e938..fab7484f1b9d 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmerlin
 PORTVERSION=	0.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -139,7 +139,7 @@ PLIST_SUB+=	TIFF="@comment "
 .endif
 
 .if !defined(WITHOUT_MJPEGTOOLS)
-LIB_DEPENDS+=	lavjpeg-1.9.0:${PORTSDIR}/multimedia/mjpegtools
+LIB_DEPENDS+=	lavjpeg-2.0.0:${PORTSDIR}/multimedia/mjpegtools
 .else
 CONFIGURE_ARGS+=--disable-mjpegtools
 .endif
diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
index ec0488758256..990c5c8190ca 100644
--- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/gstreamer-plugins-mpeg2enc/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mpeg encoder plugin
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 9428ec15487c..43d5880e6386 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -387,7 +387,7 @@ gst_mad_PLIST_FILES=	${GST_LIB_DIR}/libgstmad.la \
 gst_mad_DIST=	ugly
 
 # mpeg2enc
-gst_mpeg2enc_LIB_DEPENDS+=	mjpegutils-1.9.0:${PORTSDIR}/multimedia/mjpegtools
+gst_mpeg2enc_LIB_DEPENDS+=	mjpegutils-2.0.0:${PORTSDIR}/multimedia/mjpegtools
 gst_mpeg2enc_PLIST_FILES=	${GST_LIB_DIR}/libgstmpeg2enc.la \
 		${GST_LIB_DIR}/libgstmpeg2enc.so
 gst_mpeg2enc_DIST=	bad
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 8339bbc44291..ad5de221b0fd 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lives
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xs4all.nl/~salsaman/lives/current/
 DISTNAME=	LiVES-${PORTVERSION}
@@ -19,7 +20,7 @@ LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		visual-0.4.0:${PORTSDIR}/graphics/libvisual04 \
 		dv.4:${PORTSDIR}/multimedia/libdv \
 		theora.0:${PORTSDIR}/multimedia/libtheora \
-		mjpegutils-1.9.0:${PORTSDIR}/multimedia/mjpegtools
+		mjpegutils-2.0.0:${PORTSDIR}/multimedia/mjpegtools
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
 		sox:${PORTSDIR}/audio/sox \
 		ogg123:${PORTSDIR}/audio/vorbis-tools \
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
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index afecc5d673c9..3ec8da3b7a1d 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -27,8 +27,8 @@ USE_LDCONFIG=	yes
 WANT_SDL=	yes
 WANT_GNOME=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-isystem /usr/include -isystem ${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS+=	-isystem ${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		SDL_CONFIG="${SDL_CONFIG}"
 CONFIGURE_ARGS+=	--with-libmpeg2-prefix=${LOCALBASE} \
 			--with-libavcodec-prefix=${LOCALBASE} \
@@ -194,7 +194,7 @@ CONFIGURE_ARGS+=	--disable-libxml2
 .endif
 
 .if defined(WITH_MJPEG)
-LIB_DEPENDS+=	lavjpeg-1.9.0:${PORTSDIR}/multimedia/mjpegtools
+LIB_DEPENDS+=	lavjpeg-2.0.0:${PORTSDIR}/multimedia/mjpegtools
 CONFIGURE_ARGS+=	--with-mjpegtools-prefix=${LOCALBASE} --enable-mjpegtools
 .else
 CONFIGURE_ARGS+=	--disable-mjpegtools
diff --git a/multimedia/y4mscaler/Makefile b/multimedia/y4mscaler/Makefile
index dba4bb00f0db..534dc06f4956 100644
--- a/multimedia/y4mscaler/Makefile
+++ b/multimedia/y4mscaler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	y4mscaler
 PORTVERSION=	9.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mir.com/DMG/Software/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Y4mscaler scales, crops, and shifts Y'CbCr video
 
-LIB_DEPENDS=	lavjpeg-1.9.0:${PORTSDIR}/multimedia/mjpegtools
+LIB_DEPENDS=	lavjpeg-2.0.0:${PORTSDIR}/multimedia/mjpegtools
 
 USE_GMAKE=	yes