From 8534bcf0a44105c7b66ec73249201f3822fd3ecb Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 21 Feb 2014 21:51:09 +0200
Subject: [PATCH] vdr-plugin-dvbapi: update to vdr-plugin-dvbapi-400879b

---
 .../multimedia/vdr-plugin-dvbapi/package.mk   |  2 +-
 .../vdr-plugin-dvbapi-02_makefile.patch       | 47 ++++---------------
 .../vdr-plugin-dvbapi-04_force-softcsa.patch  | 13 -----
 3 files changed, 11 insertions(+), 51 deletions(-)
 delete mode 100644 packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-04_force-softcsa.patch

diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk
index 85333e97c1..f1db42feae 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="4d9de95"
+PKG_VERSION="400879b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch
index bab32c78b8..ef16801ff1 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch
@@ -1,13 +1,13 @@
 diff --git a/Makefile b/Makefile
-index ebe9d76..ef2d2e5 100644
+index a49dda6..873e73d 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -15,18 +15,11 @@ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print
+@@ -16,18 +16,11 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
  
  ### 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))
+-PKGCFG  = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 -LIBDIR  = $(call PKGCFG,libdir)
 -LOCDIR  = $(call PKGCFG,locdir)
 -PLGCFG  = $(call PKGCFG,plgcfg)
@@ -22,56 +22,29 @@ index ebe9d76..ef2d2e5 100644
  
  ### Allow user defined options to overwrite defaults:
  
-@@ -34,33 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
+@@ -35,7 +28,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
  
  ### The version number of VDR's plugin API:
  
 -APIVERSION = $(call PKGCFG,apiversion)
--ifeq ($(strip $(APIVERSION)),)
--APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
--NOCONFIG := 1
--endif
--
--# backward compatibility with VDR version < 1.7.34
--API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
--
--ifdef API1733
--
--VDRSRC = $(VDRDIR)
--ifeq ($(strip $(VDRSRC)),)
--VDRSRC := ../../..
--endif
--LIBDIR = $(VDRSRC)/PLUGINS/lib
--
--ifndef NOCONFIG
--CXXFLAGS = $(call PKGCFG,cflags)
--CXXFLAGS += -fPIC
--else
---include $(VDRSRC)/Make.global
---include $(VDRSRC)/Make.config
--endif
--
--export CXXFLAGS
--endif
 +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
  
  ### The name of the distribution archive:
  
-@@ -73,9 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+@@ -48,7 +41,7 @@ SOFILE = libvdr-$(PLUGIN).so
  
  ### Includes and Defines (add further entries here):
  
--ifdef API1733
- INCLUDES += -I$(VDRSRC)/include
--endif
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
  
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  
-@@ -145,6 +110,7 @@ $(DEPFILE): Makefile
+@@ -122,6 +115,7 @@ install-i18n: $(I18Nmsgs)
  
  $(SOFILE): $(OBJS) $(FFDECSA)
  	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
 +	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
  
- libdvbapi-dvbsddevice.so: device-sd.o
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $< -o $@
+ ifndef LIBDVBCSA
+ $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-04_force-softcsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-04_force-softcsa.patch
deleted file mode 100644
index cfa1cc9f54..0000000000
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-04_force-softcsa.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/device-tmpl.cpp b/device-tmpl.cpp
-index 158324b..4d9f862 100644
---- a/device-tmpl.cpp
-+++ b/device-tmpl.cpp
-@@ -71,7 +71,7 @@ SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int ca
-   fd_dvr = -1;
- 
-   int n = Adapter;
--  softcsa = (fd_ca < 0);
-+  softcsa = true;
-   if (softcsa)
-   {
-     if (HasDecoder())