diff --git a/packages/3rdparty/multimedia/vdr-iptv/build b/packages/3rdparty/multimedia/vdr-iptv/build index 470986dae0..deb8d5474d 100755 --- a/packages/3rdparty/multimedia/vdr-iptv/build +++ b/packages/3rdparty/multimedia/vdr-iptv/build @@ -30,4 +30,3 @@ LDFLAGS="$LDFLAGS -fPIC" cd $PKG_BUILD make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" - diff --git a/packages/3rdparty/multimedia/vdr-iptv/meta b/packages/3rdparty/multimedia/vdr-iptv/meta index 2ecb3620f5..62829331ef 100644 --- a/packages/3rdparty/multimedia/vdr-iptv/meta +++ b/packages/3rdparty/multimedia/vdr-iptv/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-iptv" -PKG_VERSION="0.5.2" +PKG_VERSION="2.0.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch deleted file mode 100644 index 38d0e738ff..0000000000 --- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c7cd9b614762103a95f3da27783e03ce115d43fb Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sun, 20 May 2012 16:05:51 +0300 -Subject: [PATCH] vdr-iptv: skip header processing - ---- - protocolhttp.c | 12 +----------- - 1 files changed, 1 insertions(+), 11 deletions(-) - -diff --git a/protocolhttp.c b/protocolhttp.c -index de50f64..45c5425 100644 ---- a/protocolhttp.c -+++ b/protocolhttp.c -@@ -140,17 +140,7 @@ bool cIptvProtocolHttp::ProcessHeaders(void) - memset(buf, '\0', sizeof(buf)); - if (!GetHeaderLine(buf, sizeof(buf), lineLength)) - return false; -- if (!responseFound && sscanf(buf, fmt, &version, &response) != 2) { -- error("Expected HTTP header not found\n"); -- continue; -- } -- else -- responseFound = true; -- // Allow only 'OK' and 'Partial Content' -- if ((response != 200) && (response != 206)) { -- error("Invalid HTTP response (%d): %s\n", response, buf); -- return false; -- } -+ responseFound = true; - } - return true; - } --- -1.7.2.5 - diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch deleted file mode 100644 index 0f6f059b45..0000000000 --- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index d41acd1..58faab1 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,9 +5,6 @@ - # Debugging on/off - #IPTV_DEBUG = 1 - --# Strip debug symbols? Set eg. to /bin/true if not --STRIP = strip -- - # The official name of this plugin. - # This name will be used in the '-P...' option of VDR to load the plugin. - # By default the main source file also carries this name. diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch new file mode 100644 index 0000000000..43517c085f --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch @@ -0,0 +1,56 @@ +diff --git a/Makefile b/Makefile +index 7f147b8..db294fc 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,8 +12,6 @@ + + # Strip debug symbols? Set eg. to /bin/true if not + +-STRIP = strip +- + # The official name of this plugin. + # This name will be used in the '-P...' option of VDR to load the plugin. + # By default the main source file also carries this name. +@@ -27,23 +25,15 @@ 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 --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) +-LIBDIR = $(call PKGCFG,libdir) +-LOCDIR = $(call PKGCFG,locdir) +-PLGCFG = $(call PKGCFG,plgcfg) +-CFGDIR = $(call PKGCFG,configdir) +-# + 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: + +@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs) + + ### Includes and Defines (add further entries here): + +-INCLUDES += ++INCLUDES += -I$(VDRDIR)/include + + DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' + +@@ -138,6 +128,7 @@ install-i18n: $(I18Nmsgs) + + $(SOFILE): $(OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@ ++ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) + ifndef IPTV_DEBUG + @$(STRIP) $@ + endif