[gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/, media-libs/opencv/

["Amy Liffey" <amynka@gentoo.org>]

commit:     9e7938189272bae00cd3da81d868cfe85748d08d
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 22:15:53 2019 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 22:20:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e793818

media-libs/opencv: patch to remove git autodetect

Closes: https://bugs.gentoo.org/672162
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../files/opencv-3.4.1-remove-git-autodetect.patch | 42 ++++++++++++++++++++++
 media-libs/opencv/opencv-3.4.1-r5.ebuild           |  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch b/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch
new file mode 100644
index 00000000000..94b221ab9a8
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch
@@ -0,0 +1,42 @@
+--- a/CMakeLists.txt	2019-01-10 19:29:06.831367707 +0100
++++ b/CMakeLists.txt	2019-01-10 19:30:11.125364384 +0100
+@@ -522,23 +522,23 @@
+ # ----------------------------------------------------------------------------
+ #  Autodetect if we are in a GIT repository
+ # ----------------------------------------------------------------------------
+-find_host_package(Git QUIET)
++# find_host_package(Git QUIET)
+ 
+-if(NOT DEFINED OPENCV_VCSVERSION AND 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()
+-elseif(NOT DEFINED OPENCV_VCSVERSION)
+-  # We don't have git:
+-  set(OPENCV_VCSVERSION "unknown")
+-endif()
++# if(NOT DEFINED OPENCV_VCSVERSION AND 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()
++# elseif(NOT DEFINED OPENCV_VCSVERSION)
++#  # We don't have git:
++# set(OPENCV_VCSVERSION "unknown")
++#endif()
+ 
+ 
+ # ----------------------------------------------------------------------------

diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index b03f24a8491..569397d8555 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -230,6 +230,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
 	"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
 	"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
+	"${FILESDIR}/${P}-remove-git-autodetect.patch"
 )
 
 pkg_pretend() {