diff --git a/packages/3rdparty/multimedia/vdr-live/meta b/packages/3rdparty/multimedia/vdr-live/meta index 769fd60a65..8a3fcc8a91 100644 --- a/packages/3rdparty/multimedia/vdr-live/meta +++ b/packages/3rdparty/multimedia/vdr-live/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-live" -PKG_VERSION="0.2.0" +PKG_VERSION="0.3.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-01_ipv6.patch b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-01_ipv6.patch deleted file mode 100644 index 827b6b5d84..0000000000 --- a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-01_ipv6.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Allows to use IPV6 addresses -Forwarded: not-needed -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630627#10 -Bug-Debian: http://bugs.debian.org/630627 -Author: Luboš Doležel - ---- live-0.2.0/setup.cpp.orig 2008-04-23 01:01:53.000000000 +0200 -+++ live-0.2.0/setup.cpp 2011-06-15 20:22:36.577961061 +0200 -@@ -151,13 +151,28 @@ - - bool Setup::CheckServerIps() - { -+ bool v6supported = false; -+ int s = socket(AF_INET6, SOCK_STREAM, 0); -+ -+ if (s != -1) { -+ close(s); -+ v6supported = true; -+ } -+ - if ( m_serverIps.empty() ) { -- m_serverIps.push_back( "0.0.0.0" ); -+ if (v6supported) -+ m_serverIps.push_back( "::" ); -+ else -+ m_serverIps.push_back( "0.0.0.0" ); - return true; - } - -+ union { -+ in_addr in4; -+ in6_addr in6; -+ }; - for ( IpList::const_iterator ip = m_serverIps.begin(); ip != m_serverIps.end(); ++ip ) { -- if ( inet_addr( ip->c_str() ) == static_cast< in_addr_t >( -1 ) ) { -+ if ( !inet_pton(AF_INET, ip->c_str(), &in4) && !inet_pton(AF_INET6, ip->c_str(), &in6) ) { - esyslog( "ERROR: live server ip %s is not a valid ip address", ip->c_str() ); - cerr << "ERROR: live server ip " << *ip << " is not a valid ip address" << endl; - return false; diff --git a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-02_timers_colon.patch b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-02_timers_colon.patch deleted file mode 100644 index f84d00dcb9..0000000000 --- a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-02_timers_colon.patch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_timers_colon.dpatch by Timo Weingärtner -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: colons have to be replaced by pipes in timer titles. - -@DPATCH@ ---- vdr-plugin-live-0.2.0/timers.cpp 2008-04-10 22:06:05.000000000 +0200 -+++ vdr-plugin-live-0.2.0.new/timers.cpp 2009-07-25 23:39:02.000000000 +0200 -@@ -138,7 +138,7 @@ - ostringstream builder; - builder << flags << ":" << channel << ":" << ( weekdays != "-------" ? weekdays : "" ) - << ( weekdays == "-------" || day.empty() ? "" : "@" ) << day << ":" << start << ":" << stop << ":" -- << priority << ":" << lifetime << ":" << title << ":" << aux; -+ << priority << ":" << lifetime << ":" << StringReplace(title, ":", "|") << ":" << aux; - // dsyslog("%s", builder.str().c_str()); - - TimerPair timerData( timer, builder.str() ); diff --git a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-03_fix-INCLUDES.patch b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-03_fix-INCLUDES.patch deleted file mode 100644 index 1b8760f953..0000000000 --- a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-03_fix-INCLUDES.patch +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_live-0.2.0-fix-INCLUDES.dpatch by Thomas Günther -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes compilation with VDR >= 1.7.13. - -@DPATCH@ ---- live-0.2.0/Makefile -+++ live-0.2.0/Makefile -@@ -38,6 +38,7 @@ - ### Allow user defined options to overwrite defaults: - - -include $(VDRDIR)/Make.config -+EXTRA_INCLUDES = $(INCLUDES) - - ### The version number of VDR's plugin API (taken from VDR's "config.h"): - -@@ -139,10 +140,10 @@ - subdirs: $(SUBDIRS) - - $(SUBDIRS): -- $(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" $(MAKECMDGOALS) -+ $(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" $(MAKECMDGOALS) - - PAGES: -- $(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" .dependencies -+ $(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" .dependencies - - $(VERSIONSUFFIX): FORCE - ./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX) ---- live-0.2.0/css/Makefile -+++ live-0.2.0/css/Makefile -@@ -7,6 +7,7 @@ - CXXFLAGS += `tntnet-config --cxxflags` - LDFLAGS += `tntnet-config --libs` - -+INCLUDES += $(EXTRA_INCLUDES) - INCLUDES += -I.. - - ### The directory environment: ---- live-0.2.0/httpd/Makefile -+++ live-0.2.0/httpd/Makefile -@@ -7,6 +7,7 @@ - - ### Includes and Defines (add further entries here): - -+INCLUDES += $(EXTRA_INCLUDES) - INCLUDES += -I. - - ### The object files (add further files here): ---- live-0.2.0/javascript/Makefile -+++ live-0.2.0/javascript/Makefile -@@ -7,6 +7,7 @@ - CXXFLAGS += `tntnet-config --cxxflags` - LDFLAGS += `tntnet-config --libs` - -+INCLUDES += $(EXTRA_INCLUDES) - INCLUDES += -I.. -I$(VDRDIR)/include - - ### The directory environment: ---- live-0.2.0/pages/Makefile -+++ live-0.2.0/pages/Makefile -@@ -2,6 +2,7 @@ - AR ?= ar - ECPPC ?= ecppc - -+INCLUDES += $(EXTRA_INCLUDES) - INCLUDES += -I.. -I$(VDRDIR)/include - - ### The directory environment: diff --git a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-05_do-not-use-the-direct-access-to-crecoding.patch b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-05_do-not-use-the-direct-access-to-crecoding.patch deleted file mode 100644 index a7c143e7e2..0000000000 --- a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-05_do-not-use-the-direct-access-to-crecoding.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9 Mon Sep 17 00:00:00 2001 -From: Dieter Hametner -Date: Sun, 25 Mar 2012 14:42:12 +0000 -Subject: Updated LIVE to latest changes in vdr 1.7.27 - -- Do not use the direct access to cRecoding members any more. ---- -diff --git a/epg_events.cpp b/epg_events.cpp -index a514769..cd4996e 100644 ---- a/epg_events.cpp -+++ b/epg_events.cpp -@@ -182,12 +182,20 @@ namespace vdrlive - - time_t EpgRecording::GetStartTime() const - { -+#if VDRVERSNUM < 10726 - return m_recording ? m_recording->start : 0; -+#else -+ return m_recording ? m_recording->Start() : 0; -+#endif - } - - time_t EpgRecording::GetEndTime() const - { -+#if VDRVERSNUM < 10726 - return m_recording ? m_recording->start : 0; -+#else -+ return m_recording ? m_recording->Start() : 0; -+#endif - } - - const string EpgRecording::Name() const -diff --git a/recman.cpp b/recman.cpp -index fb315d2..6a2fc00 100644 ---- a/recman.cpp -+++ b/recman.cpp -@@ -383,7 +383,11 @@ namespace vdrlive { - - time_t RecordingsItemRec::StartTime() const - { -+#if VDRVERSNUM < 10726 - return m_recording->start; -+#else -+ return m_recording->Start(); -+#endif - } - - long RecordingsItemRec::Duration() const --- -cgit v0.9.0.2-40-g7c79 diff --git a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-06_compile-fix-for-vdr.1.7.28+.patch b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-06_compile-fix-for-vdr.1.7.28+.patch deleted file mode 100644 index 38dc1a5f81..0000000000 --- a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-06_compile-fix-for-vdr.1.7.28+.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c3ecf9fabb674bc154f5a08cdd62e74e2b5d0e36 Mon Sep 17 00:00:00 2001 -From: Christian Ruppert -Date: Sun, 03 Jun 2012 23:42:31 +0000 -Subject: Compile fix for >=vdr-1.7.28 - ---- -diff --git a/tasks.cpp b/tasks.cpp -index 9f20190..2a2b8d5 100644 ---- a/tasks.cpp -+++ b/tasks.cpp -@@ -60,9 +60,15 @@ void PlayRecordingTask::Action() - - const char *current = NowReplaying(); - if (!current || (0 != strcmp(current, recording->FileName()))) { -+#if VDRVERSNUM >= 10728 -+ cReplayControl::SetRecording( 0 ); -+ cControl::Shutdown(); -+ cReplayControl::SetRecording( recording->FileName() ); -+#else - cReplayControl::SetRecording( 0, 0 ); - cControl::Shutdown(); - cReplayControl::SetRecording( recording->FileName(), recording->Title() ); -+#endif - cControl::Launch( new cReplayControl ); - cControl::Attach(); - } -@@ -122,7 +128,11 @@ void StopRecordingTask::Action() - return; - } - -+#if VDRVERSNUM >= 10728 -+ cReplayControl::SetRecording( 0 ); -+#else - cReplayControl::SetRecording( 0, 0 ); -+#endif - cControl::Shutdown(); - } - --- -cgit v0.9.0.2-40-g7c79