| 1 |
commit: 510d7eb712901d372fba19bccc96e9d23855bae4 |
| 2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 17 08:59:50 2019 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 17 18:12:05 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510d7eb7 |
| 7 |
|
| 8 |
media-libs/opencv: add missing build dep |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/656576 |
| 11 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 13 |
|
| 14 |
.../files/opencv-3.4.1-fix-build-with-va.patch | 26 ++++++++++++++++++++++ |
| 15 |
media-libs/opencv/opencv-3.4.1-r5.ebuild | 4 +++- |
| 16 |
2 files changed, 29 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch b/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..813eb7e4ae6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch |
| 23 |
@@ -0,0 +1,26 @@ |
| 24 |
+From 20f5fa8e3e880bc8b2e5156e9f25f7fb756ed8e4 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@××××××.com> |
| 26 |
+Date: Wed, 28 Feb 2018 19:21:31 +0000 |
| 27 |
+Subject: [PATCH] Fix build with VA |
| 28 |
+ |
| 29 |
+This commit readd ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES} |
| 30 |
+that was missed in commit 2200e13c7193e0fe9db4b9f7c4bee3a7ef043909 |
| 31 |
+ |
| 32 |
+ diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt |
| 33 |
+ - ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES}) |
| 34 |
+ + ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS}) |
| 35 |
+--- |
| 36 |
+ samples/va_intel/CMakeLists.txt | 2 +- |
| 37 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 38 |
+ |
| 39 |
+diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt |
| 40 |
+index af51dd32061..04f2ea5fd40 100644 |
| 41 |
+--- a/samples/va_intel/CMakeLists.txt |
| 42 |
++++ b/samples/va_intel/CMakeLists.txt |
| 43 |
+@@ -17,5 +17,5 @@ ocv_include_modules_recurse(${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS}) |
| 44 |
+ file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) |
| 45 |
+ foreach(sample_filename ${all_samples}) |
| 46 |
+ ocv_define_sample(tgt ${sample_filename} va_intel) |
| 47 |
+- ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS}) |
| 48 |
++ ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES}) |
| 49 |
+ endforeach() |
| 50 |
|
| 51 |
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild |
| 52 |
index 4b41ad5b750..45086698e73 100644 |
| 53 |
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild |
| 54 |
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild |
| 55 |
@@ -105,7 +105,8 @@ DEPEND="${RDEPEND} |
| 56 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 57 |
contrib_dnn? ( dev-libs/cereal ) |
| 58 |
eigen? ( dev-cpp/eigen:3 ) |
| 59 |
- java? ( >=virtual/jdk-1.6 )" |
| 60 |
+ java? ( >=virtual/jdk-1.6 ) |
| 61 |
+ vaapi? ( x11-libs/libva )" |
| 62 |
|
| 63 |
MULTILIB_WRAPPED_HEADERS=( |
| 64 |
/usr/include/opencv2/cvconfig.h |
| 65 |
@@ -231,6 +232,7 @@ PATCHES=( |
| 66 |
"${FILESDIR}/${P}-python-lib-suffix-hack.patch" |
| 67 |
"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch" |
| 68 |
"${FILESDIR}/${P}-remove-git-autodetect.patch" |
| 69 |
+ "${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576 |
| 70 |
) |
| 71 |
|
| 72 |
pkg_pretend() { |
Archives