ffmpegthumbnailer: update to 2.2.0.

FFmpegThumbnailer 2.2.0
- New option to prefer embedded image metadata over video content (command line argument: -m)
- Fixed 'Resource temporarily unavailable' errors when using ffmpeg < 3.0

FFmpegThumbnailer 2.1.2
- Restored deinterlace functionality using the libavfilter library (additional ffmpeg dependency)
- Additional video mime types added to the thumbnailer file
- Take rotation metadata into account when generating thumbnails

FFmpegThumbnailer 2.1.1
- Buildable agains latest ffmpeg (currently breaks deinterlacing)
- Fallback when smart frame detection fails (thanks to johnnydeez)
- Add MPEG-TS (MTS) support (thanks to marcinn)

FFmpegThumbnailer 2.1.0
- The library is now completely silent on std out and err by default
- A callback can be registered to listen to logging messages
- Fixed cmake installation directories (thanks to Vallimar)
- Fixed dimension calculation for anamorphic streams (Thanks to Richard Zurad)
- Fixed static library filename

FFmpegThumbnailer 2.0.10
- Migrated to github
- Use cmake instead of autotools
- Remove stderr logging

FFmpegThumbnailer 2.0.9
- Fixed gio library loading issue
- Support udp sources (thanks to tchristensen)
- No longer support older ffmpeg versions

5 files changed, 32 insertions, 31 deletions

diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index c04fc8b0af0..979f75430cd 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -1,23 +1,34 @@
-# $NetBSD: Makefile,v 1.22 2018/02/26 08:19:28 adam Exp $
+# $NetBSD: Makefile,v 1.23 2018/04/28 19:28:20 wiz Exp $
 
-DISTNAME=	ffmpegthumbnailer-2.0.8
-PKGREVISION=	8
+DISTNAME=	ffmpegthumbnailer-2.2.0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://ffmpegthumbnailer.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=dirkvdb/}
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.tar.bz2
+EXTRACT_USING=	bsdtar
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/dirkvdb/ffmpegthumbnailer
 COMMENT=	Lightweight video thumbnailer that can be used by file managers
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
 
 PKGCONFIG_OVERRIDE+=	libffmpegthumbnailer.pc.in
 
+CMAKE_ARG_PATH=	..
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=	-DENABLE_GIO=ON
+CMAKE_ARGS+=	-DENABLE_THUMBNAILER=ON
+CONFIGURE_DIRS=	build
+
+pre-configure:
+	${MKDIR} ${WRKSRC}/build
+
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ffmpegthumbnailer/PLIST b/multimedia/ffmpegthumbnailer/PLIST
index 2c486995932..c98064bd253 100644
--- a/multimedia/ffmpegthumbnailer/PLIST
+++ b/multimedia/ffmpegthumbnailer/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2011/01/20 20:21:16 gavan Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/04/28 19:28:20 wiz Exp $
 bin/ffmpegthumbnailer
+include/libffmpegthumbnailer/ffmpegthumbnailertypes.h
 include/libffmpegthumbnailer/filmstripfilter.h
 include/libffmpegthumbnailer/ifilter.h
 include/libffmpegthumbnailer/imagetypes.h
 include/libffmpegthumbnailer/videoframe.h
 include/libffmpegthumbnailer/videothumbnailer.h
 include/libffmpegthumbnailer/videothumbnailerc.h
-lib/libffmpegthumbnailer.la
+lib/libffmpegthumbnailer.so
+lib/libffmpegthumbnailer.so.4
+lib/libffmpegthumbnailer.so.4.13.1
 lib/pkgconfig/libffmpegthumbnailer.pc
 man/man1/ffmpegthumbnailer.1
+share/thumbnailers/ffmpegthumbnailer.thumbnailer
diff --git a/multimedia/ffmpegthumbnailer/buildlink3.mk b/multimedia/ffmpegthumbnailer/buildlink3.mk
index 1bd9e0f0e40..ba955323152 100644
--- a/multimedia/ffmpegthumbnailer/buildlink3.mk
+++ b/multimedia/ffmpegthumbnailer/buildlink3.mk
@@ -1,16 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:24 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/04/28 19:28:20 wiz Exp $
 
 BUILDLINK_TREE+=	ffmpegthumbnailer
 
 .if !defined(FFMPEGTHUMBNAILER_BUILDLINK3_MK)
 FFMPEGTHUMBNAILER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ffmpegthumbnailer+=	ffmpegthumbnailer>=2.0.6nb1
-BUILDLINK_ABI_DEPENDS.ffmpegthumbnailer?=	ffmpegthumbnailer>=2.0.8nb1
+BUILDLINK_API_DEPENDS.ffmpegthumbnailer+=	ffmpegthumbnailer>=2.2.0
 BUILDLINK_PKGSRCDIR.ffmpegthumbnailer?=		../../multimedia/ffmpegthumbnailer
 
 #.include "../../graphics/png/buildlink3.mk"
-#.include "../../multimedia/ffmpeg1/buildlink3.mk"
+#.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .endif	# FFMPEGTHUMBNAILER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ffmpegthumbnailer
diff --git a/multimedia/ffmpegthumbnailer/distinfo b/multimedia/ffmpegthumbnailer/distinfo
index 801590ef95c..9b1be230a30 100644
--- a/multimedia/ffmpegthumbnailer/distinfo
+++ b/multimedia/ffmpegthumbnailer/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 23:54:24 agc Exp $
+$NetBSD: distinfo,v 1.7 2018/04/28 19:28:20 wiz Exp $
 
-SHA1 (ffmpegthumbnailer-2.0.8.tar.gz) = 2c54ca16efd953f46547e22799cfc40bd9c24533
-RMD160 (ffmpegthumbnailer-2.0.8.tar.gz) = 39ef118a30111ab1035c4f18092123a3013f6972
-SHA512 (ffmpegthumbnailer-2.0.8.tar.gz) = 6062d4b8f5326bde96c8c6dceaac52e1fabcec93f0a0ee4be19e203050e6c80426a006076a27e4a12582e05daceebd37beef008154fdd92a87f365fdff68ca83
-Size (ffmpegthumbnailer-2.0.8.tar.gz) = 367186 bytes
-SHA1 (patch-libffmpegthumbnailer_pngwriter.cpp) = d5fc0aa9bdbc94cf2ea89a89ff082c4a8d49540e
+SHA1 (ffmpegthumbnailer-2.2.0.tar.bz2) = 4c7cdb3f2f7acd73c2f5138429ed2d2397f0f146
+RMD160 (ffmpegthumbnailer-2.2.0.tar.bz2) = 3b89af75a3c65c4a1d998157e8000a2b862b6bd1
+SHA512 (ffmpegthumbnailer-2.2.0.tar.bz2) = 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf
+Size (ffmpegthumbnailer-2.2.0.tar.bz2) = 1223895 bytes
diff --git a/multimedia/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_pngwriter.cpp b/multimedia/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_pngwriter.cpp
deleted file mode 100644
index f5fa10685c5..00000000000
--- a/multimedia/ffmpegthumbnailer/patches/patch-libffmpegthumbnailer_pngwriter.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-libffmpegthumbnailer_pngwriter.cpp,v 1.1 2013/02/26 11:05:30 joerg Exp $
-
---- libffmpegthumbnailer/pngwriter.cpp.orig	2013-02-25 17:13:07.000000000 +0000
-+++ libffmpegthumbnailer/pngwriter.cpp
-@@ -17,6 +17,7 @@
- #include "pngwriter.h"
- #include <stdexcept>
- #include <cassert>
-+#include <cstring>
- 
- using namespace std;
-