From 39a7a00d3b5d24b3b18128a6611cd63d3479600d Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 14 Apr 2013 13:18:31 +0300
Subject: [PATCH] vdr-plugin-xvdr: update to vdr-plugin-xvdr-935a294

---
 .../3rdparty/multimedia/vdr-plugin-xvdr/meta  |  2 +-
 .../patches/vdr-plugin-xvdr-makefile.patch    | 79 +++++++++++++++++++
 .../multimedia/vdr-addon/changelog.txt        |  1 +
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-makefile.patch

diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta
index 1b8f1ef53b..c2ccd295b5 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta
+++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="c43033c"
+PKG_VERSION="935a294"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-makefile.patch b/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-makefile.patch
new file mode 100644
index 0000000000..53daf9794a
--- /dev/null
+++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-makefile.patch
@@ -0,0 +1,79 @@
+diff --git a/Makefile b/Makefile
+index 06a49a2..ab037bd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,45 +16,46 @@ VERSION = $(shell grep 'static const char \*VERSION *=' src/xvdr/xvdr.h | awk '{
+ ### The directory environment:
+ 
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-CFGDIR  = $(call PKGCFG,configdir)/plugins/$(PLUGIN)
+ #
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++OPTLEVEL ?= 2
++CXXFLAGS = -O$(OPTLEVEL) -g -Wall -Woverloaded-virtual -fPIC -DPIC
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++#DVBDIR = ../../../../DVB
++#VDRDIR = ../../..
++#LIBDIR = ../../lib
++#TMPDIR = /tmp
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+--include $(PLGCFG)
++-include $(VDRDIR)/Make.config
++-include $(VDRDIR)/Make.global
+ 
+ ### The name of the distribution archive:
+ 
+ ARCHIVE = $(PLUGIN)-$(VERSION)
+ PACKAGE = vdr-$(ARCHIVE)
+ 
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++
+ ### The name of the shared object file:
+ 
+ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I./src
++INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR) -I./src -I.
+ 
+ ifdef DEBUG
+ INCLUDES += -DDEBUG
+ endif
+ 
+-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DXVDR_VERSION='"$(VERSION)"'
++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DXVDR_VERSION='"$(VERSION)"'
+ 
+ ### The object files (add further files here):
+ 
+@@ -103,7 +104,7 @@ all: $(SOFILE) i18n
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+ $(DEPFILE): Makefile
+-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
++	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+ 
+ -include $(DEPFILE)
+ 
+@@ -137,6 +138,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt
index 47e67bc0cb..af9f6930b8 100644
--- a/packages/addons/service/multimedia/vdr-addon/changelog.txt
+++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt
@@ -7,6 +7,7 @@
 - update to vdr-live-0.3.0
 - update to vdr-plugin-dvbapi-555272d
 - update to vdr-plugin-xmltv2vdr-41b998d
+- update to vdr-plugin-xvdr-935a294
 - update to rotorng-0.3.1
 - added dvbsddevice plugin
 - added dvbhddevice plugin