svn commit: r543931 - in head/multimedia/ffmpegthumbnailer: . files
Tobias C. Berner
tcberner at FreeBSD.org
Sun Aug 2 08:28:29 UTC 2020
Author: tcberner
Date: Sun Aug 2 08:28:28 2020
New Revision: 543931
URL: https://svnweb.freebsd.org/changeset/ports/543931
Log:
multimedia/ffmpegthumbnailer: Update to 2.2.2
- adds TEST option. For this a manual extract command was required
as the testing uses a UTF-8 encoded file name.
PR: 248095
Submitted by: Marcel Bischoff <marcel at herrbischoff.com>, daniel.engberg.lists at pyret.net (committed version)
Reported by: Marcel Bischoff <marcel at herrbischoff.com>
Added:
head/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt (contents, props changed)
Deleted:
head/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer
head/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h
Modified:
head/multimedia/ffmpegthumbnailer/Makefile
head/multimedia/ffmpegthumbnailer/distinfo
head/multimedia/ffmpegthumbnailer/pkg-plist
Modified: head/multimedia/ffmpegthumbnailer/Makefile
==============================================================================
--- head/multimedia/ffmpegthumbnailer/Makefile Sun Aug 2 07:06:33 2020 (r543930)
+++ head/multimedia/ffmpegthumbnailer/Makefile Sun Aug 2 08:28:28 2020 (r543931)
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= ffmpegthumbnailer
-PORTVERSION= 2.2.0
-PORTREVISION= 10
+PORTVERSION= 2.2.2
CATEGORIES= multimedia graphics
+MASTER_SITES= https://github.com/dirkvdb/${PORTNAME}/releases/download/${PORTVERSION}/
MAINTAINER= ports at FreeBSD.org
COMMENT= Lightweight video thumbnailer that can be used by file managers
@@ -13,22 +13,26 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png \
- libswscale.so:multimedia/ffmpeg
+ libavformat.so:multimedia/ffmpeg
-USE_GITHUB= yes
-GH_ACCOUNT= dirkvdb
-
-USES= cmake compiler:c++11-lib gnome jpeg localbase pathfix pkgconfig
+USES= cmake compiler:c++11-lib gnome jpeg localbase pkgconfig tar:bz2
USE_GNOME= glib20
USE_LDCONFIG= yes
-CMAKE_ARGS= -DENABLE_GIO=ON
+EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
-OPTIONS_DEFINE= THUMBNAILER
+CMAKE_ON= ENABLE_GIO
+
+OPTIONS_DEFINE= TEST THUMBNAILER
THUMBNAILER_DESC=Register as a system thumbnailer
OPTIONS_SUB= yes
OPTIONS_DEFAULT=THUMBNAILER
-THUMBNAILER_CMAKE_ON= -DENABLE_THUMBNAILER=ON
+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>
Modified: head/multimedia/ffmpegthumbnailer/distinfo
==============================================================================
--- head/multimedia/ffmpegthumbnailer/distinfo Sun Aug 2 07:06:33 2020 (r543930)
+++ head/multimedia/ffmpegthumbnailer/distinfo Sun Aug 2 08:28:28 2020 (r543931)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485821757
-SHA256 (dirkvdb-ffmpegthumbnailer-2.2.0_GH0.tar.gz) = 8bc74755aa960531acdea8fa19ad7e1b7c806c28a068306a8c7150d278241a8f
-SIZE (dirkvdb-ffmpegthumbnailer-2.2.0_GH0.tar.gz) = 1284692
+TIMESTAMP = 1595238599
+SHA256 (ffmpegthumbnailer-2.2.2.tar.bz2) = 1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b
+SIZE (ffmpegthumbnailer-2.2.2.tar.bz2) = 1201838
Added: head/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt Sun Aug 2 08:28:28 2020 (r543931)
@@ -0,0 +1,52 @@
+--- 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
Modified: head/multimedia/ffmpegthumbnailer/pkg-plist
==============================================================================
--- head/multimedia/ffmpegthumbnailer/pkg-plist Sun Aug 2 07:06:33 2020 (r543930)
+++ head/multimedia/ffmpegthumbnailer/pkg-plist Sun Aug 2 08:28:28 2020 (r543931)
@@ -8,7 +8,7 @@ include/libffmpegthumbnailer/videothumbnailer.h
include/libffmpegthumbnailer/videothumbnailerc.h
lib/libffmpegthumbnailer.so
lib/libffmpegthumbnailer.so.4
-lib/libffmpegthumbnailer.so.4.13.1
+lib/libffmpegthumbnailer.so.4.15.1
libdata/pkgconfig/libffmpegthumbnailer.pc
man/man1/ffmpegthumbnailer.1.gz
%%THUMBNAILER%%share/thumbnailers/ffmpegthumbnailer.thumbnailer
More information about the svn-ports-head
mailing list