package/vdr/vdr-osdteletext/api-vdr-1.5.x.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../vdr-osdteletext/api-vdr-1.5.x.patch
   5 # Copyright (C) 2008 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 diff -aur osdteletext-0.5.1/Makefile osdteletext/Makefile
  18 --- osdteletext-0.5.1/Makefile  2005-08-08 18:29:22.000000000 +0200
  19 +++ osdteletext/Makefile        2006-04-23 17:54:49.000000000 +0200
  20 @@ -20,7 +20,6 @@
  21
  22  ### The directory environment:
  23
  24 -DVBDIR = ../../../../DVB
  25  VDRDIR = ../../..
  26  LIBDIR = ../../lib
  27  TMPDIR = /tmp
  28 @@ -32,6 +31,10 @@
  29  ### The version number of VDR (taken from VDR's "config.h"):
  30
  31  VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
  32 +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
  33 +ifeq ($(strip $(APIVERSION)),)
  34 +  APIVERSION = $(VDRVERSION)
  35 +endif
  36
  37  ### The name of the distribution archive:
  38
  39 @@ -40,7 +43,7 @@
  40
  41  ### Includes and Defines (add further entries here):
  42
  43 -INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
  44 +INCLUDES += -I$(VDRDIR)/include
  45
  46  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE
  47
  48 @@ -72,7 +75,7 @@
  49
  50  libvdr-$(PLUGIN).so: $(OBJS)
  51         $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
  52 -       @cp $@ $(LIBDIR)/$@.$(VDRVERSION)
  53 +       @cp $@ $(LIBDIR)/$@.$(APIVERSION)
  54
  55  dist: clean
  56         @-rm -rf $(TMPDIR)/$(ARCHIVE)
  57 Nur in osdteletext: .svn.
  58 diff -aur osdteletext-0.5.1/txtrecv.c osdteletext/txtrecv.c
  59 --- osdteletext-0.5.1/txtrecv.c 2005-08-12 13:20:09.000000000 +0200
  60 +++ osdteletext/txtrecv.c       2007-01-14 00:14:15.667936696 +0100
  61 @@ -692,7 +692,9 @@
  62  */
  63
  64  cTxtReceiver::cTxtReceiver(int TPid, tChannelID chan)
  65 -#if VDRVERSNUM >= 10319
  66 +#if VDRVERSNUM >= 10500
  67 + : cReceiver(chan, -1, TPid),
  68 +#elif VDRVERSNUM >= 10319
  69   : cReceiver(0, -1, TPid),
  70  #else
  71   : cReceiver(0, -1, 1, TPid),