Attachment #179451 for bug #216648




# $FreeBSD$

PORTNAME=	ffmpegthumbnailer
PORTVERSION=	2.2.0
PORTREVISION=	1
CATEGORIES=	multimedia graphics

MAINTAINER=	clutton@zoho.com


USE_GITHUB=	yes
GH_ACCOUNT=	dirkvdb
GH_PROJECT=     ffmpegthumbnailer
GH_SUBDIR=      src/github.com/dirkvdb/ffmpegthumbnailer

USES=		cmake:outsource compiler:c++11-lib jpeg localbase pathfix pkgconfig
USE_GNOME=	glib20

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (dirkvdb-ffmpegthumbnailer-2.1.1_GH0.tar.gz) = e43d8aae7e80771dc700b3d960a0717d5d28156684a8ddc485572cbcbc4365e9	1	TIMESTAMP = 1485821757
2	SIZE (dirkvdb-ffmpegthumbnailer-2.1.1_GH0.tar.gz) = 1531723	2	SHA256 (dirkvdb-ffmpegthumbnailer-2.2.0_GH0.tar.gz) = 8bc74755aa960531acdea8fa19ad7e1b7c806c28a068306a8c7150d278241a8f
		3	SIZE (dirkvdb-ffmpegthumbnailer-2.2.0_GH0.tar.gz) = 1284692




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

Lines 8-14 Link Here

(-)pkg-plist (-1 / +1 lines)
8	include/libffmpegthumbnailer/videothumbnailerc.h	8	include/libffmpegthumbnailer/videothumbnailerc.h
9	lib/libffmpegthumbnailer.so	9	lib/libffmpegthumbnailer.so
10	lib/libffmpegthumbnailer.so.4	10	lib/libffmpegthumbnailer.so.4
11	lib/libffmpegthumbnailer.so.4.11.0	11	lib/libffmpegthumbnailer.so.4.13.1
12	libdata/pkgconfig/libffmpegthumbnailer.pc	12	libdata/pkgconfig/libffmpegthumbnailer.pc
13	man/man1/ffmpegthumbnailer.1.gz	13	man/man1/ffmpegthumbnailer.1.gz
14	%%THUMBNAILER%%share/thumbnailers/ffmpegthumbnailer.thumbnailer	14	%%THUMBNAILER%%share/thumbnailers/ffmpegthumbnailer.thumbnailer

Return to bug 216648

Lines 2-9 Link Here

(-)Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ffmpegthumbnailer	4	PORTNAME= ffmpegthumbnailer
5	PORTVERSION= 2.1.1	5	PORTVERSION= 2.2.0
6	PORTREVISION= 1
7	CATEGORIES= multimedia graphics	6	CATEGORIES= multimedia graphics
8		7
9	MAINTAINER= clutton@zoho.com	8	MAINTAINER= clutton@zoho.com
Lines 17-22 Link Here
17		16
18	USE_GITHUB= yes	17	USE_GITHUB= yes
19	GH_ACCOUNT= dirkvdb	18	GH_ACCOUNT= dirkvdb
		19	GH_PROJECT= ffmpegthumbnailer
		20	GH_SUBDIR= src/github.com/dirkvdb/ffmpegthumbnailer
20		21
21	USES= cmake:outsource compiler:c++11-lib jpeg localbase pathfix pkgconfig	22	USES= cmake:outsource compiler:c++11-lib jpeg localbase pathfix pkgconfig
22	USE_GNOME= glib20	23	USE_GNOME= glib20

Lines 1-16 Link Here

(-)files/patch-CMakeLists.txt (-16 lines)
1	libdl only exists on Linux. Use CMAKE_DL_LIBS instead.
2
3	Submitted upstream: https://github.com/dirkvdb/ffmpegthumbnailer/pull/132
4	--- CMakeLists.txt.orig 2016-04-16 16:57:31 UTC
5	+++ CMakeLists.txt
6	@@ -96,9 +96,8 @@ FIND_LIBRARY(SWSCALE_LIBRARY
7
8	IF (ENABLE_GIO)
9	FIND_PATH(DL_INCLUDES dlfcn.h)
10	- FIND_LIBRARY(DL_LIBRARY dl)
11	LIST(APPEND FFMPEGTHUMBNAILER_INCLUDE_DIRS ${DL_INCLUDES})
12	- LIST(APPEND FFMPEGTHUMBNAILER_LIBRARIES ${DL_LIBRARY})
13	+ LIST(APPEND FFMPEGTHUMBNAILER_LIBRARIES ${CMAKE_DL_LIBS})
14	ENDIF ()
15
16	LIST(APPEND FFMPEGTHUMBNAILER_INCLUDE_DIRS ${AVFORMAT_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR})