Landry
> Lots of symbols were added/removed in libffmpegthumbnailer so you should
> bump the library major (ie 5.0 in SHARED_LIBS) otherzise it looks good
> here (at least it builds, but not that it fails to build if the previous
> version is installed....)
I fixed this. Thanks to review!
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpegthumbnailer/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile 26 Jul 2017 22:45:23 -0000 1.32
+++ Makefile 14 Dec 2017 19:57:43 -0000
@@ -1,29 +1,25 @@
-# $OpenBSD: Makefile,v 1.32 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2017/07/26 22:45:23 sthen Exp $m
COMMENT= lightweight video thumbnailer for file managers
-DISTNAME= ffmpegthumbnailer-2.0.8
-REVISION= 5
CATEGORIES= graphics multimedia
-MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=ffmpegthumbnailer/}
-SHARED_LIBS= ffmpegthumbnailer 4.1
+GH_ACCOUNT= dirkvdb
+GH_PROJECT= ffmpegthumbnailer
+GH_TAGNAME= 2.2.0
+SHARED_LIBS= ffmpegthumbnailer 5.0
HOMEPAGE= https://github.com/dirkvdb/ffmpegthumbnailer
+MAINTAINER = Victor Kukshiev <[email protected]>
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += avcodec avformat avutil c jpeg m png pthread ${COMPILER_LIBCXX}
-WANTLIB += swscale xvidcore
+MODULES = devel/cmake
+WANTLIB += avcodec avfilter avformat avutil c jpeg m png pthread
${COMPILER_LIBCXX} z
LIB_DEPENDS= graphics/ffmpeg \
graphics/jpeg \
graphics/png
-
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ffmpegthumbnailer/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 20 Nov 2012 12:01:07 -0000 1.7
+++ distinfo 14 Dec 2017 19:57:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (ffmpegthumbnailer-2.0.8.tar.gz) =
LIu++oONOOpC/IrHgljNo2hl2XTJkWJLFM/9uSo7xos=
-SIZE (ffmpegthumbnailer-2.0.8.tar.gz) = 367186
+SHA256 (ffmpegthumbnailer-2.2.0.tar.gz) =
i8dHVaqWBTGs3qj6Ga1+G3yAbCigaDBqjHFQ0ngkGo8=
+SIZE (ffmpegthumbnailer-2.2.0.tar.gz) = 1284692
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 14 Dec 2017 19:57:43 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+ upstream pulll request: https://github.com/dirkvdb/ffmpegthumbnailer/pull/163
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -178,7 +178,7 @@ IF (ENABLE_SHARED)
+ ADD_LIBRARY(libffmpegthumbnailer SHARED ${LIB_SRC_LIST})
+ TARGET_LINK_LIBRARIES(libffmpegthumbnailer ${FFMPEGTHUMBNAILER_LIBRARIES})
+ SET_TARGET_PROPERTIES(libffmpegthumbnailer PROPERTIES
+- PREFIX ""
++ OUTPUT_NAME ffmpegthumbnailer
+ VERSION
${FFMPEGTHUMBNAILER_SOVERSION_CURRENT}.${FFMPEGTHUMBNAILER_SOVERSION_REVISION}.${FFMPEGTHUMBNAILER_SOVERSION_AGE}
+ SOVERSION ${FFMPEGTHUMBNAILER_SOVERSION_CURRENT}
+ PUBLIC_HEADER "${LIB_HDRS}"
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 20 Nov 2012 12:01:07 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.4 2012/11/20 12:01:07 dcoppa Exp $
---- configure.ac.orig Sat Aug 25 15:00:19 2012
-+++ configure.ac Tue Nov 20 12:18:46 2012
-@@ -128,7 +128,7 @@ AC_ARG_ENABLE(debug,
- AM_CONDITIONAL(DEBUG, test "$enable_debug" = "yes")
- if test "$DEBUG" = "yes"; then
- AC_DEFINE(ENABLE_DEBUG, [], "Enable debug mode")
-- CXXFLAGS="$CXXFLAGS -g -O1 -Wall -Werror -Wfatal-errors"
-+ CXXFLAGS="$CXXFLAGS -g -Wall -Werror -Wfatal-errors"
- fi
-
- AC_ARG_ENABLE(unittests,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ffmpegthumbnailer/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:46 -0000 1.5
+++ pkg/PLIST 14 Dec 2017 19:57:43 -0000
@@ -1,14 +1,13 @@
@comment $OpenBSD: PLIST,v 1.5 2015/03/16 18:07:46 naddy Exp $
@bin bin/ffmpegthumbnailer
include/libffmpegthumbnailer/
+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.la
@lib lib/libffmpegthumbnailer.so.${LIBffmpegthumbnailer_VERSION}
lib/pkgconfig/libffmpegthumbnailer.pc
@man man/man1/ffmpegthumbnailer.1
