diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk index 5eebef6400..caddd3c630 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-live" -PKG_VERSION="e582514ede475574842b44ca6792335ff141172d" -PKG_SHA256="74deb2ca43ffb5779b3f9ff6f34c8b53898a226fcf92605d7ede0401cb62601c" +PKG_VERSION="b2938deb061a83454d14aeb149c18a87e38e8b25" +PKG_SHA256="f74844fad4f0c3fd828816fd3f094ff740d82d31a164b0cd6384aff9fb7e33b8" PKG_LICENSE="GPL" PKG_SITE="http://live.vdr-developer.org/en/index.php" -PKG_URL="https://github.com/vdr-projects/vdr-plugin-live/archive/${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/MarkusEh/vdr-plugin-live/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="Allows a comfortable operation of VDR and some of its plugins trough a web interface." diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-01-makefile.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-01-makefile.patch deleted file mode 100644 index fab596fa69..0000000000 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-01-makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -11,7 +11,7 @@ PLUGIN := live - VERSION := $(shell grep '\#define LIVEVERSION ' setup.h | awk '{ print $$3 }' | sed -e 's/[";]//g') - - ### Check for libpcre c++ wrapper --HAVE_LIBPCRECPP := $(shell pcre-config --libs-cpp) -+HAVE_LIBPCRECPP := $(shell pkg-config --libs libpcrecpp libpcre) - - ### The directory environment: - # Use package data if installed...otherwise assume we're under the VDR source directory: -@@ -37,18 +37,18 @@ APIVERSION := $(call PKGCFG,apiversion) - include global.mk - - ### Determine tntnet and cxxtools versions: --TNTVERSION = $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }') --CXXTOOLVER = $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }') -+TNTVERSION = $(shell pkg-config --modversion tntnet | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }') -+CXXTOOLVER = $(shell pkg-config --modversion cxxtools | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }') - --CXXFLAGS += $(shell tntnet-config --cxxflags) --LIBS += $(shell tntnet-config --libs) -+CXXFLAGS += $(shell pkg-config --cflags tntnet) -+LIBS += $(shell pkg-config --libs tntnet) - - ### Optional configuration features - PLUGINFEATURES := - ifneq ($(HAVE_LIBPCRECPP),) - PLUGINFEATURES += -DHAVE_LIBPCRECPP -- CXXFLAGS += $(shell pcre-config --cflags) -- LIBS += $(HAVE_LIBPCRECPP) -+ CXXFLAGS += $(shell pkg-config --cflags libpcreposix libpcre) -+ LIBS += -Wl,-Bstatic $(HAVE_LIBPCRECPP) -Wl,-Bdynamic - endif - - # -Wno-deprecated-declarations .. get rid of warning: ‘template class std::auto_ptr’ is deprecated