From d39c72d088c18ec0a789d4c9df1ec6a961a1acf0 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 21 Sep 2002 09:11:36 +0200
Subject: Fixed the 'newplugin' script for use with the NEWSTRUCT driver
---
CONTRIBUTORS | 1 +
HISTORY | 32 ++++++++++++++++++++++++++++++++
newplugin | 9 +++++++--
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ffeda8d7..3afb3939 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -174,6 +174,7 @@ Andreas Schultz <aschultz@warp10.net>
OSD capabilities
for implementing an SPU decoder
for fixing opening /dev/video in cDvbDevice::GrabImage() in case of NEWSTRUCT driver
+ for reporting a problem with plugin Makefiles and the NEWSTRUCT driver
Aaron Holtzman
for writing 'ac3dec'
diff --git a/HISTORY b/HISTORY
index 78908d93..9d7f3683 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1483,3 +1483,35 @@ Video Disk Recorder Revision History
- Fixed an incomplete initialization of the filter parameters in eit.c (thanks
to Jeremy Hall).
+- Fixed the 'newplugin' script for use with the NEWSTRUCT driver (thanks to
+ Andreas Schultz for reporting this one). If you have already created a plugin
+ directory and Makefile with 'newplugin', please apply the following patch to it:
+
+ -------------------------------------------------------
+ --- Makefile 2002/06/10 16:24:06 1.4
+ +++ Makefile 2002/09/17 15:36:36 1.5
+ @@ -15,7 +15,12 @@
+
+ ### The directory environment:
+
+ +ifdef NEWSTRUCT
+ +DVBDIR = ../../../../DVB/include
+ +DEFINES += -DNEWSTRUCT
+ +else
+ DVBDIR = ../../../../DVB/ost/include
+ +endif
+ VDRDIR = ../../..
+ VDRINC = $(VDRDIR)/include
+ LIBDIR = ../../lib
+ @@ -34,7 +39,7 @@
+
+ INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+
+ -DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+ ### The object files (add further files here):
+ -------------------------------------------------------
+
+ This is the diff for the 'setup' example that comes with VDR, so your line
+ numbers may be different.
diff --git a/newplugin b/newplugin
index f0c77a93..e4eb2287 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: newplugin 1.7 2002/08/28 19:26:27 kls Exp $
+# $Id: newplugin 1.8 2002/09/21 09:09:00 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@@ -70,7 +70,12 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
### The directory environment:
+ifdef NEWSTRUCT
+DVBDIR = ../../../../DVB/include
+DEFINES += -DNEWSTRUCT
+else
DVBDIR = ../../../../DVB/ost/include
+endif
VDRDIR = ../../..
VDRINC = \$(VDRDIR)/include
LIBDIR = ../../lib
@@ -89,7 +94,7 @@ PACKAGE = vdr-\$(ARCHIVE)
INCLUDES = -I\$(VDRINC) -I\$(DVBDIR)
-DEFINES = -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
### The object files (add further files here):
--
cgit v1.2.3