* [gentoo-commits] repo/gentoo:master commit in: profiles/, media-plugins/vdr-text2skin/files/, media-plugins/vdr-text2skin/
@ 2018-10-09 21:14 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2018-10-09 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 55bfaf7dbf9109488921ecb529126be3a018ceb6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 9 21:08:58 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct 9 21:14:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55bfaf7d
media-plugins/vdr-text2skin: Remove last-rited pkg
Closes: https://bugs.gentoo.org/665126
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-plugins/vdr-text2skin/Manifest | 1 -
media-plugins/vdr-text2skin/files/vdr-1.7.27.diff | 94 ----------------------
.../files/vdr-text2skin-1.3.2-Makefile.patch | 71 ----------------
.../files/vdr-text2skin-1.3.2_vdr-2.1.2.diff | 15 ----
media-plugins/vdr-text2skin/metadata.xml | 11 ---
.../vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild | 87 --------------------
profiles/package.mask | 7 --
7 files changed, 286 deletions(-)
diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
deleted file mode 100644
index a3fefd12c93..00000000000
--- a/media-plugins/vdr-text2skin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vdr-text2skin-1.3.2.tgz 94476 BLAKE2B 485e3694acb66d48e2da929f854ad685d18cb7ade326515390dedc365f979badb00b494d14bb4cd30eeff22101ea394ffc37f5de0484a4d33ebebcf71e1040ae SHA512 418339f7132ddf854f1c7fbaa3b11aac5eb7aba0f15d427bb946d4175b6540199ac079fd895f9cebdccb4797dcf96b0681cee4db93a5e4c817abae04a08bdea9
diff --git a/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff b/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff
deleted file mode 100644
index 9d3280cf584..00000000000
--- a/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Naur text2skin-1.3.2.orig/display.c text2skin-1.3.2/display.c
---- text2skin-1.3.2.orig/display.c 2012-04-07 20:45:11.000000000 +0200
-+++ text2skin-1.3.2/display.c 2012-04-07 20:45:47.000000000 +0200
-@@ -1233,17 +1233,17 @@
-
- case tRecordingPriority:
- return mRecording != NULL
-- ? (cxType)mRecording->priority
-+ ? (cxType)mRecording->Priority()
- : (cxType)false;
-
- case tRecordingLifetime:
- return mRecording != NULL
-- ? (cxType)mRecording->lifetime
-+ ? (cxType)mRecording->Lifetime()
- : (cxType)false;
-
- case tRecordingDateTime:
- return mRecording != NULL
-- ? (cxType)TimeType(mRecording->start, Token.Attrib.Text)
-+ ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text)
- : (cxType)false;
-
- case tRecordingTitle:
-diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
---- text2skin-1.3.2.orig/render.c 2012-04-07 20:45:11.000000000 +0200
-+++ text2skin-1.3.2/render.c 2012-04-07 20:48:29.000000000 +0200
-@@ -597,14 +597,14 @@
- if (Marks) {
- bool start = true;
- for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
-- txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y);
-+ txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y);
- if (Selected && start) {
- const cMark *m2 = Marks->Next(m);
- DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3),
-- txSize(((m2 ? m2->position : Total) - m->position)
-+ txSize(((m2 ? m2->Position() : Total) - m->Position())
- * Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected);
- }
-- DrawMark(pt, Size, start, m->position == Current, false, Mark, Cur);
-+ DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur);
- start = !start;
- }
- }
-@@ -614,15 +614,15 @@
- if (Marks) {
- bool start = true;
- for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
-- txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total);
-+ txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total);
- if (Selected && start) {
- const cMark *m2 = Marks->Next(m);
- DrawRectangle(txPoint(Pos.x + Size.w / 3, pt.y),
- txSize(Size.w - Size.w * 2 / 3 + 1,
-- ((m2 ? m2->position : Total) - m->position)
-+ ((m2 ? m2->Position() : Total) - m->Position())
- * Size.h / Total + 1), Selected);
- }
-- DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur);
-+ DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur);
- start = !start;
- }
- }
-diff -Naur text2skin-1.3.2.orig/common.c text2skin-1.3.2/common.c
---- text2skin-1.3.2.orig/common.c 2012-04-07 20:54:59.000000000 +0200
-+++ text2skin-1.3.2/common.c 2012-04-07 20:56:00.000000000 +0200
-@@ -255,11 +255,11 @@
- int start = 1; // first frame
- bool isStart = true;
-
-- for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) {
-+ for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) {
- if (isStart)
-- start = m->position;
-+ start = m->Position();
- else
-- length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
-+ length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
-
- isStart = !isStart;
- }
-diff -Naur text2skin-1.3.2.orig/status.c text2skin-1.3.2/status.c
---- text2skin-1.3.2.orig/status.c 2012-04-07 20:59:39.000000000 +0200
-+++ text2skin-1.3.2/status.c 2012-04-07 21:01:12.000000000 +0200
-@@ -314,7 +314,7 @@
-
- case tReplayDateTime:
- return mReplay != NULL
-- ? (cxType)TimeType(mReplay->start, Token.Attrib.Text)
-+ ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text)
- : (cxType)false;
-
- case tReplayShortText:
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
deleted file mode 100644
index cce51d79feb..00000000000
--- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/Makefile b/Makefile
-index daa54d7..1163a8d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -9,6 +9,7 @@ STRIP=strip
- # External image lib to use: imagemagick, graphicsmagick, imlib2 or none
- IMAGELIB = imagemagick
-
-+#
-
- # DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU'RE DOING
- # -------------------------------------------------------------
-@@ -29,13 +30,18 @@ VERSION = $(shell grep 'const char \*cText2SkinPlugin::VERSION *=' $(PLUGIN).c |
- ### The C++ compiler and options:
-
- CXX ?= g++
--CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
-+ifdef DEBUG
-+CXXFLAGS ?= -Wall -Woverloaded-virtual
-+else
-+CXXFLAGS ?= -Wall -Woverloaded-virtual -O3
-+endif
-+CXXFLAGS += -fPIC
-
- ### The directory environment:
-
--VDRDIR = ../../..
--LIBDIR = ../../lib
--TMPDIR = /tmp
-+VDRDIR ?= ../../..
-+LIBDIR ?= ../../lib
-+TMPDIR ?= /tmp
-
- ### Make sure that necessary options are included (VDR >= 1.7.13):
-
-@@ -88,8 +94,7 @@ endif
- ifdef DEBUG
- CXXFLAGS += -g -fno-inline
- DEFINES += -DDEBUG
--else
-- CXXFLAGS += -O3
-+ STRIP=
- ifdef BENCH
- DEFINES += -DBENCH
- endif
-@@ -118,7 +123,7 @@ $(DEPFILE): Makefile
- -include $(DEPFILE)
-
- ### Internationalization (I18N):
--
-+#
- PODIR = po
- LOCALEDIR = $(VDRDIR)/locale
- I18Npo = $(notdir $(wildcard $(PODIR)/*.po))
-@@ -134,6 +139,7 @@ $(I18Npot): $(wildcard *.c)
- $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.po
- @mkdir -p $(dir $@)
- msgfmt -c -o $@ $<
-+#
-
- .PHONY: i18n
- i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
-@@ -143,7 +149,7 @@ i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
- libvdr-$(PLUGIN).so: $(OBJS)
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
--ifndef DEBUG
-+ifdef STRIP
- $(STRIP) $(LIBDIR)/$@.$(APIVERSION)
- endif
-
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
deleted file mode 100644
index 7a4873db751..00000000000
--- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
---- text2skin-1.3.2.orig/render.c 2013-10-26 22:29:16.000000000 +0200
-+++ text2skin-1.3.2/render.c 2013-10-26 22:33:19.000000000 +0200
-@@ -813,7 +813,11 @@
- switch (Token.Type) {
- case tFreeDiskSpace: {
- int FreeMB;
-+#if APIVERSNUM > 20101
-+ cVideoDirectory::VideoDiskSpace(&FreeMB);
-+#else
- VideoDiskSpace(&FreeMB);
-+#endif
- Dprintf("FreeMB: %d, attrib type is %d\n", FreeMB,Token.Attrib.Type);
- return Token.Attrib.Type == aString && Token.Attrib.Text.length() > 0
- ? (cxType)DurationType(FreeMB * 60 / MB_PER_MINUTE,
diff --git a/media-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
deleted file mode 100644
index bd64b5471f5..00000000000
--- a/media-plugins/vdr-text2skin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>vdr@gentoo.org</email>
- <name>Gentoo VDR Project</name>
- </maintainer>
- <use>
- <flag name="contrib">Install user contributed scripts</flag>
- </use>
-</pkgmetadata>
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
deleted file mode 100644
index 3ed16ca90fc..00000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-VERSION="783" # changes with every version / new file :-(
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="contrib doc graphicsmagick +imagemagick imlib"
-
-RDEPEND="
- >=media-video/vdr-1.6.0
- imagemagick? (
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- )
- !imagemagick? (
- imlib? (
- media-libs/imlib2
- >=media-video/vdr-1.6.0[-graphtft]
- )
- )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-KEEP_I18NOBJECT="yes"
-
-src_prepare() {
- local imagelib=
-
- epatch "${FILESDIR}/${P}-Makefile.patch"
-
- sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
-
- if ! has_version ">=media-video/vdr-1.7.13"; then
- sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
- fi
-
- if use imagemagick; then
- if use graphicsmagick; then
- imagelib="graphicsmagick"
- else
- imagelib="imagemagick"
- fi
- else
- if use imlib; then
- imagelib="imlib2"
- else
- imagelib="none"
- fi
- fi
-
- sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || die
-
- vdr-plugin-2_src_prepare
-
- if has_version ">=media-video/vdr-1.7.27"; then
- epatch "${FILESDIR}/vdr-1.7.27.diff"
- fi
-
- epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-}
-
-src_install() {
- vdr-plugin-2_src_install
-
- keepdir "/usr/share/vdr/${VDRPLUGIN}"
-
- dodoc CONTRIBUTORS
-
- if use doc; then
- dodoc Docs/{Reference,Tutorial}.txt
- fi
-
- if use contrib; then
- dodoc -r contrib/
- fi
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 6e04fae56da..9508f49946c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -157,13 +157,6 @@ dev-lang/solidity
# masked for removal on End Sep 2018
media-plugins/vdr-prefermenu
-# Joerg Bornkessel <hd_brummy@gentoo.org> (02/Sep/2018)
-# fails on latest imagemagick
-# not converted to gettext
-# bug 665126
-# masked for removal on End Sep 2018
-media-plugins/vdr-text2skin
-
# Matthias Maier <tamiko@gentoo.org> (1 Sep 2018)
# Mask 0.7.0 and 1.0.1 for the time being until a compatible LLVM version
# made it into the tree, bug #665192
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-10-09 21:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-09 21:14 [gentoo-commits] repo/gentoo:master commit in: profiles/, media-plugins/vdr-text2skin/files/, media-plugins/vdr-text2skin/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox