Attachment #216825 for bug #248095




# $FreeBSD$

PORTNAME=	ffmpegthumbnailer
PORTVERSION=	2.2.2
PORTREVISION=	10
CATEGORIES=	multimedia graphics
MASTER_SITES=	https://github.com/dirkvdb/${PORTNAME}/releases/download/${PORTVERSION}/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Lightweight video thumbnailer that can be used by file managers

LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libpng.so:graphics/png \
		libavformat.so:multimedia/ffmpeg

USES=		cmake compiler:c++11-lib gnome jpeg localbase pkgconfig tar:bz2
GH_ACCOUNT=	dirkvdb

USES=		cmake compiler:c++11-lib gnome jpeg localbase pathfix pkgconfig
USE_GNOME=	glib20
USE_LDCONFIG=	yes

EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar

CMAKE_ON=	ENABLE_GIO

OPTIONS_DEFINE=	TEST THUMBNAILER
THUMBNAILER_DESC=Register as a system thumbnailer
OPTIONS_SUB=	yes
OPTIONS_DEFAULT=THUMBNAILER

TEST_CMAKE_BOOL=	ENABLE_TESTS

THUMBNAILER_CMAKE_ON=	-DENABLE_THUMBNAILER:BOOL=ON

do-test:
	(cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest)

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/ffmpegthumbnailer/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1485821757	1	TIMESTAMP = 1595238599
2	SHA256 (dirkvdb-ffmpegthumbnailer-2.2.0_GH0.tar.gz) = 8bc74755aa960531acdea8fa19ad7e1b7c806c28a068306a8c7150d278241a8f	2	SHA256 (ffmpegthumbnailer-2.2.2.tar.bz2) = 1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b
3	SIZE (dirkvdb-ffmpegthumbnailer-2.2.0_GH0.tar.gz) = 1284692	3	SIZE (ffmpegthumbnailer-2.2.2.tar.bz2) = 1201838




--- CMakeLists.txt.orig	2019-10-03 19:51:17 UTC
+++ CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
@@ -92,6 +92,15 @@ add_library(libffmpegthumbnailerobj OBJECT
     libffmpegthumbnailer/filmstripfilter.cpp
 )
 
