Date: Sat, 16 Apr 2016 17:09:07 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413461 - in head/multimedia/ffmpegthumbnailer: . files Message-ID: <201604161709.u3GH9779054919@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Apr 16 17:09:07 2016 New Revision: 413461 URL: https://svnweb.freebsd.org/changeset/ports/413461 Log: Update to 2.1.1. - Convert to USE_GITHUB. - Convert to USES=cmake. - Add patch to prevent cmake trying to find the dl library, since in FreeBSD the dl functions are in the Standard C library (libc) - see dlopen(3) - Pet portlint with other patches (remake the patches with makepatch) This update also allows multimedia/ffmpegthumbnailer to build against ffmpeg 3.0.x. The ports tree currently still has multimedia/ffmepg at version 2.8.6, however this update is backwards compatible with ffmpeg 2.8.6. The update of multimedia/ffmpeg to 3.0.x branch is waiting for ports which depend on it to successfully build with the newer version of ffmpeg. PR: 208821 Submitted by: Ben Woods <woodsb02@gmail.com> Approved by: clutton@zoho.com (maintainer) Added: head/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt (contents, props changed) Modified: head/multimedia/ffmpegthumbnailer/Makefile head/multimedia/ffmpegthumbnailer/distinfo head/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer head/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h head/multimedia/ffmpegthumbnailer/pkg-descr head/multimedia/ffmpegthumbnailer/pkg-plist Modified: head/multimedia/ffmpegthumbnailer/Makefile ============================================================================== --- head/multimedia/ffmpegthumbnailer/Makefile Sat Apr 16 17:03:38 2016 (r413460) +++ head/multimedia/ffmpegthumbnailer/Makefile Sat Apr 16 17:09:07 2016 (r413461) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= ffmpegthumbnailer -PORTVERSION= 2.0.9 -PORTREVISION= 1 +PORTVERSION= 2.1.1 CATEGORIES= multimedia graphics -MASTER_SITES= LOCAL/riggs/${PORTNAME} MAINTAINER= clutton@zoho.com COMMENT= Lightweight video thumbnailer that can be used by file managers @@ -16,21 +14,21 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libswscale.so:multimedia/ffmpeg -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig --enable-gio - -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= compiler:c++11-lib jpeg libtool pathfix pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= dirkvdb + +USES= cmake:outsource compiler:c++11-lib jpeg localbase pathfix pkgconfig USE_GNOME= glib20 USE_LDCONFIG= yes +CMAKE_ARGS= -DENABLE_GIO=ON \ + -DCMAKE_INSTALL_MANDIR:PATH="man" + OPTIONS_DEFINE= THUMBNAILER THUMBNAILER_DESC=Register as a system thumbnailer OPTIONS_SUB= yes OPTIONS_DEFAULT=THUMBNAILER -THUMBNAILER_CONFIGURE_ENABLE= thumbnailer +THUMBNAILER_CMAKE_ON= -DENABLE_THUMBNAILER=ON .include <bsd.port.mk> Modified: head/multimedia/ffmpegthumbnailer/distinfo ============================================================================== --- head/multimedia/ffmpegthumbnailer/distinfo Sat Apr 16 17:03:38 2016 (r413460) +++ head/multimedia/ffmpegthumbnailer/distinfo Sat Apr 16 17:09:07 2016 (r413461) @@ -1,2 +1,2 @@ -SHA256 (ffmpegthumbnailer-2.0.9.tar.gz) = 41f55f37000e3c640617e4807d990998ffc430472d3b481894a3df1ea7aee3af -SIZE (ffmpegthumbnailer-2.0.9.tar.gz) = 483899 +SHA256 (dirkvdb-ffmpegthumbnailer-2.1.1_GH0.tar.gz) = e43d8aae7e80771dc700b3d960a0717d5d28156684a8ddc485572cbcbc4365e9 +SIZE (dirkvdb-ffmpegthumbnailer-2.1.1_GH0.tar.gz) = 1531723 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 Sat Apr 16 17:09:07 2016 (r413461) @@ -0,0 +1,16 @@ +libdl only exists on Linux. Use CMAKE_DL_LIBS instead. + +Submitted upstream: https://github.com/dirkvdb/ffmpegthumbnailer/pull/132 +--- CMakeLists.txt.orig 2016-04-16 16:57:31 UTC ++++ CMakeLists.txt +@@ -96,9 +96,8 @@ FIND_LIBRARY(SWSCALE_LIBRARY + + IF (ENABLE_GIO) + FIND_PATH(DL_INCLUDES dlfcn.h) +- FIND_LIBRARY(DL_LIBRARY dl) + LIST(APPEND FFMPEGTHUMBNAILER_INCLUDE_DIRS ${DL_INCLUDES}) +- LIST(APPEND FFMPEGTHUMBNAILER_LIBRARIES ${DL_LIBRARY}) ++ LIST(APPEND FFMPEGTHUMBNAILER_LIBRARIES ${CMAKE_DL_LIBS}) + ENDIF () + + LIST(APPEND FFMPEGTHUMBNAILER_INCLUDE_DIRS ${AVFORMAT_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR}) Modified: head/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer ============================================================================== --- head/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer Sat Apr 16 17:03:38 2016 (r413460) +++ head/multimedia/ffmpegthumbnailer/files/patch-dist_ffmpegthumbnailer.thumbnailer Sat Apr 16 17:09:07 2016 (r413461) @@ -1,8 +1,8 @@ ---- dist/ffmpegthumbnailer.thumbnailer 2012-08-25 15:32:20.000000000 +0300 -+++ dist/ffmpegthumbnailer.thumbnailer 2013-12-03 05:21:35.000000000 +0200 +--- 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; +-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-poi nter;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; Modified: head/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h ============================================================================== --- head/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h Sat Apr 16 17:03:38 2016 (r413460) +++ head/multimedia/ffmpegthumbnailer/files/patch-libffmpegthumbnailer_jpegwriter.h Sat Apr 16 17:09:07 2016 (r413461) @@ -1,5 +1,5 @@ ---- libffmpegthumbnailer/jpegwriter.h.orig 2014-05-30 02:04:59.000000000 -0700 -+++ libffmpegthumbnailer/jpegwriter.h 2014-12-02 18:20:46.000000000 -0800 +--- 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 Modified: head/multimedia/ffmpegthumbnailer/pkg-descr ============================================================================== --- head/multimedia/ffmpegthumbnailer/pkg-descr Sat Apr 16 17:03:38 2016 (r413460) +++ head/multimedia/ffmpegthumbnailer/pkg-descr Sat Apr 16 17:09:07 2016 (r413461) @@ -5,4 +5,4 @@ files, so supported videoformats depend This thumbnailer was designed to be as fast and lightweight as possible. The only dependencies are ffmpeg, libjpeg and libpng. -WWW: http://code.google.com/p/ffmpegthumbnailer/ +WWW: https://github.com/dirkvdb/ffmpegthumbnailer Modified: head/multimedia/ffmpegthumbnailer/pkg-plist ============================================================================== --- head/multimedia/ffmpegthumbnailer/pkg-plist Sat Apr 16 17:03:38 2016 (r413460) +++ head/multimedia/ffmpegthumbnailer/pkg-plist Sat Apr 16 17:09:07 2016 (r413461) @@ -1,14 +1,14 @@ 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.a lib/libffmpegthumbnailer.so lib/libffmpegthumbnailer.so.4 -lib/libffmpegthumbnailer.so.4.0.9 +lib/libffmpegthumbnailer.so.4.11.0 libdata/pkgconfig/libffmpegthumbnailer.pc man/man1/ffmpegthumbnailer.1.gz %%THUMBNAILER%%share/thumbnailers/ffmpegthumbnailer.thumbnailer
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604161709.u3GH9779054919>