Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ee96c95c037742da694911adb2447f0045e451fb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ee96c95c037742da694911adb2447f0045e451fb)
  • Date: Tue, 22 Jul 2014 08:51:56 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

graphics-libs/opencv/HISTORY | 1 +
graphics-libs/opencv/PRE_BUILD | 5 +++++
graphics-libs/opencv/pkgconfig.patch | 35
+++++++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+)

New commits:
commit ee96c95c037742da694911adb2447f0045e451fb
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

opencv: patch from Arch added

diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 46824b0..5d87fec 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,5 +1,6 @@
2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.9
+ * PRE_BUILD, pkgconfig.patch: patch from Arch added

2014-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.8
diff --git a/graphics-libs/opencv/PRE_BUILD b/graphics-libs/opencv/PRE_BUILD
new file mode 100755
index 0000000..e5dd5dd
--- /dev/null
+++ b/graphics-libs/opencv/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/pkgconfig.patch
+
diff --git a/graphics-libs/opencv/pkgconfig.patch
b/graphics-libs/opencv/pkgconfig.patch
new file mode 100644
index 0000000..5626eb6
--- /dev/null
+++ b/graphics-libs/opencv/pkgconfig.patch
@@ -0,0 +1,35 @@
+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



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ee96c95c037742da694911adb2447f0045e451fb), Ladislav Hagara, 07/22/2014

Archive powered by MHonArc 2.6.24.

Top of Page