From 432d7ed8116713d109521ea4f5ec0a9e2310feb6 Mon Sep 17 00:00:00 2001 From: Amy Liffey Date: Sat, 7 Dec 2019 20:38:29 +0100 Subject: [PATCH] media-libs/opencv: dont try to install LICENSE.txt Submitted-by: Helmut Jarausch Closes: https://bugs.gentoo.org/701448 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Amy Liffey --- .../opencv/files/opencv-4.1.2-opencl-license.patch | 10 ++++++++++ media-libs/opencv/opencv-4.1.2-r2.ebuild | 1 + 2 files changed, 11 insertions(+) create mode 100644 media-libs/opencv/files/opencv-4.1.2-opencl-license.patch diff --git a/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch b/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch new file mode 100644 index 000000000000..f69a88db0a49 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch @@ -0,0 +1,10 @@ +--- a/cmake/OpenCVDetectOpenCL.cmake.ORIG 2019-11-29 11:29:00.642852106 +0100 ++++ b/cmake/OpenCVDetectOpenCL.cmake 2019-11-29 11:37:57.088822546 +0100 +@@ -5,7 +5,6 @@ + else() + set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library") + set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory") +- ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt") + endif() + mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) + diff --git a/media-libs/opencv/opencv-4.1.2-r2.ebuild b/media-libs/opencv/opencv-4.1.2-r2.ebuild index 5f9efaf91349..c97e2fcb3f48 100644 --- a/media-libs/opencv/opencv-4.1.2-r2.ebuild +++ b/media-libs/opencv/opencv-4.1.2-r2.ebuild @@ -235,6 +235,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.4.0-disable-download.patch" "${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch" "${FILESDIR}/${P}-pkg-config-file.patch" + "${FILESDIR}/${P}-opencl-license.patch" ) pkg_pretend() { -- 2.26.2