From 88a60314b16c1198666b71c634d12c4c8551bf70 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 10 Oct 2022 14:24:39 +0200 Subject: [PATCH 01/65] Updatae to 3.1.8 --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 528ec0a..08bd2a9 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -67,7 +67,7 @@ iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %if 0%{?fedora} > 35 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %else -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++11 -fPIC" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++14 -fPIC" %endif %install From 7b1330c5cd399d4fcc462e219465b741c0aec4e3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 17 Nov 2022 09:40:43 +0100 Subject: [PATCH 02/65] Rebuilt due undefined symbol: _ZN7vdrlive6cUsers14logged_in_userB5cxx11E --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 08bd2a9..80ea93f 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -14,7 +14,7 @@ Name: vdr-live Version: 3.1.8 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -89,6 +89,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Nov 17 2022 Martin Gansser - 3.1.8-2 +- Rebuilt due undefined symbol: _ZN7vdrlive6cUsers14logged_in_userB5cxx11E + * Mon Oct 10 2022 Martin Gansser - 3.1.8-1 - Updatae to 3.1.8 From 5f85e24c14c2db621d3900f5df8baa816408c056 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Nov 2022 18:36:47 +0100 Subject: [PATCH 03/65] Updatae to 3.1.9 --- sources | 2 +- vdr-live.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 79ed972..36c78f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.8.tar.gz) = 1f89e1b782ea258726e3cf6cf236a029937ba5df10ce04b6142084afd0912d5513efe601e9a82bd69a5fd5355d23036b90d0399bac616aed666ac00c062d5c9d +SHA512 (vdr-live-3.1.9.tar.gz) = 48c1068640b8332a55c2d10783bd68a1fbd0fc8313b32164d508b57d9cac94e617020b67dacc4cba7396d37a1ced13271d9dd063267479ffb22768e71e97a1cb diff --git a/vdr-live.spec b/vdr-live.spec index 528ec0a..bde992a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,7 +12,7 @@ %endif Name: vdr-live -Version: 3.1.8 +Version: 3.1.9 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -67,7 +67,7 @@ iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %if 0%{?fedora} > 35 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %else -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++11 -fPIC" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++14 -fPIC" %endif %install @@ -89,6 +89,12 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Nov 27 2022 Martin Gansser - 3.1.9-1 +- Updatae to 3.1.9 + +* Thu Nov 17 2022 Martin Gansser - 3.1.8-2 +- Rebuilt due undefined symbol: _ZN7vdrlive6cUsers14logged_in_userB5cxx11E + * Mon Oct 10 2022 Martin Gansser - 3.1.8-1 - Updatae to 3.1.8 From 5dcbb3acb1298da2004369327a7ad2aa08df301e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Nov 2022 18:43:15 +0100 Subject: [PATCH 04/65] Updatae to 3.1.9 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 79ed972..36c78f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.8.tar.gz) = 1f89e1b782ea258726e3cf6cf236a029937ba5df10ce04b6142084afd0912d5513efe601e9a82bd69a5fd5355d23036b90d0399bac616aed666ac00c062d5c9d +SHA512 (vdr-live-3.1.9.tar.gz) = 48c1068640b8332a55c2d10783bd68a1fbd0fc8313b32164d508b57d9cac94e617020b67dacc4cba7396d37a1ced13271d9dd063267479ffb22768e71e97a1cb diff --git a/vdr-live.spec b/vdr-live.spec index 80ea93f..bde992a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,9 +12,9 @@ %endif Name: vdr-live -Version: 3.1.8 +Version: 3.1.9 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -89,6 +89,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Nov 27 2022 Martin Gansser - 3.1.9-1 +- Updatae to 3.1.9 + * Thu Nov 17 2022 Martin Gansser - 3.1.8-2 - Rebuilt due undefined symbol: _ZN7vdrlive6cUsers14logged_in_userB5cxx11E From f3e0a44ff00aa6580e81e4acdd8c9191e02d4cfa Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 1 Dec 2022 16:59:40 +0100 Subject: [PATCH 05/65] Rebuilt for new VDR API version --- vdr-live.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index bde992a..7083601 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -3,18 +3,15 @@ %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global gitdate 20211228 # version we want build against -%global vdr_version 2.4.0 -%if 0%{?fedora} >= 36 %global vdr_version 2.6.1 -%endif -%if 0%{?fedora} == 35 -%global vdr_version 2.4.7 +%if 0%{?fedora} >= 38 +%global vdr_version 2.6.2 %endif Name: vdr-live Version: 3.1.9 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -65,7 +62,6 @@ iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build %if 0%{?fedora} > 35 -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %else %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++14 -fPIC" %endif @@ -89,6 +85,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Dec 01 2022 Martin Gansser - 3.1.9-2 +- Rebuilt for new VDR API version + * Sun Nov 27 2022 Martin Gansser - 3.1.9-1 - Updatae to 3.1.9 From a3b56127082f96a50e2a533db62d3315715d3c7c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 1 Dec 2022 17:11:51 +0100 Subject: [PATCH 06/65] Rebuilt for new VDR API version --- vdr-live.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 7083601..7d0d722 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -61,10 +61,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%if 0%{?fedora} > 35 -%else -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++14 -fPIC" -%endif +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install %make_install From 27112ed2f0412f1598430bd6112dd50676109d3e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 14 Dec 2022 16:50:30 +0100 Subject: [PATCH 07/65] Rebuilt for new VDR API version --- vdr-live.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 7d0d722..db664e6 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,13 +5,13 @@ # version we want build against %global vdr_version 2.6.1 %if 0%{?fedora} >= 38 -%global vdr_version 2.6.2 +%global vdr_version 2.6.3 %endif Name: vdr-live Version: 3.1.9 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Wed Dec 14 2022 Martin Gansser - 3.1.9-3 +- Rebuilt for new VDR API version + * Thu Dec 01 2022 Martin Gansser - 3.1.9-2 - Rebuilt for new VDR API version From 6be70cbe4bc43d50ab2adc6b17e6b99f498f6c73 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 26 Dec 2022 11:05:17 +0100 Subject: [PATCH 08/65] Update to 3.1.10 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 36c78f7..b2e8cb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.9.tar.gz) = 48c1068640b8332a55c2d10783bd68a1fbd0fc8313b32164d508b57d9cac94e617020b67dacc4cba7396d37a1ced13271d9dd063267479ffb22768e71e97a1cb +SHA512 (vdr-live-3.1.10.tar.gz) = 457439dad959cf43227ac356fa5cb9812392691dbe9299fdea969cc2e043c965a8cccedb991e820fbbf2c7fa3c62327ad311a7650b6a76319d270c9704e9a1ec diff --git a/vdr-live.spec b/vdr-live.spec index db664e6..2bc1a32 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,9 +9,9 @@ %endif Name: vdr-live -Version: 3.1.9 +Version: 3.1.10 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Dec 26 2022 Martin Gansser - 3.1.10-1 +- Update to 3.1.10 + * Wed Dec 14 2022 Martin Gansser - 3.1.9-3 - Rebuilt for new VDR API version From d15b01d06f3046cddffbedde4a3286657a048a9b Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 26 Dec 2022 11:14:22 +0100 Subject: [PATCH 09/65] Update to 3.1.10 --- sources | 2 +- vdr-live.spec | 22 +- vdr-plugin-live-noCopyTimer.patch | 378 ------------------------------ 3 files changed, 13 insertions(+), 389 deletions(-) delete mode 100644 vdr-plugin-live-noCopyTimer.patch diff --git a/sources b/sources index 36c78f7..b2e8cb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.9.tar.gz) = 48c1068640b8332a55c2d10783bd68a1fbd0fc8313b32164d508b57d9cac94e617020b67dacc4cba7396d37a1ced13271d9dd063267479ffb22768e71e97a1cb +SHA512 (vdr-live-3.1.10.tar.gz) = 457439dad959cf43227ac356fa5cb9812392691dbe9299fdea969cc2e043c965a8cccedb991e820fbbf2c7fa3c62327ad311a7650b6a76319d270c9704e9a1ec diff --git a/vdr-live.spec b/vdr-live.spec index bde992a..2bc1a32 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -3,16 +3,13 @@ %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global gitdate 20211228 # version we want build against -%global vdr_version 2.4.0 -%if 0%{?fedora} >= 36 %global vdr_version 2.6.1 -%endif -%if 0%{?fedora} == 35 -%global vdr_version 2.4.7 +%if 0%{?fedora} >= 38 +%global vdr_version 2.6.3 %endif Name: vdr-live -Version: 3.1.9 +Version: 3.1.10 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -64,11 +61,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%if 0%{?fedora} > 35 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" -%else -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++14 -fPIC" -%endif %install %make_install @@ -89,6 +82,15 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Dec 26 2022 Martin Gansser - 3.1.10-1 +- Update to 3.1.10 + +* Wed Dec 14 2022 Martin Gansser - 3.1.9-3 +- Rebuilt for new VDR API version + +* Thu Dec 01 2022 Martin Gansser - 3.1.9-2 +- Rebuilt for new VDR API version + * Sun Nov 27 2022 Martin Gansser - 3.1.9-1 - Updatae to 3.1.9 diff --git a/vdr-plugin-live-noCopyTimer.patch b/vdr-plugin-live-noCopyTimer.patch deleted file mode 100644 index 50603ca..0000000 --- a/vdr-plugin-live-noCopyTimer.patch +++ /dev/null @@ -1,378 +0,0 @@ -diff -Naur vdr-plugin-live-3.0.10/pages/searchresults.ecpp vdr-plugin-live-master/pages/searchresults.ecpp ---- vdr-plugin-live-3.0.10/pages/searchresults.ecpp 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/pages/searchresults.ecpp 2021-09-10 14:11:46.000000000 +0200 -@@ -62,53 +62,60 @@ - <%cpp> - std::string current_day = ""; - --#if VDRVERSNUM >= 20301 -- LOCK_CHANNELS_READ; --#endif - for (SearchResults::iterator result = results.begin(); result != results.end(); ++result) { - #if VDRVERSNUM >= 20301 -- cChannel* channel = (cChannel *)Channels->GetByChannelID(result->Channel()); -+ cStateKey StateKey; -+ if (const cChannels *Channels = cChannels::GetChannelsRead(StateKey)) { -+ #ifdef DEBUG_LOCK -+ dsyslog("live: pages/searchresults.ecpp LOCK_CHANNELS_READ"); -+ #endif -+ cChannel* channel = (cChannel *)Channels->GetByChannelID(result->Channel()); - #else - cChannel* channel = Channels.GetByChannelID(result->Channel()); - #endif -- if (!channel) continue; -- std::string channelname = channel->Name(); -- int channelnr = channel->Number(); -- std::string start(result->StartTime() ? FormatDateTime(tr("%I:%M %p"), result->StartTime()) : ""); -- std::string end(result->StopTime() ? FormatDateTime(tr("%I:%M %p"), result->StopTime()) : ""); -- std::string day(result->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), result->StartTime()) : ""); -- std::string description = result->Description(); -- std::string epgid = EpgEvents::EncodeDomId(result->Channel(), result->EventId()); -+ if (!channel) { -+ StateKey.Remove(); -+ continue; -+ } -+ std::string channelname = channel->Name(); -+ int channelnr = channel->Number(); -+ std::string start(result->StartTime() ? FormatDateTime(tr("%I:%M %p"), result->StartTime()) : ""); -+ std::string end(result->StopTime() ? FormatDateTime(tr("%I:%M %p"), result->StopTime()) : ""); -+ std::string day(result->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), result->StartTime()) : ""); -+ std::string description = result->Description(); -+ std::string epgid = EpgEvents::EncodeDomId(result->Channel(), result->EventId()); - -- bool truncated = false; -+ bool truncated = false; - -- bool bottom = false; -- SearchResults::iterator nextResult = result; ++nextResult; -- if (nextResult == results.end()) -- bottom = true; -- else { -- std::string nextDay(nextResult->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), nextResult->StartTime()) : ""); -- bottom = (day != nextDay); -- } -+ bool bottom = false; -+ SearchResults::iterator nextResult = result; ++nextResult; -+ if (nextResult == results.end()) -+ bottom = true; -+ else { -+ std::string nextDay(nextResult->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), nextResult->StartTime()) : ""); -+ bottom = (day != nextDay); -+ } - -- if (current_day != day) { -- if (current_day != "") { -+ if (current_day != day) { -+ if (current_day != "") { - -- -- -- -+ -+ -+ -+% } -+ -+
<$ day $>
-+ -+% current_day = day; - % } -- --
<$ day $>
-- --% current_day = day; -+% StateKey.Remove(); // release channels read lock before calling event_timer which make a timers read lock -+ -+ "><& pageelems.event_timer epgid=(epgid) &> -+ ">
<$ channelname $>
-+ ">
<$ start $> - <$ end $>
-+ ">
" + tr("Click to view details.")) &><& tooltip.display domId=(epgid) &>><$ result->Title() $>
<%cpp>if (result->ShortText().empty()) {  <%cpp> } <$ result->ShortText() $>
-+ - % } -- -- "><& pageelems.event_timer epgid=(epgid) &> -- ">
<$ channelname $>
-- ">
<$ start $> - <$ end $>
-- ">
" + tr("Click to view details.")) &><& tooltip.display domId=(epgid) &>><$ result->Title() $>
<%cpp>if (result->ShortText().empty()) {  <%cpp> } <$ result->ShortText() $>
-- - % } - - -diff -Naur vdr-plugin-live-3.0.10/pages/timers.ecpp vdr-plugin-live-master/pages/timers.ecpp ---- vdr-plugin-live-3.0.10/pages/timers.ecpp 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/pages/timers.ecpp 2021-09-10 14:11:46.000000000 +0200 -@@ -37,7 +37,7 @@ - timer = 0; - if ( !timerid.empty() ) { - std::string tId = SortedTimers::DecodeDomId(timerid); -- // dsyslog("live: DEBUG: TIMER: tId = %s", tId.c_str()); -+// dsyslog("live: DEBUG: TIMER: tId = %s", tId.c_str()); - timer = timers.GetByTimerId(tId); - if ( timer == 0 ) - throw HtmlError( tr("Couldn't find timer. Maybe you mistyped your request?") ); -@@ -70,25 +70,26 @@ - <& pageelems.logo &> - <& menu active=("timers") component=("timers.timer_actions")> -
--% if (timers.size() == 0) { -+<%cpp> -+ #ifdef DEBUG_LOCK -+ dsyslog("live: pages/timers.ecpp LOCK_TIMERS_READ"); -+ #endif -+ LOCK_TIMERS_READ; -+ cSortedTimers sortedTimers(Timers); -+ if (sortedTimers.Size() == 0) { -+ - <$ tr("No timer defined") $> - % } else { - - <%cpp> - // output of the timer list: -- for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { -- EpgInfoPtr epgEvent; -+ for (int i = 0; i < sortedTimers.Size(); i++) { -+ const cTimer *timer = sortedTimers[i]; -+ EpgInfoPtr epgEvent; - std::string longDescription; - std::string searchTimName; - std::string searchTimId; --#if VDRVERSNUM >= 20301 -- if (!timer->Event()) { -- LOCK_SCHEDULES_READ; -- timer->SetEventFromSchedule(Schedules); -- } --#else -- if (!timer->Event()) timer->SetEventFromSchedule(); --#endif -+ - if (timer->Event()) - { - epgEvent = EpgEvents::CreateEpgInfo(timer->Channel(), timer->Event()); -@@ -98,13 +99,13 @@ - searchTimName = SortedTimers::SearchTimerInfo(*timer, "searchtimer"); - searchTimId = SortedTimers::SearchTimerInfo(*timer, "s-id"); - } -- std::string currentDay = SortedTimers::GetTimerDays(*timer); -- SortedTimers::iterator nextTimer = timer; ++nextTimer; -+ std::string currentDay = SortedTimers::GetTimerDays(timer); -+ const cTimer *nextTimer = NULL; -+ if (i < (sortedTimers.Size() - 1)) nextTimer = sortedTimers[i + 1]; - bool bottom = false; -- if (nextTimer == timers.end()) -- bottom = true; -+ if (i == sortedTimers.Size() - 1) bottom = true; - else { -- std::string nextDay = SortedTimers::GetTimerDays(*nextTimer); -+ std::string nextDay = SortedTimers::GetTimerDays(nextTimer); - bottom = (currentDay != nextDay); - } - if (previousDay != currentDay) { -diff -Naur vdr-plugin-live-3.0.10/timers.cpp vdr-plugin-live-master/timers.cpp ---- vdr-plugin-live-3.0.10/timers.cpp 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/timers.cpp 2021-09-10 14:11:46.000000000 +0200 -@@ -11,11 +11,6 @@ - #include - #include - --static bool operator<( cTimer const& left, cTimer const& right ) --{ -- return left.Compare( right ) < 0; --} -- - namespace vdrlive { - - static char const* const TIMER_DELETE = "DELETE"; -@@ -26,7 +21,6 @@ - : m_state( 0 ) - #endif - { -- ReloadTimers(); - } - - std::string SortedTimers::GetTimerId( cTimer const& timer ) -@@ -46,6 +40,11 @@ - } - - #if VDRVERSNUM >= 20301 -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp SortedTimers::GetByTimerId() LOCK_TIMERS_READ"); -+ dsyslog("live: timers.cpp SortedTimers::GetByTimerId() LOCK_CHANNELS_READ"); -+ #endif -+ LOCK_TIMERS_READ - LOCK_CHANNELS_READ; - cChannel* channel = (cChannel *)Channels->GetByChannelID( tChannelID::FromString( parts[0].c_str() ) ); - #else -@@ -64,7 +63,7 @@ - - cMutexLock MutexLock(&m_mutex); - -- for ( SortedTimers::iterator timer = begin(); timer != end(); ++timer ) { -+ for (cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next(timer)) { - if ( timer->Channel() == channel && - ( ( weekdays != 0 && timer->WeekDays() == weekdays ) || ( weekdays == 0 && timer->Day() == day ) ) && - timer->Start() == start && timer->Stop() == stop ) -@@ -94,33 +93,12 @@ - } - - -- void SortedTimers::ReloadTimers() -- { --// dsyslog("live: SortedTimers::ReloadTimers() reloading timers"); -- -- cMutexLock MutexLock(&m_mutex); -- -- clear(); --#if VDRVERSNUM >= 20301 -- { -- LOCK_TIMERS_READ; -- for ( cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next( timer ) ) { -- push_back( *timer ); -- } -- } --#else -- for ( cTimer* timer = Timers.First(); timer; timer = Timers.Next( timer ) ) { -- push_back( *timer ); -- } --#endif -- sort(); -- } -- -- std::string SortedTimers::GetTimerDays(cTimer const& timer) -+ std::string SortedTimers::GetTimerDays(cTimer const *timer) - { -- std::string currentDay = timer.WeekDays() > 0 ? -- *cTimer::PrintDay(0, timer.WeekDays(), true) : -- FormatDateTime(tr("%A, %x"), timer.Day()); -+ if (!timer) return ""; -+ std::string currentDay = timer->WeekDays() > 0 ? -+ *cTimer::PrintDay(0, timer->WeekDays(), true) : -+ FormatDateTime(tr("%A, %x"), timer->Day()); - return currentDay; - } - -@@ -269,7 +247,6 @@ - if ( m_updateTimers.size() > 0 ) { - DoUpdateTimers(); - } -- DoReloadTimers(); - // dsyslog("live: SV: signalling waiters"); - m_updateWait.Broadcast(); - } -@@ -332,6 +309,9 @@ - } - #if VDRVERSNUM >= 20301 - dsyslog("live: DoInsertTimer() add local timer"); -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoInsertTimer() LOCK_TIMERS_WRITE"); -+ #endif - LOCK_TIMERS_WRITE; - Timers->SetExplicitModify(); - const cTimer *checkTimer = Timers->GetTimer( newTimer.get() ); -@@ -418,6 +398,9 @@ - else { // old and new are local - dsyslog("live: DoUpdateTimer() old and new timer are local"); - #if VDRVERSNUM >= 20301 -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoUpdateTimer() LOCK_TIMERS_WRITE"); -+ #endif - LOCK_TIMERS_WRITE; - Timers->SetExplicitModify(); - cTimer* oldTimer = Timers->GetById( timerData.id, timerData.oldRemote ); -@@ -494,6 +477,9 @@ - #endif - - #if VDRVERSNUM >= 20301 -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoDeleteTimer() LOCK_TIMERS_WRITE"); -+ #endif - LOCK_TIMERS_WRITE; - Timers->SetExplicitModify(); - cTimer* oldTimer = Timers->GetById( timerData.id, timerData.remote ); -@@ -527,6 +513,9 @@ - void TimerManager::DoToggleTimer( timerStruct& timerData ) - { - if ( timerData.remote ) { // toggle remote timer via svdrpsend -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoToggleTimer() LOCK_TIMERS_READ"); -+ #endif - LOCK_TIMERS_READ; - const cTimer* toggleTimer = Timers->GetById( timerData.id, timerData.remote ); - std::string command = "MODT "; -@@ -571,6 +560,9 @@ - #endif - - #if VDRVERSNUM >= 20301 -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoToggleTimer() LOCK_TIMERS_WRITE"); -+ #endif - LOCK_TIMERS_WRITE; - Timers->SetExplicitModify(); - cTimer* toggleTimer = Timers->GetById( timerData.id, timerData.remote ); -@@ -616,20 +608,18 @@ - const cTimer* TimerManager::GetTimer(tEventID eventid, tChannelID channelid) - { - cMutexLock timersLock( &LiveTimerManager() ); -- SortedTimers& timers = LiveTimerManager().GetTimers(); - -- for ( SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer ) -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::GetTimer() LOCK_TIMERS_READ"); -+ #endif -+ LOCK_TIMERS_READ; -+ for (cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next(timer)) { - if (timer->Channel() && timer->Channel()->GetChannelID() == channelid) - { --#if VDRVERSNUM >= 20301 -- LOCK_SCHEDULES_READ; -- if (!timer->Event()) timer->SetEventFromSchedule(Schedules); --#else -- if (!timer->Event()) timer->SetEventFromSchedule(); --#endif - if (timer->Event() && timer->Event()->EventID() == eventid) - return &*timer; - } -+ } - return NULL; - } - -diff -Naur vdr-plugin-live-3.0.10/timers.h vdr-plugin-live-master/timers.h ---- vdr-plugin-live-3.0.10/timers.h 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/timers.h 2021-09-10 14:11:46.000000000 +0200 -@@ -31,7 +31,7 @@ - bool Modified() { return Timers.Modified(m_state); } - #endif - -- static std::string GetTimerDays(cTimer const& timer); -+ static std::string GetTimerDays(cTimer const *timer); - static std::string GetTimerInfo(cTimer const& timer); - static std::string SearchTimerInfo(cTimer const& timer, std::string const& value); - -@@ -47,7 +47,6 @@ - int m_state; - #endif - -- void ReloadTimers(); - }; - - class TimerManager: public cMutex -@@ -64,7 +63,6 @@ - void ToggleTimerActive( int timerId, const char* remote); - // may only be called from Plugin::MainThreadHook - void DoPendingWork(); -- void DoReloadTimers() { m_timers.ReloadTimers(); m_reloadTimers = false; } - const cTimer* GetTimer(tEventID eventid, tChannelID channelid); - void SetReloadTimers() { m_reloadTimers = true; } - -diff -Naur vdr-plugin-live-3.0.10/tools.h vdr-plugin-live-master/tools.h ---- vdr-plugin-live-3.0.10/tools.h 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/tools.h 2021-09-10 14:11:46.000000000 +0200 -@@ -1,6 +1,9 @@ - #ifndef VDR_LIVE_TOOLS_H - #define VDR_LIVE_TOOLS_H - -+// uncomment to debug lock sequence -+// #define DEBUG_LOCK -+ - // STL headers need to be before VDR tools.h (included by ) - #include - #include From 5f02f1700acd72fdb656688516f6b9a5882d8355 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 6 Jan 2023 09:30:24 +0100 Subject: [PATCH 10/65] Rebuilt --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 2bc1a32..e8fe3d0 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -11,7 +11,7 @@ Name: vdr-live Version: 3.1.10 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Jan 06 2023 Martin Gansser - 3.1.10-2 +- Rebuilt + * Mon Dec 26 2022 Martin Gansser - 3.1.10-1 - Update to 3.1.10 From aa997dbeabc5edf82771076d8e2ede5b1709efde Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 18 Jan 2023 09:19:07 +0100 Subject: [PATCH 11/65] Update to 3.1.11 --- sources | 2 +- vdr-live.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b2e8cb7..6d9cff1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.10.tar.gz) = 457439dad959cf43227ac356fa5cb9812392691dbe9299fdea969cc2e043c965a8cccedb991e820fbbf2c7fa3c62327ad311a7650b6a76319d270c9704e9a1ec +SHA512 (vdr-live-3.1.11.tar.gz) = cf69b4a019dfc873566b776330ac28a405f5783836e45ad186dcc65a49b0020f508682ff2e01cfb2d3bddc954c23d417303f407983c55af7d2c27acefc287cea diff --git a/vdr-live.spec b/vdr-live.spec index 2bc1a32..ae103fe 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.1.10 +Version: 3.1.11 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,12 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Wed Jan 18 2023 Martin Gansser - 3.1.11-1 +- Update to 3.1.11 + +* Fri Jan 06 2023 Martin Gansser - 3.1.10-2 +- Rebuilt + * Mon Dec 26 2022 Martin Gansser - 3.1.10-1 - Update to 3.1.10 From 33db440fdd71414e2a8e2a7123363c96712bec8f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 18 Jan 2023 09:20:28 +0100 Subject: [PATCH 12/65] Update to 3.1.11 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index b2e8cb7..6d9cff1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.10.tar.gz) = 457439dad959cf43227ac356fa5cb9812392691dbe9299fdea969cc2e043c965a8cccedb991e820fbbf2c7fa3c62327ad311a7650b6a76319d270c9704e9a1ec +SHA512 (vdr-live-3.1.11.tar.gz) = cf69b4a019dfc873566b776330ac28a405f5783836e45ad186dcc65a49b0020f508682ff2e01cfb2d3bddc954c23d417303f407983c55af7d2c27acefc287cea diff --git a/vdr-live.spec b/vdr-live.spec index e8fe3d0..ae103fe 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,9 +9,9 @@ %endif Name: vdr-live -Version: 3.1.10 +Version: 3.1.11 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Wed Jan 18 2023 Martin Gansser - 3.1.11-1 +- Update to 3.1.11 + * Fri Jan 06 2023 Martin Gansser - 3.1.10-2 - Rebuilt From 9471ba2f696be25869ddc48ee74621c1a61ac746 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:10:42 +0000 Subject: [PATCH 13/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index ae103fe..55317e3 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -11,7 +11,7 @@ Name: vdr-live Version: 3.1.11 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 18 2023 Martin Gansser - 3.1.11-1 - Update to 3.1.11 From e44faa039bcc5ab550206c36cf27e4a1e9bee4e9 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 24 Jan 2023 13:38:32 +0100 Subject: [PATCH 14/65] Rebuilt --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6d9cff1..e0f6cbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.11.tar.gz) = cf69b4a019dfc873566b776330ac28a405f5783836e45ad186dcc65a49b0020f508682ff2e01cfb2d3bddc954c23d417303f407983c55af7d2c27acefc287cea +SHA512 (vdr-live-3.1.11.tar.gz) = f9b0bf16708fb21959bbefcd3d8d28f765670b1a10540cf3187a8a3506b5ad259830f1841c7cfd5fa050ae927c24003b70ac8aee98cdd2fa83fd22b390227489 diff --git a/vdr-live.spec b/vdr-live.spec index 55317e3..1a8c1f5 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -11,7 +11,7 @@ Name: vdr-live Version: 3.1.11 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Jan 24 2023 Martin Gansser - 3.1.11-3 +- Rebuilt + * Sat Jan 21 2023 Fedora Release Engineering - 3.1.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 60284c52dfb4b592dae4a14f890ee80a38a657c7 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 24 Jan 2023 13:39:38 +0100 Subject: [PATCH 15/65] Rebuilt --- sources | 2 +- vdr-live.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6d9cff1..e0f6cbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.11.tar.gz) = cf69b4a019dfc873566b776330ac28a405f5783836e45ad186dcc65a49b0020f508682ff2e01cfb2d3bddc954c23d417303f407983c55af7d2c27acefc287cea +SHA512 (vdr-live-3.1.11.tar.gz) = f9b0bf16708fb21959bbefcd3d8d28f765670b1a10540cf3187a8a3506b5ad259830f1841c7cfd5fa050ae927c24003b70ac8aee98cdd2fa83fd22b390227489 diff --git a/vdr-live.spec b/vdr-live.spec index ae103fe..1a8c1f5 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -11,7 +11,7 @@ Name: vdr-live Version: 3.1.11 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,12 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Jan 24 2023 Martin Gansser - 3.1.11-3 +- Rebuilt + +* Sat Jan 21 2023 Fedora Release Engineering - 3.1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 18 2023 Martin Gansser - 3.1.11-1 - Update to 3.1.11 From 1229db30cf0804d6dec3e20386e0f0128577ad53 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 11 Jun 2023 17:09:53 +0200 Subject: [PATCH 16/65] Update to 3.1.12 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index e0f6cbd..9a1021d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.11.tar.gz) = f9b0bf16708fb21959bbefcd3d8d28f765670b1a10540cf3187a8a3506b5ad259830f1841c7cfd5fa050ae927c24003b70ac8aee98cdd2fa83fd22b390227489 +SHA512 (vdr-live-3.1.12.tar.gz) = 3fb9b65d335c4ef1d602c5baa9c8b02cbe3597f8a1e58b18778fae3519fe52abf3b30053b2d23c88bc5ef026aa40d6120066b0696b18dfe54230b560549f3294 diff --git a/vdr-live.spec b/vdr-live.spec index 1a8c1f5..bafee3d 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.1.11 +Version: 3.1.12 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Jun 11 2023 Martin Gansser - 3.1.12-1 +- Update to 3.1.12 + * Tue Jan 24 2023 Martin Gansser - 3.1.11-3 - Rebuilt From 49f2d22a8b2a4f1cab718489eca5dc897690470e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 11 Jun 2023 17:13:10 +0200 Subject: [PATCH 17/65] Update to 3.1.12 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index e0f6cbd..9a1021d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.11.tar.gz) = f9b0bf16708fb21959bbefcd3d8d28f765670b1a10540cf3187a8a3506b5ad259830f1841c7cfd5fa050ae927c24003b70ac8aee98cdd2fa83fd22b390227489 +SHA512 (vdr-live-3.1.12.tar.gz) = 3fb9b65d335c4ef1d602c5baa9c8b02cbe3597f8a1e58b18778fae3519fe52abf3b30053b2d23c88bc5ef026aa40d6120066b0696b18dfe54230b560549f3294 diff --git a/vdr-live.spec b/vdr-live.spec index 1a8c1f5..bafee3d 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.1.11 +Version: 3.1.12 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Jun 11 2023 Martin Gansser - 3.1.12-1 +- Update to 3.1.12 + * Tue Jan 24 2023 Martin Gansser - 3.1.11-3 - Rebuilt From 1bb044c25a136aabbdfcece2f046726d877ebd50 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 11 Jun 2023 17:28:13 +0200 Subject: [PATCH 18/65] Update to 3.1.12 Add vdr-live-timerconflict.patch --- vdr-live-timerconflict.patch | 15 +++++++++++++++ vdr-live.spec | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 vdr-live-timerconflict.patch diff --git a/vdr-live-timerconflict.patch b/vdr-live-timerconflict.patch new file mode 100644 index 0000000..847ccef --- /dev/null +++ b/vdr-live-timerconflict.patch @@ -0,0 +1,15 @@ +diff --git a/timerconflict.h b/timerconflict.h +index f394f0b..9d61493 100644 +--- a/timerconflict.h ++++ b/timerconflict.h +@@ -7,6 +7,10 @@ + #include + #include + ++#if TNTVERSION >= 30000 ++ #include // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO) ++#endif ++ + #include + + namespace vdrlive { diff --git a/vdr-live.spec b/vdr-live.spec index bafee3d..3386786 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -20,6 +20,7 @@ URL: https://github.com/MarkusEh/vdr-plugin-live #Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf +Patch0: %{name}-timerconflict.patch BuildRequires: make BuildRequires: gcc-c++ @@ -84,6 +85,7 @@ install -Dpm 644 %{SOURCE1} \ %changelog * Sun Jun 11 2023 Martin Gansser - 3.1.12-1 - Update to 3.1.12 +- Add %{name}-timerconflict.patch * Tue Jan 24 2023 Martin Gansser - 3.1.11-3 - Rebuilt From f02f2ebe090affa7a0224133e7df5ea2762c1308 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 11 Jun 2023 17:32:45 +0200 Subject: [PATCH 19/65] Update to 3.1.12 Add vdr-live-timerconflict.patch --- vdr-live-timerconflict.patch | 15 +++++++++++++++ vdr-live.spec | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 vdr-live-timerconflict.patch diff --git a/vdr-live-timerconflict.patch b/vdr-live-timerconflict.patch new file mode 100644 index 0000000..847ccef --- /dev/null +++ b/vdr-live-timerconflict.patch @@ -0,0 +1,15 @@ +diff --git a/timerconflict.h b/timerconflict.h +index f394f0b..9d61493 100644 +--- a/timerconflict.h ++++ b/timerconflict.h +@@ -7,6 +7,10 @@ + #include + #include + ++#if TNTVERSION >= 30000 ++ #include // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO) ++#endif ++ + #include + + namespace vdrlive { diff --git a/vdr-live.spec b/vdr-live.spec index bafee3d..3386786 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -20,6 +20,7 @@ URL: https://github.com/MarkusEh/vdr-plugin-live #Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf +Patch0: %{name}-timerconflict.patch BuildRequires: make BuildRequires: gcc-c++ @@ -84,6 +85,7 @@ install -Dpm 644 %{SOURCE1} \ %changelog * Sun Jun 11 2023 Martin Gansser - 3.1.12-1 - Update to 3.1.12 +- Add %{name}-timerconflict.patch * Tue Jan 24 2023 Martin Gansser - 3.1.11-3 - Rebuilt From bfeb8a71b320c5a6bee0c2618ab26b97b1c5e907 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 18 Jun 2023 17:00:43 +0200 Subject: [PATCH 20/65] Update to 3.2.0 --- sources | 2 +- vdr-live.spec | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 9a1021d..198922f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.12.tar.gz) = 3fb9b65d335c4ef1d602c5baa9c8b02cbe3597f8a1e58b18778fae3519fe52abf3b30053b2d23c88bc5ef026aa40d6120066b0696b18dfe54230b560549f3294 +SHA512 (vdr-live-3.2.0.tar.gz) = ab7d4803aaaa4f3c4b4f661ed32c456fea8c19ab9ce78aed4347d0751bfc0f2bf077bf79d4c261301efa51a27025bac0b5ebc6d6c5585552d7e0d1780e5081e9 diff --git a/vdr-live.spec b/vdr-live.spec index 3386786..2914dd8 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,9 +9,9 @@ %endif Name: vdr-live -Version: 3.1.12 +Version: 3.2.0 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -20,7 +20,6 @@ URL: https://github.com/MarkusEh/vdr-plugin-live #Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf -Patch0: %{name}-timerconflict.patch BuildRequires: make BuildRequires: gcc-c++ @@ -83,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Jun 11 2023 Martin Gansser - 3.2.0-1 +- Update to 3.2.0 + * Sun Jun 11 2023 Martin Gansser - 3.1.12-1 - Update to 3.1.12 - Add %{name}-timerconflict.patch From c18b637fed869c04c8c1ba93b4bfcbcaa5cf7e7e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 18 Jun 2023 17:03:56 +0200 Subject: [PATCH 21/65] Update to 3.2.0 --- sources | 2 +- vdr-live.spec | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 9a1021d..198922f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.12.tar.gz) = 3fb9b65d335c4ef1d602c5baa9c8b02cbe3597f8a1e58b18778fae3519fe52abf3b30053b2d23c88bc5ef026aa40d6120066b0696b18dfe54230b560549f3294 +SHA512 (vdr-live-3.2.0.tar.gz) = ab7d4803aaaa4f3c4b4f661ed32c456fea8c19ab9ce78aed4347d0751bfc0f2bf077bf79d4c261301efa51a27025bac0b5ebc6d6c5585552d7e0d1780e5081e9 diff --git a/vdr-live.spec b/vdr-live.spec index 3386786..2914dd8 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,9 +9,9 @@ %endif Name: vdr-live -Version: 3.1.12 +Version: 3.2.0 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -20,7 +20,6 @@ URL: https://github.com/MarkusEh/vdr-plugin-live #Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf -Patch0: %{name}-timerconflict.patch BuildRequires: make BuildRequires: gcc-c++ @@ -83,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Jun 11 2023 Martin Gansser - 3.2.0-1 +- Update to 3.2.0 + * Sun Jun 11 2023 Martin Gansser - 3.1.12-1 - Update to 3.1.12 - Add %{name}-timerconflict.patch From 65c5c037bd02ec63ca4edfcd416948552c7c64bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:29:54 +0000 Subject: [PATCH 22/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 2914dd8..01bf1fe 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -11,7 +11,7 @@ Name: vdr-live Version: 3.2.0 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jun 11 2023 Martin Gansser - 3.2.0-1 - Update to 3.2.0 From 61ec194aed568a1ab7aa6cda6fc1d93f357eba1f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 3 Oct 2023 19:49:17 +0200 Subject: [PATCH 23/65] Update to 3.2.1 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 198922f..5a002b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.2.0.tar.gz) = ab7d4803aaaa4f3c4b4f661ed32c456fea8c19ab9ce78aed4347d0751bfc0f2bf077bf79d4c261301efa51a27025bac0b5ebc6d6c5585552d7e0d1780e5081e9 +SHA512 (vdr-live-3.2.1.tar.gz) = c008d1273c54509ea9c143eaea5648586f188d2ec74ee1da5e27a3a931e81f32d6b5d1215a2d41bbe6023bf744279e64619c55cb50d40fc8060a5f8e5d759744 diff --git a/vdr-live.spec b/vdr-live.spec index 01bf1fe..3f8b581 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,9 +9,9 @@ %endif Name: vdr-live -Version: 3.2.0 +Version: 3.2.1 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Oct 03 2023 Martin Gansser - 3.2.1-1 +- Update to 3.2.1 + * Sat Jul 22 2023 Fedora Release Engineering - 3.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 203ab1ae4919b093e5067131a1021b0c64c37f23 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 3 Oct 2023 19:52:01 +0200 Subject: [PATCH 24/65] Update to 3.2.1 --- sources | 2 +- vdr-live.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 198922f..5a002b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.2.0.tar.gz) = ab7d4803aaaa4f3c4b4f661ed32c456fea8c19ab9ce78aed4347d0751bfc0f2bf077bf79d4c261301efa51a27025bac0b5ebc6d6c5585552d7e0d1780e5081e9 +SHA512 (vdr-live-3.2.1.tar.gz) = c008d1273c54509ea9c143eaea5648586f188d2ec74ee1da5e27a3a931e81f32d6b5d1215a2d41bbe6023bf744279e64619c55cb50d40fc8060a5f8e5d759744 diff --git a/vdr-live.spec b/vdr-live.spec index 2914dd8..3f8b581 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.2.0 +Version: 3.2.1 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,12 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Oct 03 2023 Martin Gansser - 3.2.1-1 +- Update to 3.2.1 + +* Sat Jul 22 2023 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jun 11 2023 Martin Gansser - 3.2.0-1 - Update to 3.2.0 From fca797fb364e8c0cfac95132930070dc369c1762 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 19 Nov 2023 12:32:22 +0100 Subject: [PATCH 25/65] Update to 3.3.0 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5a002b0..23bb307 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.2.1.tar.gz) = c008d1273c54509ea9c143eaea5648586f188d2ec74ee1da5e27a3a931e81f32d6b5d1215a2d41bbe6023bf744279e64619c55cb50d40fc8060a5f8e5d759744 +SHA512 (vdr-live-3.3.0.tar.gz) = ecf9d5249011f07721899237272c1580ac49af8b3f9dbf1e527f54468a5d4fb4afa5ea9d4026d74a5ea4557fb9031bca827773f515d3c8f57998638b2ef4bbf6 diff --git a/vdr-live.spec b/vdr-live.spec index 3f8b581..517b186 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.2.1 +Version: 3.3.0 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Nov 19 2023 Martin Gansser - 3.3.0-1 +- Update to 3.3.0 + * Tue Oct 03 2023 Martin Gansser - 3.2.1-1 - Update to 3.2.1 From 16e2fb0eb979a97834e6473d5af917cd01816495 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 19 Nov 2023 12:33:23 +0100 Subject: [PATCH 26/65] Update to 3.3.0 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5a002b0..23bb307 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.2.1.tar.gz) = c008d1273c54509ea9c143eaea5648586f188d2ec74ee1da5e27a3a931e81f32d6b5d1215a2d41bbe6023bf744279e64619c55cb50d40fc8060a5f8e5d759744 +SHA512 (vdr-live-3.3.0.tar.gz) = ecf9d5249011f07721899237272c1580ac49af8b3f9dbf1e527f54468a5d4fb4afa5ea9d4026d74a5ea4557fb9031bca827773f515d3c8f57998638b2ef4bbf6 diff --git a/vdr-live.spec b/vdr-live.spec index 3f8b581..517b186 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.2.1 +Version: 3.3.0 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Nov 19 2023 Martin Gansser - 3.3.0-1 +- Update to 3.3.0 + * Tue Oct 03 2023 Martin Gansser - 3.2.1-1 - Update to 3.2.1 From a53b27252eb5d27ec907a53532ca3bc62c34fec5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 21 Nov 2023 08:43:07 +0100 Subject: [PATCH 27/65] Update to 3.3.1 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 23bb307..9591ed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.0.tar.gz) = ecf9d5249011f07721899237272c1580ac49af8b3f9dbf1e527f54468a5d4fb4afa5ea9d4026d74a5ea4557fb9031bca827773f515d3c8f57998638b2ef4bbf6 +SHA512 (vdr-live-3.3.1.tar.gz) = 28c87652e901fd3aca20ac40ec840ea5127d666466d065427a9fa75d8b1502ac5100168d97bd80eb416a43c69b2ff740f160d63328dee2bad38294ea9aea4066 diff --git a/vdr-live.spec b/vdr-live.spec index 517b186..a031055 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.3.0 +Version: 3.3.1 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Nov 21 2023 Martin Gansser - 3.3.1-1 +- Update to 3.3.1 + * Sun Nov 19 2023 Martin Gansser - 3.3.0-1 - Update to 3.3.0 From be65027dbf896c269147bf24cc46acdbfe93ccf3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 21 Nov 2023 08:49:33 +0100 Subject: [PATCH 28/65] Update to 3.3.1 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 23bb307..9591ed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.0.tar.gz) = ecf9d5249011f07721899237272c1580ac49af8b3f9dbf1e527f54468a5d4fb4afa5ea9d4026d74a5ea4557fb9031bca827773f515d3c8f57998638b2ef4bbf6 +SHA512 (vdr-live-3.3.1.tar.gz) = 28c87652e901fd3aca20ac40ec840ea5127d666466d065427a9fa75d8b1502ac5100168d97bd80eb416a43c69b2ff740f160d63328dee2bad38294ea9aea4066 diff --git a/vdr-live.spec b/vdr-live.spec index 517b186..a031055 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.3.0 +Version: 3.3.1 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Nov 21 2023 Martin Gansser - 3.3.1-1 +- Update to 3.3.1 + * Sun Nov 19 2023 Martin Gansser - 3.3.0-1 - Update to 3.3.0 From 12b562c975ceb44987078dbdf1b3290e64f44c6c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 27 Nov 2023 09:26:13 +0100 Subject: [PATCH 29/65] Update to 3.3.2 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9591ed6..26e96b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.1.tar.gz) = 28c87652e901fd3aca20ac40ec840ea5127d666466d065427a9fa75d8b1502ac5100168d97bd80eb416a43c69b2ff740f160d63328dee2bad38294ea9aea4066 +SHA512 (vdr-live-3.3.2.tar.gz) = 1fc6bbb15772578918de22f3fabb13693328bef349b479819c354f4dd9275c86c94e02c81f7515829ac385fe08e6a3538ca1fd9fb8b839d3c7ead3e592757875 diff --git a/vdr-live.spec b/vdr-live.spec index a031055..1930332 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.3.1 +Version: 3.3.2 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Nov 27 2023 Martin Gansser - 3.3.2-1 +- Update to 3.3.2 + * Tue Nov 21 2023 Martin Gansser - 3.3.1-1 - Update to 3.3.1 From 5e79957ed35928f6fb99e6466bc380127667ac56 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 27 Nov 2023 09:30:04 +0100 Subject: [PATCH 30/65] Update to 3.3.2 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9591ed6..26e96b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.1.tar.gz) = 28c87652e901fd3aca20ac40ec840ea5127d666466d065427a9fa75d8b1502ac5100168d97bd80eb416a43c69b2ff740f160d63328dee2bad38294ea9aea4066 +SHA512 (vdr-live-3.3.2.tar.gz) = 1fc6bbb15772578918de22f3fabb13693328bef349b479819c354f4dd9275c86c94e02c81f7515829ac385fe08e6a3538ca1fd9fb8b839d3c7ead3e592757875 diff --git a/vdr-live.spec b/vdr-live.spec index a031055..1930332 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.3.1 +Version: 3.3.2 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Nov 27 2023 Martin Gansser - 3.3.2-1 +- Update to 3.3.2 + * Tue Nov 21 2023 Martin Gansser - 3.3.1-1 - Update to 3.3.1 From f915fb4264b4622f41978ffedf85735e0c7e56b5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 20 Dec 2023 08:55:37 +0100 Subject: [PATCH 31/65] Update to 3.3.3 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 26e96b8..c32ae92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.2.tar.gz) = 1fc6bbb15772578918de22f3fabb13693328bef349b479819c354f4dd9275c86c94e02c81f7515829ac385fe08e6a3538ca1fd9fb8b839d3c7ead3e592757875 +SHA512 (vdr-live-3.3.3.tar.gz) = 227686dad5f43c55a75431ceacb574d81325a00259b65c4b66592f14c11ea7ac634076a881c36955b637a2ec3cc3305da4bb944f4b76df2b8d91eddc7906153a diff --git a/vdr-live.spec b/vdr-live.spec index 1930332..e5cda02 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -9,7 +9,7 @@ %endif Name: vdr-live -Version: 3.3.2 +Version: 3.3.3 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -82,6 +82,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Wed Dec 20 2023 Martin Gansser - 3.3.3-1 +- Update to 3.3.3 + * Mon Nov 27 2023 Martin Gansser - 3.3.2-1 - Update to 3.3.2 From e6b31539d753800ad7159d253c4774319abbc80f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 20:18:08 +0100 Subject: [PATCH 32/65] Rebuilt for new VDR API version Add BR gettext for rawhide --- sources | 2 +- vdr-live.spec | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c32ae92..c04e397 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.3.tar.gz) = 227686dad5f43c55a75431ceacb574d81325a00259b65c4b66592f14c11ea7ac634076a881c36955b637a2ec3cc3305da4bb944f4b76df2b8d91eddc7906153a +SHA512 (vdr-live-3.3.4.tar.gz) = 53938473a3dac670ab823e1c302e4215515f5f66f813db522283fd25f7a4322c952ea123c71729779e9cfee6d3f5542c21bb0ff4f13ab770575118bb44621d74 diff --git a/vdr-live.spec b/vdr-live.spec index e5cda02..4996e5e 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -3,13 +3,13 @@ %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global gitdate 20211228 # version we want build against -%global vdr_version 2.6.1 -%if 0%{?fedora} >= 38 %global vdr_version 2.6.3 +%if 0%{?fedora} >= 40 +%global vdr_version 2.6.5 %endif Name: vdr-live -Version: 3.3.3 +Version: 3.3.4 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -23,6 +23,7 @@ Source1: %{name}.conf BuildRequires: make BuildRequires: gcc-c++ +BuildRequires: gettext BuildRequires: vdr-devel >= %{vdr_version} BuildRequires: pcre2-devel BuildRequires: tntnet-devel @@ -82,6 +83,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Jan 05 2024 Martin Gansser - 3.3.4-1 +- Rebuilt for new VDR API version +- Add BR gettext for rawhide + * Wed Dec 20 2023 Martin Gansser - 3.3.3-1 - Update to 3.3.3 From f6b5a19ddf323471347ff57634384b3cbfd5b04c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 26 Jan 2024 11:49:44 +0100 Subject: [PATCH 33/65] Rebuilt for new VDR API version --- vdr-live.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 4996e5e..6abe78a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,13 +5,13 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.5 +%global vdr_version 2.6.6 %endif Name: vdr-live Version: 3.3.4 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -83,6 +83,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Jan 26 2024 Martin Gansser - 3.3.4-2 +- Rebuilt for new VDR API version + * Fri Jan 05 2024 Martin Gansser - 3.3.4-1 - Rebuilt for new VDR API version - Add BR gettext for rawhide From 81cf89571f0d77e37fa2b8d7d7590610d7c428a8 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 12 Apr 2024 16:33:33 +0200 Subject: [PATCH 34/65] Update to 3.3.5 Rebuilt for new VDR API version --- sources | 2 +- vdr-live.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c04e397..17f8c2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.4.tar.gz) = 53938473a3dac670ab823e1c302e4215515f5f66f813db522283fd25f7a4322c952ea123c71729779e9cfee6d3f5542c21bb0ff4f13ab770575118bb44621d74 +SHA512 (vdr-live-3.3.5.tar.gz) = 1ca2fc854f691acea3efebbd4cbac0b211801e8fe7d80b3d9678c71d86d392de4133a2837322fdc9b28ca3f27ce8e3b05cead512e670ff9d98ea42affb4bbffa diff --git a/vdr-live.spec b/vdr-live.spec index 6abe78a..1f3e196 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,13 +5,13 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.6 +%global vdr_version 2.6.7 %endif Name: vdr-live -Version: 3.3.4 +Version: 3.3.5 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -83,6 +83,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Apr 12 2024 Martin Gansser - 3.3.5-1 +- Update to 3.3.5 +- Rebuilt for new VDR API version + * Fri Jan 26 2024 Martin Gansser - 3.3.4-2 - Rebuilt for new VDR API version From 93e1a0fcd497ab11f8c34074228f852e18916a14 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 12 Apr 2024 16:35:17 +0200 Subject: [PATCH 35/65] Update to 3.3.5 Rebuilt for new VDR API version --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 1f3e196..4494f19 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -83,7 +83,7 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog -* Thu Apr 12 2024 Martin Gansser - 3.3.5-1 +* Fri Apr 12 2024 Martin Gansser - 3.3.5-1 - Update to 3.3.5 - Rebuilt for new VDR API version From acb12d75b9e0d22496ed13be4e7a878260920aae Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 12 Jul 2024 08:51:05 +0200 Subject: [PATCH 36/65] Rebuilt for new VDR API version 2.6.8 --- vdr-live.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 4494f19..4e1ddad 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,13 +5,13 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.7 +%global vdr_version 2.6.8 %endif Name: vdr-live Version: 3.3.5 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -83,6 +83,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Jul 12 2024 Martin Gansser - 3.3.5-2 +- Rebuilt for new VDR API version 2.6.8 + * Fri Apr 12 2024 Martin Gansser - 3.3.5-1 - Update to 3.3.5 - Rebuilt for new VDR API version From 914f4c0a33af3e8471d73e2077357f5293912a95 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 15 Jul 2024 16:27:58 +0200 Subject: [PATCH 37/65] Rebuilt for new VDR API version 2.6.9 --- vdr-live.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 4e1ddad..7558a79 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,13 +5,13 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.8 +%global vdr_version 2.6.9 %endif Name: vdr-live Version: 3.3.5 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -83,6 +83,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Jul 15 2024 Martin Gansser - 3.3.5-3 +- Rebuilt for new VDR API version 2.6.9 + * Fri Jul 12 2024 Martin Gansser - 3.3.5-2 - Rebuilt for new VDR API version 2.6.8 From 003cba763b3945380e576738ab4ff74fda2b43af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:39:06 +0000 Subject: [PATCH 38/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 7558a79..5c5cf18 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -11,7 +11,7 @@ Name: vdr-live Version: 3.3.5 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT @@ -83,6 +83,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Martin Gansser - 3.3.5-3 - Rebuilt for new VDR API version 2.6.9 From 8f674674f9485f27f774ea4d76ae5df4427f0db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:38:26 +0200 Subject: [PATCH 39/65] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vdr-live.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 5c5cf18..e61d4bb 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -11,11 +11,12 @@ Name: vdr-live Version: 3.3.5 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 4%{?dist} +Release: 5%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT -License: GPLv2+ and MIT +# Automatically converted from old format: GPLv2+ and MIT - review is highly recommended. +License: GPL-2.0-or-later AND LicenseRef-Callaway-MIT URL: https://github.com/MarkusEh/vdr-plugin-live #Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -83,6 +84,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Wed Sep 04 2024 Miroslav Suchý - 3.3.5-5 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.3.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 31fb1414908caec7f5dd23801d85b1cfb379da04 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 9 Oct 2024 15:15:39 +0200 Subject: [PATCH 40/65] Rebuilt for new VDR API version 2.7.2 Update to 3.3.8-0.1.20241008git80b8da8 --- sources | 2 +- vdr-live.spec | 38 ++++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/sources b/sources index 17f8c2d..4feeccb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.5.tar.gz) = 1ca2fc854f691acea3efebbd4cbac0b211801e8fe7d80b3d9678c71d86d392de4133a2837322fdc9b28ca3f27ce8e3b05cead512e670ff9d98ea42affb4bbffa +SHA512 (vdr-live-3.3.8-80b8da8.tar.gz) = 35abdd198f7f4df510a0da8f461228bcbbf93fa9aac020f4b0faef16508f562e0aedec12ce2561ba8f3a1726aa5828392f6df812f02cc6781b227e9be49a6e39 diff --git a/vdr-live.spec b/vdr-live.spec index e61d4bb..aa18c33 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,25 +1,27 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/0fbd9b32fc6afcdbe8722daa0e772260cd058f41 -%global commit0 0fbd9b32fc6afcdbe8722daa0e772260cd058f41 +# https://github.com/MarkusEh/vdr-plugin-live/commit/80b8da8af509fc0c4e93338b0a680b05d7d1e550 +%global commit0 80b8da8af509fc0c4e93338b0a680b05d7d1e550 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20211228 -# version we want build against +%global gitdate 20241008 +# version we want to build against %global vdr_version 2.6.3 -%if 0%{?fedora} >= 40 +# Set vdr_version based on Fedora version +%if 0%{?fedora} >= 42 +%global vdr_version 2.7.2 +%elif 0%{?fedora} >= 40 %global vdr_version 2.6.9 %endif Name: vdr-live -Version: 3.3.5 -#Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 5%{?dist} +Version: 3.3.8 +Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} +# Release: 1%%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR -# The entire source code is GPLv2+ except live/js/mootools/ which is MIT -# Automatically converted from old format: GPLv2+ and MIT - review is highly recommended. +# The entire source code is GPL-2.0-or-later except live/js/mootools/ which is MIT License: GPL-2.0-or-later AND LicenseRef-Callaway-MIT URL: https://github.com/MarkusEh/vdr-plugin-live -#Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz -Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz +# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz Source1: %{name}.conf BuildRequires: make @@ -51,8 +53,8 @@ Requires: %{name} = %{version}-%{release} This package contains images, themes and JavaScript. %prep -#%%autosetup -p1 -n vdr-plugin-live-%%{commit0} -%autosetup -p1 -n vdr-plugin-live-%{version} +%autosetup -p1 -n vdr-plugin-live-%{commit0} +#%%autosetup -p1 -n vdr-plugin-live-%%{version} # delete unused directories and files find -name .git -type d -or -name gitignore -type d | xargs rm -rfv @@ -78,12 +80,20 @@ install -Dpm 644 %{SOURCE1} \ %doc CONTRIBUTORS README %license COPYING %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/live.conf +%config(noreplace) %{_sysconfdir}/vdr/plugins/live/ffmpeg.conf %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %files data %{vdr_resdir}/plugins/live/ %changelog +* Wed Oct 09 2024 Martin Gansser - 3.3.8-0.1.20241008git80b8da8 +- Rebuilt for new VDR API version 2.7.2 +- Update to 3.3.8-0.1.20241008git80b8da8 + +* Mon Sep 30 2024 Martin Gansser - 3.3.7-1 +- Update to 3.3.7 + * Wed Sep 04 2024 Miroslav Suchý - 3.3.5-5 - convert license to SPDX From b00a7b4dd0272b3c91a6e336ec779dd39581af13 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 22 Oct 2024 15:06:46 +0200 Subject: [PATCH 41/65] Update to 3.3.8-0.2.20241022git8b97db3 Update to 3.3.8-0.2.20241022git8b97db3 --- sources | 2 +- vdr-live.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 4feeccb..511d342 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.8-80b8da8.tar.gz) = 35abdd198f7f4df510a0da8f461228bcbbf93fa9aac020f4b0faef16508f562e0aedec12ce2561ba8f3a1726aa5828392f6df812f02cc6781b227e9be49a6e39 +SHA512 (vdr-live-3.3.8-8b97db3.tar.gz) = 1e225f3e8774baa281426a9e3f18a0ae9101812731a349cbe823f8b23d3feec1cc71d18170a7c360a8bf80c61266762a268d45ae49fa82bde3f64fa0c8abc695 diff --git a/vdr-live.spec b/vdr-live.spec index aa18c33..ad782ef 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,7 +1,7 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/80b8da8af509fc0c4e93338b0a680b05d7d1e550 -%global commit0 80b8da8af509fc0c4e93338b0a680b05d7d1e550 +# https://github.com/MarkusEh/vdr-plugin-live/commit/8b97db3483f03d6ba150ba4cf43820a888c99295 +%global commit0 8b97db3483f03d6ba150ba4cf43820a888c99295 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20241008 +%global gitdate 20241022 # version we want to build against %global vdr_version 2.6.3 # Set vdr_version based on Fedora version @@ -13,7 +13,7 @@ Name: vdr-live Version: 3.3.8 -Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} # Release: 1%%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Oct 22 2024 Martin Gansser - 3.3.8-0.2.20241022git8b97db3 +- Update to 3.3.8-0.2.20241022git8b97db3 + * Wed Oct 09 2024 Martin Gansser - 3.3.8-0.1.20241008git80b8da8 - Rebuilt for new VDR API version 2.7.2 - Update to 3.3.8-0.1.20241008git80b8da8 From 08b9af0067880a5f7ddeb240efebd8475753d2be Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 26 Oct 2024 18:08:36 +0200 Subject: [PATCH 42/65] Update to 3.3.8 Update to 3.3.8 --- sources | 2 +- vdr-live.spec | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 511d342..3516e7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.8-8b97db3.tar.gz) = 1e225f3e8774baa281426a9e3f18a0ae9101812731a349cbe823f8b23d3feec1cc71d18170a7c360a8bf80c61266762a268d45ae49fa82bde3f64fa0c8abc695 +SHA512 (vdr-live-3.3.8.tar.gz) = 7d05ceebd7cb90aa97ff866adcd10a3a747704c1a55dfb390c4fc62c848c1c16dc982b6d39ca5f131d49081f7ec204feabd654be2863b68d57e2dbf0666c5ad8 diff --git a/vdr-live.spec b/vdr-live.spec index ad782ef..0e8ee00 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -13,15 +13,15 @@ Name: vdr-live Version: 3.3.8 -Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} -# Release: 1%%{?dist} +# Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is MIT License: GPL-2.0-or-later AND LicenseRef-Callaway-MIT URL: https://github.com/MarkusEh/vdr-plugin-live -Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz -# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz +# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz +Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf BuildRequires: make @@ -53,8 +53,8 @@ Requires: %{name} = %{version}-%{release} This package contains images, themes and JavaScript. %prep -%autosetup -p1 -n vdr-plugin-live-%{commit0} -#%%autosetup -p1 -n vdr-plugin-live-%%{version} +#%%autosetup -p1 -n vdr-plugin-live-%{commit0} +%autosetup -p1 -n vdr-plugin-live-%{version} # delete unused directories and files find -name .git -type d -or -name gitignore -type d | xargs rm -rfv @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Oct 26 2024 Martin Gansser - 3.3.8-1 +- Update to 3.3.8 + * Tue Oct 22 2024 Martin Gansser - 3.3.8-0.2.20241022git8b97db3 - Update to 3.3.8-0.2.20241022git8b97db3 From 527c6b7ba7f125b9ade4bb9f00968a861b4e1c2e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 2 Nov 2024 15:15:37 +0100 Subject: [PATCH 43/65] Update to 3.3.9-0.1.20241101gitf67dfc0 Update to 3.3.9-0.1.20241101gitf67dfc0 --- sources | 2 +- vdr-live.spec | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sources b/sources index 3516e7b..715d118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.8.tar.gz) = 7d05ceebd7cb90aa97ff866adcd10a3a747704c1a55dfb390c4fc62c848c1c16dc982b6d39ca5f131d49081f7ec204feabd654be2863b68d57e2dbf0666c5ad8 +SHA512 (vdr-live-3.3.9-f67dfc0.tar.gz) = 8e346221bbb16cdd07daf818bf27ec4f5c5ea1c638f1e09b272abf77b3f7be6b08a7f5b4ed4e55823dc27e3fd0fa3832166cfe073dc8ac54a892ed62d0ac1d02 diff --git a/vdr-live.spec b/vdr-live.spec index 0e8ee00..06207fc 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,7 +1,7 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/8b97db3483f03d6ba150ba4cf43820a888c99295 -%global commit0 8b97db3483f03d6ba150ba4cf43820a888c99295 +# https://github.com/MarkusEh/vdr-plugin-live/commit/f67dfc0723b2ebf2b03ab0b5158597c77ff24b94 +%global commit0 f67dfc0723b2ebf2b03ab0b5158597c77ff24b94 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20241022 +%global gitdate 20241102 # version we want to build against %global vdr_version 2.6.3 # Set vdr_version based on Fedora version @@ -12,16 +12,16 @@ %endif Name: vdr-live -Version: 3.3.8 -# Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Version: 3.3.9 +Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} +# Release: 1%%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is MIT License: GPL-2.0-or-later AND LicenseRef-Callaway-MIT URL: https://github.com/MarkusEh/vdr-plugin-live -# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz -Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz +# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz Source1: %{name}.conf BuildRequires: make @@ -53,8 +53,8 @@ Requires: %{name} = %{version}-%{release} This package contains images, themes and JavaScript. %prep -#%%autosetup -p1 -n vdr-plugin-live-%{commit0} -%autosetup -p1 -n vdr-plugin-live-%{version} +%autosetup -p1 -n vdr-plugin-live-%{commit0} +#%%autosetup -p1 -n vdr-plugin-live-%%{version} # delete unused directories and files find -name .git -type d -or -name gitignore -type d | xargs rm -rfv @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Oct 26 2024 Martin Gansser - 3.3.9-0.1.20241101gitf67dfc0 +- Update to 3.3.9-0.1.20241101gitf67dfc0 + * Sat Oct 26 2024 Martin Gansser - 3.3.8-1 - Update to 3.3.8 From bae9b62df4f7b4ca65d79edb93e7a271511385de Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 3 Nov 2024 18:25:14 +0100 Subject: [PATCH 44/65] Update to 3.3.9-0.2.20241103git9967f1d Update to 3.3.9-0.2.20241103git9967f1d --- sources | 2 +- vdr-live.spec | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 715d118..be8de91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.9-f67dfc0.tar.gz) = 8e346221bbb16cdd07daf818bf27ec4f5c5ea1c638f1e09b272abf77b3f7be6b08a7f5b4ed4e55823dc27e3fd0fa3832166cfe073dc8ac54a892ed62d0ac1d02 +SHA512 (vdr-live-3.3.9-9967f1d.tar.gz) = f050dd91e46ac88ce094dd48174049ab361da13b35dd87123a84961256a2589ef544fdf424e8d7454e711a7306ba172cc7dd7390537d126195dd5255624349b4 diff --git a/vdr-live.spec b/vdr-live.spec index 06207fc..082ccdc 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,7 +1,7 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/f67dfc0723b2ebf2b03ab0b5158597c77ff24b94 -%global commit0 f67dfc0723b2ebf2b03ab0b5158597c77ff24b94 +# https://github.com/MarkusEh/vdr-plugin-live/commit/9967f1d6757a4f4855a6b07abf526258838dd5ac +%global commit0 9967f1d6757a4f4855a6b07abf526258838dd5ac %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20241102 +%global gitdate 20241103 # version we want to build against %global vdr_version 2.6.3 # Set vdr_version based on Fedora version @@ -13,7 +13,7 @@ Name: vdr-live Version: 3.3.9 -Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} # Release: 1%%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -87,7 +87,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog -* Sat Oct 26 2024 Martin Gansser - 3.3.9-0.1.20241101gitf67dfc0 +* Sun Nov 03 2024 Martin Gansser - 3.3.9-0.2.20241103git9967f1d +- Update to 3.3.9-0.2.20241103git9967f1d + +* Sat Nov 02 2024 Martin Gansser - 3.3.9-0.1.20241101gitf67dfc0 - Update to 3.3.9-0.1.20241101gitf67dfc0 * Sat Oct 26 2024 Martin Gansser - 3.3.8-1 From a7b56c7996105641a7d8bfb69c39c9a0b92c6f2b Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 5 Nov 2024 17:08:18 +0100 Subject: [PATCH 45/65] Update to 3.3.9 Update to 3.3.9 --- sources | 2 +- vdr-live-timerconflict.patch | 15 -- vdr-live.spec | 15 +- vdr-plugin-live-noCopyTimer.patch | 378 ------------------------------ 4 files changed, 10 insertions(+), 400 deletions(-) delete mode 100644 vdr-live-timerconflict.patch delete mode 100644 vdr-plugin-live-noCopyTimer.patch diff --git a/sources b/sources index be8de91..5bb5da4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.9-9967f1d.tar.gz) = f050dd91e46ac88ce094dd48174049ab361da13b35dd87123a84961256a2589ef544fdf424e8d7454e711a7306ba172cc7dd7390537d126195dd5255624349b4 +SHA512 (vdr-live-3.3.9.tar.gz) = 484abd66618221c6459b2f256127a592b6de071bef4c3ed1ef005b9b0879fc620cc4456abee61298d0ea3cf93ce9ea7cc666f3fac199eb918ae1b86ec0a03472 diff --git a/vdr-live-timerconflict.patch b/vdr-live-timerconflict.patch deleted file mode 100644 index 847ccef..0000000 --- a/vdr-live-timerconflict.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/timerconflict.h b/timerconflict.h -index f394f0b..9d61493 100644 ---- a/timerconflict.h -+++ b/timerconflict.h -@@ -7,6 +7,10 @@ - #include - #include - -+#if TNTVERSION >= 30000 -+ #include // must be loaded before any vdr include because of duplicate macros (LOG_ERROR, LOG_DEBUG, LOG_INFO) -+#endif -+ - #include - - namespace vdrlive { diff --git a/vdr-live.spec b/vdr-live.spec index 082ccdc..a327d08 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -13,15 +13,15 @@ Name: vdr-live Version: 3.3.9 -Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} -# Release: 1%%{?dist} +# Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is MIT License: GPL-2.0-or-later AND LicenseRef-Callaway-MIT URL: https://github.com/MarkusEh/vdr-plugin-live -Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz -# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz +# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz +Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf BuildRequires: make @@ -53,8 +53,8 @@ Requires: %{name} = %{version}-%{release} This package contains images, themes and JavaScript. %prep -%autosetup -p1 -n vdr-plugin-live-%{commit0} -#%%autosetup -p1 -n vdr-plugin-live-%%{version} +#%%autosetup -p1 -n vdr-plugin-live-%{commit0} +%autosetup -p1 -n vdr-plugin-live-%{version} # delete unused directories and files find -name .git -type d -or -name gitignore -type d | xargs rm -rfv @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Nov 05 2024 Martin Gansser - 3.3.9-1 +- Update to 3.3.9 + * Sun Nov 03 2024 Martin Gansser - 3.3.9-0.2.20241103git9967f1d - Update to 3.3.9-0.2.20241103git9967f1d diff --git a/vdr-plugin-live-noCopyTimer.patch b/vdr-plugin-live-noCopyTimer.patch deleted file mode 100644 index 50603ca..0000000 --- a/vdr-plugin-live-noCopyTimer.patch +++ /dev/null @@ -1,378 +0,0 @@ -diff -Naur vdr-plugin-live-3.0.10/pages/searchresults.ecpp vdr-plugin-live-master/pages/searchresults.ecpp ---- vdr-plugin-live-3.0.10/pages/searchresults.ecpp 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/pages/searchresults.ecpp 2021-09-10 14:11:46.000000000 +0200 -@@ -62,53 +62,60 @@ - <%cpp> - std::string current_day = ""; - --#if VDRVERSNUM >= 20301 -- LOCK_CHANNELS_READ; --#endif - for (SearchResults::iterator result = results.begin(); result != results.end(); ++result) { - #if VDRVERSNUM >= 20301 -- cChannel* channel = (cChannel *)Channels->GetByChannelID(result->Channel()); -+ cStateKey StateKey; -+ if (const cChannels *Channels = cChannels::GetChannelsRead(StateKey)) { -+ #ifdef DEBUG_LOCK -+ dsyslog("live: pages/searchresults.ecpp LOCK_CHANNELS_READ"); -+ #endif -+ cChannel* channel = (cChannel *)Channels->GetByChannelID(result->Channel()); - #else - cChannel* channel = Channels.GetByChannelID(result->Channel()); - #endif -- if (!channel) continue; -- std::string channelname = channel->Name(); -- int channelnr = channel->Number(); -- std::string start(result->StartTime() ? FormatDateTime(tr("%I:%M %p"), result->StartTime()) : ""); -- std::string end(result->StopTime() ? FormatDateTime(tr("%I:%M %p"), result->StopTime()) : ""); -- std::string day(result->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), result->StartTime()) : ""); -- std::string description = result->Description(); -- std::string epgid = EpgEvents::EncodeDomId(result->Channel(), result->EventId()); -+ if (!channel) { -+ StateKey.Remove(); -+ continue; -+ } -+ std::string channelname = channel->Name(); -+ int channelnr = channel->Number(); -+ std::string start(result->StartTime() ? FormatDateTime(tr("%I:%M %p"), result->StartTime()) : ""); -+ std::string end(result->StopTime() ? FormatDateTime(tr("%I:%M %p"), result->StopTime()) : ""); -+ std::string day(result->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), result->StartTime()) : ""); -+ std::string description = result->Description(); -+ std::string epgid = EpgEvents::EncodeDomId(result->Channel(), result->EventId()); - -- bool truncated = false; -+ bool truncated = false; - -- bool bottom = false; -- SearchResults::iterator nextResult = result; ++nextResult; -- if (nextResult == results.end()) -- bottom = true; -- else { -- std::string nextDay(nextResult->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), nextResult->StartTime()) : ""); -- bottom = (day != nextDay); -- } -+ bool bottom = false; -+ SearchResults::iterator nextResult = result; ++nextResult; -+ if (nextResult == results.end()) -+ bottom = true; -+ else { -+ std::string nextDay(nextResult->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), nextResult->StartTime()) : ""); -+ bottom = (day != nextDay); -+ } - -- if (current_day != day) { -- if (current_day != "") { -+ if (current_day != day) { -+ if (current_day != "") { - -- -- -+ -+ -+% } -+ -+ -+ -+% current_day = day; - % } -- -- -- --% current_day = day; -+% StateKey.Remove(); // release channels read lock before calling event_timer which make a timers read lock -+ -+ -+ -+ -+ -+ - % } -- -- -- -- -- -- - % } -
--
-+
<$ day $>
<$ day $>
"><& pageelems.event_timer epgid=(epgid) &>">
<$ channelname $>
">
<$ start $> - <$ end $>
">
" + tr("Click to view details.")) &><& tooltip.display domId=(epgid) &>><$ result->Title() $>
<%cpp>if (result->ShortText().empty()) {  <%cpp> } <$ result->ShortText() $>
"><& pageelems.event_timer epgid=(epgid) &>">
<$ channelname $>
">
<$ start $> - <$ end $>
">
" + tr("Click to view details.")) &><& tooltip.display domId=(epgid) &>><$ result->Title() $>
<%cpp>if (result->ShortText().empty()) {  <%cpp> } <$ result->ShortText() $>
-
-diff -Naur vdr-plugin-live-3.0.10/pages/timers.ecpp vdr-plugin-live-master/pages/timers.ecpp ---- vdr-plugin-live-3.0.10/pages/timers.ecpp 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/pages/timers.ecpp 2021-09-10 14:11:46.000000000 +0200 -@@ -37,7 +37,7 @@ - timer = 0; - if ( !timerid.empty() ) { - std::string tId = SortedTimers::DecodeDomId(timerid); -- // dsyslog("live: DEBUG: TIMER: tId = %s", tId.c_str()); -+// dsyslog("live: DEBUG: TIMER: tId = %s", tId.c_str()); - timer = timers.GetByTimerId(tId); - if ( timer == 0 ) - throw HtmlError( tr("Couldn't find timer. Maybe you mistyped your request?") ); -@@ -70,25 +70,26 @@ - <& pageelems.logo &> - <& menu active=("timers") component=("timers.timer_actions")> -
--% if (timers.size() == 0) { -+<%cpp> -+ #ifdef DEBUG_LOCK -+ dsyslog("live: pages/timers.ecpp LOCK_TIMERS_READ"); -+ #endif -+ LOCK_TIMERS_READ; -+ cSortedTimers sortedTimers(Timers); -+ if (sortedTimers.Size() == 0) { -+ - <$ tr("No timer defined") $> - % } else { - - <%cpp> - // output of the timer list: -- for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { -- EpgInfoPtr epgEvent; -+ for (int i = 0; i < sortedTimers.Size(); i++) { -+ const cTimer *timer = sortedTimers[i]; -+ EpgInfoPtr epgEvent; - std::string longDescription; - std::string searchTimName; - std::string searchTimId; --#if VDRVERSNUM >= 20301 -- if (!timer->Event()) { -- LOCK_SCHEDULES_READ; -- timer->SetEventFromSchedule(Schedules); -- } --#else -- if (!timer->Event()) timer->SetEventFromSchedule(); --#endif -+ - if (timer->Event()) - { - epgEvent = EpgEvents::CreateEpgInfo(timer->Channel(), timer->Event()); -@@ -98,13 +99,13 @@ - searchTimName = SortedTimers::SearchTimerInfo(*timer, "searchtimer"); - searchTimId = SortedTimers::SearchTimerInfo(*timer, "s-id"); - } -- std::string currentDay = SortedTimers::GetTimerDays(*timer); -- SortedTimers::iterator nextTimer = timer; ++nextTimer; -+ std::string currentDay = SortedTimers::GetTimerDays(timer); -+ const cTimer *nextTimer = NULL; -+ if (i < (sortedTimers.Size() - 1)) nextTimer = sortedTimers[i + 1]; - bool bottom = false; -- if (nextTimer == timers.end()) -- bottom = true; -+ if (i == sortedTimers.Size() - 1) bottom = true; - else { -- std::string nextDay = SortedTimers::GetTimerDays(*nextTimer); -+ std::string nextDay = SortedTimers::GetTimerDays(nextTimer); - bottom = (currentDay != nextDay); - } - if (previousDay != currentDay) { -diff -Naur vdr-plugin-live-3.0.10/timers.cpp vdr-plugin-live-master/timers.cpp ---- vdr-plugin-live-3.0.10/timers.cpp 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/timers.cpp 2021-09-10 14:11:46.000000000 +0200 -@@ -11,11 +11,6 @@ - #include - #include - --static bool operator<( cTimer const& left, cTimer const& right ) --{ -- return left.Compare( right ) < 0; --} -- - namespace vdrlive { - - static char const* const TIMER_DELETE = "DELETE"; -@@ -26,7 +21,6 @@ - : m_state( 0 ) - #endif - { -- ReloadTimers(); - } - - std::string SortedTimers::GetTimerId( cTimer const& timer ) -@@ -46,6 +40,11 @@ - } - - #if VDRVERSNUM >= 20301 -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp SortedTimers::GetByTimerId() LOCK_TIMERS_READ"); -+ dsyslog("live: timers.cpp SortedTimers::GetByTimerId() LOCK_CHANNELS_READ"); -+ #endif -+ LOCK_TIMERS_READ - LOCK_CHANNELS_READ; - cChannel* channel = (cChannel *)Channels->GetByChannelID( tChannelID::FromString( parts[0].c_str() ) ); - #else -@@ -64,7 +63,7 @@ - - cMutexLock MutexLock(&m_mutex); - -- for ( SortedTimers::iterator timer = begin(); timer != end(); ++timer ) { -+ for (cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next(timer)) { - if ( timer->Channel() == channel && - ( ( weekdays != 0 && timer->WeekDays() == weekdays ) || ( weekdays == 0 && timer->Day() == day ) ) && - timer->Start() == start && timer->Stop() == stop ) -@@ -94,33 +93,12 @@ - } - - -- void SortedTimers::ReloadTimers() -- { --// dsyslog("live: SortedTimers::ReloadTimers() reloading timers"); -- -- cMutexLock MutexLock(&m_mutex); -- -- clear(); --#if VDRVERSNUM >= 20301 -- { -- LOCK_TIMERS_READ; -- for ( cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next( timer ) ) { -- push_back( *timer ); -- } -- } --#else -- for ( cTimer* timer = Timers.First(); timer; timer = Timers.Next( timer ) ) { -- push_back( *timer ); -- } --#endif -- sort(); -- } -- -- std::string SortedTimers::GetTimerDays(cTimer const& timer) -+ std::string SortedTimers::GetTimerDays(cTimer const *timer) - { -- std::string currentDay = timer.WeekDays() > 0 ? -- *cTimer::PrintDay(0, timer.WeekDays(), true) : -- FormatDateTime(tr("%A, %x"), timer.Day()); -+ if (!timer) return ""; -+ std::string currentDay = timer->WeekDays() > 0 ? -+ *cTimer::PrintDay(0, timer->WeekDays(), true) : -+ FormatDateTime(tr("%A, %x"), timer->Day()); - return currentDay; - } - -@@ -269,7 +247,6 @@ - if ( m_updateTimers.size() > 0 ) { - DoUpdateTimers(); - } -- DoReloadTimers(); - // dsyslog("live: SV: signalling waiters"); - m_updateWait.Broadcast(); - } -@@ -332,6 +309,9 @@ - } - #if VDRVERSNUM >= 20301 - dsyslog("live: DoInsertTimer() add local timer"); -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoInsertTimer() LOCK_TIMERS_WRITE"); -+ #endif - LOCK_TIMERS_WRITE; - Timers->SetExplicitModify(); - const cTimer *checkTimer = Timers->GetTimer( newTimer.get() ); -@@ -418,6 +398,9 @@ - else { // old and new are local - dsyslog("live: DoUpdateTimer() old and new timer are local"); - #if VDRVERSNUM >= 20301 -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoUpdateTimer() LOCK_TIMERS_WRITE"); -+ #endif - LOCK_TIMERS_WRITE; - Timers->SetExplicitModify(); - cTimer* oldTimer = Timers->GetById( timerData.id, timerData.oldRemote ); -@@ -494,6 +477,9 @@ - #endif - - #if VDRVERSNUM >= 20301 -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoDeleteTimer() LOCK_TIMERS_WRITE"); -+ #endif - LOCK_TIMERS_WRITE; - Timers->SetExplicitModify(); - cTimer* oldTimer = Timers->GetById( timerData.id, timerData.remote ); -@@ -527,6 +513,9 @@ - void TimerManager::DoToggleTimer( timerStruct& timerData ) - { - if ( timerData.remote ) { // toggle remote timer via svdrpsend -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoToggleTimer() LOCK_TIMERS_READ"); -+ #endif - LOCK_TIMERS_READ; - const cTimer* toggleTimer = Timers->GetById( timerData.id, timerData.remote ); - std::string command = "MODT "; -@@ -571,6 +560,9 @@ - #endif - - #if VDRVERSNUM >= 20301 -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::DoToggleTimer() LOCK_TIMERS_WRITE"); -+ #endif - LOCK_TIMERS_WRITE; - Timers->SetExplicitModify(); - cTimer* toggleTimer = Timers->GetById( timerData.id, timerData.remote ); -@@ -616,20 +608,18 @@ - const cTimer* TimerManager::GetTimer(tEventID eventid, tChannelID channelid) - { - cMutexLock timersLock( &LiveTimerManager() ); -- SortedTimers& timers = LiveTimerManager().GetTimers(); - -- for ( SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer ) -+ #ifdef DEBUG_LOCK -+ dsyslog("live: timers.cpp TimerManager::GetTimer() LOCK_TIMERS_READ"); -+ #endif -+ LOCK_TIMERS_READ; -+ for (cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next(timer)) { - if (timer->Channel() && timer->Channel()->GetChannelID() == channelid) - { --#if VDRVERSNUM >= 20301 -- LOCK_SCHEDULES_READ; -- if (!timer->Event()) timer->SetEventFromSchedule(Schedules); --#else -- if (!timer->Event()) timer->SetEventFromSchedule(); --#endif - if (timer->Event() && timer->Event()->EventID() == eventid) - return &*timer; - } -+ } - return NULL; - } - -diff -Naur vdr-plugin-live-3.0.10/timers.h vdr-plugin-live-master/timers.h ---- vdr-plugin-live-3.0.10/timers.h 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/timers.h 2021-09-10 14:11:46.000000000 +0200 -@@ -31,7 +31,7 @@ - bool Modified() { return Timers.Modified(m_state); } - #endif - -- static std::string GetTimerDays(cTimer const& timer); -+ static std::string GetTimerDays(cTimer const *timer); - static std::string GetTimerInfo(cTimer const& timer); - static std::string SearchTimerInfo(cTimer const& timer, std::string const& value); - -@@ -47,7 +47,6 @@ - int m_state; - #endif - -- void ReloadTimers(); - }; - - class TimerManager: public cMutex -@@ -64,7 +63,6 @@ - void ToggleTimerActive( int timerId, const char* remote); - // may only be called from Plugin::MainThreadHook - void DoPendingWork(); -- void DoReloadTimers() { m_timers.ReloadTimers(); m_reloadTimers = false; } - const cTimer* GetTimer(tEventID eventid, tChannelID channelid); - void SetReloadTimers() { m_reloadTimers = true; } - -diff -Naur vdr-plugin-live-3.0.10/tools.h vdr-plugin-live-master/tools.h ---- vdr-plugin-live-3.0.10/tools.h 2021-07-18 14:51:47.000000000 +0200 -+++ vdr-plugin-live-master/tools.h 2021-09-10 14:11:46.000000000 +0200 -@@ -1,6 +1,9 @@ - #ifndef VDR_LIVE_TOOLS_H - #define VDR_LIVE_TOOLS_H - -+// uncomment to debug lock sequence -+// #define DEBUG_LOCK -+ - // STL headers need to be before VDR tools.h (included by ) - #include - #include From 58845b5a114db531a46bf8cea6c22b7535fbe88e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 19 Nov 2024 08:20:52 +0100 Subject: [PATCH 46/65] Update to 3.3.10 Update to 3.3.10 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5bb5da4..7d29128 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.9.tar.gz) = 484abd66618221c6459b2f256127a592b6de071bef4c3ed1ef005b9b0879fc620cc4456abee61298d0ea3cf93ce9ea7cc666f3fac199eb918ae1b86ec0a03472 +SHA512 (vdr-live-3.3.10.tar.gz) = a94293f4c708bd8dffafcbc55ecf06ebb3a36956b5ba633555eb9dc08911dde1c6ff7a5aa76f51d14cdc5bbe7926f8b72ecb9c222e13ab818f41e6c13e7461f2 diff --git a/vdr-live.spec b/vdr-live.spec index a327d08..8eca93f 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,12 +12,12 @@ %endif Name: vdr-live -Version: 3.3.9 +Version: 3.3.10 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR -# The entire source code is GPL-2.0-or-later except live/js/mootools/ which is MIT +# The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT License: GPL-2.0-or-later AND LicenseRef-Callaway-MIT URL: https://github.com/MarkusEh/vdr-plugin-live # Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Nov 19 2024 Martin Gansser - 3.3.10-1 +- Update to 3.3.10 + * Tue Nov 05 2024 Martin Gansser - 3.3.9-1 - Update to 3.3.9 From 470b9c2b25c87337d51950a903aaa069b5119148 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 11 Dec 2024 09:20:15 +0100 Subject: [PATCH 47/65] Update to 3.3.11 Update to 3.3.11 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7d29128..95ac4d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.10.tar.gz) = a94293f4c708bd8dffafcbc55ecf06ebb3a36956b5ba633555eb9dc08911dde1c6ff7a5aa76f51d14cdc5bbe7926f8b72ecb9c222e13ab818f41e6c13e7461f2 +SHA512 (vdr-live-3.3.11.tar.gz) = 7784463376b6f709a1d33b04d25dc28ad2547420fca5db9634b02ee6b6132362c611e4d813d81d07097de6d0ef94a1b3936a535a383ce98e9a19c3231d47460e diff --git a/vdr-live.spec b/vdr-live.spec index 8eca93f..dc646e7 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,7 +12,7 @@ %endif Name: vdr-live -Version: 3.3.10 +Version: 3.3.11 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Wed Dec 11 2024 Martin Gansser - 3.3.11-1 +- Update to 3.3.11 + * Tue Nov 19 2024 Martin Gansser - 3.3.10-1 - Update to 3.3.10 From 530ed4b89863aeaf781f3b46c08996cb86e6c7f5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Dec 2024 11:16:25 +0100 Subject: [PATCH 48/65] Update to 3.3.12 Update to 3.3.12 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 95ac4d0..2820b02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.11.tar.gz) = 7784463376b6f709a1d33b04d25dc28ad2547420fca5db9634b02ee6b6132362c611e4d813d81d07097de6d0ef94a1b3936a535a383ce98e9a19c3231d47460e +SHA512 (vdr-live-3.3.12.tar.gz) = c5a6b6fbb381ed5a34bd5ec3e19a1bd22fe180a702464a3d9c0843fc8fcca49eb70984264b75340d944ba7905999e67e04f5edcd81b80b63a736f08440b64e18 diff --git a/vdr-live.spec b/vdr-live.spec index dc646e7..4471aac 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,7 +12,7 @@ %endif Name: vdr-live -Version: 3.3.11 +Version: 3.3.12 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Dec 22 2024 Martin Gansser - 3.3.12-1 +- Update to 3.3.12 + * Wed Dec 11 2024 Martin Gansser - 3.3.11-1 - Update to 3.3.11 From 02520fc27a5e57e2abc1c16bb89758f21f739d98 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 2 Jan 2025 19:04:38 +0100 Subject: [PATCH 49/65] Update to 3.4.0 Update to 3.4.0 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2820b02..8e0e606 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.12.tar.gz) = c5a6b6fbb381ed5a34bd5ec3e19a1bd22fe180a702464a3d9c0843fc8fcca49eb70984264b75340d944ba7905999e67e04f5edcd81b80b63a736f08440b64e18 +SHA512 (vdr-live-3.4.0.tar.gz) = b126cebd9b9c865c0eb05f9ac755eae92877239c9f57d6dab2ae1156c43f52ab88d7e3bff05a636d86054d907ec6817f02c299ad9797a8813af3d1be4bd976a6 diff --git a/vdr-live.spec b/vdr-live.spec index 4471aac..258682f 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,7 +12,7 @@ %endif Name: vdr-live -Version: 3.3.12 +Version: 3.4.0 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Jan 02 2025 Martin Gansser - 3.4.0-1 +- Update to 3.4.0 + * Sun Dec 22 2024 Martin Gansser - 3.3.12-1 - Update to 3.3.12 From 338fee54a14810adc89d827e61c3d3976d191a3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:12:05 +0000 Subject: [PATCH 50/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 258682f..917221e 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -14,7 +14,7 @@ Name: vdr-live Version: 3.4.0 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 02 2025 Martin Gansser - 3.4.0-1 - Update to 3.4.0 From ca193983dc4158baba18781496efdf88f42d6d42 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 4 Feb 2025 08:38:51 +0100 Subject: [PATCH 51/65] Update to 3.4.1 Update to 3.4.1 --- sources | 2 +- vdr-live.spec | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 8e0e606..ff3ddb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.4.0.tar.gz) = b126cebd9b9c865c0eb05f9ac755eae92877239c9f57d6dab2ae1156c43f52ab88d7e3bff05a636d86054d907ec6817f02c299ad9797a8813af3d1be4bd976a6 +SHA512 (vdr-live-3.4.1.tar.gz) = a0860305f64fd9edeb6c0155fd09ccf013c62f192f5b23a6994398d92d817adab69582f49a36398cecb866e76a2801a3de42c19d23cbd08a5c783cf860045dcd diff --git a/vdr-live.spec b/vdr-live.spec index 917221e..f6bb24a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,9 +12,9 @@ %endif Name: vdr-live -Version: 3.4.0 +Version: 3.4.1 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,8 +87,8 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog -* Sun Jan 19 2025 Fedora Release Engineering - 3.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +* Tue Feb 04 2025 Martin Gansser - 3.4.1-1 +- Update to 3.4.1 * Thu Jan 02 2025 Martin Gansser - 3.4.0-1 - Update to 3.4.0 From 528554a8542b8136829363611570de409843a0c1 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 4 Feb 2025 08:41:04 +0100 Subject: [PATCH 52/65] Update to 3.4.1 Update to 3.4.1 --- vdr-live.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vdr-live.spec b/vdr-live.spec index f6bb24a..eb346f0 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -90,6 +90,9 @@ install -Dpm 644 %{SOURCE1} \ * Tue Feb 04 2025 Martin Gansser - 3.4.1-1 - Update to 3.4.1 +* Sun Jan 19 2025 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 02 2025 Martin Gansser - 3.4.0-1 - Update to 3.4.0 From f9bbfe556b5a69b00c09fe41470c61a591dcb276 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 6 Feb 2025 08:20:50 +0100 Subject: [PATCH 53/65] Rebuil Rebuil --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index eb346f0..edff05b 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -14,7 +14,7 @@ Name: vdr-live Version: 3.4.1 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Feb 06 2025 Martin Gansser - 3.4.1-2 +- Rebuil + * Tue Feb 04 2025 Martin Gansser - 3.4.1-1 - Update to 3.4.1 From 7a5228562c82d9066f87b7a8d5676e9eeb301abf Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 6 Feb 2025 08:21:58 +0100 Subject: [PATCH 54/65] Rebuild Rebuild --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index edff05b..bbabd16 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -88,7 +88,7 @@ install -Dpm 644 %{SOURCE1} \ %changelog * Thu Feb 06 2025 Martin Gansser - 3.4.1-2 -- Rebuil +- Rebuild * Tue Feb 04 2025 Martin Gansser - 3.4.1-1 - Update to 3.4.1 From 34308036c46d99cdfc73ecae9a1c03d2cac41023 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Feb 2025 13:22:22 +0100 Subject: [PATCH 55/65] Rebuilt for new VDR API version 2.7.4 Rebuilt for new VDR API version 2.7.4 --- vdr-live.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index bbabd16..2dbc652 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -3,18 +3,16 @@ %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global gitdate 20241103 # version we want to build against -%global vdr_version 2.6.3 +%global vdr_version 2.6.9 # Set vdr_version based on Fedora version %if 0%{?fedora} >= 42 -%global vdr_version 2.7.2 -%elif 0%{?fedora} >= 40 -%global vdr_version 2.6.9 +%global vdr_version 2.7.4 %endif Name: vdr-live Version: 3.4.1 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,6 +85,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Feb 28 2025 Martin Gansser - 3.4.1-3 +- Rebuilt for new VDR API version 2.7.4 + * Thu Feb 06 2025 Martin Gansser - 3.4.1-2 - Rebuild From 91aa720f38237ab89b4923f3721bcee396325c50 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 2 Mar 2025 11:36:44 +0100 Subject: [PATCH 56/65] Update to 3.4.2 Update to 3.4.2 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index ff3ddb4..d87a829 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.4.1.tar.gz) = a0860305f64fd9edeb6c0155fd09ccf013c62f192f5b23a6994398d92d817adab69582f49a36398cecb866e76a2801a3de42c19d23cbd08a5c783cf860045dcd +SHA512 (vdr-live-3.4.2.tar.gz) = b4385818aa9436f50a26f10ab6d6a1fcda4f1274b0974755868921f8412a5cba161b9aa73fe101f1c4ccb87e86f8d727b55483bcc298afa9466f2b70370e5d18 diff --git a/vdr-live.spec b/vdr-live.spec index 2dbc652..bf09e6c 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -10,9 +10,9 @@ %endif Name: vdr-live -Version: 3.4.1 +Version: 3.4.2 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -85,6 +85,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Mar 02 2025 Martin Gansser - 3.4.2-1 +- Update to 3.4.2 + * Fri Feb 28 2025 Martin Gansser - 3.4.1-3 - Rebuilt for new VDR API version 2.7.4 From 153bbdb2bc874073a722cf39fcda7d5027132680 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 19 Apr 2025 09:08:39 +0200 Subject: [PATCH 57/65] Update to 3.5.0 --- sources | 2 +- vdr-live.spec | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d87a829..a605bc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.4.2.tar.gz) = b4385818aa9436f50a26f10ab6d6a1fcda4f1274b0974755868921f8412a5cba161b9aa73fe101f1c4ccb87e86f8d727b55483bcc298afa9466f2b70370e5d18 +SHA512 (vdr-live-3.5.0.tar.gz) = 5b9708b879d211b0e4a1e8dc984722917ad66c1366d52e3d980c570400ce9dd317cce97089212e28dcf5adc485a0446ca3c04b8d5c689d61d3060ea5cf75b40d diff --git a/vdr-live.spec b/vdr-live.spec index bf09e6c..6abf588 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -10,7 +10,7 @@ %endif Name: vdr-live -Version: 3.4.2 +Version: 3.5.0 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -85,6 +85,42 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Apr 19 2025 Martin Gansser - 3.5.0-1 +- Update to 3.5.0 + +* Sun Mar 02 2025 Martin Gansser - 3.4.2-1 +- Update to 3.4.2 + +* Fri Feb 28 2025 Martin Gansser - 3.4.1-3 +- Rebuilt for new VDR API version 2.7.4 + +* Thu Feb 06 2025 Martin Gansser - 3.4.1-2 +- Rebuild + +* Tue Feb 04 2025 Martin Gansser - 3.4.1-1 +- Update to 3.4.1 + +* Sun Jan 19 2025 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jan 02 2025 Martin Gansser - 3.4.0-1 +- Update to 3.4.0 + +* Sun Dec 22 2024 Martin Gansser - 3.3.12-1 +- Update to 3.3.12 + +* Wed Dec 11 2024 Martin Gansser - 3.3.11-1 +- Update to 3.3.11 + +* Tue Nov 19 2024 Martin Gansser - 3.3.10-1 +- Update to 3.3.10 + +* Tue Nov 05 2024 Martin Gansser - 3.3.9-1 +- Update to 3.3.9 + +* Sun Nov 03 2024 Martin Gansser - 3.3.9-0.2.20241103git9967f1d +- Update to 3.3.9-0.2.20241103git9967f1d + * Sun Mar 02 2025 Martin Gansser - 3.4.2-1 - Update to 3.4.2 From 6cc1631e6f1e4a32aa37845ed0e528fdfc15775c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 27 May 2025 17:12:57 +0200 Subject: [PATCH 58/65] Rebuilt for new VDR API version 2.7.5 --- vdr-live.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 6abf588..45ebce0 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -2,17 +2,19 @@ %global commit0 9967f1d6757a4f4855a6b07abf526258838dd5ac %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global gitdate 20241103 -# version we want to build against -%global vdr_version 2.6.9 # Set vdr_version based on Fedora version -%if 0%{?fedora} >= 42 +%if 0%{?fedora} >= 43 +%global vdr_version 2.7.5 +%elif 0%{?fedora} == 42 %global vdr_version 2.7.4 +%else +%global vdr_version 2.6.9 %endif Name: vdr-live Version: 3.5.0 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -85,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue May 27 2025 Martin Gansser - 3.5.0-2 +- Rebuilt for new VDR API version 2.7.5 + * Sat Apr 19 2025 Martin Gansser - 3.5.0-1 - Update to 3.5.0 From de562e546f1a1b389ee09997bfe1d81a4e536c80 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 27 May 2025 17:26:23 +0200 Subject: [PATCH 59/65] Rebuilt for new VDR API version 2.7.5 --- vdr-live.spec | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 45ebce0..0c81985 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -126,39 +126,6 @@ install -Dpm 644 %{SOURCE1} \ * Sun Nov 03 2024 Martin Gansser - 3.3.9-0.2.20241103git9967f1d - Update to 3.3.9-0.2.20241103git9967f1d -* Sun Mar 02 2025 Martin Gansser - 3.4.2-1 -- Update to 3.4.2 - -* Fri Feb 28 2025 Martin Gansser - 3.4.1-3 -- Rebuilt for new VDR API version 2.7.4 - -* Thu Feb 06 2025 Martin Gansser - 3.4.1-2 -- Rebuild - -* Tue Feb 04 2025 Martin Gansser - 3.4.1-1 -- Update to 3.4.1 - -* Sun Jan 19 2025 Fedora Release Engineering - 3.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jan 02 2025 Martin Gansser - 3.4.0-1 -- Update to 3.4.0 - -* Sun Dec 22 2024 Martin Gansser - 3.3.12-1 -- Update to 3.3.12 - -* Wed Dec 11 2024 Martin Gansser - 3.3.11-1 -- Update to 3.3.11 - -* Tue Nov 19 2024 Martin Gansser - 3.3.10-1 -- Update to 3.3.10 - -* Tue Nov 05 2024 Martin Gansser - 3.3.9-1 -- Update to 3.3.9 - -* Sun Nov 03 2024 Martin Gansser - 3.3.9-0.2.20241103git9967f1d -- Update to 3.3.9-0.2.20241103git9967f1d - * Sat Nov 02 2024 Martin Gansser - 3.3.9-0.1.20241101gitf67dfc0 - Update to 3.3.9-0.1.20241101gitf67dfc0 From 949d3a9864dd3ddf95f895bd1535b48272133dd5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Jun 2025 12:28:33 +0200 Subject: [PATCH 60/65] Rebuilt for new VDR API version 2.7.6 --- vdr-live.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 0c81985..c32192f 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20241103 # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.5 +%global vdr_version 2.7.6 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -14,7 +14,7 @@ Name: vdr-live Version: 3.5.0 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Jun 21 2025 Martin Gansser - 3.5.0-3 +- Rebuilt for new VDR API version 2.7.6 + * Tue May 27 2025 Martin Gansser - 3.5.0-2 - Rebuilt for new VDR API version 2.7.5 From 497c837b42d3f1eca2138375a78b16d83699b066 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 7 Jul 2025 08:58:15 +0200 Subject: [PATCH 61/65] Update to 3.5.1 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index a605bc1..3853144 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.5.0.tar.gz) = 5b9708b879d211b0e4a1e8dc984722917ad66c1366d52e3d980c570400ce9dd317cce97089212e28dcf5adc485a0446ca3c04b8d5c689d61d3060ea5cf75b40d +SHA512 (vdr-live-3.5.1.tar.gz) = b928700185112b3e3bbcec163de2c195188d4849f593ce0a3d685a1c966af03deb98c2e4ca7b29a903caeef62779ac88f4c982d311c36c53118c2b8f74620440 diff --git a/vdr-live.spec b/vdr-live.spec index c32192f..f6fbb36 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,9 +12,9 @@ %endif Name: vdr-live -Version: 3.5.0 +Version: 3.5.1 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Jul 01 2025 Martin Gansser - 3.5.1-1 +- Update to 3.5.1 + * Sat Jun 21 2025 Martin Gansser - 3.5.0-3 - Rebuilt for new VDR API version 2.7.6 From c3ab8424f8cbb6b0c36175d6c6e33c15b17e8b55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:00:54 +0000 Subject: [PATCH 62/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index f6fbb36..1a9e924 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -14,7 +14,7 @@ Name: vdr-live Version: 3.5.1 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 01 2025 Martin Gansser - 3.5.1-1 - Update to 3.5.1 From 1c7ecea9c7fcee0b543bc180ef285e21856c7251 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Jul 2025 18:47:29 +0200 Subject: [PATCH 63/65] Rebuilt for new VDR API version 2.7.7 --- vdr-live.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 1a9e924..74dfa21 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20241103 # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.6 +%global vdr_version 2.7.7 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -14,7 +14,7 @@ Name: vdr-live Version: 3.5.1 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Jul 25 2025 Martin Gansser - 3.5.1-3 +- Rebuilt for new VDR API version 2.7.7 + * Fri Jul 25 2025 Fedora Release Engineering - 3.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f20c2b87f2742fe02b71575f2a714ed1be347020 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 10 Oct 2025 16:40:52 +0200 Subject: [PATCH 64/65] Update to 3.5.2 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 3853144..4e7d544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.5.1.tar.gz) = b928700185112b3e3bbcec163de2c195188d4849f593ce0a3d685a1c966af03deb98c2e4ca7b29a903caeef62779ac88f4c982d311c36c53118c2b8f74620440 +SHA512 (vdr-live-3.5.2.tar.gz) = 25ab09633a7cc9303bd1dc4a9eb32abf936832985e3764a4b1f913ca340827cfddb48c244379b3be79c60b418f35549488572cbf61418994f6ce42dc3b4fe136 diff --git a/vdr-live.spec b/vdr-live.spec index 74dfa21..e7ba21f 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,9 +12,9 @@ %endif Name: vdr-live -Version: 3.5.1 +Version: 3.5.2 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Oct 10 2025 Martin Gansser - 3.5.2-1 +- Update to 3.5.2 + * Fri Jul 25 2025 Martin Gansser - 3.5.1-3 - Rebuilt for new VDR API version 2.7.7 From dcd0def2b190a007f7c5856251fee98c6b52534a Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 19 Dec 2025 20:25:32 +0100 Subject: [PATCH 65/65] Update to 3.5.3 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4e7d544..1c6234a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.5.2.tar.gz) = 25ab09633a7cc9303bd1dc4a9eb32abf936832985e3764a4b1f913ca340827cfddb48c244379b3be79c60b418f35549488572cbf61418994f6ce42dc3b4fe136 +SHA512 (vdr-live-3.5.3.tar.gz) = b41e559d8bfe1d21301bfc852f91c92155baed49823d2bbf8fe9d36955b93ddd8aaebf4e4ba2fc1427c60876f2889a36846ca894f320fb5e6b7cdb37f6ac2a58 diff --git a/vdr-live.spec b/vdr-live.spec index e7ba21f..4c5997e 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,7 +12,7 @@ %endif Name: vdr-live -Version: 3.5.2 +Version: 3.5.3 # Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -87,6 +87,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Dec 19 2025 Martin Gansser - 3.5.3-1 +- Update to 3.5.3 + * Fri Oct 10 2025 Martin Gansser - 3.5.2-1 - Update to 3.5.2