summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2015-12-17 23:34:27 +0100
committerMichael Palimaka <kensington@gentoo.org>2015-12-28 03:47:49 +1100
commit3ffe920c7daee95c45cbdd9dc4d4ac1f22f27e25 (patch)
tree45a0c8e2e6f85c902d3363662094839aff67cf38 /app-accessibility
parentsci-chemistry/gelemental: Chop DESCRIPTION to 80 chars (diff)
downloadgentoo-3ffe920c7daee95c45cbdd9dc4d4ac1f22f27e25.tar.gz
gentoo-3ffe920c7daee95c45cbdd9dc4d4ac1f22f27e25.tar.bz2
gentoo-3ffe920c7daee95c45cbdd9dc4d4ac1f22f27e25.zip
app-accessibility/simon: Fix build w/ opencv3, bug 558534
Package-Manager: portage-2.2.24
Diffstat (limited to 'app-accessibility')
-rw-r--r--app-accessibility/simon/files/simon-0.4.1-opencv-include.patch20
-rw-r--r--app-accessibility/simon/simon-0.4.1.ebuild11
2 files changed, 26 insertions, 5 deletions
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
new file mode 100644
index 000000000000..b6a7d33c409f
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
@@ -0,0 +1,20 @@
+From: Peter Grasch <me@bedahr.org>
+Date: Sat, 25 Jul 2015 08:45:03 +0000
+Subject: Adding OpenCV include directories to include path
+X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9
+---
+Adding OpenCV include directories to include path
+---
+
+
+--- a/cmake/FindOpenCV.cmake
++++ b/cmake/FindOpenCV.cmake
+@@ -61,6 +61,7 @@
+
+ ## Include the standard CMake script
+ include("${OpenCV_DIR}/OpenCVConfig.cmake")
++ include_directories(${OpenCV_INCLUDE_DIRS})
+
+ ## Search for a specific version
+ set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
index b2b9c344428d..d713e97c7fda 100644
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ b/app-accessibility/simon/simon-0.4.1.ebuild
@@ -51,11 +51,12 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libdir.patch \
- "${FILESDIR}"/${P}-linguas.patch \
- "${FILESDIR}"/${P}-sphinx.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-libdir.patch
+ "${FILESDIR}"/${P}-linguas.patch
+ "${FILESDIR}"/${P}-sphinx.patch
+ "${FILESDIR}"/${P}-opencv-include.patch
+)
src_configure() {
local mycmakeargs=(