From patchwork Sat Oct 14 14:00:38 2006
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Harald Milz <hm@seneca.muc.de>
X-Patchwork-Id: 12402
Received: from colin.muc.de ([193.149.48.1] helo=mail.muc.de ident=qmailr)
	by www.linuxtv.org with esmtp (Exim 4.50) id 1GYk4f-0006Av-EY
	for vdr@linuxtv.org; Sat, 14 Oct 2006 16:01:13 +0200
Received: (qmail 58533 invoked by uid 66); 14 Oct 2006 14:01:12 -0000
Received: from seneca by colin2.muc.de with UUCP;
	Sat Oct 14 14:01:12 2006 -0000
Received: by seneca.muc.de (Postfix, from userid 2425)
	id 68F941157B7; Sat, 14 Oct 2006 14:00:38 +0000 (UTC)
From: Harald Milz <hm@seneca.muc.de>
Subject: Re: [vdr] vdr-1.4 and osdpip anyone?
To: vdr@linuxtv.org
References: <20061013165533.GA21514@seneca.muc.de> <452FCEE2.5090909@gmx.de>
User-Agent: tin/1.6.2-20030910 ("Pabbay") (UNIX)
	(Linux/2.6.11.4-21.14-default (x86_64))
MIME-Version: 1.0
Message-Id: <20061014140038.68F941157B7@seneca.muc.de>
Date: Sat, 14 Oct 2006 14:00:38 +0000 (UTC)
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Oct 2006 14:01:13 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 10911

Udo Richter <udo_richter@gmx.de> wrote:
> osdpip requires a patch since 1.3.31. See wiki:

> http://www.vdr-wiki.de/wiki/index.php/Osdpip-plugin#Patches
> http://deela.cc.fh-lippe.de/files/vdr-osdpip/

Ooops I saw it bit missed to get it. 

But it still cries for help: 

receiver.h:32: error: extra qualification ‘cOsdPipReceiver::’ on member ‘cOsdPipReceiver’
make[1]: *** [osd.o] Fehler 1

? 


Plus the usual patch for APIVERSION ...

diff -ur osdpip-0.0.8.ORIG/Makefile osdpip-0.0.8/Makefile
--- osdpip-0.0.8.ORIG/Makefile	2005-05-14 18:41:53.000000000 +0200
+++ osdpip-0.0.8/Makefile	2006-10-14 15:56:55.826701500 +0200
@@ -33,6 +33,11 @@
 ### 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 sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+
+ifeq ($(APIVERSION),)
+        APIVERSION = $(VDRVERSION)
+endif
 
 ### The name of the distribution archive:
 
@@ -74,7 +79,7 @@
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared -o $@ $^ $(LIBS)
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)