Attachment #240855 for bug #270224

View | Details | Raw Unified | Return to bug 270224
Collapse All | Expand All




PORTNAME=	ffmpegthumbnailer
DISTVERSION=	2.2.2.a.20221021
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

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

USES=		cmake:testing compiler:c++11-lib gnome jpeg localbase pkgconfig tar:bz2
USE_GITHUB=	yes
GH_ACCOUNT=	dirkvdb
GH_TAGNAME=	e0bf01d

USE_GNOME=	glib20
USE_LDCONFIG=	yes

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

CMAKE_OFF=	ENABLE_TESTS
CMAKE_ON=	ENABLE_GIO

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

THUMBNAILER_DESC=	Register as a system thumbnailer

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 = 1595238599	1	TIMESTAMP = 1678817076
2	SHA256 (ffmpegthumbnailer-2.2.2.tar.bz2) = 1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b	2	SHA256 (dirkvdb-ffmpegthumbnailer-2.2.2.a.20221021-e0bf01d_GH0.tar.gz) = 56e100ef6e6a8ce18e6015b79efad6601a636b03b6bcf9abf6b6f73c501e13e7
3	SIZE (ffmpegthumbnailer-2.2.2.tar.bz2) = 1201838	3	SIZE (dirkvdb-ffmpegthumbnailer-2.2.2.a.20221021-e0bf01d_GH0.tar.gz) = 1291600




--- 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

Return to bug 270224

Lines 1-7 Link Here

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

Removed Link Here

(-)a/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