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

---
 .../multimedia/vdr-plugin-eepg/package.mk     | 23 ++++++++-----
 .../patches/vdr-plugin-eepg-01_makefile.patch | 34 -------------------
 2 files changed, 15 insertions(+), 42 deletions(-)
 delete mode 100644 packages/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch

diff --git a/packages/multimedia/vdr-plugin-eepg/package.mk b/packages/multimedia/vdr-plugin-eepg/package.mk
index 7aa770b640..a25ecfb018 100644
--- a/packages/multimedia/vdr-plugin-eepg/package.mk
+++ b/packages/multimedia/vdr-plugin-eepg/package.mk
@@ -33,17 +33,24 @@ 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 \
+  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
+  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+
+  make \
     LIBDIR="." \
-    LOCALEDIR="./locale"
+    LOCDIR="./locale" \
+    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-eepg/patches/vdr-plugin-eepg-01_makefile.patch b/packages/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch
deleted file mode 100644
index c191ea6da0..0000000000
--- a/packages/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- vdr-plugin-eepg-master/Makefile	2014-03-11 15:44:36.675368020 +0000
-+++ vdr-plugin-eepg-master/Makefile	2014-03-11 15:51:02.065495474 +0000
-@@ -31,21 +31,16 @@
- ### 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
- 
- ### 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:
- 
-@@ -119,6 +114,7 @@
- 
- $(SOFILE): $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- install-lib: $(SOFILE)
- 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)