From 43b6e8dd0dec9ddcaedd7ae10f652c18df9bd584 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 10 Jul 2012 00:01:30 +0000 Subject: [PATCH] - obsolete --- opencv-multilib.patch | 14 ------------- opencv-ximea-linux.patch | 44 ---------------------------------------- 2 files changed, 58 deletions(-) delete mode 100644 opencv-multilib.patch delete mode 100644 opencv-ximea-linux.patch diff --git a/opencv-multilib.patch b/opencv-multilib.patch deleted file mode 100644 index 7b9785f..0000000 --- a/opencv-multilib.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- OpenCV-2.3.1/CMakeLists.txt~ 2011-09-20 16:37:58.864889717 +0200 -+++ OpenCV-2.3.1/CMakeLists.txt 2011-09-21 09:33:29.341296893 +0200 -@@ -666,9 +666,9 @@ - OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH - OUTPUT_STRIP_TRAILING_WHITESPACE) - if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages") -- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") -+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") - else() #debian based assumed, install to the dist-packages. -- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") -+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") - endif() - endif() - if(CMAKE_HOST_WIN32) diff --git a/opencv-ximea-linux.patch b/opencv-ximea-linux.patch deleted file mode 100644 index 55e0c17..0000000 --- a/opencv-ximea-linux.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- OpenCV-2.3.1/OpenCVFindXimea.cmake.orig 2011-09-12 20:45:38.000000000 +0200 -+++ OpenCV-2.3.1/OpenCVFindXimea.cmake 2012-02-01 19:18:07.619900166 +0100 -@@ -14,15 +14,13 @@ - set(XIMEA_PATH) - set(XIMEA_LIBRARY_DIR) - --# Try to find the XIMEA API path in registry. --GET_FILENAME_COMPONENT(XIMEA_PATH "[HKEY_CURRENT_USER\\Software\\XIMEA\\CamSupport\\API;Path]" ABSOLUTE) -+find_file(XIMEA_INC "m3Api.h" PATHS $ENV{XIMEA_INCLUDE} "/usr/include/ximea") -+find_library(XIMEA_LIB "m3api" PATHS $ENV{XIMEA_LIB} "/usr/lib${LIB_SUFFIX}") - --if(XIMEA_PATH) -+if(XIMEA_INC AND XIMEA_LIB) -+ get_filename_component(XIMEA_LIBRARY_DIR "${XIMEA_LIB}" PATH CACHE) -+ get_filename_component(XIMEA_PATH "${XIMEA_INC}" PATH CACHE) - set(XIMEA_FOUND 1) -- -- # set LIB folders -- set(XIMEA_LIBRARY_DIR "${XIMEA_PATH}\\x86") -- - else() - set(XIMEA_FOUND 0) - endif() ---- OpenCV-2.3.1/modules/highgui/src/cap_ximea.cpp.orig 2011-09-12 20:41:29.000000000 +0200 -+++ OpenCV-2.3.1/modules/highgui/src/cap_ximea.cpp 2012-02-01 20:12:54.750010230 +0100 -@@ -1,4 +1,4 @@ -- -+#include - #include "precomp.hpp" - - #include "xiApi.h" -@@ -245,9 +245,7 @@ - - void CvCaptureCAM_XIMEA::errMsg(char* msg, int errNum) - { -- char buf[512]; -- sprintf( buf, "%s : %d\n", msg, errNum); -- OutputDebugString(buf); -+ fprintf(stderr, "%s : %d\n", msg, errNum); - } - --/**********************************************************************************/ -\ No newline -+/**********************************************************************************/ -- 2.44.0