From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EFF85138334 for ; Mon, 14 Jan 2019 22:23:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 999F2E0A02; Mon, 14 Jan 2019 22:23:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66CCCE0A02 for ; Mon, 14 Jan 2019 22:23:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C649335D04 for ; Mon, 14 Jan 2019 22:23:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 143D5455 for ; Mon, 14 Jan 2019 22:23:34 +0000 (UTC) From: "Amy Liffey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" Message-ID: <1547504423.9e7938189272bae00cd3da81d868cfe85748d08d.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/, media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch media-libs/opencv/opencv-3.4.1-r5.ebuild X-VCS-Directories: media-libs/opencv/ media-libs/opencv/files/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Liffey X-VCS-Revision: 9e7938189272bae00cd3da81d868cfe85748d08d X-VCS-Branch: master Date: Mon, 14 Jan 2019 22:23:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ccb2b7c3-0734-4c2e-92f9-ee4f0461f8df X-Archives-Hash: 1e4b5e83ce94701882fbb08eff88f9e2 commit: 9e7938189272bae00cd3da81d868cfe85748d08d Author: Amy Liffey gentoo org> AuthorDate: Mon Jan 14 22:15:53 2019 +0000 Commit: Amy Liffey gentoo 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 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() {