summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2009-02-25 15:52:56 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2009-02-25 15:52:56 +0000
commit961cc72e5bbbd4824e2e1303d99792a37741bee1 (patch)
tree81caa007435eb424e5b9c9121ed2917915bc4ab5 /media-plugins
parentMarked stable on x86. (diff)
downloadgentoo-2-961cc72e5bbbd4824e2e1303d99792a37741bee1.tar.gz
gentoo-2-961cc72e5bbbd4824e2e1303d99792a37741bee1.tar.bz2
gentoo-2-961cc72e5bbbd4824e2e1303d99792a37741bee1.zip
Fix default logo path, to match the logos installed by x11-themes/vdr-channel-logos, Bug #257842. Also rdepend on vdr-channel-logos now.
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-tvonscreen/ChangeLog13
-rw-r--r--media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff12
-rw-r--r--media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild23
3 files changed, 46 insertions, 2 deletions
diff --git a/media-plugins/vdr-tvonscreen/ChangeLog b/media-plugins/vdr-tvonscreen/ChangeLog
index bfc238c8c4e3..1eec72710f25 100644
--- a/media-plugins/vdr-tvonscreen/ChangeLog
+++ b/media-plugins/vdr-tvonscreen/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for media-plugins/vdr-tvonscreen
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/ChangeLog,v 1.7 2008/04/22 10:41:49 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/ChangeLog,v 1.8 2009/02/25 15:52:56 zzam Exp $
+
+*vdr-tvonscreen-1.0.141-r2 (25 Feb 2009)
+
+ 25 Feb 2009; Matthias Schwarzott <zzam@gentoo.org>
+ +files/vdr-tvonscreen-1.0.141-logo-path.diff,
+ +vdr-tvonscreen-1.0.141-r2.ebuild:
+ Fix default logo path, to match the logos installed by
+ x11-themes/vdr-channel-logos, Bug #257842. Also rdepend on
+ vdr-channel-logos now.
*vdr-tvonscreen-1.0.141-r1 (22 Apr 2008)
diff --git a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff
new file mode 100644
index 000000000000..41125073f2be
--- /dev/null
+++ b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff
@@ -0,0 +1,12 @@
+diff -ru tvonscreen-1.0.141.orig/magazine.c tvonscreen-1.0.141/magazine.c
+--- tvonscreen-1.0.141.orig/magazine.c 2009-02-25 16:39:18.024158328 +0100
++++ tvonscreen-1.0.141/magazine.c 2009-02-25 16:39:51.401402805 +0100
+@@ -183,7 +183,7 @@
+ txt=channel->ShortName(true);
+ // logo: 64x48px
+
+- const char *ConfigDirectory=cPlugin::ConfigDirectory("logos");
++ const char *ConfigDirectory="/usr/share/vdr/channel-logos";
+ if (tvonscreenCfg.logos)
+ ConfigDirectory=tvonscreenCfg.logos;
+ char *fname=new char[strlen(ConfigDirectory) + 1 + strlen(txt) + strlen(".xpm") + 1];
diff --git a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild b/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild
new file mode 100644
index 000000000000..1b34b9c7d85e
--- /dev/null
+++ b/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild,v 1.1 2009/02/25 15:52:56 zzam Exp $
+
+IUSE=""
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: Show EPG like a TV guide"
+HOMEPAGE="http://www.js-home.org/vdr/tvonscreen"
+SRC_URI="http://www.js-home.org/vdr/tvonscreen/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=media-video/vdr-1.4.1"
+RDEPEND="${DEPEND}
+ x11-themes/vdr-channel-logos"
+
+PATCHES=("${FILESDIR}/${P}-fixes.diff"
+ "${FILESDIR}/${P}-vdr-1.5.3.diff"
+ "${FILESDIR}/${P}-logo-path.diff")
+
+NO_GETTEXT_HACK=1