vdr-1.4 and osdpip anyone?

Message ID	20061014140038.68F941157B7@seneca.muc.de
State	New
Headers	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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Message-Id: <20061014140038.68F941157B7@seneca.muc.de> Date: Sat, 14 Oct 2006 14:00:38 +0000 (UTC) Precedence: list Reply-To: VDR Mailing List <vdr@linuxtv.org> Status: O

Message ID

20061014140038.68F941157B7@seneca.muc.de

State

New

Headers

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
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Message-Id: <20061014140038.68F941157B7@seneca.muc.de>
Date: Sat, 14 Oct 2006 14:00:38 +0000 (UTC)
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
Status: O

Commit Message

Harald Milz Oct. 14, 2006, 2 p.m. UTC

  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 ...

Comments

Ville Skyttä Oct. 14, 2006, 3:14 p.m. UTC | #1

On Sat, 2006-10-14 at 14:00 +0000, Harald Milz wrote:

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

http://koti.mbnet.fi/kurg/vdr/vdr-osdpip-0.0.8-extraqual.patch

Udo Richter Oct. 14, 2006, 3:21 p.m. UTC | #2

Harald Milz wrote:
> But it still cries for help: 
> 
> receiver.h:32: error: extra qualification ‘cOsdPipReceiver::’ on member ‘cOsdPipReceiver’
> make[1]: *** [osd.o] Fehler 1

This is a GCC-4.x error, already mentioned in the 0.0.8 release thread 
on vdr-portal. Just delete the cOsdPipReceiver:: part from the mentioned 
line.

Cheers,

Udo

Harald Milz Oct. 15, 2006, 10:42 a.m. UTC | #3

Ville Skyttä <ville.skytta@iki.fi> wrote:
> On Sat, 2006-10-14 at 14:00 +0000, Harald Milz wrote:

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

> http://koti.mbnet.fi/kurg/vdr/vdr-osdpip-0.0.8-extraqual.patch

OMG ... OK, I'll put this up on the wiki as well.

diff mbox

Patch

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)