Fix for compiling with VDR 1.2.6, fix for compiling on 64bit systems

diff --git a/Makefile b/Makefile
index 5055960e8079cac55aad15b65a747410ef10eb34..23cc9c1e1681313c7727e4be2d61baa7c3cae4e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Werror
+CXXFLAGS ?= -O2 -fPIC -Wall -Woverloaded-virtual -Werror
 
 ### The directory environment:
 

diff --git a/libdvbmpeg/Makefile b/libdvbmpeg/Makefile
index a56cb6b47065226cba23d3ec0b4f0e1ab4590116..ce53c5d92205e99003f2d8a33f2153bc877272e7 100644 (file)
--- a/libdvbmpeg/Makefile
+++ b/libdvbmpeg/Makefile
@@ -1,10 +1,10 @@
 INCS   = -I.
-CFLAGS =  -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS =  -g -fPIC -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 MFLAG  = -M
 OBJS = ctools.o ringbuffy.o remux.o transform.o cpptools.o
 SRC  = $(wildcard *.c)
 CPPSRC = $(wildcard *.cpp)
-CSRC = $(wildcard *.cc) 
+CSRC = $(wildcard *.cc)
 
 DESTDIR = /usr/local
 
@@ -14,18 +14,18 @@ clean:
        - rm -f *.o  *~ *.a .depend
 
 libdvbmpegtools.a: $(OBJS)
-       ar -rcs libdvbmpegtools.a $(OBJS) 
+       ar -rcs libdvbmpegtools.a $(OBJS)
 
-%.o:    %.cc 
+%.o:    %.cc
        $(CXX) -c $(CFLAGS) $(INCS) $(DEFINES) $<
 
 %.o:    %.cpp
        $(CXX) -c $(CFLAGS) $(INCS) $(DEFINES) $<
 
-%.o:    %.c 
+%.o:    %.c
        $(CC) -c $(CFLAGS) $(INCS) $(DEFINES) $<
 
-.depend: 
+.depend:
        $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCS)> .depend
 
 

diff --git a/mvpclient.c b/mvpclient.c
index 7e4978560eb903c39c7a45f710faa7cda4d4cf83..256a6a55430172a5b4ea645edf99ed4ae0cbb8a3 100644 (file)
--- a/mvpclient.c
+++ b/mvpclient.c
@@ -498,9 +498,10 @@ int MVPClient::processMoveRecording(UCHAR* data, int length)
 
       if (renameret == 0)
       {
+#if VDRVERSNUM > 10311
         // Tell VDR
         ::Recordings.Update();
-
+#endif
         // Success. Send a different packet from just a ulong
         int totalLength = 4 + 4 + strlen(newDir) + 1;
         UCHAR* sendBuffer = new UCHAR[totalLength];