+target_link_libraries(libffmpegthumbnailerobj
+    FFmpeg::avformat
+    FFmpeg::avcodec
+    FFmpeg::avutil
+    FFmpeg::avfilter
+    $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
+    $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
+)
+
 # we use our own deprecated struct menbers, so disable the warning about it
 set_source_files_properties(libffmpegthumbnailer/videothumbnailerc.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
 
@@ -118,12 +127,7 @@ set (FFMPEGTHUMBNAILER_SOVERSION_AGE 1)
 if (ENABLE_STATIC)
     add_library(libffmpegthumbnailerstatic STATIC $<TARGET_OBJECTS:libffmpegthumbnailerobj>)
     target_link_libraries(libffmpegthumbnailerstatic
-        FFmpeg::avformat
-        FFmpeg::avcodec
-        FFmpeg::avutil
-        FFmpeg::avfilter
-        $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
-        $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
+        libffmpegthumbnailerobj
         $<$<BOOL:${ENABLE_GIO}>:${CMAKE_DL_LIBS}>
     )
 
@@ -140,12 +144,7 @@ endif ()
 if (ENABLE_SHARED)
     add_library(libffmpegthumbnailer SHARED $<TARGET_OBJECTS:libffmpegthumbnailerobj>)
     target_link_libraries(libffmpegthumbnailer
-        FFmpeg::avformat
-        FFmpeg::avcodec
-        FFmpeg::avutil
-        FFmpeg::avfilter
-        $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
-        $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
+        libffmpegthumbnailerobj
     )
 
     set_target_properties(libffmpegthumbnailer PROPERTIES

Removed Link Here

(-)a/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer (-8 lines)
1	--- dist/ffmpegthumbnailer.thumbnailer.orig 2016-02-17 19:57:35 UTC
2	+++ dist/ffmpegthumbnailer.thumbnailer
3	@@ -1,4 +1,4 @@
4	[Thumbnailer Entry]
5	TryExec=ffmpegthumbnailer
6	Exec=ffmpegthumbnailer -i %i -o %o -s %s -f
7	-MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-msvideo;video/x-flv;video/x-matroska;video/webm;video/mp2t;
8	+MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktimeplayer;application/x-shorten;audio/3gpp;audio/AMR;audio/AMR-WB;audio/ac3;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-real-audio;audio/x-realaudio;audio/x-sbc;audio/x-speex;audio/x-tta;audio/x-vorbis;audio/x-vorbis/ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-nsv;video/x-ogm/ogg;video/x-theora/ogg;video/x-totem-stream;

Removed Link Here

(-)a/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h (-10 lines)
1	--- libffmpegthumbnailer/jpegwriter.h.orig 2016-02-17 19:57:35 UTC
2	+++ libffmpegthumbnailer/jpegwriter.h
3	@@ -17,6 +17,7 @@
4	#ifndef JPEG_WRITER_H
5	#define JPEG_WRITER_H
6
7	+#include <cstdio>
8	#include <string>
9	#include <vector>
10

Lines 8-14 include/libffmpegthumbnailer/videothumbnailer.h Link Here

(-)b/multimedia/ffmpegthumbnailer/pkg-plist (-2 / +1 lines)
8	include/libffmpegthumbnailer/videothumbnailerc.h	8	include/libffmpegthumbnailer/videothumbnailerc.h
9	lib/libffmpegthumbnailer.so	9	lib/libffmpegthumbnailer.so
10	lib/libffmpegthumbnailer.so.4	10	lib/libffmpegthumbnailer.so.4
11	lib/libffmpegthumbnailer.so.4.13.1	11	lib/libffmpegthumbnailer.so.4.15.1
12	libdata/pkgconfig/libffmpegthumbnailer.pc	12	libdata/pkgconfig/libffmpegthumbnailer.pc
13	man/man1/ffmpegthumbnailer.1.gz	13	man/man1/ffmpegthumbnailer.1.gz
14	%%THUMBNAILER%%share/thumbnailers/ffmpegthumbnailer.thumbnailer	14	%%THUMBNAILER%%share/thumbnailers/ffmpegthumbnailer.thumbnailer
15	-

Return to bug 248095

Lines 2-10 Link Here

(-)b/multimedia/ffmpegthumbnailer/Makefile (-10 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ffmpegthumbnailer	4	PORTNAME= ffmpegthumbnailer
5	PORTVERSION= 2.2.0	5	PORTVERSION= 2.2.2
6	PORTREVISION= 10
7	CATEGORIES= multimedia graphics	6	CATEGORIES= multimedia graphics
		7	MASTER_SITES= https://github.com/dirkvdb/${PORTNAME}/releases/download/${PORTVERSION}/
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Lightweight video thumbnailer that can be used by file managers	10	COMMENT= Lightweight video thumbnailer that can be used by file managers
Lines 13-34 LICENSE= GPLv2+ Link Here
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	LIB_DEPENDS= libpng.so:graphics/png \	15	LIB_DEPENDS= libpng.so:graphics/png \
16	libswscale.so:multimedia/ffmpeg	16	libavformat.so:multimedia/ffmpeg
17		17
18	USE_GITHUB= yes	18	USES= cmake compiler:c++11-lib gnome jpeg localbase pkgconfig tar:bz2
19	GH_ACCOUNT= dirkvdb
20
21	USES= cmake compiler:c++11-lib gnome jpeg localbase pathfix pkgconfig
22	USE_GNOME= glib20	19	USE_GNOME= glib20
23	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
24		21
25	CMAKE_ARGS= -DENABLE_GIO=ON	22	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
		23
		24	CMAKE_ON= ENABLE_GIO
26		25
27	OPTIONS_DEFINE= THUMBNAILER	26	OPTIONS_DEFINE= TEST THUMBNAILER
28	THUMBNAILER_DESC=Register as a system thumbnailer	27	THUMBNAILER_DESC=Register as a system thumbnailer
29	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
30	OPTIONS_DEFAULT=THUMBNAILER	29	OPTIONS_DEFAULT=THUMBNAILER
31		30
32	THUMBNAILER_CMAKE_ON= -DENABLE_THUMBNAILER=ON	31	TEST_CMAKE_BOOL= ENABLE_TESTS
		32
		33	THUMBNAILER_CMAKE_ON= -DENABLE_THUMBNAILER:BOOL=ON
		34
		35	do-test:
		36	(cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest)
33		37
34	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Added Link Here

(-)b/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt (+52 lines)
1	--- CMakeLists.txt.orig 2019-10-03 19:51:17 UTC
2	+++ CMakeLists.txt
3	@@ -1,4 +1,4 @@
4	-cmake_minimum_required(VERSION 3.5)
5	+cmake_minimum_required(VERSION 3.12)
6
7	list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
8
9	@@ -92,6 +92,15 @@ add_library(libffmpegthumbnailerobj OBJECT
10	libffmpegthumbnailer/filmstripfilter.cpp
11	)
12
13	+target_link_libraries(libffmpegthumbnailerobj
14	+ FFmpeg::avformat
15	+ FFmpeg::avcodec
16	+ FFmpeg::avutil
17	+ FFmpeg::avfilter
18	+ $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
19	+ $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
20	+)
21	+
22	# we use our own deprecated struct menbers, so disable the warning about it
23	set_source_files_properties(libffmpegthumbnailer/videothumbnailerc.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
24
25	@@ -118,12 +127,7 @@ set (FFMPEGTHUMBNAILER_SOVERSION_AGE 1)
26	if (ENABLE_STATIC)
27	add_library(libffmpegthumbnailerstatic STATIC $<TARGET_OBJECTS:libffmpegthumbnailerobj>)
28	target_link_libraries(libffmpegthumbnailerstatic
29	- FFmpeg::avformat
30	- FFmpeg::avcodec
31	- FFmpeg::avutil
32	- FFmpeg::avfilter
33	- $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
34	- $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
35	+ libffmpegthumbnailerobj
36	$<$<BOOL:${ENABLE_GIO}>:${CMAKE_DL_LIBS}>
37	)
38
39	@@ -140,12 +144,7 @@ endif ()
40	if (ENABLE_SHARED)
41	add_library(libffmpegthumbnailer SHARED $<TARGET_OBJECTS:libffmpegthumbnailerobj>)
42	target_link_libraries(libffmpegthumbnailer
43	- FFmpeg::avformat
44	- FFmpeg::avcodec
45	- FFmpeg::avutil
46	- FFmpeg::avfilter
47	- $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
48	- $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
49	+ libffmpegthumbnailerobj
50	)
51
52	set_target_properties(libffmpegthumbnailer PROPERTIES