Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, media-video/qgifer/, media-video/qgifer/files/
Date: Tue, 27 Feb 2018 09:25:11
Message-Id: 1519723487.216fd1d0c5b15090dde473cbff5e1a1c9a6d055b.asturm@gentoo
1 commit: 216fd1d0c5b15090dde473cbff5e1a1c9a6d055b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 27 09:24:10 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 27 09:24:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216fd1d0
7
8 profiles: Remove last-rited media-video/qgifer
9
10 Closes: https://bugs.gentoo.org/644558
11
12 media-video/qgifer/Manifest | 1 -
13 .../qgifer/files/qgifer-0.2.1-desktop.patch | 13 --
14 .../qgifer/files/qgifer-0.2.1-giflib5.patch | 157 ---------------------
15 .../qgifer/files/qgifer-0.2.1-opencv3.patch | 44 ------
16 media-video/qgifer/metadata.xml | 22 ---
17 media-video/qgifer/qgifer-0.2.1-r4.ebuild | 47 ------
18 media-video/qgifer/qgifer-0.2.1-r5.ebuild | 49 -------
19 profiles/package.mask | 5 -
20 8 files changed, 338 deletions(-)
21
22 diff --git a/media-video/qgifer/Manifest b/media-video/qgifer/Manifest
23 deleted file mode 100644
24 index ff034db6fdc..00000000000
25 --- a/media-video/qgifer/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST qgifer-0.2.1-source.tar.gz 373441 BLAKE2B 7413626484ce3c10995f2b16799104f0ad942de1211455b47d2780828b2f77c58d8a20fd3f44def8a3710129b626bd4961adc4e186abcfc7e2095e6b7e5a3086 SHA512 ce48e5756cbab283d5894ddb369114e52c9cedc2fe15aed5d22aeeacc822058123d3a2f3c9a6eddf94a1eef992c3ddcad77d6941c76ba0c795c8b44209fac7df
29
30 diff --git a/media-video/qgifer/files/qgifer-0.2.1-desktop.patch b/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
31 deleted file mode 100644
32 index 8e021630f13..00000000000
33 --- a/media-video/qgifer/files/qgifer-0.2.1-desktop.patch
34 +++ /dev/null
35 @@ -1,13 +0,0 @@
36 -Index: doc/qgifer.desktop
37 -===================================================================
38 ---- a/doc/qgifer.desktop (revision 91)
39 -+++ b/doc/qgifer.desktop (working copy)
40 -@@ -3,7 +3,7 @@
41 - Name=QGifer
42 - Icon=/usr/share/icons/qgifer.xpm
43 - Type=Application
44 --Categories=Graphics;2DGraphics;RasterGraphics;Video;
45 -+Categories=Graphics;2DGraphics;RasterGraphics;Video;AudioVideo;
46 - Comment=A video-based animated GIF creator
47 - GenericName=A video-based animated GIF creator
48 - Comment[pl]=Narzędzie do tworzenia animowanych plików GIF
49
50 diff --git a/media-video/qgifer/files/qgifer-0.2.1-giflib5.patch b/media-video/qgifer/files/qgifer-0.2.1-giflib5.patch
51 deleted file mode 100644
52 index 9ddfdac8064..00000000000
53 --- a/media-video/qgifer/files/qgifer-0.2.1-giflib5.patch
54 +++ /dev/null
55 @@ -1,157 +0,0 @@
56 -Port qgifer to giflib 5 API.
57 -See also: https://bugs.gentoo.org/show_bug.cgi?id=536634
58 -
59 ---- a/src/gifcreator.cpp
60 -+++ b/src/gifcreator.cpp
61 -@@ -38,7 +38,7 @@
62 - j--;
63 - }
64 - for(int i=0;i<cmaps.size();i++)
65 -- FreeMapObject(cmaps[i]);
66 -+ GifFreeMapObject(cmaps[i]);
67 - }
68 -
69 -
70 -@@ -52,7 +52,7 @@
71 - }
72 -
73 -
74 -- GifFileType *GifFile = EGifOpenFileName(filename, FALSE);
75 -+ GifFileType *GifFile = EGifOpenFileName(filename, 0, NULL);
76 -
77 - if (!GifFile){
78 - PrintGifError();
79 -@@ -74,7 +74,7 @@
80 - {
81 - char nsle[12] = "NETSCAPE2.0";
82 - char subblock[3];
83 -- if (EGifPutExtensionFirst(GifFile, APPLICATION_EXT_FUNC_CODE, 11, nsle) == GIF_ERROR) {
84 -+ if (EGifPutExtension(GifFile, APPLICATION_EXT_FUNC_CODE, 11, nsle) == GIF_ERROR) {
85 - PrintGifError();
86 - return false;
87 - }
88 -@@ -82,7 +82,7 @@
89 - subblock[2] = loop_count % 256;
90 - subblock[1] = loop_count / 256;
91 -
92 -- if (EGifPutExtensionLast(GifFile, APPLICATION_EXT_FUNC_CODE, 3, subblock) == GIF_ERROR) {
93 -+ if (EGifPutExtension(GifFile, APPLICATION_EXT_FUNC_CODE, 3, subblock) == GIF_ERROR) {
94 - PrintGifError();
95 - return false;
96 - }
97 -@@ -111,7 +111,7 @@
98 -
99 - if (EGifPutImageDesc(
100 - GifFile,
101 -- 0, 0, w, h, FALSE, cmaps.size() > ni ? cmaps.at(ni) : cmaps.at(cmaps.size()-1)
102 -+ 0, 0, w, h, 0, cmaps.size() > ni ? cmaps.at(ni) : cmaps.at(cmaps.size()-1)
103 - ) == GIF_ERROR) {
104 - PrintGifError();
105 - endProgress();
106 -@@ -135,7 +135,7 @@
107 - return false;
108 - }
109 -
110 -- if (EGifCloseFile(GifFile) == GIF_ERROR) {
111 -+ if (EGifCloseFile(GifFile, NULL) == GIF_ERROR) {
112 - PrintGifError();
113 - endProgress();
114 - return false;
115 ---- a/src/gifcreator.h
116 -+++ b/src/gifcreator.h
117 -@@ -31,6 +31,12 @@
118 - typedef vector<GifByteType> Frame;
119 - typedef unsigned char Byte;
120 -
121 -+static inline void
122 -+PrintGifError()
123 -+{
124 -+ fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString(GIF_ERROR));
125 -+}
126 -+
127 - class GifCreator
128 - {
129 -
130 ---- a/src/palettewidget.cpp
131 -+++ b/src/palettewidget.cpp
132 -@@ -34,7 +34,7 @@
133 -
134 - PaletteWidget::~PaletteWidget()
135 - {
136 -- FreeMapObject(palette);
137 -+ GifFreeMapObject(palette);
138 - }
139 -
140 - void PaletteWidget::paintEvent(QPaintEvent*)
141 -@@ -117,7 +117,7 @@
142 - if(palette && mindiff > 1)
143 - {
144 - qDebug() << "deleting old palette, size: " << size << ", colors: " << palette->ColorCount;
145 -- FreeMapObject(palette);
146 -+ GifFreeMapObject(palette);
147 - qDebug() << "done";
148 - palette = NULL;
149 - }
150 -@@ -157,7 +157,7 @@
151 - }
152 -
153 - ColorMapObject* previous = palette;
154 -- palette = MakeMapObject(size, NULL);
155 -+ palette = GifMakeMapObject(size, NULL);
156 - if (!palette)
157 - {
158 - qDebug() << "NULL palette!";
159 -@@ -165,7 +165,7 @@
160 - }
161 -
162 -
163 -- if (QuantizeBuffer(fimg.width(), fimg.height(), &size,
164 -+ if (GifQuantizeBuffer(fimg.width(), fimg.height(), &size,
165 - &(r[0]),&(g[0]),&(b[0]), &(output[0]),
166 - palette->Colors) == GIF_ERROR)
167 - {
168 -@@ -178,11 +178,11 @@
169 - //qDebug() << "difference: " << df;
170 - if(previous && df < mindiff)
171 - {
172 -- FreeMapObject(palette);
173 -+ GifFreeMapObject(palette);
174 - palette = previous;
175 - }
176 - else if(df >= mindiff)
177 -- FreeMapObject(previous);
178 -+ GifFreeMapObject(previous);
179 -
180 - // qDebug() << "palette (" << palette->ColorCount << ") :";
181 - // for(int i=0;i<size;i++)
182 -@@ -230,8 +230,8 @@
183 - {
184 - QStringList rgb = QString(str).split(";", QString::SkipEmptyParts);
185 - if(palette)
186 -- FreeMapObject(palette);
187 -- palette = MakeMapObject(rgb.size(), NULL);
188 -+ GifFreeMapObject(palette);
189 -+ palette = GifMakeMapObject(rgb.size(), NULL);
190 - if(!palette)
191 - return false;
192 - size = rgb.size();
193 ---- a/src/palettewidget.h
194 -+++ b/src/palettewidget.h
195 -@@ -30,7 +30,7 @@
196 - PaletteWidget(QWidget* parent=0, Qt::WindowFlags f=0);
197 - virtual ~PaletteWidget();
198 - ColorMapObject* map() {return palette;}
199 -- ColorMapObject* mapCopy() {return MakeMapObject(palette->ColorCount, palette->Colors);}
200 -+ ColorMapObject* mapCopy() {return GifMakeMapObject(palette->ColorCount, palette->Colors);}
201 - bool fromImage(const QImage& img, int palette_size, float mindiff = 2);
202 - void setColumnCount(int cc){cols = cc;}
203 - bool toFile(const QString& path);
204 -@@ -38,7 +38,7 @@
205 - QString toString();
206 - bool fromString(const QString& str);
207 - int getSize() const {return size;}
208 -- void clear() {if(palette) FreeMapObject(palette); palette = NULL; update();}
209 -+ void clear() {if(palette) GifFreeMapObject(palette); palette = NULL; update();}
210 - private:
211 - int size;
212 - int cols;
213
214 diff --git a/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch b/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch
215 deleted file mode 100644
216 index 89c79ff1794..00000000000
217 --- a/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch
218 +++ /dev/null
219 @@ -1,44 +0,0 @@
220 -diff -Naur qgifer-0.2.1-source/CMakeLists.txt qgifer-0.2.1-modified/CMakeLists.txt
221 ---- qgifer-0.2.1-source/CMakeLists.txt 2013-06-04 18:33:16.000000000 +0200
222 -+++ qgifer-0.2.1-modified/CMakeLists.txt 2015-12-19 20:58:13.772808845 +0100
223 -@@ -35,7 +35,7 @@
224 - SET(GIF_INCLUDE_DIR "C:\\Program Files\\GnuWin32\\include")
225 - ENDIF(WIN32)
226 -
227 --FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc )
228 -+FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc videoio)
229 - FIND_PACKAGE(Qt4 REQUIRED)
230 - FIND_PACKAGE(GIF REQUIRED)
231 -
232 -@@ -148,9 +148,9 @@
233 - QT4_ADD_RESOURCES(RESOURCES_RCC ${RESOURCES})
234 -
235 - IF(WIN32)
236 -- SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244" )
237 -+ SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244 -lopencv_videoio244" )
238 - ELSE(WIN32)
239 -- SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc" )
240 -+ SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_videoio" )
241 - ENDIF(WIN32)
242 -
243 - SET( GIF_LIBS "-lgif" )
244 -@@ -207,7 +207,7 @@
245 - #SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${QGIFER_VERSION_MAJOR}.${QGIFER_VERSION_MINOR}.${QGIFER_VERSION_PATCH}")
246 -
247 - #set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) #za pierwszym razem, pozniej dodano | dla nowszych opencv
248 --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)")
249 -+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)")
250 -
251 - SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
252 - SET(CPACK_DEBIAN_PACKAGE_SECTION "video")
253 -diff -Naur qgifer-0.2.1-source/src/frameplayer.h qgifer-0.2.1-modified/src/frameplayer.h
254 ---- qgifer-0.2.1-source/src/frameplayer.h 2013-06-04 18:14:55.000000000 +0200
255 -+++ qgifer-0.2.1-modified/src/frameplayer.h 2015-12-19 21:01:44.419870869 +0100
256 -@@ -23,6 +23,7 @@
257 - #include <opencv2/core/core.hpp>
258 - #include <opencv2/highgui/highgui.hpp>
259 - #include <opencv2/imgproc/imgproc.hpp>
260 -+#include <opencv2/videoio/videoio.hpp>
261 - #include <QWidget>
262 - #include <QImage>
263 - #include <QStatusBar>
264
265 diff --git a/media-video/qgifer/metadata.xml b/media-video/qgifer/metadata.xml
266 deleted file mode 100644
267 index ec2e60d4c66..00000000000
268 --- a/media-video/qgifer/metadata.xml
269 +++ /dev/null
270 @@ -1,22 +0,0 @@
271 -<?xml version="1.0" encoding="UTF-8"?>
272 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
273 -<pkgmetadata>
274 - <maintainer type="person">
275 - <email>andrzej.pauli@×××××.com</email>
276 - <name>Andrzej Pauli</name>
277 - </maintainer>
278 - <maintainer type="project">
279 - <email>proxy-maint@g.o</email>
280 - <name>Proxy Maintainers</name>
281 - </maintainer>
282 - <longdescription lang="en">
283 - QGifer is a tool for extracting part of a video to an animated GIF file.
284 - </longdescription>
285 - <use>
286 - <flag name="imagemagick">Use imagemagick for image operations</flag>
287 - <flag name="opencv3">Use media-libs/opencv:0/3.0 for video operations instead media-libs/opencv:0/2.4</flag>
288 - </use>
289 - <upstream>
290 - <remote-id type="sourceforge">qgifer</remote-id>
291 - </upstream>
292 -</pkgmetadata>
293
294 diff --git a/media-video/qgifer/qgifer-0.2.1-r4.ebuild b/media-video/qgifer/qgifer-0.2.1-r4.ebuild
295 deleted file mode 100644
296 index 02e746bc771..00000000000
297 --- a/media-video/qgifer/qgifer-0.2.1-r4.ebuild
298 +++ /dev/null
299 @@ -1,47 +0,0 @@
300 -# Copyright 1999-2016 Gentoo Foundation
301 -# Distributed under the terms of the GNU General Public License v2
302 -
303 -EAPI="6"
304 -
305 -inherit cmake-utils
306 -
307 -DESCRIPTION="A video-based animated GIF creator"
308 -HOMEPAGE="https://sourceforge.net/projects/qgifer/"
309 -SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
310 -
311 -LICENSE="GPL-3+"
312 -SLOT="0"
313 -KEYWORDS="~amd64 ~x86"
314 -
315 -IUSE="debug imagemagick opencv3"
316 -
317 -RDEPEND="<media-libs/giflib-4.2.3:0
318 - dev-qt/qtcore:4
319 - dev-qt/qtgui:4
320 - imagemagick? ( media-gfx/imagemagick:0 )
321 - !opencv3? ( <media-libs/opencv-3.0.0:0[ffmpeg] )
322 - opencv3? ( >=media-libs/opencv-3.0.0:0[ffmpeg] )
323 - virtual/ffmpeg:0"
324 -
325 -DEPEND="${RDEPEND}"
326 -
327 -S="${WORKDIR}/${P}-source"
328 -
329 -PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
330 -
331 -src_prepare(){
332 - use opencv3 && PATCHES+=( "${FILESDIR}/${P}-opencv3.patch" )
333 -
334 - cmake-utils_src_prepare
335 -
336 - # Fix the doc path
337 - sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt || die
338 -}
339 -
340 -src_configure() {
341 - local mycmakeargs
342 -
343 - use debug && mycmakeargs=( -DRELEASE_MODE=OFF )
344 -
345 - cmake-utils_src_configure
346 -}
347
348 diff --git a/media-video/qgifer/qgifer-0.2.1-r5.ebuild b/media-video/qgifer/qgifer-0.2.1-r5.ebuild
349 deleted file mode 100644
350 index a027d20e16d..00000000000
351 --- a/media-video/qgifer/qgifer-0.2.1-r5.ebuild
352 +++ /dev/null
353 @@ -1,49 +0,0 @@
354 -# Copyright 1999-2016 Gentoo Foundation
355 -# Distributed under the terms of the GNU General Public License v2
356 -
357 -EAPI=6
358 -
359 -inherit cmake-utils
360 -
361 -DESCRIPTION="A video-based animated GIF creator"
362 -HOMEPAGE="https://sourceforge.net/projects/qgifer/"
363 -SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
364 -
365 -LICENSE="GPL-3+"
366 -SLOT="0"
367 -KEYWORDS="~amd64 ~x86"
368 -
369 -IUSE="debug imagemagick opencv3"
370 -
371 -RDEPEND="
372 - >=media-libs/giflib-5.1:=
373 - dev-qt/qtcore:4
374 - dev-qt/qtgui:4
375 - virtual/ffmpeg:0
376 - imagemagick? ( media-gfx/imagemagick:0 )
377 - !opencv3? ( <media-libs/opencv-3.0.0:0=[ffmpeg] )
378 - opencv3? ( >=media-libs/opencv-3.0.0:0=[ffmpeg] )"
379 -DEPEND="${RDEPEND}"
380 -
381 -S="${WORKDIR}/${P}-source"
382 -
383 -PATCHES=(
384 - "${FILESDIR}/${P}-desktop.patch"
385 - # Port to giflib 5 API
386 - "${FILESDIR}/${P}-giflib5.patch"
387 -)
388 -
389 -src_prepare(){
390 - use opencv3 && PATCHES+=( "${FILESDIR}/${P}-opencv3.patch" )
391 - cmake-utils_src_prepare
392 -
393 - # Fix the doc path
394 - sed -i -e "s|share/doc/qgifer|share/doc/${PF}|" CMakeLists.txt || die
395 -}
396 -
397 -src_configure() {
398 - local mycmakeargs=(
399 - $(usex debug '-DRELEASE_MODE=OFF' '')
400 - )
401 - cmake-utils_src_configure
402 -}
403
404 diff --git a/profiles/package.mask b/profiles/package.mask
405 index a0cbe10a583..39777e7f945 100644
406 --- a/profiles/package.mask
407 +++ b/profiles/package.mask
408 @@ -207,11 +207,6 @@ media-sound/qtagconvert
409 # Masked for removal in 30 days. Bug #644516
410 media-sound/qpitch
411
412 -# Andreas Sturmlechner <asturm@g.o> (28 Jan 2018)
413 -# Dead upstream, depends on deprecated Qt4.
414 -# Masked for removal in 30 days. Bug #644558
415 -media-video/qgifer
416 -
417 # Patrice Clement <monsieurp@g.o> (26 Jan 2018)
418 # Has different symbols. Known to cause issues with i3bar/swaybar.
419 media-fonts/fontawesome:0/5
Report Message
Find on MARC Find on Google Groups