Date: Thu, 16 Apr 2015 08:01:49 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384091 - in head/graphics: opencv opencv-core opencv/files Message-ID: <201504160801.t3G81nSZ005979@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Thu Apr 16 08:01:48 2015 New Revision: 384091 URL: https://svnweb.freebsd.org/changeset/ports/384091 Log: Add patch from debian to fix the installed pkg-config files. This allows the gstreamer plugin to actualy link to the needed opencv libraries. PR: 196021 Approved by: maintainer timeout (4 months) Obtained from: debian Added: head/graphics/opencv/files/patch-pkg-config (contents, props changed) Modified: head/graphics/opencv-core/Makefile head/graphics/opencv/Makefile Modified: head/graphics/opencv-core/Makefile ============================================================================== --- head/graphics/opencv-core/Makefile Thu Apr 16 07:47:10 2015 (r384090) +++ head/graphics/opencv-core/Makefile Thu Apr 16 08:01:48 2015 (r384091) @@ -1,7 +1,7 @@ # Created by: Martin Matuska <mm@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -${OCV_SLAVE} COMMENT= OpenCV core libraries Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Thu Apr 16 07:47:10 2015 (r384090) +++ head/graphics/opencv/Makefile Thu Apr 16 08:01:48 2015 (r384091) @@ -3,7 +3,7 @@ PORTNAME?= opencv PORTVERSION= 2.4.9 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION} Added: head/graphics/opencv/files/patch-pkg-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/opencv/files/patch-pkg-config Thu Apr 16 08:01:48 2015 (r384091) @@ -0,0 +1,50 @@ +Description: pkg-config is broken in OpenCV-2.4.x +Bug: http://code.opencv.org/issues/1925 +Bug-Debian: http://bugs.debian.org/721894, http://bugs.debian.org/678222 +Author: Ray Rashif +Last-Update: 2013-11-23 + +diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +index a36b70e..a3733bc 100644 +--- cmake/OpenCVGenPkgconfig.cmake ++++ cmake/OpenCVGenPkgconfig.cmake +@@ -10,7 +10,7 @@ + # ------------------------------------------------------------------------------------------- + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +-set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS ++set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}") + set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") + + if(CMAKE_BUILD_TYPE MATCHES "Release") +@@ -35,10 +35,11 @@ ocv_list_reverse(OpenCV_LIB_COMPONENTS) + ocv_list_reverse(OpenCV_EXTRA_COMPONENTS) + + #build the list of components +-set(OpenCV_LIB_COMPONENTS_ "") ++set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}") + foreach(CVLib ${OpenCV_LIB_COMPONENTS}) + get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE}) + get_filename_component(libname "${libpath}" NAME) ++ get_filename_component(lname "${libpath}" NAME_WE) + + if(INSTALL_TO_MANGLED_PATHS) + set(libname "${libname}.${OPENCV_VERSION}") +@@ -52,6 +53,8 @@ foreach(CVLib ${OpenCV_LIB_COMPONENTS}) + endif() + + set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}") ++ string(REPLACE "libopencv" "-lopencv" lname "${lname}") ++ set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}") + endforeach() + + # add extra dependencies required for OpenCV +@@ -67,6 +70,8 @@ if(OpenCV_EXTRA_COMPONENTS) + + set(OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS} ${maybe_l_prefix}${extra_component}") + ++ ++ + endforeach() + endif() +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504160801.t3G81nSZ005979>