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

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

diff --git a/packages/multimedia/vdr-plugin-restfulapi/package.mk b/packages/multimedia/vdr-plugin-restfulapi/package.mk
index 59e3a36b02..dac3c2f06f 100644
--- a/packages/multimedia/vdr-plugin-restfulapi/package.mk
+++ b/packages/multimedia/vdr-plugin-restfulapi/package.mk
@@ -32,12 +32,6 @@ PKG_LONGDESC="vdr-plugin-restfulapi allows to access many internals of the VDR v
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-pre_configure_target() {
-  export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
-  export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
-  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
-}
-
 pre_make_target() {
   # dont build parallel
   MAKEFLAGS=-j1
@@ -45,9 +39,22 @@ pre_make_target() {
 
 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-restfulapi/patches/vdr-plugin-restfulapi-01_makefile.patch b/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01_makefile.patch
deleted file mode 100644
index 8431853eeb..0000000000
--- a/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01_makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- vdr-plugin-restfulapi.orig/Makefile	2015-01-17 19:15:51.425203423 +0100
-+++ vdr-plugin-restfulapi/Makefile	2015-01-17 20:12:27.336707418 +0100
-@@ -16,21 +16,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 --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
--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:
- 
-@@ -47,9 +42,13 @@
- 
- ### Includes and Defines (add further entries here):
- 
--DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-+INCLUDES += -I$(VDRDIR)/include
- 
--LIBS    += $(shell cxxtools-config --libs) -lcxxtools-http
-+DOCUMENT_ROOT=/storage/.kodi/addons/service.multimedia.vdr-addon/res/plugins/restfulapi/
-+
-+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DDOCUMENT_ROOT='"$(DOCUMENT_ROOT)"'
-+
-+LIBS    += -lcxxtools-http $(shell cxxtools-config --libs)
- CONFDIR  = $(call PKGCFG,configdir)
- PLGCONFDIR = $(CONFDIR)/plugins/$(PLUGIN)
- 
-@@ -106,6 +105,7 @@
- 
- $(SOFILE): $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ -Wl,--no-whole-archive $(LIBS)
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- install-lib: $(SOFILE)
- 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)