commit: 17175667216af9f238015556b76afca821eb5f1e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 10 13:09:18 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 10 13:09:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17175667
media-libs/opencv: backport filter-lto to 4.8.0 Backport ffe7db9fea449121418607737c320c312bebb7f9. Bug: https://bugs.gentoo.org/919101 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/opencv/metadata.xml | 1 - .../opencv/{opencv-4.8.0-r2.ebuild => opencv-4.8.0-r3.ebuild} | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index 80f1912bd4fd..fc1efa988e96 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/metadata.xml @@ -34,7 +34,6 @@ <flag name="gflags">Use Google's C++ argument parsing library (<pkg>dev-cpp/gflags</pkg>)</flag> <flag name="glog">Use Google's C++ logging library (<pkg>dev-cpp/glog</pkg>)</flag> <flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag> - <flag name="lto">Build using Link Time Optimizations (LTO)</flag> <flag name="non-free">Enable non-free components</flag> <flag name="opencvapps">Enable compilation with opencvapps</flag> <flag name="tbb">Enable multithreading with the Intel Threads Building Block (<pkg>dev-cpp/tbb</pkg>)</flag> diff --git a/media-libs/opencv/opencv-4.8.0-r2.ebuild b/media-libs/opencv/opencv-4.8.0-r3.ebuild similarity index 98% rename from media-libs/opencv/opencv-4.8.0-r2.ebuild rename to media-libs/opencv/opencv-4.8.0-r3.ebuild index 2671f7fab885..99a65fe7d7c7 100644 --- a/media-libs/opencv/opencv-4.8.0-r2.ebuild +++ b/media-libs/opencv/opencv-4.8.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0/${PV}" # subslot = libopencv* soname version KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" -IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" +IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications ARM_CPU_FEATURES=( @@ -342,6 +342,9 @@ src_prepare() { } multilib_src_configure() { + # bug #919101 and https://github.com/opencv/opencv/issues/19020 + filter-lto + # please dont sort here, order is the same as in CMakeLists.txt GLOBALCMAKEARGS=( # for protobuf @@ -468,7 +471,6 @@ multilib_src_configure() { -DENABLE_INSTRUMENTATION=OFF -DGENERATE_ABI_DESCRIPTOR=OFF -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF - -DENABLE_LTO=$(usex lto) # =================================================== # things we want to be hard off or not yet figured out # ===================================================
