From d402affd6c6b6c716dc93b09ff07cea2776aaec9 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 27 Jul 2020 23:19:13 +0200 Subject: [PATCH] ffmpegthumbnailer222-v2 ffmpegthumbnailer222-v2 Signed-off-by: Daniel Engberg --- multimedia/ffmpegthumbnailer/Makefile | 24 +++++---- multimedia/ffmpegthumbnailer/distinfo | 6 +-- .../files/patch-CMakeLists.txt | 52 +++++++++++++++++++ .../patch-dist_ffmpegthumbnailer.thumbnailer | 8 --- .../patch-libffmpegthumbnailer_jpegwriter.h | 10 ---- multimedia/ffmpegthumbnailer/pkg-plist | 2 +- 6 files changed, 70 insertions(+), 32 deletions(-) create mode 100644 multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt delete mode 100644 multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer delete mode 100644 multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 34e9cc5fa826..e099d0788be9 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -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@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 + +CMAKE_ON= ENABLE_GIO -OPTIONS_DEFINE= THUMBNAILER +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 diff --git a/multimedia/ffmpegthumbnailer/distinfo b/multimedia/ffmpegthumbnailer/distinfo index a34772d0b702..e3f4747e9420 100644 --- a/multimedia/ffmpegthumbnailer/distinfo +++ b/multimedia/ffmpegthumbnailer/distinfo @@ -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 diff --git a/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt b/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2d065734fdf0 --- /dev/null +++ b/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt @@ -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 ++ $<$:${JPEG_LIBRARIES}> ++ $<$: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_link_libraries(libffmpegthumbnailerstatic +- FFmpeg::avformat +- FFmpeg::avcodec +- FFmpeg::avutil +- FFmpeg::avfilter +- $<$:${JPEG_LIBRARIES}> +- $<$:PNG::PNG> ++ libffmpegthumbnailerobj + $<$:${CMAKE_DL_LIBS}> + ) + +@@ -140,12 +144,7 @@ endif () + if (ENABLE_SHARED) + add_library(libffmpegthumbnailer SHARED $) + target_link_libraries(libffmpegthumbnailer +- FFmpeg::avformat +- FFmpeg::avcodec +- FFmpeg::avutil +- FFmpeg::avfilter +- $<$:${JPEG_LIBRARIES}> +- $<$:PNG::PNG> ++ libffmpegthumbnailerobj + ) + + set_target_properties(libffmpegthumbnailer PROPERTIES diff --git a/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer b/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer deleted file mode 100644 index f884590db406..000000000000 --- a/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer +++ /dev/null @@ -1,8 +0,0 @@ ---- dist/ffmpegthumbnailer.thumbnailer.orig 2016-02-17 19:57:35 UTC -+++ dist/ffmpegthumbnailer.thumbnailer -@@ -1,4 +1,4 @@ - [Thumbnailer Entry] - TryExec=ffmpegthumbnailer - Exec=ffmpegthumbnailer -i %i -o %o -s %s -f --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; -+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; diff --git a/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h b/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h deleted file mode 100644 index 3049071917c9..000000000000 --- a/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h +++ /dev/null @@ -1,10 +0,0 @@ ---- libffmpegthumbnailer/jpegwriter.h.orig 2016-02-17 19:57:35 UTC -+++ libffmpegthumbnailer/jpegwriter.h -@@ -17,6 +17,7 @@ - #ifndef JPEG_WRITER_H - #define JPEG_WRITER_H - -+#include - #include - #include - diff --git a/multimedia/ffmpegthumbnailer/pkg-plist b/multimedia/ffmpegthumbnailer/pkg-plist index 6ffd63b5ef2e..21581f22dba1 100644 --- a/multimedia/ffmpegthumbnailer/pkg-plist +++ b/multimedia/ffmpegthumbnailer/pkg-plist @@ -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 -- 2.27.0