commit: 6cd559c43465c20af06254031d6b6bef023be901
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 17:34:44 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 17:36:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd559c4
media-libs/opencv: disable git autodetect bug #558556
Package-Manager: portage-2.2.26
.../files/opencv-2.4.10-git-autodetect.patch | 57 +++++++++++++++++++++
.../files/opencv-2.4.11-git-autodetect.patch | 57 +++++++++++++++++++++
.../files/opencv-2.4.12-git-autodetect.patch | 57 +++++++++++++++++++++
.../opencv/files/opencv-2.4.9-git-autodetect.patch | 59 ++++++++++++++++++++++
.../opencv/files/opencv-3.0.0-git-autodetect.patch | 41 +++++++++++++++
.../opencv/files/opencv-3.1.0-git-autodetect.patch | 42 +++++++++++++++
media-libs/opencv/opencv-2.4.10.ebuild | 3 +-
media-libs/opencv/opencv-2.4.11.ebuild | 3 +-
media-libs/opencv/opencv-2.4.12.ebuild | 3 +-
media-libs/opencv/opencv-2.4.9.ebuild | 3 +-
media-libs/opencv/opencv-3.0.0.ebuild | 3 +-
media-libs/opencv/opencv-3.1.0-r1.ebuild | 3 +-
media-libs/opencv/opencv-3.1.0-r2.ebuild | 3 +-
13 files changed, 327 insertions(+), 7 deletions(-)
diff --git a/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch
b/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch
new file mode 100644
index 0000000..9349864
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch
@@ -0,0 +1,57 @@
+--- opencv-2.4.10/work/opencv-2.4.10/CMakeLists.txt.old 2016-04-07
14:17:10.524981054 +0200
++++ opencv-2.4.10/work/opencv-2.4.10/CMakeLists.txt 2016-04-07
14:13:38.726989961 +0200
+@@ -375,32 +375,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()
+
+
+ # ----------------------------------------------------------------------------
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 0000000..12a5ca0
--- /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()
+
+
+ # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
b/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
new file mode 100644
index 0000000..e981c37
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
@@ -0,0 +1,57 @@
+--- opencv-2.4.12/work/opencv-2.4.12/CMakeLists.txt.old 2016-04-07
14:44:17.461912634 +0200
++++ opencv-2.4.12/work/opencv-2.4.12/CMakeLists.txt 2016-04-07
14:45:10.674910396 +0200
+@@ -388,32 +388,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()
+
+
+ # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-2.4.9-git-autodetect.patch
b/media-libs/opencv/files/opencv-2.4.9-git-autodetect.patch
new file mode 100644
index 0000000..7c45857
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.9-git-autodetect.patch
@@ -0,0 +1,59 @@
+--- CMakeLists.txt.old 2016-04-07 13:07:18.177841867 +0200
++++ CMakeLists.txt 2016-04-07 13:09:39.449835926 +0200
+@@ -369,32 +369,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()
+-
+-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(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)
++
++#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()
+
+
+ # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-3.0.0-git-autodetect.patch
b/media-libs/opencv/files/opencv-3.0.0-git-autodetect.patch
new file mode 100644
index 0000000..7413075
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.0.0-git-autodetect.patch
@@ -0,0 +1,41 @@
+--- opencv-3.0.0/work/opencv-3.0.0/CMakeLists.txt.old 2016-04-07
14:28:07.641953419 +0200
++++ opencv-3.0.0/work/opencv-3.0.0/CMakeLists.txt 2016-04-07
14:28:47.713951734 +0200
+@@ -433,23 +433,23 @@
+ # ----------------------------------------------------------------------------
+ # Autodetect if we are in a GIT repository
+ # ----------------------------------------------------------------------------
+-find_host_package(Git QUIET)
++#find_host_package(Git QUIET)
+
+-if(GIT_FOUND)
+- execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always
--dirty --match "[0-9].[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_FOUND)
++# execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always
--dirty --match "[0-9].[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()
+
+
+ # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch
b/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch
new file mode 100644
index 0000000..e4fa287
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch
@@ -0,0 +1,42 @@
+--- opencv-3.1.0-r1/work/opencv-3.1.0/CMakeLists.txt.old 2016-04-07
14:34:35.090937125 +0200
++++ opencv-3.1.0-r1/work/opencv-3.1.0/CMakeLists.txt 2016-04-07
14:35:18.492935300 +0200
+@@ -444,23 +444,23 @@
+ # ----------------------------------------------------------------------------
+ # Autodetect if we are in a GIT repository
+ # ----------------------------------------------------------------------------
+-find_host_package(Git QUIET)
++#find_host_package(Git QUIET)
+
+-if(GIT_FOUND)
+- execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always
--dirty --match "[0-9].[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()
++#if(GIT_FOUND)
++# execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always
--dirty --match "[0-9].[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()
+
+
+ # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/opencv-2.4.10.ebuild
b/media-libs/opencv/opencv-2.4.10.ebuild
index 04799f0..7e0970f 100644
--- a/media-libs/opencv/opencv-2.4.10.ebuild
+++ b/media-libs/opencv/opencv-2.4.10.ebuild
@@ -85,7 +85,8 @@ src_prepare() {
"${FILESDIR}/${PN}-2.4.8-javamagic.patch" \
"${FILESDIR}/${PN}-2.4.9-libav10.patch" \
"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \
- "${FILESDIR}/${PN}-2.4.10-pic-x86.patch"
+ "${FILESDIR}/${PN}-2.4.10-pic-x86.patch" \
+ "${FILESDIR}/${P}-git-autodetect.patch"
# remove bundled stuff
rm -rf 3rdparty
diff --git a/media-libs/opencv/opencv-2.4.11.ebuild
b/media-libs/opencv/opencv-2.4.11.ebuild
index d5fc0f7..225533b 100644
--- a/media-libs/opencv/opencv-2.4.11.ebuild
+++ b/media-libs/opencv/opencv-2.4.11.ebuild
@@ -83,7 +83,8 @@ src_prepare() {
"${FILESDIR}/${PN}-2.4.3-gcc47.patch" \
"${FILESDIR}/${PN}-2.4.2-cflags.patch" \
"${FILESDIR}/${PN}-2.4.8-javamagic.patch" \
- "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
+ "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \
+ "${FILESDIR}/${P}-git-autodetect.patch"
# remove bundled stuff
rm -rf 3rdparty
diff --git a/media-libs/opencv/opencv-2.4.12.ebuild
b/media-libs/opencv/opencv-2.4.12.ebuild
index e6096e5..be13558 100644
--- a/media-libs/opencv/opencv-2.4.12.ebuild
+++ b/media-libs/opencv/opencv-2.4.12.ebuild
@@ -83,7 +83,8 @@ src_prepare() {
"${FILESDIR}/${PN}-2.4.3-gcc47.patch" \
"${FILESDIR}/${PN}-2.4.2-cflags.patch" \
"${FILESDIR}/${PN}-2.4.8-javamagic.patch" \
- "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
+ "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \
+ "${FILESDIR}/${P}-git-autodetect.patch"
# remove bundled stuff
rm -rf 3rdparty
diff --git a/media-libs/opencv/opencv-2.4.9.ebuild
b/media-libs/opencv/opencv-2.4.9.ebuild
index 872d74c..e192c8d 100644
--- a/media-libs/opencv/opencv-2.4.9.ebuild
+++ b/media-libs/opencv/opencv-2.4.9.ebuild
@@ -86,7 +86,8 @@ src_prepare() {
"${FILESDIR}/${PN}-2.4.8-javamagic.patch" \
"${FILESDIR}/${PN}-2.4.9-cuda.patch" \
"${FILESDIR}/${PN}-2.4.9-libav10.patch" \
- "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
+ "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \
+ "${FILESDIR}/${P}-git-autodetect.patch"
# remove bundled stuff
rm -rf 3rdparty
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild
b/media-libs/opencv/opencv-3.0.0.ebuild
index 5e435a0..60aff3a 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -90,7 +90,8 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/${P}-gles.patch"
+ epatch "${FILESDIR}/${P}-gles.patch" \
+ "${FILESDIR}/${P}-git-autodetect.patch"
# remove bundled stuff
rm -rf 3rdparty
diff --git a/media-libs/opencv/opencv-3.1.0-r1.ebuild
b/media-libs/opencv/opencv-3.1.0-r1.ebuild
index bbbcde9..5df52b0 100644
--- a/media-libs/opencv/opencv-3.1.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r1.ebuild
@@ -94,7 +94,8 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
- "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch"
+ "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
+ "${FILESDIR}/${P}-git-autodetect.patch"
# remove bundled stuff
rm -rf 3rdparty
diff --git a/media-libs/opencv/opencv-3.1.0-r2.ebuild
b/media-libs/opencv/opencv-3.1.0-r2.ebuild
index 310b4dc..66d7de4 100644
--- a/media-libs/opencv/opencv-3.1.0-r2.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r2.ebuild
@@ -94,7 +94,8 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
- "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch"
+ "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
+ "${FILESDIR}/${P}-git-autodetect.patch"
# remove bundled stuff
rm -rf 3rdparty
