diff options
author | Jörg Bornkessel <hd_brummy@gentoo.org> | 2007-11-11 17:36:54 +0000 |
---|---|---|
committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2007-11-11 17:36:54 +0000 |
commit | d8e06295bd1256d0420ebad4e086e3488370f0e0 (patch) | |
tree | 1505673c87144320e77c3176216653df3acce4f8 /media-plugins/vdr-live | |
parent | remove unused patches (diff) | |
download | gentoo-2-d8e06295bd1256d0420ebad4e086e3488370f0e0.tar.gz gentoo-2-d8e06295bd1256d0420ebad4e086e3488370f0e0.tar.bz2 gentoo-2-d8e06295bd1256d0420ebad4e086e3488370f0e0.zip |
cleanup old versions
(Portage version: 2.1.3.19)
Diffstat (limited to 'media-plugins/vdr-live')
14 files changed, 9 insertions, 379 deletions
diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog index 276b43f570c5..b7b7c8a0df4d 100644 --- a/media-plugins/vdr-live/ChangeLog +++ b/media-plugins/vdr-live/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-plugins/vdr-live # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.8 2007/11/11 16:15:39 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.9 2007/11/11 17:36:52 hd_brummy Exp $ + + 11 Nov 2007; Joerg Bornkessel <hd_brummy@gentoo.org> + -files/0.1.0/linking.diff, -files/0.1.0/series, + -files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff, + -files/0.1.0/new-tntnet.diff, -files/0.1.0/timerdelete.diff, + -vdr-live-0.1.0.ebuild, -vdr-live-0.1.0-r1.ebuild, + -vdr-live-0.1.0.20070704.ebuild, -vdr-live-0.1.0.20070919.ebuild: + cleanup old versions *vdr-live-0.1.0.20071111 (11 Nov 2007) diff --git a/media-plugins/vdr-live/files/0.1.0/linking.diff b/media-plugins/vdr-live/files/0.1.0/linking.diff deleted file mode 100644 index 730f1cc4c6f8..000000000000 --- a/media-plugins/vdr-live/files/0.1.0/linking.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: live-0.1.0/Makefile -=================================================================== ---- live-0.1.0.orig/Makefile -+++ live-0.1.0/Makefile -@@ -26,7 +26,7 @@ LDFLAGS ?= -fPIC -g - ECPPC ?= ecppc - CXXFLAGS += `tntnet-config --cxxflags` - --LDFLAGS += `tntnet-config --libs` -+LIBS += $(shell tntnet-config --libs) - - ### The directory environment: - -@@ -71,7 +71,7 @@ WEBLIBS = pages/libpages.a css/libcss - - .PHONY: all dist clean SUBDIRS - --all: SUBDIRS libvdr-$(PLUGIN).so -+all: libvdr-$(PLUGIN).so - - ### Implicit rules: - -@@ -94,7 +94,7 @@ SUBDIRS: - make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" || exit 1; \ - done - --libvdr-$(PLUGIN).so: $(PLUGINOBJS) $(LIBS) $(WEBLIBS) -+libvdr-$(PLUGIN).so: SUBDIRS $(PLUGINOBJS) - $(CXX) $(LDFLAGS) -shared -o $@ $(PLUGINOBJS) -Wl,--whole-archive $(WEBLIBS) -Wl,--no-whole-archive $(LIBS) - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - diff --git a/media-plugins/vdr-live/files/0.1.0/new-tntnet.diff b/media-plugins/vdr-live/files/0.1.0/new-tntnet.diff deleted file mode 100644 index 7526ed86201c..000000000000 --- a/media-plugins/vdr-live/files/0.1.0/new-tntnet.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: live-0.1.0/httpd/worker.cpp -=================================================================== ---- live-0.1.0.orig/httpd/worker.cpp -+++ live-0.1.0/httpd/worker.cpp -@@ -77,7 +77,6 @@ namespace tnt - { - cxxtools::MutexLock lock(mutex); - workers.erase(this); -- comploader.cleanup(); - - log_debug("delete worker " << threadId << " - " << workers.size() << " threads left - " << application.getQueue().getWaitThreadCount() << " waiting threads"); - } diff --git a/media-plugins/vdr-live/files/0.1.0/series b/media-plugins/vdr-live/files/0.1.0/series deleted file mode 100644 index 8da524b6ac13..000000000000 --- a/media-plugins/vdr-live/files/0.1.0/series +++ /dev/null @@ -1,3 +0,0 @@ -new-tntnet.diff -linking.diff -timerdelete.diff diff --git a/media-plugins/vdr-live/files/0.1.0/timerdelete.diff b/media-plugins/vdr-live/files/0.1.0/timerdelete.diff deleted file mode 100644 index 014c8437cd04..000000000000 --- a/media-plugins/vdr-live/files/0.1.0/timerdelete.diff +++ /dev/null @@ -1,162 +0,0 @@ -Index: live-0.1.0/timers.cpp -=================================================================== ---- live-0.1.0.orig/timers.cpp -+++ live-0.1.0/timers.cpp -@@ -15,6 +15,9 @@ namespace vdrlive { - using namespace std; - using namespace vdrlive; - -+static char const* const TIMER_DELETE = "DELETE"; -+static char const* const TIMER_TOGGLE = "TOGGLE"; -+ - SortedTimers::SortedTimers(): - m_state( 0 ) - { -@@ -79,6 +82,8 @@ TimerManager::TimerManager() - void TimerManager::UpdateTimer( cTimer* timer, int flags, tChannelID& channel, string const& weekdays, string const& day, - int start, int stop, int priority, int lifetime, string const& title, string const& aux ) - { -+ cMutexLock lock( this ); -+ - ostringstream builder; - builder << flags << ":" << channel << ":" << ( weekdays != "-------" ? weekdays : "" ) - << ( weekdays == "-------" || day.empty() ? "" : "@" ) << day << ":" << start << ":" << stop << ":" -@@ -98,22 +103,33 @@ void TimerManager::UpdateTimer( cTimer* - throw HtmlError( error ); - } - --void TimerManager::DelTimer( cTimer* timer) -+void TimerManager::DelTimer( cTimer* timer ) - { -- cTimer* delTimer = Timers.GetTimer(timer); -- Timers.Del(delTimer, true); -- Timers.SetModified(); -- m_timers.ReloadTimers(false); -+ cMutexLock lock( this ); -+ -+ TimerPair timerData( timer, TIMER_DELETE ); -+ -+ m_updateTimers.push_back( timerData ); -+ m_updateWait.Wait( *this ); -+ -+ string error = GetError( timerData ); -+ if ( !error.empty() ) -+ throw HtmlError( error ); - } - - void TimerManager::ToggleTimerActive( cTimer* timer) - { -- cTimer* toggleTimer = Timers.GetTimer(timer); -- toggleTimer->OnOff(); -- Timers.SetModified(); -- m_timers.ReloadTimers(false); --} -+ cMutexLock lock( this ); -+ -+ TimerPair timerData( timer, TIMER_TOGGLE ); -+ -+ m_updateTimers.push_back( timerData ); -+ m_updateWait.Wait( *this ); - -+ string error = GetError( timerData ); -+ if ( !error.empty() ) -+ throw HtmlError( error ); -+} - - void TimerManager::DoPendingWork() - { -@@ -123,10 +139,10 @@ void TimerManager::DoPendingWork() - cMutexLock lock( this ); - if ( m_updateTimers.size() > 0 ) { - DoUpdateTimers(); -- dsyslog("SV: signalling waiters"); -- m_updateWait.Broadcast(); - } - DoReloadTimers(); -+ dsyslog("SV: signalling waiters"); -+ m_updateWait.Broadcast(); - } - - void TimerManager::DoUpdateTimers() -@@ -135,8 +151,10 @@ void TimerManager::DoUpdateTimers() - for ( TimerList::iterator timer = m_updateTimers.begin(); timer != m_updateTimers.end(); ++timer ) { - if ( timer->first == 0 ) // new timer - DoInsertTimer( *timer ); -- else if ( timer->second == "" ) // delete timer -- ; // XXX -+ else if ( timer->second == TIMER_DELETE ) // delete timer -+ DoDeleteTimer( *timer ); -+ else if ( timer->second == TIMER_TOGGLE ) // toggle timer -+ DoToggleTimer( *timer ); - else // update timer - DoUpdateTimer( *timer ); - } -@@ -187,6 +205,47 @@ void TimerManager::DoUpdateTimer( TimerP - isyslog("live timer %s modified (%s)", *oldTimer->ToDescr(), oldTimer->HasFlags(tfActive) ? "active" : "inactive"); - } - -+void TimerManager::DoDeleteTimer( TimerPair& timerData ) -+{ -+ if ( Timers.BeingEdited() ) { -+ StoreError( timerData, tr("Timers are being edited - try again later") ); -+ return; -+ } -+ -+ cTimer* oldTimer = Timers.GetTimer( timerData.first ); -+ if ( oldTimer == 0 ) { -+ StoreError( timerData, tr("Timer not defined") ); -+ return; -+ } -+ -+ cTimer copy = *oldTimer; -+ if ( oldTimer->Recording() ) { -+ oldTimer->Skip(); -+ cRecordControls::Process( time( 0 ) ); -+ } -+ Timers.Del( oldTimer ); -+ Timers.SetModified(); -+ isyslog("live timer %s deleted", *copy.ToDescr()); -+} -+ -+void TimerManager::DoToggleTimer( TimerPair& timerData ) -+{ -+ if ( Timers.BeingEdited() ) { -+ StoreError( timerData, tr("Timers are being edited - try again later") ); -+ return; -+ } -+ -+ cTimer* toggleTimer = Timers.GetTimer( timerData.first ); -+ if ( toggleTimer == 0 ) { -+ StoreError( timerData, tr("Timer not defined") ); -+ return; -+ } -+ -+ toggleTimer->OnOff(); -+ Timers.SetModified(); -+ isyslog("live timer %s toggled %s", *toggleTimer->ToDescr(), toggleTimer->HasFlags(tfActive) ? "on" : "off"); -+} -+ - void TimerManager::StoreError( TimerPair const& timerData, std::string const& error ) - { - m_failedUpdates.push_back( ErrorPair( timerData, error ) ); -Index: live-0.1.0/timers.h -=================================================================== ---- live-0.1.0.orig/timers.h -+++ live-0.1.0/timers.h -@@ -4,6 +4,7 @@ - #include <list> - #include <string> - #include <vdr/channels.h> -+#include <vdr/menu.h> - #include <vdr/timers.h> - #include <vdr/thread.h> - #include "live.h" -@@ -63,6 +64,8 @@ private: - void DoUpdateTimers(); - void DoInsertTimer( TimerPair& timerData ); - void DoUpdateTimer( TimerPair& timerData ); -+ void DoDeleteTimer( TimerPair& timerData ); -+ void DoToggleTimer( TimerPair& timerData ); - - void StoreError( TimerPair const& timerData, std::string const& error ); - std::string GetError( TimerPair const& timerData ); diff --git a/media-plugins/vdr-live/files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff b/media-plugins/vdr-live/files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff deleted file mode 100644 index 9196ee9189f5..000000000000 --- a/media-plugins/vdr-live/files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 92_live-0.1.0-1.5.3.dpatch by Thomas Günther <tom@toms-cafe.de> -## http://toms-cafe.de/vdr/download/live-0.1.0-1.5.3.diff -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Changes for VDR >= 1.5.3. - -@DPATCH@ ---- live-0.1.0/pages/timers.ecpp -+++ live-0.1.0/pages/timers.ecpp -@@ -59,7 +59,11 @@ using namespace vdrlive; - <table class="timers" cellspacing="0" cellpadding="0"> - <%cpp> - for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { -+#if VDRVERSNUM >= 10503 -+ string currentDay = timer->WeekDays() > 0 ? *cTimer::PrintDay(0, timer->WeekDays(), true) : FormatDateTime(tr("%A, %x"), timer->Day()); -+#else - string currentDay = timer->WeekDays() > 0 ? *cTimer::PrintDay(0, timer->WeekDays()) : FormatDateTime(tr("%A, %x"), timer->Day()); -+#endif - if (previousDay != currentDay) { - if (!previousDay.empty()) { - </%cpp> -@@ -73,7 +77,7 @@ using namespace vdrlive; - <tr class="head"> - <td colspan="10"> - <div class="boxheader"><div><div> -- <$ timer->WeekDays() > 0 ? *cTimer::PrintDay(0, timer->WeekDays()) : FormatDateTime(tr("%A, %x"), timer->Day()) $> -+ <$ currentDay $> - </div></div></div> - </td> - </tr> - diff --git a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0 b/media-plugins/vdr-live/files/digest-vdr-live-0.1.0 deleted file mode 100644 index b45dedfd40f4..000000000000 --- a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bf6070e8839180239b0f983c71ec1128 vdr-live-0.1.0.tar.gz 268899 -RMD160 303cd0b95520d20c70931fa546533962dd624634 vdr-live-0.1.0.tar.gz 268899 -SHA256 6d8467434e47b1127e7dc61a56f67011cf14cc348036591ef10e2069009d6dc2 vdr-live-0.1.0.tar.gz 268899 diff --git a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0-r1 b/media-plugins/vdr-live/files/digest-vdr-live-0.1.0-r1 deleted file mode 100644 index b45dedfd40f4..000000000000 --- a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bf6070e8839180239b0f983c71ec1128 vdr-live-0.1.0.tar.gz 268899 -RMD160 303cd0b95520d20c70931fa546533962dd624634 vdr-live-0.1.0.tar.gz 268899 -SHA256 6d8467434e47b1127e7dc61a56f67011cf14cc348036591ef10e2069009d6dc2 vdr-live-0.1.0.tar.gz 268899 diff --git a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070704 b/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070704 deleted file mode 100644 index 8a9687a54dc2..000000000000 --- a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070704 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4ba29ff0673f4396b423309e0a1f1374 vdr-live-20070704.tar.gz 459512 -RMD160 08561b9178dec7f3b0d45e3de815962b75e4ff5f vdr-live-20070704.tar.gz 459512 -SHA256 e282a465548747886670d5fc7dbf6edd2f57442279cd5a03a4ffefd377f631a9 vdr-live-20070704.tar.gz 459512 diff --git a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070919 b/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070919 deleted file mode 100644 index ac3bc4cbc1fb..000000000000 --- a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070919 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 26bd9cebda9070abc0ba1db092dc4e94 vdr-live-20070919.tar.gz 529044 -RMD160 cb302ce3ab1ab651d502c0fb3ea23316a3faf2bd vdr-live-20070919.tar.gz 529044 -SHA256 18caf4917aa3852bfa0ba78535ba1c9d89754ff6bf4b47cbfce6c702292490cb vdr-live-20070919.tar.gz 529044 diff --git a/media-plugins/vdr-live/vdr-live-0.1.0-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0-r1.ebuild deleted file mode 100644 index c9ed4dd6b8b2..000000000000 --- a/media-plugins/vdr-live/vdr-live-0.1.0-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.1.0-r1.ebuild,v 1.2 2007/06/26 17:21:46 hd_brummy Exp $ - -inherit vdr-plugin - -DESCRIPTION="VDR Plugin: Web Access To Settings" -HOMEPAGE="http://live.vdr-developer.org" -SRC_URI="http://live.vdr-developer.org/downloads/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="media-video/vdr - >=dev-libs/boost-1.33.0 - >=dev-libs/tntnet-1.5.3 - >=dev-libs/cxxtools-1.4.3" - -PATCHES="${FILESDIR}/${PV}/new-tntnet.diff - ${FILESDIR}/${PV}/linking.diff - ${FILESDIR}/${PV}/timerdelete.diff - ${FILESDIR}/${PV}/${P}_vdr-1.5.3-compile.diff" diff --git a/media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild deleted file mode 100644 index 3ac301d9470e..000000000000 --- a/media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild,v 1.2 2007/07/10 23:08:59 mr_bones_ Exp $ - -inherit vdr-plugin versionator - -MY_PV=$(get_version_component_range 4) -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="VDR Plugin: Web Access To Settings" -HOMEPAGE="http://live.vdr-developer.org" -#SRC_URI="http://live.vdr-developer.org/downloads/${MY_PP}.tar.gz" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="media-video/vdr - >=dev-libs/boost-1.33.0 - >=dev-libs/tntnet-1.5.3 - >=dev-libs/cxxtools-1.4.3" - -PATCHES="${FILESDIR}/vdr-live-content-type.diff" - -S="${WORKDIR}/${VDRPLUGIN}" - -src_unpack() { - vdr-plugin_src_unpack - - cd "${S}" -# sed -i live.cpp -e '/m_configDirectory =/s#=.*#= "/usr/share/vdr/live/http";#' -} - -src_install() { - vdr-plugin_src_install - - cd "${S}/live" - #insinto /usr/share/vdr/live/http - insinto /etc/vdr/plugins/live - doins -r * - - chown vdr:vdr -R "${D}"/etc/vdr/plugins/live -} diff --git a/media-plugins/vdr-live/vdr-live-0.1.0.20070919.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0.20070919.ebuild deleted file mode 100644 index e9978722452c..000000000000 --- a/media-plugins/vdr-live/vdr-live-0.1.0.20070919.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.1.0.20070919.ebuild,v 1.1 2007/09/19 21:43:53 hd_brummy Exp $ - -inherit vdr-plugin versionator - -MY_PV=$(get_version_component_range 4) -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="VDR Plugin: Web Access To Settings" -HOMEPAGE="http://live.vdr-developer.org" -#SRC_URI="http://live.vdr-developer.org/downloads/${MY_PP}.tar.gz" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="media-video/vdr - >=dev-libs/boost-1.33.0 - >=dev-libs/tntnet-1.5.3 - >=dev-libs/cxxtools-1.4.3" - -S="${WORKDIR}/${VDRPLUGIN}" - -src_install() { - vdr-plugin_src_install - - cd "${S}/live" - insinto /etc/vdr/plugins/live - doins -r * - - chown vdr:vdr -R "${D}"/etc/vdr/plugins/live -} diff --git a/media-plugins/vdr-live/vdr-live-0.1.0.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0.ebuild deleted file mode 100644 index e6a6d099e6b3..000000000000 --- a/media-plugins/vdr-live/vdr-live-0.1.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.1.0.ebuild,v 1.2 2007/05/29 16:07:04 zzam Exp $ - -inherit vdr-plugin - -DESCRIPTION="VDR Plugin: Web Access To Settings" -HOMEPAGE="http://live.vdr-developer.org" -SRC_URI="http://live.vdr-developer.org/downloads/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="media-video/vdr - >=dev-libs/boost-1.33.0 - >=dev-libs/tntnet-1.5.3 - >=dev-libs/cxxtools-1.4.3" - -PATCHES="${FILESDIR}/${PV}/new-tntnet.diff - ${FILESDIR}/${PV}/linking.diff" |