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

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, media-plugins/vdr-text2skin/files/, media-plugins/vdr-text2skin/
Date: Tue, 09 Oct 2018 21:14:56
Message-Id: 1539119646.55bfaf7dbf9109488921ecb529126be3a018ceb6.mgorny@gentoo
1 commit: 55bfaf7dbf9109488921ecb529126be3a018ceb6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 9 21:08:58 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 9 21:14:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55bfaf7d
7
8 media-plugins/vdr-text2skin: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/665126
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 media-plugins/vdr-text2skin/Manifest | 1 -
14 media-plugins/vdr-text2skin/files/vdr-1.7.27.diff | 94 ----------------------
15 .../files/vdr-text2skin-1.3.2-Makefile.patch | 71 ----------------
16 .../files/vdr-text2skin-1.3.2_vdr-2.1.2.diff | 15 ----
17 media-plugins/vdr-text2skin/metadata.xml | 11 ---
18 .../vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild | 87 --------------------
19 profiles/package.mask | 7 --
20 7 files changed, 286 deletions(-)
21
22 diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
23 deleted file mode 100644
24 index a3fefd12c93..00000000000
25 --- a/media-plugins/vdr-text2skin/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST vdr-text2skin-1.3.2.tgz 94476 BLAKE2B 485e3694acb66d48e2da929f854ad685d18cb7ade326515390dedc365f979badb00b494d14bb4cd30eeff22101ea394ffc37f5de0484a4d33ebebcf71e1040ae SHA512 418339f7132ddf854f1c7fbaa3b11aac5eb7aba0f15d427bb946d4175b6540199ac079fd895f9cebdccb4797dcf96b0681cee4db93a5e4c817abae04a08bdea9
29
30 diff --git a/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff b/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff
31 deleted file mode 100644
32 index 9d3280cf584..00000000000
33 --- a/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff
34 +++ /dev/null
35 @@ -1,94 +0,0 @@
36 -diff -Naur text2skin-1.3.2.orig/display.c text2skin-1.3.2/display.c
37 ---- text2skin-1.3.2.orig/display.c 2012-04-07 20:45:11.000000000 +0200
38 -+++ text2skin-1.3.2/display.c 2012-04-07 20:45:47.000000000 +0200
39 -@@ -1233,17 +1233,17 @@
40 -
41 - case tRecordingPriority:
42 - return mRecording != NULL
43 -- ? (cxType)mRecording->priority
44 -+ ? (cxType)mRecording->Priority()
45 - : (cxType)false;
46 -
47 - case tRecordingLifetime:
48 - return mRecording != NULL
49 -- ? (cxType)mRecording->lifetime
50 -+ ? (cxType)mRecording->Lifetime()
51 - : (cxType)false;
52 -
53 - case tRecordingDateTime:
54 - return mRecording != NULL
55 -- ? (cxType)TimeType(mRecording->start, Token.Attrib.Text)
56 -+ ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text)
57 - : (cxType)false;
58 -
59 - case tRecordingTitle:
60 -diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
61 ---- text2skin-1.3.2.orig/render.c 2012-04-07 20:45:11.000000000 +0200
62 -+++ text2skin-1.3.2/render.c 2012-04-07 20:48:29.000000000 +0200
63 -@@ -597,14 +597,14 @@
64 - if (Marks) {
65 - bool start = true;
66 - for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
67 -- txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y);
68 -+ txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y);
69 - if (Selected && start) {
70 - const cMark *m2 = Marks->Next(m);
71 - DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3),
72 -- txSize(((m2 ? m2->position : Total) - m->position)
73 -+ txSize(((m2 ? m2->Position() : Total) - m->Position())
74 - * Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected);
75 - }
76 -- DrawMark(pt, Size, start, m->position == Current, false, Mark, Cur);
77 -+ DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur);
78 - start = !start;
79 - }
80 - }
81 -@@ -614,15 +614,15 @@
82 - if (Marks) {
83 - bool start = true;
84 - for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
85 -- txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total);
86 -+ txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total);
87 - if (Selected && start) {
88 - const cMark *m2 = Marks->Next(m);
89 - DrawRectangle(txPoint(Pos.x + Size.w / 3, pt.y),
90 - txSize(Size.w - Size.w * 2 / 3 + 1,
91 -- ((m2 ? m2->position : Total) - m->position)
92 -+ ((m2 ? m2->Position() : Total) - m->Position())
93 - * Size.h / Total + 1), Selected);
94 - }
95 -- DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur);
96 -+ DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur);
97 - start = !start;
98 - }
99 - }
100 -diff -Naur text2skin-1.3.2.orig/common.c text2skin-1.3.2/common.c
101 ---- text2skin-1.3.2.orig/common.c 2012-04-07 20:54:59.000000000 +0200
102 -+++ text2skin-1.3.2/common.c 2012-04-07 20:56:00.000000000 +0200
103 -@@ -255,11 +255,11 @@
104 - int start = 1; // first frame
105 - bool isStart = true;
106 -
107 -- for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) {
108 -+ for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) {
109 - if (isStart)
110 -- start = m->position;
111 -+ start = m->Position();
112 - else
113 -- length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
114 -+ length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
115 -
116 - isStart = !isStart;
117 - }
118 -diff -Naur text2skin-1.3.2.orig/status.c text2skin-1.3.2/status.c
119 ---- text2skin-1.3.2.orig/status.c 2012-04-07 20:59:39.000000000 +0200
120 -+++ text2skin-1.3.2/status.c 2012-04-07 21:01:12.000000000 +0200
121 -@@ -314,7 +314,7 @@
122 -
123 - case tReplayDateTime:
124 - return mReplay != NULL
125 -- ? (cxType)TimeType(mReplay->start, Token.Attrib.Text)
126 -+ ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text)
127 - : (cxType)false;
128 -
129 - case tReplayShortText:
130
131 diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
132 deleted file mode 100644
133 index cce51d79feb..00000000000
134 --- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
135 +++ /dev/null
136 @@ -1,71 +0,0 @@
137 -diff --git a/Makefile b/Makefile
138 -index daa54d7..1163a8d 100644
139 ---- a/Makefile
140 -+++ b/Makefile
141 -@@ -9,6 +9,7 @@ STRIP=strip
142 - # External image lib to use: imagemagick, graphicsmagick, imlib2 or none
143 - IMAGELIB = imagemagick
144 -
145 -+#
146 -
147 - # DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU'RE DOING
148 - # -------------------------------------------------------------
149 -@@ -29,13 +30,18 @@ VERSION = $(shell grep 'const char \*cText2SkinPlugin::VERSION *=' $(PLUGIN).c |
150 - ### The C++ compiler and options:
151 -
152 - CXX ?= g++
153 --CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
154 -+ifdef DEBUG
155 -+CXXFLAGS ?= -Wall -Woverloaded-virtual
156 -+else
157 -+CXXFLAGS ?= -Wall -Woverloaded-virtual -O3
158 -+endif
159 -+CXXFLAGS += -fPIC
160 -
161 - ### The directory environment:
162 -
163 --VDRDIR = ../../..
164 --LIBDIR = ../../lib
165 --TMPDIR = /tmp
166 -+VDRDIR ?= ../../..
167 -+LIBDIR ?= ../../lib
168 -+TMPDIR ?= /tmp
169 -
170 - ### Make sure that necessary options are included (VDR >= 1.7.13):
171 -
172 -@@ -88,8 +94,7 @@ endif
173 - ifdef DEBUG
174 - CXXFLAGS += -g -fno-inline
175 - DEFINES += -DDEBUG
176 --else
177 -- CXXFLAGS += -O3
178 -+ STRIP=
179 - ifdef BENCH
180 - DEFINES += -DBENCH
181 - endif
182 -@@ -118,7 +123,7 @@ $(DEPFILE): Makefile
183 - -include $(DEPFILE)
184 -
185 - ### Internationalization (I18N):
186 --
187 -+#
188 - PODIR = po
189 - LOCALEDIR = $(VDRDIR)/locale
190 - I18Npo = $(notdir $(wildcard $(PODIR)/*.po))
191 -@@ -134,6 +139,7 @@ $(I18Npot): $(wildcard *.c)
192 - $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.po
193 - @mkdir -p $(dir $@)
194 - msgfmt -c -o $@ $<
195 -+#
196 -
197 - .PHONY: i18n
198 - i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
199 -@@ -143,7 +149,7 @@ i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
200 - libvdr-$(PLUGIN).so: $(OBJS)
201 - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
202 - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
203 --ifndef DEBUG
204 -+ifdef STRIP
205 - $(STRIP) $(LIBDIR)/$@.$(APIVERSION)
206 - endif
207 -
208
209 diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
210 deleted file mode 100644
211 index 7a4873db751..00000000000
212 --- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
213 +++ /dev/null
214 @@ -1,15 +0,0 @@
215 -diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
216 ---- text2skin-1.3.2.orig/render.c 2013-10-26 22:29:16.000000000 +0200
217 -+++ text2skin-1.3.2/render.c 2013-10-26 22:33:19.000000000 +0200
218 -@@ -813,7 +813,11 @@
219 - switch (Token.Type) {
220 - case tFreeDiskSpace: {
221 - int FreeMB;
222 -+#if APIVERSNUM > 20101
223 -+ cVideoDirectory::VideoDiskSpace(&FreeMB);
224 -+#else
225 - VideoDiskSpace(&FreeMB);
226 -+#endif
227 - Dprintf("FreeMB: %d, attrib type is %d\n", FreeMB,Token.Attrib.Type);
228 - return Token.Attrib.Type == aString && Token.Attrib.Text.length() > 0
229 - ? (cxType)DurationType(FreeMB * 60 / MB_PER_MINUTE,
230
231 diff --git a/media-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
232 deleted file mode 100644
233 index bd64b5471f5..00000000000
234 --- a/media-plugins/vdr-text2skin/metadata.xml
235 +++ /dev/null
236 @@ -1,11 +0,0 @@
237 -<?xml version="1.0" encoding="UTF-8"?>
238 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
239 -<pkgmetadata>
240 - <maintainer type="project">
241 - <email>vdr@g.o</email>
242 - <name>Gentoo VDR Project</name>
243 - </maintainer>
244 - <use>
245 - <flag name="contrib">Install user contributed scripts</flag>
246 - </use>
247 -</pkgmetadata>
248
249 diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
250 deleted file mode 100644
251 index 3ed16ca90fc..00000000000
252 --- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
253 +++ /dev/null
254 @@ -1,87 +0,0 @@
255 -# Copyright 1999-2018 Gentoo Foundation
256 -# Distributed under the terms of the GNU General Public License v2
257 -
258 -EAPI="5"
259 -
260 -inherit vdr-plugin-2
261 -
262 -VERSION="783" # changes with every version / new file :-(
263 -
264 -DESCRIPTION="VDR text2skin PlugIn"
265 -HOMEPAGE="https://projects.vdr-developer.org/projects/plg-text2skin"
266 -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
267 -
268 -SLOT="0"
269 -LICENSE="GPL-2"
270 -KEYWORDS="~x86 ~amd64"
271 -IUSE="contrib doc graphicsmagick +imagemagick imlib"
272 -
273 -RDEPEND="
274 - >=media-video/vdr-1.6.0
275 - imagemagick? (
276 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
277 - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
278 - )
279 - !imagemagick? (
280 - imlib? (
281 - media-libs/imlib2
282 - >=media-video/vdr-1.6.0[-graphtft]
283 - )
284 - )"
285 -DEPEND="${RDEPEND}
286 - sys-devel/gettext
287 - virtual/pkgconfig"
288 -
289 -KEEP_I18NOBJECT="yes"
290 -
291 -src_prepare() {
292 - local imagelib=
293 -
294 - epatch "${FILESDIR}/${P}-Makefile.patch"
295 -
296 - sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
297 -
298 - if ! has_version ">=media-video/vdr-1.7.13"; then
299 - sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
300 - fi
301 -
302 - if use imagemagick; then
303 - if use graphicsmagick; then
304 - imagelib="graphicsmagick"
305 - else
306 - imagelib="imagemagick"
307 - fi
308 - else
309 - if use imlib; then
310 - imagelib="imlib2"
311 - else
312 - imagelib="none"
313 - fi
314 - fi
315 -
316 - sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || die
317 -
318 - vdr-plugin-2_src_prepare
319 -
320 - if has_version ">=media-video/vdr-1.7.27"; then
321 - epatch "${FILESDIR}/vdr-1.7.27.diff"
322 - fi
323 -
324 - epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
325 -}
326 -
327 -src_install() {
328 - vdr-plugin-2_src_install
329 -
330 - keepdir "/usr/share/vdr/${VDRPLUGIN}"
331 -
332 - dodoc CONTRIBUTORS
333 -
334 - if use doc; then
335 - dodoc Docs/{Reference,Tutorial}.txt
336 - fi
337 -
338 - if use contrib; then
339 - dodoc -r contrib/
340 - fi
341 -}
342
343 diff --git a/profiles/package.mask b/profiles/package.mask
344 index 6e04fae56da..9508f49946c 100644
345 --- a/profiles/package.mask
346 +++ b/profiles/package.mask
347 @@ -157,13 +157,6 @@ dev-lang/solidity
348 # masked for removal on End Sep 2018
349 media-plugins/vdr-prefermenu
350
351 -# Joerg Bornkessel <hd_brummy@g.o> (02/Sep/2018)
352 -# fails on latest imagemagick
353 -# not converted to gettext
354 -# bug 665126
355 -# masked for removal on End Sep 2018
356 -media-plugins/vdr-text2skin
357 -
358 # Matthias Maier <tamiko@g.o> (1 Sep 2018)
359 # Mask 0.7.0 and 1.0.1 for the time being until a compatible LLVM version
360 # made it into the tree, bug #665192
Report Message
Find on MARC Find on Google Groups