* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/, media-video/qgifer/files/
@ 2015-12-21 21:56 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 2+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2015-12-21 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 3153480b7ce8176cdd1be5021e77f0b4438096e2
Author: Andrzej Pauli <andrzej.pauli <AT> gmail <DOT> com>
AuthorDate: Mon Dec 21 21:53:30 2015 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 21:53:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3153480b
media-video/qgifer: Fix build with >=media-libs/opencv-3
Patch qgifer for build with >=media-libs/opencv-3.
Gentoo-bug: 568538
.../qgifer/files/qgifer-0.2.1-opencv3.patch | 44 +++++++++++++++++++++
media-video/qgifer/qgifer-0.2.1-r1.ebuild | 46 ++++++++++++++++++++++
2 files changed, 90 insertions(+)
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 0000000..89c79ff
--- /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 0000000..2c646a9
--- /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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/, media-video/qgifer/files/
@ 2016-11-08 16:40 Amy Winston
0 siblings, 0 replies; 2+ messages in thread
From: Amy Winston @ 2016-11-08 16:40 UTC (permalink / raw
To: gentoo-commits
commit: 05d80b9e4935caa4b4b3e2bdc32a50284a70d298
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 8 16:38:08 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 16:40:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d80b9e
media-video/qgifer: fix dependencies, remove broken version
- Fix subslot dependencies
- Remove broken version
- Change patch to p1
Package-Manager: portage-2.3.0
.../qgifer/files/qgifer-0.2.1-desktop.patch | 4 +-
media-video/qgifer/qgifer-0.2.1-r2.ebuild | 46 ----------------------
...ifer-0.2.1-r3.ebuild => qgifer-0.2.1-r4.ebuild} | 16 ++++----
3 files changed, 9 insertions(+), 57 deletions(-)
diff --git a/media-video/qgifer/files/qgifer-0.2.1-desktop.patch b/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
index 2804cae..8e02163 100644
--- a/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
+++ b/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
@@ -1,7 +1,7 @@
Index: doc/qgifer.desktop
===================================================================
---- doc/qgifer.desktop (revision 91)
-+++ doc/qgifer.desktop (working copy)
+--- a/doc/qgifer.desktop (revision 91)
++++ b/doc/qgifer.desktop (working copy)
@@ -3,7 +3,7 @@
Name=QGifer
Icon=/usr/share/icons/qgifer.xpm
diff --git a/media-video/qgifer/qgifer-0.2.1-r2.ebuild b/media-video/qgifer/qgifer-0.2.1-r2.ebuild
deleted file mode 100644
index 0303568..00000000
--- a/media-video/qgifer/qgifer-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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:0/2.4[ffmpeg] )
- opencv3? ( media-libs/opencv:0/3.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
-}
diff --git a/media-video/qgifer/qgifer-0.2.1-r3.ebuild b/media-video/qgifer/qgifer-0.2.1-r4.ebuild
similarity index 75%
rename from media-video/qgifer/qgifer-0.2.1-r3.ebuild
rename to media-video/qgifer/qgifer-0.2.1-r4.ebuild
index 721698e..e0ddb0a 100644
--- a/media-video/qgifer/qgifer-0.2.1-r3.ebuild
+++ b/media-video/qgifer/qgifer-0.2.1-r4.ebuild
@@ -20,25 +20,23 @@ RDEPEND="<media-libs/giflib-4.2.3:0
dev-qt/qtcore:4
dev-qt/qtgui:4
imagemagick? ( media-gfx/imagemagick:0 )
- !opencv3? ( media-libs/opencv:0/2.4[ffmpeg] )
- opencv3? ( media-libs/opencv:0/3.0[ffmpeg] )
+ !opencv3? ( <media-libs/opencv-3.0.0:0[ffmpeg] )
+ opencv3? ( >=media-libs/opencv-3.0.0:0[ffmpeg] )
virtual/ffmpeg:0"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${P}-source"
-src_prepare() {
- eapply -p0 "${FILESDIR}/${P}-desktop.patch"
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
- if use opencv3 ; then
- eapply "${FILESDIR}/${P}-opencv3.patch"
- fi
+src_prepare(){
+ use opencv3 && PATCHES+=( "${FILESDIR}/${P}-opencv3.patch" )
+
+ cmake-utils_src_prepare
# Fix the doc path
sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt || die
-
- eapply_user
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-08 16:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-21 21:56 [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/, media-video/qgifer/files/ Amadeusz Piotr Żołnowski
-- strict thread matches above, loose matches on Subject: below --
2016-11-08 16:40 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox