media-video/qgifer: Fix build with >=media-libs/opencv-3

Patch qgifer for build with >=media-libs/opencv-3.

Gentoo-bug: 568538

2 files changed, 90 insertions, 0 deletions

diff --git a/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch b/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch
new file mode 100644
index 000000000000..89c79ff17943
--- /dev/null
+++ b/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch
@@ -0,0 +1,44 @@
+diff -Naur qgifer-0.2.1-source/CMakeLists.txt qgifer-0.2.1-modified/CMakeLists.txt
+--- qgifer-0.2.1-source/CMakeLists.txt	2013-06-04 18:33:16.000000000 +0200
++++ qgifer-0.2.1-modified/CMakeLists.txt	2015-12-19 20:58:13.772808845 +0100
+@@ -35,7 +35,7 @@
+ 	SET(GIF_INCLUDE_DIR "C:\\Program Files\\GnuWin32\\include")
+ ENDIF(WIN32)
+ 
+-FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc )
++FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc videoio)
+ FIND_PACKAGE(Qt4 REQUIRED)
+ FIND_PACKAGE(GIF REQUIRED)
+ 
+@@ -148,9 +148,9 @@
+ QT4_ADD_RESOURCES(RESOURCES_RCC ${RESOURCES})
+ 
+ IF(WIN32)
+-	SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244" )
++	SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244 -lopencv_videoio244" )
+ ELSE(WIN32)
+-	SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc" )
++	SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_videoio" )
+ ENDIF(WIN32)
+ 
+ SET( GIF_LIBS "-lgif" )	
+@@ -207,7 +207,7 @@
+ #SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${QGIFER_VERSION_MAJOR}.${QGIFER_VERSION_MINOR}.${QGIFER_VERSION_PATCH}")
+  
+ #set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) #za pierwszym razem, pozniej dodano | dla nowszych opencv
+-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.1.3), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libgif4 (>= 4.1.4), libopencv-core2.3 | libopencv-core2.4, libopencv-highgui2.3 | libopencv-highgui2.4, libopencv-imgproc2.3 | libopencv-imgproc2.4, libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)")
++SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.1.3), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libgif4 (>= 4.1.4), libopencv-core2.3 | libopencv-core2.4 | libopencv-core3.0, libopencv-highgui2.3 | libopencv-highgui2.4 | libopencv-highgui3.0, libopencv-imgproc2.3 | libopencv-imgproc2.4 | libopencv-imgproc3.0, libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)")
+  
+ SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+ SET(CPACK_DEBIAN_PACKAGE_SECTION "video")
+diff -Naur qgifer-0.2.1-source/src/frameplayer.h qgifer-0.2.1-modified/src/frameplayer.h
+--- qgifer-0.2.1-source/src/frameplayer.h	2013-06-04 18:14:55.000000000 +0200
++++ qgifer-0.2.1-modified/src/frameplayer.h	2015-12-19 21:01:44.419870869 +0100
+@@ -23,6 +23,7 @@
+ #include <opencv2/core/core.hpp>
+ #include <opencv2/highgui/highgui.hpp>
+ #include <opencv2/imgproc/imgproc.hpp>
++#include <opencv2/videoio/videoio.hpp>
+ #include <QWidget>
+ #include <QImage>
+ #include <QStatusBar>
diff --git a/media-video/qgifer/qgifer-0.2.1-r1.ebuild b/media-video/qgifer/qgifer-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..2c646a902fed
--- /dev/null
+++ b/media-video/qgifer/qgifer-0.2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+
+DESCRIPTION="A video-based animated GIF creator"
+HOMEPAGE="https://sourceforge.net/projects/qgifer/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug imagemagick opencv3"
+
+RDEPEND="media-libs/giflib:0
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	imagemagick? ( media-gfx/imagemagick:0 )
+	!opencv3? ( >=media-libs/opencv-2.4.9[ffmpeg] <media-libs/opencv-3.0.0[ffmpeg] )
+	opencv3? ( >=media-libs/opencv-3.0.0[ffmpeg] )
+	virtual/ffmpeg:0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.8:0"
+
+S="${WORKDIR}/${P}-source"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	if use opencv3 ; then
+		epatch "${FILESDIR}"/${P}-opencv3.patch
+	fi
+}
+
+src_configure() {
+	local mycmakeargs
+
+	use debug && mycmakeargs=( -DRELEASE_MODE=OFF )
+
+	cmake-utils_src_configure
+}