[gentoo-commits] dev/xmw:master commit in: media-gfx/lyli/files/, media-gfx/lyli/

[gentoo-commits] dev/xmw:master commit in: media-gfx/lyli/files/, media-gfx/lyli/

[Michael Weber]

commit:     df8fa3737f081e700181e93073a7043303ff4edd
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Sun Jan 17 12:49:38 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 12:49:38 2016 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=df8fa373

media-gfx/lyli: fix live build

Package-Manager: portage-2.2.26
Manifest-Sign-Key: 0x71D573A82F434065

 media-gfx/lyli/files/lyli-9999-opencv2-imwrite.patch | 10 ++++++++++
 media-gfx/lyli/lyli-9999.ebuild                      |  1 +
 2 files changed, 11 insertions(+)

diff --git a/media-gfx/lyli/files/lyli-9999-opencv2-imwrite.patch b/media-gfx/lyli/files/lyli-9999-opencv2-imwrite.patch
new file mode 100644
index 0000000..0a17f4a
--- /dev/null
+++ b/media-gfx/lyli/files/lyli-9999-opencv2-imwrite.patch
@@ -0,0 +1,10 @@
+--- lyli-9999/calibration/calibrator.cpp
++++ lyli-9999/calibration/calibrator.cpp
+@@ -40,6 +40,7 @@
+ #include <opencv2/calib3d/calib3d.hpp>
+ #include <opencv2/core/core.hpp>
+ #include <opencv2/imgproc/imgproc.hpp>
++#include <opencv2/imgcodecs.hpp>
+ 
+ #include <tbb/parallel_for_each.h>
+ #include <tbb/spin_mutex.h>

diff --git a/media-gfx/lyli/lyli-9999.ebuild b/media-gfx/lyli/lyli-9999.ebuild
index 8ecb71f..3a0dfee 100644
--- a/media-gfx/lyli/lyli-9999.ebuild
+++ b/media-gfx/lyli/lyli-9999.ebuild
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 PATCHES=( 
 	"${FILESDIR}"/${P}-jsoncpp-include.patch
 	"${FILESDIR}"/${P}-system-libusbpp.patch
+	"${FILESDIR}"/${P}-opencv2-imwrite.patch
 )
 
 src_configure() {

[gentoo-commits] dev/xmw:master commit in: media-gfx/lyli/files/, media-gfx/lyli/

[Michael Weber]

commit:     58646f108143447ce3d3d7305b1f7b2afc01e315
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Mon Apr  4 11:46:02 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 11:46:02 2016 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=58646f10

media-gfx/lyli: Upstream fixed jsoncpp include path

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0x71D573A82F434065

 media-gfx/lyli/files/lyli-9999-jsoncpp-include.patch | 10 ----------
 media-gfx/lyli/lyli-9999.ebuild                      |  1 -
 2 files changed, 11 deletions(-)

diff --git a/media-gfx/lyli/files/lyli-9999-jsoncpp-include.patch b/media-gfx/lyli/files/lyli-9999-jsoncpp-include.patch
deleted file mode 100644
index 00746d6..0000000
--- a/media-gfx/lyli/files/lyli-9999-jsoncpp-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lyli-9999/CMakeLists.txt
-+++ lyli-9999/CMakeLists.txt
-@@ -22,6 +22,7 @@
- 
- set(CMAKE_CXX_FLAGS "-std=c++14")
- include_directories(${LIBUSB_INCLUDE_DIRS})
-+include_directories(${JsonCpp_INCLUDE_DIR})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- 
- #########

diff --git a/media-gfx/lyli/lyli-9999.ebuild b/media-gfx/lyli/lyli-9999.ebuild
index 3a0dfee..84b7e35 100644
--- a/media-gfx/lyli/lyli-9999.ebuild
+++ b/media-gfx/lyli/lyli-9999.ebuild
@@ -23,7 +23,6 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=( 
-	"${FILESDIR}"/${P}-jsoncpp-include.patch
 	"${FILESDIR}"/${P}-system-libusbpp.patch
 	"${FILESDIR}"/${P}-opencv2-imwrite.patch
 )