File vdr-xine-0.9.3.diff of Package vdr-plugin-xine
diff -ur xine-0.9.3.orig/Makefile xine-0.9.3/Makefile
--- xine-0.9.3.orig/Makefile 2009-04-04 21:01:49.000000000 +0200
+++ xine-0.9.3/Makefile 2009-06-19 21:44:20.000000000 +0200
@@ -25,18 +25,20 @@
### The directory environment:
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+DVBDIR = .
+VDRDIR = /usr/include/vdr
+LIBDIR = .
### Allow user defined options to overwrite defaults:
-include $(VDRDIR)/Make.config
+CXXFLAGS += -fno-strict-aliasing
+
INCLUDES += `pkg-config --cflags libxine`
# where to create fifos (xine expects them at /tmp/vdr-xine)
-VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
+VDR_XINE_FIFO_DIR ?= /var/lib/vdr-xine
# can be used to detect inefficient OSD drawing
# 0 - do not verify whether the dirty area of a bitmap is really dirty
@@ -116,7 +118,7 @@
### Internationalization (I18N):
PODIR = po
-LOCALEDIR = $(VDRDIR)/locale
+LOCALEDIR = locale
I18Npo = $(wildcard $(PODIR)/*.po)
I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
I18Ndirs = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
diff -ur xine-0.9.3.orig/xineLib.c xine-0.9.3/xineLib.c
--- xine-0.9.3.orig/xineLib.c 2009-06-01 19:32:05.000000000 +0200
+++ xine-0.9.3/xineLib.c 2009-06-19 21:44:20.000000000 +0200
@@ -2270,7 +2270,7 @@
return false; \
} } while (0)
- if (::mkdir(m_fifoDir.c_str(), 0755) < 0)
+ if (::mkdir(m_fifoDir.c_str(), 0755) < 0 && errno != EEXIST)
{
string msg = "vdr-xine: error: couldn't create directory '" + m_fifoDir + "'";
perror(msg.c_str());
diff -ur xine-0.9.3.orig/xineLib.h xine-0.9.3/xineLib.h
--- xine-0.9.3.orig/xineLib.h 2009-06-01 19:31:04.000000000 +0200
+++ xine-0.9.3/xineLib.h 2009-06-19 21:44:20.000000000 +0200
@@ -29,6 +29,7 @@
#include "xineExternal.h"
#include "xineSettings.h"
+class cPlugin;
namespace PluginXine