From f35b3f5254de4d4926c79041150fe91bef1e1922 Mon Sep 17 00:00:00 2001
From: Holger Steinhaus <hsteinhaus@gmx.de>
Date: Sun, 15 Nov 2015 17:06:38 +0100
Subject: [PATCH] vdr-plugin-dvbapi: remove makefile patch - no longer needed

---
 .../multimedia/vdr-plugin-dvbapi/package.mk   | 26 +++++----
 .../vdr-plugin-dvbapi-02_makefile.patch       | 54 -------------------
 2 files changed, 16 insertions(+), 64 deletions(-)
 delete mode 100644 packages/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch

diff --git a/packages/multimedia/vdr-plugin-dvbapi/package.mk b/packages/multimedia/vdr-plugin-dvbapi/package.mk
index b48ae2690a..f3258c48de 100644
--- a/packages/multimedia/vdr-plugin-dvbapi/package.mk
+++ b/packages/multimedia/vdr-plugin-dvbapi/package.mk
@@ -33,12 +33,6 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-pre_configure_target() {
-  export CFLAGS="$CFLAGS -fPIC"
-  export CXXFLAGS="$CXXFLAGS -fPIC"
-  export LDFLAGS="$LDFLAGS -fPIC"
-}
-
 pre_make_target() {
   # dont build parallel
   MAKEFLAGS=-j1
@@ -46,11 +40,23 @@ pre_make_target() {
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  make VDRDIR=$VDR_DIR \
-    VDRSRC=$VDR_DIR \
+  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
+  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+
+  make \
     LIBDIR="." \
-    LOCALEDIR="./locale" \
-    LIBDVBCSA=1
+    LOCDIR="./locale" \
+    LIBDVBCSA=1 \
+    all install-i18n
+}
+
+post_make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  LIB_NAME=lib${PKG_NAME/-plugin/}
+
+  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  $STRIP libvdr-*.so*
 }
 
 makeinstall_target() {
diff --git a/packages/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch b/packages/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch
deleted file mode 100644
index 73920f4dac..0000000000
--- a/packages/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Makefile b/Makefile
-index efd124a..ed303fa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,22 +12,14 @@ PLUGIN = dvbapi
- ### The version number of this plugin (taken from the main source file):
- 
- VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
--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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
--LIBDIR  = $(call PKGCFG,libdir)
--LOCDIR  = $(call PKGCFG,locdir)
--PLGCFG  = $(call PKGCFG,plgcfg)
--#
- TMPDIR ?= /tmp
- 
- ### The compiler options:
- 
--export CFLAGS   = $(call PKGCFG,cflags)
--export CXXFLAGS = $(call PKGCFG,cxxflags)
-+include $(VDRDIR)/Make.global
- 
- ### Allow user defined options to overwrite defaults:
- 
-@@ -35,7 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
- 
- ### The version number of VDR's plugin API:
- 
--APIVERSION = $(call PKGCFG,apiversion)
-+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
- 
- ### The name of the distribution archive:
- 
-@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
- 
- ### Includes and Defines (add further entries here):
- 
--INCLUDES +=
-+INCLUDES += -I$(VDRDIR)/include
- 
- DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- 
-@@ -122,6 +114,7 @@ install-i18n: $(I18Nmsgs)
- 
- $(SOFILE): $(OBJS) $(FFDECSA)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- ifndef LIBDVBCSA
- $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h