Added vdr-1.5 patch.

(Portage version: 2.1.2.3)

4 files changed, 96 insertions, 2 deletions

diff --git a/media-plugins/vdr-osdteletext/ChangeLog b/media-plugins/vdr-osdteletext/ChangeLog
index 3a99da2e87e2..5f096cb50a5f 100644
--- a/media-plugins/vdr-osdteletext/ChangeLog
+++ b/media-plugins/vdr-osdteletext/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-osdteletext
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/ChangeLog,v 1.7 2006/09/28 11:27:38 hd_brummy Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/ChangeLog,v 1.8 2007/04/02 10:48:19 zzam Exp $
+
+*vdr-osdteletext-0.5.1-r1 (02 Apr 2007)
+
+  02 Apr 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-osdteletext-0.5.1-vdr-1.5.patch,
+  +vdr-osdteletext-0.5.1-r1.ebuild:
+  Added vdr-1.5 patch.
 
   28 Sep 2006; Joerg Bornkessel <hd_brummy@gentoo.org> files/rc-addon.sh:
   correct PATH handling
diff --git a/media-plugins/vdr-osdteletext/files/digest-vdr-osdteletext-0.5.1-r1 b/media-plugins/vdr-osdteletext/files/digest-vdr-osdteletext-0.5.1-r1
new file mode 100644
index 000000000000..e1d50c2bb0e0
--- /dev/null
+++ b/media-plugins/vdr-osdteletext/files/digest-vdr-osdteletext-0.5.1-r1
@@ -0,0 +1,3 @@
+MD5 52c219e38a089504071237209ad114cd vdr-osdteletext-0.5.1.tgz 58631
+RMD160 b53bee592844f4527917fe28a322e3561de19092 vdr-osdteletext-0.5.1.tgz 58631
+SHA256 e3cb0b95d351d0fc63ba3e1ca82f776e44f1a1945ffad574b54a55e0169fa969 vdr-osdteletext-0.5.1.tgz 58631
diff --git a/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch b/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch
new file mode 100644
index 000000000000..eef0fe66677c
--- /dev/null
+++ b/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch
@@ -0,0 +1,55 @@
+diff -aur osdteletext-0.5.1/Makefile osdteletext/Makefile
+--- osdteletext-0.5.1/Makefile	2005-08-08 18:29:22.000000000 +0200
++++ osdteletext/Makefile	2006-04-23 17:54:49.000000000 +0200
+@@ -20,7 +20,6 @@
+ 
+ ### The directory environment:
+ 
+-DVBDIR = ../../../../DVB
+ VDRDIR = ../../..
+ LIBDIR = ../../lib
+ TMPDIR = /tmp
+@@ -32,6 +31,10 @@
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+ VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++ifeq ($(strip $(APIVERSION)),)
++  APIVERSION = $(VDRVERSION)
++endif
+ 
+ ### The name of the distribution archive:
+ 
+@@ -40,7 +43,7 @@
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE
+ 
+@@ -72,7 +75,7 @@
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+Nur in osdteletext: .svn.
+diff -aur osdteletext-0.5.1/txtrecv.c osdteletext/txtrecv.c
+--- osdteletext-0.5.1/txtrecv.c	2005-08-12 13:20:09.000000000 +0200
++++ osdteletext/txtrecv.c	2007-01-14 00:14:15.667936696 +0100
+@@ -692,7 +692,9 @@
+ */
+ 
+ cTxtReceiver::cTxtReceiver(int TPid, tChannelID chan)
+-#if VDRVERSNUM >= 10319
++#if VDRVERSNUM >= 10500
++ : cReceiver(chan, -1, TPid), 
++#elif VDRVERSNUM >= 10319
+  : cReceiver(0, -1, TPid), 
+ #else
+  : cReceiver(0, -1, 1, TPid), 
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..3f69716ccb13
--- /dev/null
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r1.ebuild,v 1.1 2007/04/02 10:48:19 zzam Exp ${VDRPLUGIN}/vdr-${VDRPLUGIN}-0.3.1.ebuild,v 1.1 2003/05/13 09:39:19 fow0ryl Exp $
+
+inherit vdr-plugin
+
+DESCRIPTION="Video Disk Recorder OSD-Teletext Plugin"
+HOMEPAGE="http://www.wiesweg-online.de/linux/linux.html"
+SRC_URI="http://www.wiesweg-online.de/linux/vdr/${P}.tgz
+		mirror://vdrfiles/${PN}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.2.5"
+
+PATCHES="${FILESDIR}/i18n_german_lang.diff
+	${FILESDIR}/${P}-vdr-1.5.patch"
+
+src_install() {
+	vdr-plugin_src_install
+
+	# create the teletext directory
+	diropts -m755 -ovdr -gvdr
+	keepdir /var/cache/${VDRPLUGIN}
+
+}