diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2007-11-11 17:36:54 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2007-11-11 17:36:54 +0000 |
commit | 6ec99f60ed0c4a7b39909cf7421a6164598e1abb (patch) | |
tree | 5fec2e6fd770eacc85728690ff2755c056db85c8 | |
parent | remove unused patches (diff) | |
download | historical-6ec99f60ed0c4a7b39909cf7421a6164598e1abb.tar.gz historical-6ec99f60ed0c4a7b39909cf7421a6164598e1abb.tar.bz2 historical-6ec99f60ed0c4a7b39909cf7421a6164598e1abb.zip |
cleanup old versions
Package-Manager: portage-2.1.3.19
-rw-r--r-- | media-plugins/vdr-live/ChangeLog | 10 | ||||
-rw-r--r-- | media-plugins/vdr-live/Manifest | 65 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/0.1.0/linking.diff | 31 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/0.1.0/new-tntnet.diff | 12 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/0.1.0/series | 3 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/0.1.0/timerdelete.diff | 162 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff | 32 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/digest-vdr-live-0.1.0 | 3 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/digest-vdr-live-0.1.0-r1 | 3 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070704 | 3 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070919 | 3 | ||||
-rw-r--r-- | media-plugins/vdr-live/vdr-live-0.1.0-r1.ebuild | 24 | ||||
-rw-r--r-- | media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild | 45 | ||||
-rw-r--r-- | media-plugins/vdr-live/vdr-live-0.1.0.20070919.ebuild | 35 | ||||
-rw-r--r-- | media-plugins/vdr-live/vdr-live-0.1.0.ebuild | 22 |
15 files changed, 16 insertions, 437 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/Manifest b/media-plugins/vdr-live/Manifest index fe83bcaa505c..2499b970ca0b 100644 --- a/media-plugins/vdr-live/Manifest +++ b/media-plugins/vdr-live/Manifest @@ -1,26 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 0.1.0/linking.diff 911 RMD160 f3235c203650ed5ee67f0376025118a44663884c SHA1 60d6570a163649b1ce497ebe6bcbe0152ded0cf8 SHA256 33183a8b332f96781e27692acbbcfa3f52fdabcd7847732cac511d0a45f77274 -MD5 6c5f4f881554571ef010f478c5be1be6 files/0.1.0/linking.diff 911 -RMD160 f3235c203650ed5ee67f0376025118a44663884c files/0.1.0/linking.diff 911 -SHA256 33183a8b332f96781e27692acbbcfa3f52fdabcd7847732cac511d0a45f77274 files/0.1.0/linking.diff 911 -AUX 0.1.0/new-tntnet.diff 471 RMD160 e3ceea141dcf81013aa8f3b2465dc1c424052af5 SHA1 e296f89759c0abdaa992699de2875fc09d1a079b SHA256 88aec1375bc2e98ba3f56b42df68b590dbf5acf33ea3ce4cd58f4bfe1162c485 -MD5 3c3f5e8d5405e26e46dc394ed67fbd7f files/0.1.0/new-tntnet.diff 471 -RMD160 e3ceea141dcf81013aa8f3b2465dc1c424052af5 files/0.1.0/new-tntnet.diff 471 -SHA256 88aec1375bc2e98ba3f56b42df68b590dbf5acf33ea3ce4cd58f4bfe1162c485 files/0.1.0/new-tntnet.diff 471 -AUX 0.1.0/series 46 RMD160 a01489b32647ecafcfad14a8ed91fdcda01d77a9 SHA1 c617ba653dcd788de629927c19eb930b3c305402 SHA256 7a3028babd82bf997c0f862bff438b9112090295e94d97a8f95fdb8531a82922 -MD5 7cd6afeec94b5dadc4d6fe7145fe8f53 files/0.1.0/series 46 -RMD160 a01489b32647ecafcfad14a8ed91fdcda01d77a9 files/0.1.0/series 46 -SHA256 7a3028babd82bf997c0f862bff438b9112090295e94d97a8f95fdb8531a82922 files/0.1.0/series 46 -AUX 0.1.0/timerdelete.diff 4937 RMD160 5f8e81d0235eb7abe29dabcc777edd24162e7c9b SHA1 c740bd1db5998de5182e0d1b79c6f66bbe641a9f SHA256 fa21ffa1ee3040458b176dd9558292eec60c9347acdde571befb4e970bbc3d1d -MD5 fe72d5dd8c29f0c82ee178b94af8ca72 files/0.1.0/timerdelete.diff 4937 -RMD160 5f8e81d0235eb7abe29dabcc777edd24162e7c9b files/0.1.0/timerdelete.diff 4937 -SHA256 fa21ffa1ee3040458b176dd9558292eec60c9347acdde571befb4e970bbc3d1d files/0.1.0/timerdelete.diff 4937 -AUX 0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff 1293 RMD160 d003ecccaa6c0499e5314672320e570e3753d4f5 SHA1 1f8d309563a720dcd2e4e63f6c1e7540ca277a4c SHA256 5c8fc20fb2cd3921d7e7fa9f1eddb3d155f187c3ac49deb620abb74cea3d08fa -MD5 8f960d3759f6d356c4e11c3554802e9f files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff 1293 -RMD160 d003ecccaa6c0499e5314672320e570e3753d4f5 files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff 1293 -SHA256 5c8fc20fb2cd3921d7e7fa9f1eddb3d155f187c3ac49deb620abb74cea3d08fa files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff 1293 AUX confd 125 RMD160 f9b80ed1c08301c7cdab9c4fe20c0e933a977db1 SHA1 3b8ef982bbfa64811176379c629ca3b7f1a08778 SHA256 949c97e715af8405b47877afe4fa9c93dc3ed04b1ac6b6d7982e41f61ba0d122 MD5 589dba865404ebe65434930fbc255555 files/confd 125 RMD160 f9b80ed1c08301c7cdab9c4fe20c0e933a977db1 files/confd 125 @@ -33,50 +13,19 @@ AUX vdr-live-content-type.diff 2947 RMD160 6535db3dff27001e04e5c5a85696cd6664c99 MD5 9260ccf74f6a76124959bf349246c001 files/vdr-live-content-type.diff 2947 RMD160 6535db3dff27001e04e5c5a85696cd6664c99e56 files/vdr-live-content-type.diff 2947 SHA256 7de6392dd1d0a896c9a01e06f672c929253d1811bf29dbfbf55b56147ebb1049 files/vdr-live-content-type.diff 2947 -DIST vdr-live-0.1.0.tar.gz 268899 RMD160 303cd0b95520d20c70931fa546533962dd624634 SHA1 c881ca4fbe620e970de53cbde34ba304c53d2146 SHA256 6d8467434e47b1127e7dc61a56f67011cf14cc348036591ef10e2069009d6dc2 -DIST vdr-live-20070704.tar.gz 459512 RMD160 08561b9178dec7f3b0d45e3de815962b75e4ff5f SHA1 e83cc6fb50f8a50d48c5411169dab0c97e9f0d61 SHA256 e282a465548747886670d5fc7dbf6edd2f57442279cd5a03a4ffefd377f631a9 -DIST vdr-live-20070919.tar.gz 529044 RMD160 cb302ce3ab1ab651d502c0fb3ea23316a3faf2bd SHA1 6144788ceeae72611dbb0b498c6e0399d64e3ab4 SHA256 18caf4917aa3852bfa0ba78535ba1c9d89754ff6bf4b47cbfce6c702292490cb DIST vdr-live-20071111.tar.gz 526778 RMD160 b7dcdd25ef2c4914327696e22552bd43cd94c230 SHA1 a5857aa0af540bfba34a92dca91ab5b38b2d99a6 SHA256 83a39fbb3a813acc10b04619aac563e0abb4c01ff3e164fce4029af26408793b -EBUILD vdr-live-0.1.0-r1.ebuild 718 RMD160 18b2adc998f69b4ca88c9541bd3a79cd027ed1ad SHA1 28d5a7221ff9a5802fa901acf1c06c7b40cda3fc SHA256 b9dc6f12309e185ef00ea00a23682fd5af6c8e226eb0a8978a54fda62b103e97 -MD5 1d4cd4013275d5b80982950903711f23 vdr-live-0.1.0-r1.ebuild 718 -RMD160 18b2adc998f69b4ca88c9541bd3a79cd027ed1ad vdr-live-0.1.0-r1.ebuild 718 -SHA256 b9dc6f12309e185ef00ea00a23682fd5af6c8e226eb0a8978a54fda62b103e97 vdr-live-0.1.0-r1.ebuild 718 -EBUILD vdr-live-0.1.0.20070704.ebuild 1082 RMD160 63bb400ac4c9c57b074c9f02fa204859e4c26f9f SHA1 e714c9bf5bab8050f8068bb1b4f233508ea9d188 SHA256 a8fb2b029fadcc13b22c530f35ba7b3063a324789944f173fe662eda37796fa3 -MD5 81a3d67e8b58114ff680f06b931f7393 vdr-live-0.1.0.20070704.ebuild 1082 -RMD160 63bb400ac4c9c57b074c9f02fa204859e4c26f9f vdr-live-0.1.0.20070704.ebuild 1082 -SHA256 a8fb2b029fadcc13b22c530f35ba7b3063a324789944f173fe662eda37796fa3 vdr-live-0.1.0.20070704.ebuild 1082 -EBUILD vdr-live-0.1.0.20070919.ebuild 863 RMD160 070335765b28b5c777a8df333357bde468c0d438 SHA1 70f6f20be7a08f0e0feb3cb3e41a5b35aa339259 SHA256 a47eb15999520fb71045245d91bae63d418a1265e0317c7d5f349ec2a5ebfb08 -MD5 e0a027c659dc18c820b60641f563f159 vdr-live-0.1.0.20070919.ebuild 863 -RMD160 070335765b28b5c777a8df333357bde468c0d438 vdr-live-0.1.0.20070919.ebuild 863 -SHA256 a47eb15999520fb71045245d91bae63d418a1265e0317c7d5f349ec2a5ebfb08 vdr-live-0.1.0.20070919.ebuild 863 EBUILD vdr-live-0.1.0.20071111.ebuild 863 RMD160 ea74dd6556cd4a0d54961d50119be0259343260b SHA1 740d53261cd8116a85bd1c0e71c4376808ac1b10 SHA256 916cb03f3b07209d6b9c8d2e938247ed36449599d5615258a8cc6ccd3b1a0cab MD5 1acf57bf771629e2a095f6af18c78287 vdr-live-0.1.0.20071111.ebuild 863 RMD160 ea74dd6556cd4a0d54961d50119be0259343260b vdr-live-0.1.0.20071111.ebuild 863 SHA256 916cb03f3b07209d6b9c8d2e938247ed36449599d5615258a8cc6ccd3b1a0cab vdr-live-0.1.0.20071111.ebuild 863 -EBUILD vdr-live-0.1.0.ebuild 627 RMD160 c215e343d431cdf31d690ba97657c495f8cc2f76 SHA1 2edcf2db6fc121027b2c67cb7f54ea4a87119ec9 SHA256 ae1efe7ac4a3de9f14f4928a839aa82831db8e1131a3301820abbac7e4042ef9 -MD5 93937b01eaf8d17cb913a09eea09be75 vdr-live-0.1.0.ebuild 627 -RMD160 c215e343d431cdf31d690ba97657c495f8cc2f76 vdr-live-0.1.0.ebuild 627 -SHA256 ae1efe7ac4a3de9f14f4928a839aa82831db8e1131a3301820abbac7e4042ef9 vdr-live-0.1.0.ebuild 627 -MISC ChangeLog 1730 RMD160 91e3b79a5a80b7b505448f211ca440a41c53aa30 SHA1 247c1819085b812c1763478b5ee81c909748d39e SHA256 ee67759a5a31a0462b368a5de19732882e1bbe15882a5adda4580ba3757add47 -MD5 c3b8ae9b6f68f82fadbc3719d851042a ChangeLog 1730 -RMD160 91e3b79a5a80b7b505448f211ca440a41c53aa30 ChangeLog 1730 -SHA256 ee67759a5a31a0462b368a5de19732882e1bbe15882a5adda4580ba3757add47 ChangeLog 1730 +MISC ChangeLog 2097 RMD160 3b02d4b4702168148a1e8ddb7c4fd697d08006f5 SHA1 1a0d363dcf08241ce280244d8e5b81064e5a1e0d SHA256 31713289e7a25a71f739db265868a0bc6835097a940e26b79c626c8d08c8f4a5 +MD5 1462b4280503cac0be15c6c52f6e4c03 ChangeLog 2097 +RMD160 3b02d4b4702168148a1e8ddb7c4fd697d08006f5 ChangeLog 2097 +SHA256 31713289e7a25a71f739db265868a0bc6835097a940e26b79c626c8d08c8f4a5 ChangeLog 2097 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f MD5 3cafef7c72bb98475ad53d15e79ff845 metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f metadata.xml 251 -MD5 3779a82313e23f2c24984f0ca465c0a6 files/digest-vdr-live-0.1.0 244 -RMD160 4bae0e4af78759938dd6a2c5bccc15a6bb7a2772 files/digest-vdr-live-0.1.0 244 -SHA256 51e212c94205f9e01019c667d156c77cd2a09cdd63881a1e396b5ac00a5f7d11 files/digest-vdr-live-0.1.0 244 -MD5 3779a82313e23f2c24984f0ca465c0a6 files/digest-vdr-live-0.1.0-r1 244 -RMD160 4bae0e4af78759938dd6a2c5bccc15a6bb7a2772 files/digest-vdr-live-0.1.0-r1 244 -SHA256 51e212c94205f9e01019c667d156c77cd2a09cdd63881a1e396b5ac00a5f7d11 files/digest-vdr-live-0.1.0-r1 244 -MD5 440d3e80fd0e94eb38b05b5f92918867 files/digest-vdr-live-0.1.0.20070704 253 -RMD160 346ffed2bd6e4df3422be4c74011915b7d7ad32e files/digest-vdr-live-0.1.0.20070704 253 -SHA256 418ad698480c55fe6024850ad6b7fbc89268abe153f2acf9bf9463b4a2be49c3 files/digest-vdr-live-0.1.0.20070704 253 -MD5 4cc4c8d1bfb8d3f3e996187218985051 files/digest-vdr-live-0.1.0.20070919 253 -RMD160 c24e8816782652be99a72e86d1e896df4b50e2e9 files/digest-vdr-live-0.1.0.20070919 253 -SHA256 b0abb9d156b24a0122a4b5903bf108b9661f8882161e40161267edf14edacff2 files/digest-vdr-live-0.1.0.20070919 253 MD5 30e871ce771b46c3ea8a763932070528 files/digest-vdr-live-0.1.0.20071111 253 RMD160 0b95c312bf671f73d69672d36ce24fa02ad31fb5 files/digest-vdr-live-0.1.0.20071111 253 SHA256 bda30b4ac5384985e018967bc22180fe0ba1feef97bc67eb0289115a7b65e486 files/digest-vdr-live-0.1.0.20071111 253 @@ -84,7 +33,7 @@ SHA256 bda30b4ac5384985e018967bc22180fe0ba1feef97bc67eb0289115a7b65e486 files/di Version: GnuPG v1.4.5 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFHNyq+dn07HTTCgIoRAigxAJ9mxc70CBy+z3DJzp/BxiX+pwynrgCfZgQq -ytzFVpJPmcSxhQ17ZEuUgHw= -=ncUh +iD8DBQFHNz3Jdn07HTTCgIoRAnV2AKCsbiOlI2wNwEqPnTEuvJ4QySIroACeLrZH +LHfG+sFynae+aMQ5+HCZ03E= +=0kId -----END PGP SIGNATURE----- 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" |