| 1 |
commit: 3ffe920c7daee95c45cbdd9dc4d4ac1f22f27e25 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Dec 17 22:34:27 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 27 16:47:49 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ffe920c |
| 7 |
|
| 8 |
app-accessibility/simon: Fix build w/ opencv3, bug 558534 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
.../simon/files/simon-0.4.1-opencv-include.patch | 20 ++++++++++++++++++++ |
| 13 |
app-accessibility/simon/simon-0.4.1.ebuild | 11 ++++++----- |
| 14 |
2 files changed, 26 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..b6a7d33 |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch |
| 21 |
@@ -0,0 +1,20 @@ |
| 22 |
+From: Peter Grasch <me@××××××.org> |
| 23 |
+Date: Sat, 25 Jul 2015 08:45:03 +0000 |
| 24 |
+Subject: Adding OpenCV include directories to include path |
| 25 |
+X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9 |
| 26 |
+--- |
| 27 |
+Adding OpenCV include directories to include path |
| 28 |
+--- |
| 29 |
+ |
| 30 |
+ |
| 31 |
+--- a/cmake/FindOpenCV.cmake |
| 32 |
++++ b/cmake/FindOpenCV.cmake |
| 33 |
+@@ -61,6 +61,7 @@ |
| 34 |
+ |
| 35 |
+ ## Include the standard CMake script |
| 36 |
+ include("${OpenCV_DIR}/OpenCVConfig.cmake") |
| 37 |
++ include_directories(${OpenCV_INCLUDE_DIRS}) |
| 38 |
+ |
| 39 |
+ ## Search for a specific version |
| 40 |
+ set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}") |
| 41 |
+ |
| 42 |
|
| 43 |
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild |
| 44 |
index b2b9c34..d713e97 100644 |
| 45 |
--- a/app-accessibility/simon/simon-0.4.1.ebuild |
| 46 |
+++ b/app-accessibility/simon/simon-0.4.1.ebuild |
| 47 |
@@ -51,11 +51,12 @@ DEPEND="${RDEPEND} |
| 48 |
virtual/pkgconfig |
| 49 |
nls? ( sys-devel/gettext )" |
| 50 |
|
| 51 |
-src_prepare() { |
| 52 |
- epatch "${FILESDIR}"/${P}-libdir.patch \ |
| 53 |
- "${FILESDIR}"/${P}-linguas.patch \ |
| 54 |
- "${FILESDIR}"/${P}-sphinx.patch |
| 55 |
-} |
| 56 |
+PATCHES=( |
| 57 |
+ "${FILESDIR}"/${P}-libdir.patch |
| 58 |
+ "${FILESDIR}"/${P}-linguas.patch |
| 59 |
+ "${FILESDIR}"/${P}-sphinx.patch |
| 60 |
+ "${FILESDIR}"/${P}-opencv-include.patch |
| 61 |
+) |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
local mycmakeargs=( |
Archives