diff options
author | Amy Liffey <amynka@gentoo.org> | 2019-12-07 20:38:29 +0100 |
---|---|---|
committer | Amy Liffey <amynka@gentoo.org> | 2019-12-07 20:38:59 +0100 |
commit | 432d7ed8116713d109521ea4f5ec0a9e2310feb6 (patch) | |
tree | 97d709c341c87d06a1a9cd18852cc8b49e46b5f7 /media-libs/opencv | |
parent | app-misc/qlcplus: Also add version 5.0.0_alpha3 (diff) | |
download | gentoo-432d7ed8116713d109521ea4f5ec0a9e2310feb6.tar.gz gentoo-432d7ed8116713d109521ea4f5ec0a9e2310feb6.tar.bz2 gentoo-432d7ed8116713d109521ea4f5ec0a9e2310feb6.zip |
media-libs/opencv: dont try to install LICENSE.txt
Submitted-by: Helmut Jarausch <jarausch@igpm.rwth-aachen.de>
Closes: https://bugs.gentoo.org/701448
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amy Liffey <amynka@gentoo.org>
Diffstat (limited to 'media-libs/opencv')
-rw-r--r-- | media-libs/opencv/files/opencv-4.1.2-opencl-license.patch | 10 | ||||
-rw-r--r-- | media-libs/opencv/opencv-4.1.2-r2.ebuild | 1 |
2 files changed, 11 insertions, 0 deletions
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() { |