mjpegtools: update to 2.1.0 (from 2013)

6 files changed, 12 insertions, 45 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 255d9f29ec0..f96ed41f0a4 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2015/04/25 14:23:40 tnn Exp $
+# $NetBSD: Makefile,v 1.58 2017/12/19 10:34:47 markd Exp $
 
-DISTNAME=	mjpegtools-2.0.0
-PKGREVISION=	4
+DISTNAME=	mjpegtools-2.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
@@ -21,6 +20,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-libquicktime
 CONFIGURE_ARGS+=	--enable-large-file
 CONFIGURE_ARGS+=	--with-lame-includes=${BUILDLINK_PREFIX.lame}
+CONFIGURE_ARGS+=	--with-pic
 
 SHLIBTOOL_OVERRIDE=	# empty
 PKGCONFIG_OVERRIDE=	mjpegtools.pc.in
@@ -37,6 +37,7 @@ CONFIGURE_ENV+=		mjt_cv_extern___progname=no
 .endif
 
 BUILDLINK_TRANSFORM+=	rm:-laudio
+BUILDLINK_TRANSFORM+=	rm:-fno-PIC
 
 .include "options.mk"
 
diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST
index 28521eb173e..7ca61b9d630 100644
--- a/multimedia/mjpegtools/PLIST
+++ b/multimedia/mjpegtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2012/07/07 15:49:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/12/19 10:34:47 markd Exp $
 bin/anytovcd.sh
 bin/jpeg2yuv
 bin/lav2avi.sh
@@ -29,6 +29,7 @@ bin/y4mdenoise
 bin/y4mhist
 bin/y4minterlace
 bin/y4mivtc
+bin/y4mscaler
 bin/y4mshift
 bin/y4mspatialfilter
 bin/y4mstabilizer
@@ -129,6 +130,7 @@ man/man1/pnmtoy4m.1
 man/man1/ppmtoy4m.1
 man/man1/y4mcolorbars.1
 man/man1/y4mdenoise.1
+man/man1/y4mscaler.1
 man/man1/y4mtopnm.1
 man/man1/y4mtoppm.1
 man/man1/y4munsharp.1
diff --git a/multimedia/mjpegtools/PLIST.Linux b/multimedia/mjpegtools/PLIST.Linux
deleted file mode 100644
index 546f4e72b30..00000000000
--- a/multimedia/mjpegtools/PLIST.Linux
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2012/12/31 08:00:41 sbd Exp $
-bin/lavrec
-bin/lavvideo
-bin/testrec
-lib/liblavrec.la
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index 750cf0bb795..c99c669156c 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.27 2015/11/03 23:54:30 agc Exp $
+$NetBSD: distinfo,v 1.28 2017/12/19 10:34:47 markd Exp $
 
-SHA1 (mjpegtools-2.0.0.tar.gz) = f411e8573d446711dbe8455a6ae9257e1afe1e70
-RMD160 (mjpegtools-2.0.0.tar.gz) = 454e23bedb2bd592912a546d0621b5c3662c3bb2
-SHA512 (mjpegtools-2.0.0.tar.gz) = 1b666293f55b10869e959305d9b3b2ab0388292498f49ba791439ae167f1d8c8921457e0e5312b74d53f61a68fc13da0222f1f83aced5fe5b04768be0cce07ad
-Size (mjpegtools-2.0.0.tar.gz) = 1749671 bytes
+SHA1 (mjpegtools-2.1.0.tar.gz) = b9effa86280e23d67369e842e5cb645948583097
+RMD160 (mjpegtools-2.1.0.tar.gz) = b63a26442e440512d946c4591ee604689f6e8159
+SHA512 (mjpegtools-2.1.0.tar.gz) = 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
+Size (mjpegtools-2.1.0.tar.gz) = 1844336 bytes
 SHA1 (patch-aa) = 0c46a6a6d5f7e5103cdcc51e03f9d109900cb37b
-SHA1 (patch-lavtools_Makefile.in) = 1f67844db005e16e4ba2bfc5d5fca552ca9a4aff
-SHA1 (patch-y4mdenoise_MotionSearcher.hh) = 005783ee930add3897041778a9d3b3817e18cce2
diff --git a/multimedia/mjpegtools/patches/patch-lavtools_Makefile.in b/multimedia/mjpegtools/patches/patch-lavtools_Makefile.in
deleted file mode 100644
index 7baf3355347..00000000000
--- a/multimedia/mjpegtools/patches/patch-lavtools_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lavtools_Makefile.in,v 1.1 2012/07/07 15:49:01 adam Exp $
-
-Linking against X11 out of the blue is not clean, especially on Mac OS X
-
---- lavtools/Makefile.in.orig	2012-07-07 13:01:12.000000000 +0000
-+++ lavtools/Makefile.in
-@@ -42,7 +42,6 @@ host_triplet = @host@
- @HAVE_V4L_TRUE@am__append_2 = liblavrec.la
- @HAVE_V4L_OR_SDL_TRUE@am__append_3 = liblavplay.la
- @HAVE_V4L_TRUE@am__append_4 = ${X_LIBS} 
--@HAVE_SDL_TRUE@am__append_5 = -lX11
- bin_PROGRAMS = mjpeg_simd_helper$(EXEEXT) lav2wav$(EXEEXT) \
- 	lav2yuv$(EXEEXT) lavaddwav$(EXEEXT) lavtrans$(EXEEXT) \
- 	ypipe$(EXEEXT) yuv2lav$(EXEEXT) transist.flt$(EXEEXT) \
diff --git a/multimedia/mjpegtools/patches/patch-y4mdenoise_MotionSearcher.hh b/multimedia/mjpegtools/patches/patch-y4mdenoise_MotionSearcher.hh
deleted file mode 100644
index 55141fb8d15..00000000000
--- a/multimedia/mjpegtools/patches/patch-y4mdenoise_MotionSearcher.hh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-y4mdenoise_MotionSearcher.hh,v 1.1 2012/07/07 15:49:01 adam Exp $
-
-Fix C++ error
-
---- y4mdenoise/MotionSearcher.hh.orig	2012-07-07 13:03:45.000000000 +0000
-+++ y4mdenoise/MotionSearcher.hh
-@@ -2196,7 +2196,7 @@ MotionSearcher<PIXEL_NUM,DIM,PIXEL_TOL,P
- 	{
- 		// This region is too small to be bothered with.
- 		// Just get rid of it.
--		DeleteRegion (a_pRegion);
-+		this->DeleteRegion (a_pRegion);
- 	}
- 	else
- 	{