* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/
@ 2015-12-21 22:00 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 7+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2015-12-21 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 5a129c27220c4bcddecac48b0b8ac84e3f11cc56
Author: Andrzej Pauli <andrzej.pauli <AT> gmail <DOT> com>
AuthorDate: Mon Dec 21 21:59:17 2015 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 21:59:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a129c27
media-video/qgifer: Add missing description of opencv3 flag
media-video/qgifer/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-video/qgifer/metadata.xml b/media-video/qgifer/metadata.xml
index 0f6f89d..01ae246 100644
--- a/media-video/qgifer/metadata.xml
+++ b/media-video/qgifer/metadata.xml
@@ -12,6 +12,7 @@
</longdescription>
<use>
<flag name="imagemagick">Use imagemagick for image operations</flag>
+ <flag name="opencv3">Use opencv-3.* for video operations instead opencv-2.*</flag>
</use>
<upstream>
<remote-id type="sourceforge">qgifer</remote-id>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/
@ 2016-01-12 10:31 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-01-12 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 7d38a615a226c014aa08445fbe95b5993d1011ee
Author: Chaos <haos.engine <AT> gmail <DOT> com>
AuthorDate: Tue Dec 22 00:40:22 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 00:40:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d38a615
qgifer opencv dependency with sloted entries for opencv-2* and
opencv-3*
media-video/qgifer/qgifer-0.2.1-r2.ebuild | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/media-video/qgifer/qgifer-0.2.1-r2.ebuild b/media-video/qgifer/qgifer-0.2.1-r2.ebuild
index 2fa69dd..0303568 100644
--- a/media-video/qgifer/qgifer-0.2.1-r2.ebuild
+++ b/media-video/qgifer/qgifer-0.2.1-r2.ebuild
@@ -17,30 +17,30 @@ 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"
+ 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"
+ >=dev-util/cmake-2.8:0"
S="${WORKDIR}/${P}-source"
src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
+ epatch "${FILESDIR}"/${P}-desktop.patch
- if use opencv3 ; then
- epatch "${FILESDIR}"/${P}-opencv3.patch
- fi
+ if use opencv3 ; then
+ epatch "${FILESDIR}"/${P}-opencv3.patch
+ fi
}
src_configure() {
- local mycmakeargs
+ local mycmakeargs
- use debug && mycmakeargs=( -DRELEASE_MODE=OFF )
+ use debug && mycmakeargs=( -DRELEASE_MODE=OFF )
- cmake-utils_src_configure
+ cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/
@ 2016-01-12 10:31 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-01-12 10:31 UTC (permalink / raw
To: gentoo-commits
commit: a0df2efc59eb3684410163974495dc75846ae628
Author: Chaos <haos.engine <AT> gmail <DOT> com>
AuthorDate: Fri Dec 25 23:57:19 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 23:57:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0df2efc
media-video/qgifer: opencv3 slot depedency
Fixed dependency to be from specific slot rather than version number.
First encounter with bug 568538
media-video/qgifer/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/qgifer/metadata.xml b/media-video/qgifer/metadata.xml
index 01ae246..7f69735 100644
--- a/media-video/qgifer/metadata.xml
+++ b/media-video/qgifer/metadata.xml
@@ -12,7 +12,7 @@
</longdescription>
<use>
<flag name="imagemagick">Use imagemagick for image operations</flag>
- <flag name="opencv3">Use opencv-3.* for video operations instead opencv-2.*</flag>
+ <flag name="opencv3">Use media-libs/opencv:0/3.0 for video operations instead media-libs/opencv:0/2.4</flag>
</use>
<upstream>
<remote-id type="sourceforge">qgifer</remote-id>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/
@ 2016-01-12 10:31 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-01-12 10:31 UTC (permalink / raw
To: gentoo-commits
commit: a2def6bda80b6bed4f3fc48242965c59f9377915
Author: Chaos <andrzej.pauli <AT> gmail <DOT> com>
AuthorDate: Tue Dec 22 00:31:35 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 00:31:35 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2def6bd
Create qgifer-0.2.1-r2.ebuild file
Using slots for opencv2 and opencv3 versions
media-video/qgifer/qgifer-0.2.1-r2.ebuild | 46 +++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/media-video/qgifer/qgifer-0.2.1-r2.ebuild b/media-video/qgifer/qgifer-0.2.1-r2.ebuild
new file mode 100644
index 0000000..2fa69dd
--- /dev/null
+++ b/media-video/qgifer/qgifer-0.2.1-r2.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: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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/
@ 2016-06-27 5:53 Göktürk Yüksek
0 siblings, 0 replies; 7+ messages in thread
From: Göktürk Yüksek @ 2016-06-27 5:53 UTC (permalink / raw
To: gentoo-commits
commit: faeddcb8b86ab72b5c2a428e400faad48a9dbd7b
Author: Chaos <andrzej.pauli <AT> gmail <DOT> com>
AuthorDate: Tue Jun 14 12:49:02 2016 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 05:49:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faeddcb8
media-video/qgifer: fix deps and doc path, EAPI bump
Fix the version range for media-libs/giflib dependency
Use subslots with opencv
Fix doc path so it uses ${PF} instead of ${PN}
Gentoo-bug: 579246
Closes: https://github.com/gentoo/gentoo/pull/1677
...ifer-0.2.1-r1.ebuild => qgifer-0.2.1-r3.ebuild} | 24 +++++++------
media-video/qgifer/qgifer-0.2.1.ebuild | 39 ----------------------
2 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/media-video/qgifer/qgifer-0.2.1-r1.ebuild b/media-video/qgifer/qgifer-0.2.1-r3.ebuild
similarity index 60%
rename from media-video/qgifer/qgifer-0.2.1-r1.ebuild
rename to media-video/qgifer/qgifer-0.2.1-r3.ebuild
index 2c646a9..9f2cdc5 100644
--- a/media-video/qgifer/qgifer-0.2.1-r1.ebuild
+++ b/media-video/qgifer/qgifer-0.2.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
inherit cmake-utils
@@ -10,31 +10,35 @@ 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"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug imagemagick opencv3"
-RDEPEND="media-libs/giflib:0
+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-2.4.9[ffmpeg] <media-libs/opencv-3.0.0[ffmpeg] )
- opencv3? ( >=media-libs/opencv-3.0.0[ffmpeg] )
+ !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"
+DEPEND="${RDEPEND}"
S="${WORKDIR}/${P}-source"
src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
+ eapply -p0 "${FILESDIR}/${P}-desktop.patch"
if use opencv3 ; then
- epatch "${FILESDIR}"/${P}-opencv3.patch
+ eapply "${FILESDIR}/${P}-opencv3.patch"
fi
+
+ # Fix the doc path
+ sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt
+
+ eapply_user
}
src_configure() {
diff --git a/media-video/qgifer/qgifer-0.2.1.ebuild b/media-video/qgifer/qgifer-0.2.1.ebuild
deleted file mode 100644
index 47c8279..0000000
--- a/media-video/qgifer/qgifer-0.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 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"
-
-RDEPEND="media-libs/giflib:0
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- imagemagick? ( media-gfx/imagemagick:0 )
- media-libs/opencv:0[ffmpeg]
- virtual/ffmpeg:0"
-
-DEPEND="${RDEPEND}
- >=dev-util/cmake-2.8:0"
-
-S="${WORKDIR}/${P}-source"
-
-PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
-
-src_configure() {
- local mycmakeargs=""
-
- use debug && mycmakeargs+=" -DRELEASE_MODE=OFF"
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/
@ 2016-06-27 6:01 Göktürk Yüksek
0 siblings, 0 replies; 7+ messages in thread
From: Göktürk Yüksek @ 2016-06-27 6:01 UTC (permalink / raw
To: gentoo-commits
commit: bb9f9bd02c29daf9857ffff05d8309115cedb9ad
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 06:00:34 2016 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 06:00:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb9f9bd0
media-video/qgifer: add missing die statement
Package-Manager: portage-2.2.28
media-video/qgifer/qgifer-0.2.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/qgifer/qgifer-0.2.1-r3.ebuild b/media-video/qgifer/qgifer-0.2.1-r3.ebuild
index 9f2cdc5..721698e 100644
--- a/media-video/qgifer/qgifer-0.2.1-r3.ebuild
+++ b/media-video/qgifer/qgifer-0.2.1-r3.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
fi
# Fix the doc path
- sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt
+ sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt || die
eapply_user
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/
@ 2016-11-08 18:40 Göktürk Yüksek
0 siblings, 0 replies; 7+ messages in thread
From: Göktürk Yüksek @ 2016-11-08 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 775bfde564ecff4521d75d2b1d6ff1614124201b
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 8 18:39:47 2016 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 18:40:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775bfde5
media-video/qgifer: remove unnecessary <description> tag from the metadata
Package-Manager: portage-2.2.28
media-video/qgifer/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-video/qgifer/metadata.xml b/media-video/qgifer/metadata.xml
index 44249f0..ec2e60d 100644
--- a/media-video/qgifer/metadata.xml
+++ b/media-video/qgifer/metadata.xml
@@ -4,7 +4,6 @@
<maintainer type="person">
<email>andrzej.pauli@gmail.com</email>
<name>Andrzej Pauli</name>
- <description>Maintainer. Assign bugs to him.</description>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-11-08 18:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-12 10:31 [gentoo-commits] repo/gentoo:master commit in: media-video/qgifer/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2016-11-08 18:40 Göktürk Yüksek
2016-06-27 6:01 Göktürk Yüksek
2016-06-27 5:53 Göktürk Yüksek
2016-01-12 10:31 Patrice Clement
2016-01-12 10:31 Patrice Clement
2015-12-21 22:00 Amadeusz Piotr Żołnowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox