diff --git a/packages/multimedia/vdr-plugin-streamdev/package.mk b/packages/multimedia/vdr-plugin-streamdev/package.mk index b66e284e88..dc2f74154d 100644 --- a/packages/multimedia/vdr-plugin-streamdev/package.mk +++ b/packages/multimedia/vdr-plugin-streamdev/package.mk @@ -33,17 +33,26 @@ 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 +} + +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/server/${LIB_NAME}-server.so $ROOT/$PKG_BUILD/server/${LIB_NAME}-server.so.${VDR_APIVERSION} + cp --remove-destination $ROOT/$PKG_BUILD/client/${LIB_NAME}-client.so $ROOT/$PKG_BUILD/client/${LIB_NAME}-client.so.${VDR_APIVERSION} + + $STRIP client/libvdr-*.so* + $STRIP server/libvdr-*.so* } makeinstall_target() { diff --git a/packages/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_makefile.patch b/packages/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_makefile.patch deleted file mode 100644 index b931d7bf2d..0000000000 --- a/packages/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_makefile.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/Makefile b/Makefile -index 90f3261..d80e15d 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,22 +15,15 @@ VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }' - - ### 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: - -diff --git a/client/Makefile b/client/Makefile -index ea9dc45..6fac485 100644 ---- a/client/Makefile -+++ b/client/Makefile -@@ -72,6 +72,7 @@ install-i18n: $(I18Nmsgs) - - $(SOFILE): $(CLIENTOBJS) $(COMMONOBJS) ../tools/sockettools.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@ -+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - install-lib: $(SOFILE) - install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) -diff --git a/server/Makefile b/server/Makefile -index 37cd4bb..8d2f49f 100644 ---- a/server/Makefile -+++ b/server/Makefile -@@ -78,6 +78,7 @@ install-i18n: $(I18Nmsgs) - $(SOFILE): $(SERVEROBJS) $(COMMONOBJS) \ - ../tools/sockettools.a ../remux/remux.a ../libdvbmpeg/libdvbmpegtools.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@ -+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - - install-lib: $(SOFILE) - install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) diff --git a/packages/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_makefile-largefile.patch b/packages/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_makefile-largefile.patch deleted file mode 100644 index 4a312da3de..0000000000 --- a/packages/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_makefile-largefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index d80e15d..ed2e168 100644 ---- a/Makefile -+++ b/Makefile -@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE) - INCLUDES += -I$(VDRDIR)/include -I.. - export INCLUDES - --DEFINES += -D_GNU_SOURCE -+DEFINES += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE - - ifdef DEBUG - DEFINES += -DDEBUG