| 1 |
commit: 9e7938189272bae00cd3da81d868cfe85748d08d |
| 2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 14 22:15:53 2019 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 14 22:20:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e793818 |
| 7 |
|
| 8 |
media-libs/opencv: patch to remove git autodetect |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/672162 |
| 11 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 13 |
|
| 14 |
.../files/opencv-3.4.1-remove-git-autodetect.patch | 42 ++++++++++++++++++++++ |
| 15 |
media-libs/opencv/opencv-3.4.1-r5.ebuild | 3 +- |
| 16 |
2 files changed, 44 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..94b221ab9a8 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch |
| 23 |
@@ -0,0 +1,42 @@ |
| 24 |
+--- a/CMakeLists.txt 2019-01-10 19:29:06.831367707 +0100 |
| 25 |
++++ b/CMakeLists.txt 2019-01-10 19:30:11.125364384 +0100 |
| 26 |
+@@ -522,23 +522,23 @@ |
| 27 |
+ # ---------------------------------------------------------------------------- |
| 28 |
+ # Autodetect if we are in a GIT repository |
| 29 |
+ # ---------------------------------------------------------------------------- |
| 30 |
+-find_host_package(Git QUIET) |
| 31 |
++# find_host_package(Git QUIET) |
| 32 |
+ |
| 33 |
+-if(NOT DEFINED OPENCV_VCSVERSION AND GIT_FOUND) |
| 34 |
+- execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*" |
| 35 |
+- WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}" |
| 36 |
+- OUTPUT_VARIABLE OPENCV_VCSVERSION |
| 37 |
+- RESULT_VARIABLE GIT_RESULT |
| 38 |
+- ERROR_QUIET |
| 39 |
+- OUTPUT_STRIP_TRAILING_WHITESPACE |
| 40 |
+- ) |
| 41 |
+- if(NOT GIT_RESULT EQUAL 0) |
| 42 |
+- set(OPENCV_VCSVERSION "unknown") |
| 43 |
+- endif() |
| 44 |
+-elseif(NOT DEFINED OPENCV_VCSVERSION) |
| 45 |
+- # We don't have git: |
| 46 |
+- set(OPENCV_VCSVERSION "unknown") |
| 47 |
+-endif() |
| 48 |
++# if(NOT DEFINED OPENCV_VCSVERSION AND GIT_FOUND) |
| 49 |
++# execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*" |
| 50 |
++# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}" |
| 51 |
++# OUTPUT_VARIABLE OPENCV_VCSVERSION |
| 52 |
++# RESULT_VARIABLE GIT_RESULT |
| 53 |
++# ERROR_QUIET |
| 54 |
++# OUTPUT_STRIP_TRAILING_WHITESPACE |
| 55 |
++# ) |
| 56 |
++# if(NOT GIT_RESULT EQUAL 0) |
| 57 |
++# set(OPENCV_VCSVERSION "unknown") |
| 58 |
++# endif() |
| 59 |
++# elseif(NOT DEFINED OPENCV_VCSVERSION) |
| 60 |
++# # We don't have git: |
| 61 |
++# set(OPENCV_VCSVERSION "unknown") |
| 62 |
++#endif() |
| 63 |
+ |
| 64 |
+ |
| 65 |
+ # ---------------------------------------------------------------------------- |
| 66 |
|
| 67 |
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild |
| 68 |
index b03f24a8491..569397d8555 100644 |
| 69 |
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild |
| 70 |
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild |
| 71 |
@@ -1,4 +1,4 @@ |
| 72 |
-# Copyright 1999-2018 Gentoo Authors |
| 73 |
+# Copyright 1999-2019 Gentoo Authors |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
EAPI=6 |
| 77 |
@@ -230,6 +230,7 @@ PATCHES=( |
| 78 |
"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530 |
| 79 |
"${FILESDIR}/${P}-python-lib-suffix-hack.patch" |
| 80 |
"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch" |
| 81 |
+ "${FILESDIR}/${P}-remove-git-autodetect.patch" |
| 82 |
) |
| 83 |
|
| 84 |
pkg_pretend() { |
Archives