summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-06-26 08:27:24 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-06-26 08:27:24 +0000
commit71ca415d3f6e86890caa617b79fec71df64058a6 (patch)
treeaaeba17e02dc28abdf8f4ff74f8107cb9e766416 /media-plugins/vdr-dvdswitch
parentAdded patch to compile with vdr-1.5.3 and up. (diff)
downloadgentoo-2-71ca415d3f6e86890caa617b79fec71df64058a6.tar.gz
gentoo-2-71ca415d3f6e86890caa617b79fec71df64058a6.tar.bz2
gentoo-2-71ca415d3f6e86890caa617b79fec71df64058a6.zip
Added patch to compile with vdr-1.5.4
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'media-plugins/vdr-dvdswitch')
-rw-r--r--media-plugins/vdr-dvdswitch/ChangeLog7
-rw-r--r--media-plugins/vdr-dvdswitch/files/0.1.3/series1
-rw-r--r--media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff19
-rw-r--r--media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild5
4 files changed, 29 insertions, 3 deletions
diff --git a/media-plugins/vdr-dvdswitch/ChangeLog b/media-plugins/vdr-dvdswitch/ChangeLog
index 8ef03b5828f3..5f1d387ca22b 100644
--- a/media-plugins/vdr-dvdswitch/ChangeLog
+++ b/media-plugins/vdr-dvdswitch/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/vdr-dvdswitch
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.12 2007/05/28 09:06:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.13 2007/06/26 08:27:24 zzam Exp $
+
+ 26 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+ +files/0.1.3/vdr-1.5.4-compatibility.diff, files/0.1.3/series,
+ vdr-dvdswitch-0.1.3-r1.ebuild:
+ Added patch to compile with vdr-1.5.4
*vdr-dvdswitch-0.1.3-r1 (28 May 2007)
diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/series b/media-plugins/vdr-dvdswitch/files/0.1.3/series
index b08c2759a7c9..9ea7da857b53 100644
--- a/media-plugins/vdr-dvdswitch/files/0.1.3/series
+++ b/media-plugins/vdr-dvdswitch/files/0.1.3/series
@@ -1 +1,2 @@
no-files-crash.diff
+vdr-1.5.4-compatibility.diff
diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff b/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff
new file mode 100644
index 000000000000..301df7e5bbcc
--- /dev/null
+++ b/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_dvdswitch-0.1.3-1.5.4.dpatch by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/dvdswitch-0.1.3-1.5.4.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.4.
+
+@DPATCH@
+--- dvdswitch-0.1.3/helpers.h
++++ dvdswitch-0.1.3/helpers.h
+@@ -80,7 +80,7 @@ class cStringListItem : public cListObje
+ char *Value(void) { return String; }
+ };
+
+-class cStringList : public cList<cStringListItem> {};
++//class cStringList : public cList<cStringListItem> {};
+
+ // --- cTokenizer ---------------------------------------
+
diff --git a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild
index 49cf0f2a8cf3..546aa792dfa9 100644
--- a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild
+++ b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild,v 1.2 2007/05/28 09:08:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild,v 1.3 2007/06/26 08:27:24 zzam Exp $
inherit vdr-plugin
@@ -19,7 +19,8 @@ RDEPEND="media-plugins/vdr-dvd
DEFAULT_IMAGE_DIR="/var/vdr/video/dvd-images"
-PATCHES="${FILESDIR}/${PV}/no-files-crash.diff"
+PATCHES="${FILESDIR}/${PV}/no-files-crash.diff
+ ${FILESDIR}/${PV}/vdr-1.5.4-compatibility.diff"
src_unpack() {
vdr-plugin_src_unpack