diff options
| author | Amy Winston <amynka@gentoo.org> | 2016-04-07 19:34:44 +0200 |
|---|---|---|
| committer | Amy Winston <amynka@gentoo.org> | 2016-04-07 19:36:44 +0200 |
| commit | 6cd559c43465c20af06254031d6b6bef023be901 (patch) | |
| tree | 6a105356a9d6899cac172f40974b44fba5ff6fe8 /media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch | |
| parent | 353af8036762f47a6723ea7a711c253bc5f3ebac (diff) | |
| download | gentoo-6cd559c43465c20af06254031d6b6bef023be901.tar.gz gentoo-6cd559c43465c20af06254031d6b6bef023be901.tar.xz | |
media-libs/opencv: disable git autodetect bug #558556
Package-Manager: portage-2.2.26
Diffstat (limited to 'media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch')
| -rw-r--r-- | media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch b/media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch new file mode 100644 index 00000000000..12a5ca04e27 --- /dev/null +++ b/media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch @@ -0,0 +1,57 @@ +--- opencv-2.4.11/work/opencv-2.4.11/CMakeLists.txt.old 2016-04-07 14:20:23.874972922 +0200 ++++ opencv-2.4.11/work/opencv-2.4.11/CMakeLists.txt 2016-04-07 14:21:15.689970743 +0200 +@@ -382,32 +382,32 @@ + # ---------------------------------------------------------------------------- + + # don't use FindGit because it requires CMake 2.8.2 +-set(git_names git eg) # eg = easy git ++#set(git_names git eg) # eg = easy git + # Prefer .cmd variants on Windows unless running in a Makefile in the MSYS shell +-if(CMAKE_HOST_WIN32) +- if(NOT CMAKE_GENERATOR MATCHES "MSYS") +- set(git_names git.cmd git eg.cmd eg) +- endif() +-endif() ++#if(CMAKE_HOST_WIN32) ++# if(NOT CMAKE_GENERATOR MATCHES "MSYS") ++# set(git_names git.cmd git eg.cmd eg) ++# endif() ++#endif() + +-find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client") +-mark_as_advanced(GIT_EXECUTABLE) ++#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client") ++#mark_as_advanced(GIT_EXECUTABLE) + +-if(GIT_EXECUTABLE) +- execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*" +- WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}" +- OUTPUT_VARIABLE OPENCV_VCSVERSION +- RESULT_VARIABLE GIT_RESULT +- ERROR_QUIET +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- if(NOT GIT_RESULT EQUAL 0) +- set(OPENCV_VCSVERSION "unknown") +- endif() +-else() ++#if(GIT_EXECUTABLE) ++# execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*" ++# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}" ++# OUTPUT_VARIABLE OPENCV_VCSVERSION ++# RESULT_VARIABLE GIT_RESULT ++# ERROR_QUIET ++# OUTPUT_STRIP_TRAILING_WHITESPACE ++# ) ++# if(NOT GIT_RESULT EQUAL 0) ++# set(OPENCV_VCSVERSION "unknown") ++# endif() ++#else() + # We don't have git: +- set(OPENCV_VCSVERSION "unknown") +-endif() ++# set(OPENCV_VCSVERSION "unknown") ++#endif() + + + # ---------------------------------------------------------------------------- |