| 1 |
commit: 990ef023d106b220f1f52945440509f0af2db0e0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 18:35:46 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 19:16:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=990ef023 |
| 7 |
|
| 8 |
media-libs/opencv: drop pch support (fixes eigen build) |
| 9 |
|
| 10 |
PCH support is broken when using CMake and apparently |
| 11 |
opencv is no exception. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/733796 |
| 14 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
media-libs/opencv/opencv-4.4.0.ebuild | 8 +++++--- |
| 18 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/opencv/opencv-4.4.0.ebuild b/media-libs/opencv/opencv-4.4.0.ebuild |
| 21 |
index 783f97e3a22..5e6c41a3d97 100644 |
| 22 |
--- a/media-libs/opencv/opencv-4.4.0.ebuild |
| 23 |
+++ b/media-libs/opencv/opencv-4.4.0.ebuild |
| 24 |
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 25 |
LICENSE="BSD" |
| 26 |
SLOT="0/${PV}" # subslot = libopencv* soname version |
| 27 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 28 |
-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 pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" |
| 29 |
+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" |
| 30 |
|
| 31 |
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications |
| 32 |
ARM_CPU_FEATURES=( |
| 33 |
@@ -416,7 +416,8 @@ multilib_src_configure() { |
| 34 |
# OpenCV build options |
| 35 |
# =================================================== |
| 36 |
-DENABLE_CCACHE=OFF |
| 37 |
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch) |
| 38 |
+ # bug 733796, but PCH is a risky game in CMake anyway |
| 39 |
+ -DENABLE_PRECOMPILED_HEADERS=OFF |
| 40 |
-DENABLE_SOLUTION_FOLDERS=OFF |
| 41 |
-DENABLE_PROFILING=OFF |
| 42 |
-DENABLE_COVERAGE=OFF |
| 43 |
@@ -453,6 +454,7 @@ multilib_src_configure() { |
| 44 |
for i in "${CPU_FEATURES_MAP[@]}" ; do |
| 45 |
use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};" |
| 46 |
done |
| 47 |
+ |
| 48 |
GLOBALCMAKEARGS+=( |
| 49 |
-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON |
| 50 |
-DCPU_BASELINE=${CPU_BASELINE} |
| 51 |
@@ -509,7 +511,7 @@ multilib_src_configure() { |
| 52 |
} |
| 53 |
|
| 54 |
python_module_compile() { |
| 55 |
- local BUILD_DIR=${orig_BUILD_DIR} |
| 56 |
+ local BUILD_DIR="${orig_BUILD_DIR}" |
| 57 |
local mycmakeargs=( ${GLOBALCMAKEARGS[@]} ) |
| 58 |
|
| 59 |
# Set all python variables to load the correct Gentoo paths |
Archives