vdr-plugin-xvdr: update to vdr-plugin-xvdr-fd9ba90

packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="6249892"
+PKG_VERSION="fd9ba90"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -33,6 +33,12 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
   make VDRDIR=$VDR_DIR \

packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-01_makefile.patch

@@ -0,0 +1,59 @@
+From 08b08a02a8e93e9b11594e2e846ec2b1a316d314 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 12 Feb 2014 20:32:03 +0200
+Subject: [PATCH] makefile
+
+---
+ Makefile |   15 ++++-----------
+ 1 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index da54323..81ba0e7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,23 +15,15 @@ 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)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I./src -I./src/vdr
++INCLUDES += -I./src -I./src/vdr -I$(VDRDIR)/include
+ 
+ ifdef DEBUG
+ INCLUDES += -DDEBUG
+@@ -136,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+-- 
+1.7.2.5
+

packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-makefile.patch

@@ -1,79 +0,0 @@
-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)

packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-vdr-2.1.2-buildfix.patch

@@ -1,32 +0,0 @@
-commit 45b2e4ce57e345a9b9344d5b8d8f46155b872a27
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Sat Oct 19 21:48:49 2013 +0300
-
-    vdr 2.1.2 buildfix
-
-diff --git a/src/config/config.c b/src/config/config.c
-index e058e96..1aaf9b8 100644
---- a/src/config/config.c
-+++ b/src/config/config.c
-@@ -45,7 +45,7 @@ cXVDRServerConfig::cXVDRServerConfig()
- }
- 
- void cXVDRServerConfig::Load() {
--  cLiveQueue::SetTimeShiftDir(VideoDirectory);
-+  cLiveQueue::SetTimeShiftDir(cVideoDirectory::Name());
-   cRecordingsCache::GetInstance().LoadResumeData();
- 
-   if(!cConfig<cSetupLine>::Load(AddDirectory(ConfigDirectory, GENERAL_CONFIG_FILE), true, false))
-diff --git a/src/xvdr/xvdrclient.c b/src/xvdr/xvdrclient.c
-index a1a9460..e15dd8f 100644
---- a/src/xvdr/xvdrclient.c
-+++ b/src/xvdr/xvdrclient.c
-@@ -1385,7 +1385,7 @@ bool cXVDRClient::processTIMER_Update() /* OPCODE 85 */
- bool cXVDRClient::processRECORDINGS_GetDiskSpace() /* OPCODE 100 */
- {
-   int FreeMB;
--  int Percent = VideoDiskSpace(&FreeMB);
-+  int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB);
-   int Total   = (FreeMB / (100 - Percent)) * 100;
- 
-   m_resp->put_U32(Total);