Fixed compile with vdr-1.4. Fixed homepage.

(Portage version: 2.1.5_rc6)

4 files changed, 39 insertions, 6 deletions

diff --git a/media-plugins/vdr-mlist/ChangeLog b/media-plugins/vdr-mlist/ChangeLog
index cfd753ce0eed..77a30a09ceee 100644
--- a/media-plugins/vdr-mlist/ChangeLog
+++ b/media-plugins/vdr-mlist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-mlist
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mlist/ChangeLog,v 1.5 2008/03/03 14:50:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mlist/ChangeLog,v 1.6 2008/04/28 08:49:47 zzam Exp $
+
+  28 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-mlist-0.0.5-vdr-1.4.diff, vdr-mlist-0.0.3.ebuild,
+  vdr-mlist-0.0.5.ebuild:
+  Fixed compile with vdr-1.4. Fixed homepage.
 
 *vdr-mlist-0.0.5 (03 Mar 2008)
 
diff --git a/media-plugins/vdr-mlist/files/vdr-mlist-0.0.5-vdr-1.4.diff b/media-plugins/vdr-mlist/files/vdr-mlist-0.0.5-vdr-1.4.diff
new file mode 100644
index 000000000000..6cbd0acab890
--- /dev/null
+++ b/media-plugins/vdr-mlist/files/vdr-mlist-0.0.5-vdr-1.4.diff
@@ -0,0 +1,26 @@
+diff -ru mlist-0.0.5-orig/i18n.h mlist-0.0.5/i18n.h
+--- mlist-0.0.5-orig/i18n.h	2008-04-28 10:46:28.131558650 +0200
++++ mlist-0.0.5/i18n.h	2008-04-28 10:46:46.251551253 +0200
+@@ -12,4 +12,8 @@
+ 
+ extern const tI18nPhrase Phrases[];
+ 
++#ifndef trNOOP
++#define trNOOP(s) (s)
++#endif
++
+ #endif //_I18N__H
+Nur in mlist-0.0.5: libvdr-mlist.so.
+Nur in mlist-0.0.5: libvdr-mlist.so.1.4.5.
+diff -ru mlist-0.0.5-orig/mlist.c mlist-0.0.5/mlist.c
+--- mlist-0.0.5-orig/mlist.c	2008-04-28 10:46:28.131558650 +0200
++++ mlist-0.0.5/mlist.c	2008-04-28 10:47:00.091552984 +0200
+@@ -10,6 +10,7 @@
+ #include <vdr/status.h>
+ #include <vdr/osdbase.h>
+ #include <time.h>
++#include "i18n.h"
+ 
+ static const char *VERSION        = "0.0.5";
+ static const char *DESCRIPTION    = trNOOP("Displays the message history");
+Nur in mlist-0.0.5: mlist.o.
diff --git a/media-plugins/vdr-mlist/vdr-mlist-0.0.3.ebuild b/media-plugins/vdr-mlist/vdr-mlist-0.0.3.ebuild
index ec343c5ca48d..6a4324ead89a 100644
--- a/media-plugins/vdr-mlist/vdr-mlist-0.0.3.ebuild
+++ b/media-plugins/vdr-mlist/vdr-mlist-0.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 2003-2006 Gentoo Foundation
+# Copyright 2003-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mlist/vdr-mlist-0.0.3.ebuild,v 1.3 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mlist/vdr-mlist-0.0.3.ebuild,v 1.4 2008/04/28 08:49:47 zzam Exp $
 
 IUSE=""
 
 inherit vdr-plugin eutils
 
 DESCRIPTION="VDR plugin: Show a history of the last OSD message"
-HOMEPAGE="http://joachim-wilke.de/vdr-mlist.htm"
+HOMEPAGE="http://www.joachim-wilke.de/?alias=vdr-mlist"
 SRC_URI="http://joachim-wilke.de/vdr-mlist/${P}.tgz"
 KEYWORDS="x86"
 SLOT="0"
diff --git a/media-plugins/vdr-mlist/vdr-mlist-0.0.5.ebuild b/media-plugins/vdr-mlist/vdr-mlist-0.0.5.ebuild
index e428d4b60afd..67c1e637174b 100644
--- a/media-plugins/vdr-mlist/vdr-mlist-0.0.5.ebuild
+++ b/media-plugins/vdr-mlist/vdr-mlist-0.0.5.ebuild
@@ -1,16 +1,18 @@
 # Copyright 2003-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mlist/vdr-mlist-0.0.5.ebuild,v 1.1 2008/03/03 14:50:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mlist/vdr-mlist-0.0.5.ebuild,v 1.2 2008/04/28 08:49:47 zzam Exp $
 
 IUSE=""
 
 inherit vdr-plugin eutils
 
 DESCRIPTION="VDR plugin: Show a history of the last OSD message"
-HOMEPAGE="http://joachim-wilke.de/vdr-mlist.htm"
+HOMEPAGE="http://www.joachim-wilke.de/?alias=vdr-mlist"
 SRC_URI="http://joachim-wilke.de/vdr-mlist/${P}.tgz"
 KEYWORDS="~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-video/vdr-1.3.30"
+
+PATCHES=("${FILESDIR}/${P}-vdr-1.4.diff")