[packages/opencv] - remove cmake install directory arch dependant hackery

baggins baggins at pld-linux.org
Mon Mar 9 15:01:12 CET 2015


commit e36ac0299dc4fa6702af2f14fa7973cfbf839a54
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 9 15:00:33 2015 +0100

    - remove cmake install directory arch dependant hackery

 cmake-install-path.patch | 16 ++++++++++++++++
 opencv.spec              |  6 ++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/opencv.spec b/opencv.spec
index 30a3d68..3ee1a71 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -34,10 +34,10 @@
 # - other modules
 %bcond_without	vtk		# VTK library support (opencv_viz module)
 
-%ifarch pentium3 pentium4 %{x8664}
+%ifarch pentium3 pentium4 %{x8664} x32
 %define		with_sse	1
 %endif
-%ifarch pentium4 %{x8664}
+%ifarch pentium4 %{x8664} x32
 %define		with_sse2	1
 %endif
 Summary:	A library of programming functions mainly aimed at real time computer vision
@@ -64,6 +64,7 @@ Patch6:		%{name}-ocl-fft.patch
 Patch7:		java-ant-sourcelevel.patch
 Patch8:		%{name}-shared.patch
 Patch9:		no-sysctl.patch
+Patch10:	cmake-install-path.patch
 URL:		http://www.opencv.org/
 %{?with_pvapi:BuildRequires:	AVT_GigE_SDK-devel}
 %{?with_opencl:BuildRequires:	OpenCL-devel}
@@ -277,6 +278,7 @@ Wiązania Pythona do OpenCV.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 install -d build
diff --git a/cmake-install-path.patch b/cmake-install-path.patch
new file mode 100644
index 0000000..bd7415d
--- /dev/null
+++ b/cmake-install-path.patch
@@ -0,0 +1,16 @@
+--- opencv-2.4.10.1/CMakeLists.txt~	2015-03-09 14:42:05.000000000 +0100
++++ opencv-2.4.10.1/CMakeLists.txt	2015-03-09 14:50:49.355937198 +0100
+@@ -324,12 +324,7 @@
+   endif()
+   set(OPENCV_INCLUDE_INSTALL_PATH "include")
+ 
+-  math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
+-  if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+-    set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
+-  else()
+-    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
+-  endif()
++  set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
+ endif()
+ 
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/e36ac0299dc4fa6702af2f14fa7973cfbf839a54



More information about the pld-cvs-commit mailing list