mirror of https://git.wownero.com/dsc/mxe.git
Tony Theodore
commit
bb8d0fbe56
|
|
@ -1788,6 +1788,11 @@ aptitude -t squeeze-backports install cmake yasm</pre>
|
|||
<td id="opencsg-version">1.3.2</td>
|
||||
<td id="opencsg-website"><a href="http://www.opencsg.org/">opencsg</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="opencv-package">opencv</td>
|
||||
<td id="opencv-version">2.4.4</td>
|
||||
<td id="opencv-website"><a href="http://opencv.org/">OpenCV</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="openexr-package">openexr</td>
|
||||
<td id="openexr-version">1.7.1</td>
|
||||
|
|
|
|||
|
|
@ -3,16 +3,26 @@ See index.html for further information.
|
|||
|
||||
This patch has been taken from:
|
||||
http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
|
||||
http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435
|
||||
http://sourceforge.net/p/mingw/bugs/1809
|
||||
|
||||
diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h
|
||||
--- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200
|
||||
+++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200
|
||||
@@ -275,3 +275,7 @@
|
||||
@@ -275,3 +275,17 @@
|
||||
#endif /* __STDC_WANT_DEC_FP__ */
|
||||
|
||||
#endif /* _FLOAT_H___ */
|
||||
+
|
||||
+#ifdef __MINGW32__
|
||||
+#include_next<float.h>
|
||||
+ /*
|
||||
+ * the MinGW-supplied header, which is guarded by the
|
||||
+ * _MINGW_FLOAT_H_ macro, may be found first, thus...
|
||||
+ */
|
||||
+#ifndef _MINGW_FLOAT_H_
|
||||
+ /*
|
||||
+ * ...when we didn't find the MinGW-supplied header first, we
|
||||
+ * want to pull it in now; include_next should achieve this
|
||||
+ */
|
||||
+# include_next <float.h>
|
||||
+#endif
|
||||
+#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,237 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
diff --git a/cmake/OpenCVFindLCMS.cmake b/cmake/OpenCVFindLCMS.cmake
|
||||
--- a/cmake/OpenCVFindLCMS.cmake
|
||||
+++ b/cmake/OpenCVFindLCMS.cmake
|
||||
@@ -0,0 +1,71 @@
|
||||
+# - Find LCMS
|
||||
+# Find the LCMS includes and library
|
||||
+# This module defines
|
||||
+# LCMS_INCLUDE_DIR, where to find lcms.h
|
||||
+# LCMS_LIBRARIES, the libraries needed to use LCMS.
|
||||
+# LCMS_VERSION, The value of LCMS_VERSION defined in lcms.h
|
||||
+# LCMS_FOUND, If false, do not try to use LCMS.
|
||||
+
|
||||
+
|
||||
+# Copyright (c) 2008, Adrian Page, <adrian@pagenet.plus.com>
|
||||
+# Copyright (c) 2009, Cyrille Berger, <cberger@cberger.net>
|
||||
+#
|
||||
+# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
+
|
||||
+
|
||||
+# use pkg-config to get the directories and then use these values
|
||||
+# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||
+if(NOT WIN32)
|
||||
+ find_package(PkgConfig)
|
||||
+ pkg_check_modules(PC_LCMS lcms)
|
||||
+ set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER})
|
||||
+endif(NOT WIN32)
|
||||
+
|
||||
+find_path(LCMS_INCLUDE_DIR lcms.h
|
||||
+ PATHS
|
||||
+ ${PC_LCMS_INCLUDEDIR}
|
||||
+ ${PC_LCMS_INCLUDE_DIRS}
|
||||
+ PATH_SUFFIXES lcms liblcms
|
||||
+)
|
||||
+
|
||||
+find_library(LCMS_LIBRARIES NAMES lcms liblcms lcms-1 liblcms-1
|
||||
+ PATHS
|
||||
+ ${PC_LCMS_LIBDIR}
|
||||
+ ${PC_LCMS_LIBRARY_DIRS}
|
||||
+ PATH_SUFFIXES lcms
|
||||
+)
|
||||
+
|
||||
+if(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES)
|
||||
+ set(LCMS_FOUND TRUE)
|
||||
+else(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES)
|
||||
+ set(LCMS_FOUND FALSE)
|
||||
+endif(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES)
|
||||
+
|
||||
+if(LCMS_FOUND)
|
||||
+ file(READ ${LCMS_INCLUDE_DIR}/lcms.h LCMS_VERSION_CONTENT)
|
||||
+ string(REGEX MATCH "#define LCMS_VERSION[ ]*[0-9]*\n" LCMS_VERSION_MATCH ${LCMS_VERSION_CONTENT})
|
||||
+ if(LCMS_VERSION_MATCH)
|
||||
+ string(REGEX REPLACE "#define LCMS_VERSION[ ]*([0-9]*)\n" "\\1" LCMS_VERSION ${LCMS_VERSION_MATCH})
|
||||
+ if(NOT LCMS_FIND_QUIETLY)
|
||||
+ string(SUBSTRING ${LCMS_VERSION} 0 1 LCMS_MAJOR_VERSION)
|
||||
+ string(SUBSTRING ${LCMS_VERSION} 1 2 LCMS_MINOR_VERSION)
|
||||
+ message(STATUS "Found lcms version ${LCMS_MAJOR_VERSION}.${LCMS_MINOR_VERSION}, ${LCMS_LIBRARIES}")
|
||||
+ endif(NOT LCMS_FIND_QUIETLY)
|
||||
+ else(LCMS_VERSION_MATCH)
|
||||
+ if(NOT LCMS_FIND_QUIETLY)
|
||||
+ message(STATUS "Found lcms but failed to find version ${LCMS_LIBRARIES}")
|
||||
+ endif(NOT LCMS_FIND_QUIETLY)
|
||||
+ set(LCMS_VERSION NOTFOUND)
|
||||
+ endif(LCMS_VERSION_MATCH)
|
||||
+else(LCMS_FOUND)
|
||||
+ if(NOT LCMS_FIND_QUIETLY)
|
||||
+ if(LCMS_FIND_REQUIRED)
|
||||
+ message(FATAL_ERROR "Required package lcms NOT found")
|
||||
+ else(LCMS_FIND_REQUIRED)
|
||||
+ message(STATUS "lcms NOT found")
|
||||
+ endif(LCMS_FIND_REQUIRED)
|
||||
+ endif(NOT LCMS_FIND_QUIETLY)
|
||||
+endif(LCMS_FOUND)
|
||||
+
|
||||
+mark_as_advanced(LCMS_INCLUDE_DIR LCMS_LIBRARIES LCMS_VERSION)
|
||||
diff --git a/cmake/OpenCVFindLZMA.cmake b/cmake/OpenCVFindLZMA.cmake
|
||||
--- a/cmake/OpenCVFindLZMA.cmake
|
||||
+++ b/cmake/OpenCVFindLZMA.cmake
|
||||
@@ -0,0 +1,48 @@
|
||||
+# - Find lzma and lzmadec
|
||||
+# Find the native LZMA includes and library
|
||||
+#
|
||||
+# LZMA_INCLUDE_DIR - where to find lzma.h, etc.
|
||||
+# LZMA_LIBRARIES - List of libraries when using liblzma.
|
||||
+# LZMA_FOUND - True if liblzma found.
|
||||
+# LZMADEC_INCLUDE_DIR - where to find lzmadec.h, etc.
|
||||
+# LZMADEC_LIBRARIES - List of libraries when using liblzmadec.
|
||||
+# LZMADEC_FOUND - True if liblzmadec found.
|
||||
+
|
||||
+IF (LZMA_INCLUDE_DIR)
|
||||
+ # Already in cache, be silent
|
||||
+ SET(LZMA_FIND_QUIETLY TRUE)
|
||||
+ENDIF (LZMA_INCLUDE_DIR)
|
||||
+
|
||||
+FIND_PATH(LZMA_INCLUDE_DIR lzma.h)
|
||||
+FIND_LIBRARY(LZMA_LIBRARY NAMES lzma liblzma)
|
||||
+
|
||||
+# handle the QUIETLY and REQUIRED arguments and set LZMA_FOUND to TRUE if
|
||||
+# all listed variables are TRUE
|
||||
+INCLUDE(FindPackageHandleStandardArgs)
|
||||
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZMA DEFAULT_MSG LZMA_LIBRARY LZMA_INCLUDE_DIR)
|
||||
+
|
||||
+IF(LZMA_FOUND)
|
||||
+ SET( LZMA_LIBRARIES ${LZMA_LIBRARY} )
|
||||
+ELSE(LZMA_FOUND)
|
||||
+ SET( LZMA_LIBRARIES )
|
||||
+
|
||||
+ IF (LZMADEC_INCLUDE_DIR)
|
||||
+ # Already in cache, be silent
|
||||
+ SET(LZMADEC_FIND_QUIETLY TRUE)
|
||||
+ ENDIF (LZMADEC_INCLUDE_DIR)
|
||||
+
|
||||
+ FIND_PATH(LZMADEC_INCLUDE_DIR lzmadec.h)
|
||||
+ FIND_LIBRARY(LZMADEC_LIBRARY NAMES lzmadec )
|
||||
+
|
||||
+ # handle the QUIETLY and REQUIRED arguments and set LZMADEC_FOUND to TRUE if
|
||||
+ # all listed variables are TRUE
|
||||
+ INCLUDE(FindPackageHandleStandardArgs)
|
||||
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZMADEC DEFAULT_MSG LZMADEC_LIBRARY
|
||||
+ LZMADEC_INCLUDE_DIR)
|
||||
+
|
||||
+ IF(LZMADEC_FOUND)
|
||||
+ SET( LZMADEC_LIBRARIES ${LZMADEC_LIBRARY} )
|
||||
+ ELSE(LZMADEC_FOUND)
|
||||
+ SET( LZMADEC_LIBRARIES )
|
||||
+ ENDIF(LZMADEC_FOUND)
|
||||
+ENDIF(LZMA_FOUND)
|
||||
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
|
||||
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
||||
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
||||
@@ -2,6 +2,11 @@
|
||||
# Detect 3rd-party image IO libraries
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
+# --- lzma (required by apps, examples, perf, tests) ---
|
||||
+if(BUILD_opencv_apps OR BUILD_EXAMPLES OR BUILD_PERF_TESTS OR BUILD_TESTS)
|
||||
+ include(cmake/OpenCVFindLZMA.cmake)
|
||||
+endif()
|
||||
+
|
||||
# --- zlib (required) ---
|
||||
if(BUILD_ZLIB)
|
||||
ocv_clear_vars(ZLIB_FOUND)
|
||||
@@ -26,6 +31,11 @@
|
||||
ocv_parse_header2(ZLIB "${${ZLIB_LIBRARY}_SOURCE_DIR}/zlib.h" ZLIB_VERSION)
|
||||
endif()
|
||||
|
||||
+# --- lcms (required by apps, examples, perf, tests) ---
|
||||
+if(BUILD_opencv_apps OR BUILD_EXAMPLES OR BUILD_PERF_TESTS OR BUILD_TESTS)
|
||||
+ include(cmake/OpenCVFindLCMS.cmake)
|
||||
+endif()
|
||||
+
|
||||
# --- libtiff (optional, should be searched after zlib) ---
|
||||
if(WITH_TIFF)
|
||||
if(BUILD_TIFF)
|
||||
@@ -114,6 +124,7 @@
|
||||
if(BUILD_PNG)
|
||||
ocv_clear_vars(PNG_FOUND)
|
||||
else()
|
||||
+ include(CheckIncludeFile)
|
||||
include(FindPNG)
|
||||
if(PNG_FOUND)
|
||||
check_include_file("${PNG_PNG_INCLUDE_DIR}/png.h" HAVE_PNG_H)
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -38,7 +38,7 @@
|
||||
#Android: set output folder to ${CMAKE_BINARY_DIR}
|
||||
set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "root for library output, set this to change where android libs are compiled to" )
|
||||
# any crosscompiling
|
||||
- set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
|
||||
+ #set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
|
||||
endif(NOT CMAKE_TOOLCHAIN_FILE)
|
||||
|
||||
# --------------------------------------------------------------
|
||||
diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
|
||||
--- a/modules/core/CMakeLists.txt
|
||||
+++ b/modules/core/CMakeLists.txt
|
||||
@@ -1,6 +1,12 @@
|
||||
set(the_description "The Core Functionality")
|
||||
-ocv_add_module(core ${ZLIB_LIBRARIES})
|
||||
-ocv_module_include_directories(${ZLIB_INCLUDE_DIR})
|
||||
+
|
||||
+if(BUILD_opencv_apps OR BUILD_EXAMPLES OR BUILD_PERF_TESTS OR BUILD_TESTS)
|
||||
+ ocv_add_module(core ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${LCMS_LIBRARIES})
|
||||
+ ocv_module_include_directories(${ZLIB_INCLUDE_DIR} ${LZMA_INCLUDE_DIR} ${LCMS_INCLUDE_DIR})
|
||||
+else()
|
||||
+ ocv_add_module(core ${ZLIB_LIBRARIES})
|
||||
+ ocv_module_include_directories(${ZLIB_INCLUDE_DIR})
|
||||
+endif()
|
||||
|
||||
if(HAVE_CUDA)
|
||||
ocv_source_group("Src\\Cuda" GLOB "src/cuda/*.cu")
|
||||
diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
|
||||
--- a/modules/highgui/CMakeLists.txt
|
||||
+++ b/modules/highgui/CMakeLists.txt
|
||||
@@ -10,8 +10,13 @@
|
||||
ocv_clear_vars(GRFMT_LIBS)
|
||||
|
||||
if(WITH_PNG OR WITH_TIFF OR WITH_OPENEXR)
|
||||
- ocv_include_directories(${ZLIB_INCLUDE_DIR})
|
||||
- list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES})
|
||||
+ if(BUILD_opencv_apps OR BUILD_EXAMPLES OR BUILD_PERF_TESTS OR BUILD_TESTS)
|
||||
+ ocv_include_directories(${ZLIB_INCLUDE_DIR} ${LZMA_INCLUDE_DIR} ${LCMS_INCLUDE_DIR})
|
||||
+ list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${LCMS_LIBRARIES})
|
||||
+ else()
|
||||
+ ocv_include_directories(${ZLIB_INCLUDE_DIR})
|
||||
+ list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES})
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
if(WITH_JPEG)
|
||||
@@ -262,7 +267,7 @@
|
||||
ocv_add_precompiled_headers(${the_module})
|
||||
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-deprecated-declarations)
|
||||
|
||||
-if(WIN32 AND WITH_FFMPEG)
|
||||
+if(WIN32 AND WITH_FFMPEG AND BUILD_SHARED_LIBS)
|
||||
#copy ffmpeg dll to the output folder
|
||||
if(MSVC64 OR MINGW64)
|
||||
set(FFMPEG_SUFFIX _64)
|
||||
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
|
||||
--- a/cmake/OpenCVGenConfig.cmake
|
||||
+++ b/cmake/OpenCVGenConfig.cmake
|
||||
@@ -177,6 +177,6 @@
|
||||
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
|
||||
configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
|
||||
configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" IMMEDIATE @ONLY)
|
||||
- install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/")
|
||||
- install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/")
|
||||
+ install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/cmake/")
|
||||
+ install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/cmake/")
|
||||
endif()
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
# This file is part of MXE.
|
||||
# See index.html for further information.
|
||||
|
||||
# OpenCV - Open Source Computer Vision
|
||||
PKG := opencv
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_CHECKSUM := 6e518c0274a8392c0c98d18ef0ef754b9c596aca
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := OpenCV-$($(PKG)_VERSION)a.tar.bz2
|
||||
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)library/$(PKG)-unix/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc qt xz zlib lcms1 jpeg libpng tiff jasper openexr ffmpeg eigen
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
$(WGET) -q -O- 'http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/' | \
|
||||
$(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
|
||||
head -1
|
||||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
# build
|
||||
mkdir '$(1).build'
|
||||
cd '$(1).build' && cmake \
|
||||
-DWITH_QT=ON \
|
||||
-DWITH_OPENGL=ON \
|
||||
-DWITH_GSTREAMER=ON \
|
||||
-DWITH_GTK=ON \
|
||||
-DWITH_VIDEOINPUT=ON \
|
||||
-DWITH_XINE=ON \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DBUILD_opencv_apps=OFF \
|
||||
-DBUILD_DOCS=OFF \
|
||||
-DBUILD_EXAMPLES=OFF \
|
||||
-DBUILD_PACKAGE=OFF \
|
||||
-DBUILD_PERF_TESTS=OFF \
|
||||
-DBUILD_TESTS=OFF \
|
||||
-DBUILD_WITH_DEBUG_INFO=OFF \
|
||||
-DBUILD_FAT_JAVA_LIB=OFF \
|
||||
-DBUILD_ZLIB=OFF \
|
||||
-DBUILD_TIFF=OFF \
|
||||
-DBUILD_JASPER=OFF \
|
||||
-DBUILD_JPEG=OFF \
|
||||
-DBUILD_PNG=OFF \
|
||||
-DBUILD_OPENEXR=OFF \
|
||||
-DCMAKE_VERBOSE=ON \
|
||||
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
|
||||
'$(1)'
|
||||
|
||||
# install
|
||||
$(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
|
||||
endef
|
||||
Loading…
Reference in New Issue