Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2013-12-02 07:25:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv" Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2013-11-18 13:09:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2013-12-02 07:25:54.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Dec 1 17:37:36 UTC 2013 - [email protected] + +- Added opencv-pkgconfig.patch: make sure to provide link flags in + OpenCV pc file (bnc#853036) + +------------------------------------------------------------------- New: ---- opencv-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.lxTfFT/_old 2013-12-02 07:25:56.000000000 +0100 +++ /var/tmp/diff_new_pack.lxTfFT/_new 2013-12-02 07:25:56.000000000 +0100 @@ -35,6 +35,9 @@ Patch2: %{name}-underlinking.patch # PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version Patch3: improve-sphinx-search.diff +# PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on +# getting opencv vars via pc (first), and then via CMake, as is the case with nomacs +Patch4: opencv-pkgconfig.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gstreamer-0_10-plugins-base-devel @@ -120,6 +123,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p0 +%patch4 -p1 # Remove Windows specific files rm -f doc/packaging.txt ++++++ opencv-pkgconfig.patch ++++++ diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake --- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000 +++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:41:48.936262732 +0000 @@ -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_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}") @@ -51,7 +52,8 @@ set(installDir "${OPENCV_LIB_INSTALL_PATH}") 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
