From 19780bd8114ff40380686103b91715b8623bc2ad Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 11 Jan 2021 13:04:09 +0100 Subject: [PATCH 01/86] Use fork because its under maintenance Update to 2.3.1-18.20201122git3b24485 --- vdr-live.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index a65af95..99b8160 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,12 +1,12 @@ # https://github.com/kfb77/vdr-plugin-live/commit/3b2448599112b33ede5d58d689179dd708d073f5 -%global commit0 3b2448599112b33ede5d58d689179dd708d073f5 +%global commit0 3b2448599112b33ede5d58d689179dd708d073f5 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global gitdate 20201122 Name: vdr-live Version: 2.3.1 Release: 18.%{gitdate}git%{shortcommit0}%{?dist} -Summary: An interactive web interface for VDR +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 @@ -26,11 +26,12 @@ Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} Requires: %{name}-data = %{version}-%{release} %description +New version with HTML5 live stream support Live, the "Live Interactive VDR Environment", is a plugin providing the -possibility to interactively control the VDR and some of its plugins by +possibility to interactively control the VDR and some of it's plugins by a web interface. -Unlike external utility programs that communicate with VDR and its plugins +Unlike external utility programs that communicate with VDR and it's plugins by SVDRP, Live has direct access to VDR's data structures and is thus very fast. From 26654aa935538dd0bfffe1f32cc6a59cc48c7402 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 1 Mar 2021 20:00:33 +0100 Subject: [PATCH 02/86] Rebuilt for cxxtools/tntnet-3.0 support Update to 3.0.5 --- sources | 2 +- vdr-live.spec | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 834da19..15d8904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.4.tar.gz) = 5fcf6cb756c1fde7e1cd7c0a3233bceab687ef7629b8867db0d990af7bf5676151158b77822cf7389a64134f8038da4b3577f014ff675668eb4de7d27380f684 +SHA512 (vdr-live-3.0.5.tar.gz) = 7acfe266d9b3e0a9c3f74ac45c561b70e6eabb0f63b9e8b6dee5ce85fe5803d6d63910d9f1ada1893b7820d37cd5f3e1312cb4764823570a85f999dc88dc5d0d diff --git a/vdr-live.spec b/vdr-live.spec index dc0503b..2dc3248 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,17 +1,18 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/c360c989a9d4b794836164ec40d2fb185ceddc0f -%global commit0 f6cfefad67e68bf9753303c31a507886d8231083 +# https://github.com/MarkusEh/vdr-plugin-live/commit/5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 +%global commit0 5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210111 +%global gitdate 20210301 Name: vdr-live -Version: 3.0.4 -#Release: 1.%%{gitdate}git%%{shortcommit0}%%{?dist} +Version: 3.0.5 +# Release: 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 GPLv2+ except live/js/mootools/ which is MIT License: GPLv2+ and 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 Source1: %{name}.conf @@ -43,6 +44,7 @@ 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} # delete unused directories and files @@ -54,10 +56,10 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all %install -make install DESTDIR=%{buildroot} +%make_install DESTDIR=%{buildroot} # live.conf install -Dpm 644 %{SOURCE1} \ @@ -80,6 +82,10 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %changelog +* Mon Mar 01 2021 Martin Gansser - 3.0.5-1 +- Rebuilt for cxxtools/tntnet-3.0 support +- Update to 3.0.5 + * Sun Jan 31 2021 Martin Gansser - 3.0.4-1 - Update to 3.0.4 From 60361d7501354e1bfdd0e63daea429a8d08dd3f5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 1 Mar 2021 20:03:21 +0100 Subject: [PATCH 03/86] Rebuilt for cxxtools/tntnet-3.0 support Update to 3.0.5 --- sources | 2 +- vdr-live.spec | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 834da19..15d8904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.4.tar.gz) = 5fcf6cb756c1fde7e1cd7c0a3233bceab687ef7629b8867db0d990af7bf5676151158b77822cf7389a64134f8038da4b3577f014ff675668eb4de7d27380f684 +SHA512 (vdr-live-3.0.5.tar.gz) = 7acfe266d9b3e0a9c3f74ac45c561b70e6eabb0f63b9e8b6dee5ce85fe5803d6d63910d9f1ada1893b7820d37cd5f3e1312cb4764823570a85f999dc88dc5d0d diff --git a/vdr-live.spec b/vdr-live.spec index dc0503b..2dc3248 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,17 +1,18 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/c360c989a9d4b794836164ec40d2fb185ceddc0f -%global commit0 f6cfefad67e68bf9753303c31a507886d8231083 +# https://github.com/MarkusEh/vdr-plugin-live/commit/5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 +%global commit0 5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210111 +%global gitdate 20210301 Name: vdr-live -Version: 3.0.4 -#Release: 1.%%{gitdate}git%%{shortcommit0}%%{?dist} +Version: 3.0.5 +# Release: 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 GPLv2+ except live/js/mootools/ which is MIT License: GPLv2+ and 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 Source1: %{name}.conf @@ -43,6 +44,7 @@ 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} # delete unused directories and files @@ -54,10 +56,10 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all %install -make install DESTDIR=%{buildroot} +%make_install DESTDIR=%{buildroot} # live.conf install -Dpm 644 %{SOURCE1} \ @@ -80,6 +82,10 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %changelog +* Mon Mar 01 2021 Martin Gansser - 3.0.5-1 +- Rebuilt for cxxtools/tntnet-3.0 support +- Update to 3.0.5 + * Sun Jan 31 2021 Martin Gansser - 3.0.4-1 - Update to 3.0.4 From 09811a9df258c3bf69270381bd33defae40b6525 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 3 Mar 2021 10:39:04 +0100 Subject: [PATCH 04/86] Update to 3.0.6 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 15d8904..2b2ea03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.5.tar.gz) = 7acfe266d9b3e0a9c3f74ac45c561b70e6eabb0f63b9e8b6dee5ce85fe5803d6d63910d9f1ada1893b7820d37cd5f3e1312cb4764823570a85f999dc88dc5d0d +SHA512 (vdr-live-3.0.6.tar.gz) = f60cd14c3a02eeb571ffc181dabd83dd0af0595d378ed34bc9cee1d54b560d74027c758d3b4d69541a71dc6f94b5f64e3972fc51aeb5a9d688be7656636bcf98 diff --git a/vdr-live.spec b/vdr-live.spec index 2dc3248..845e039 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20210301 Name: vdr-live -Version: 3.0.5 +Version: 3.0.6 # Release: 2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all +%make_build %install %make_install DESTDIR=%{buildroot} @@ -82,6 +82,9 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %changelog +* Wed Mar 03 2021 Martin Gansser - 3.0.6-1 +- Update to 3.0.6 + * Mon Mar 01 2021 Martin Gansser - 3.0.5-1 - Rebuilt for cxxtools/tntnet-3.0 support - Update to 3.0.5 From 27e5ce1453d7d580a1cc43fc05d5f59df19bc333 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 3 Mar 2021 11:56:44 +0100 Subject: [PATCH 05/86] Update to 3.0.6 --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 845e039..8c2cc62 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build +%make_build CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %install %make_install DESTDIR=%{buildroot} From 5bddafd71b5b40ebacd8166f6dcb67b398b6cd38 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 3 Mar 2021 12:00:30 +0100 Subject: [PATCH 06/86] Update to 3.0.6 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 15d8904..2b2ea03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.5.tar.gz) = 7acfe266d9b3e0a9c3f74ac45c561b70e6eabb0f63b9e8b6dee5ce85fe5803d6d63910d9f1ada1893b7820d37cd5f3e1312cb4764823570a85f999dc88dc5d0d +SHA512 (vdr-live-3.0.6.tar.gz) = f60cd14c3a02eeb571ffc181dabd83dd0af0595d378ed34bc9cee1d54b560d74027c758d3b4d69541a71dc6f94b5f64e3972fc51aeb5a9d688be7656636bcf98 diff --git a/vdr-live.spec b/vdr-live.spec index 2dc3248..8c2cc62 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20210301 Name: vdr-live -Version: 3.0.5 +Version: 3.0.6 # Release: 2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all +%make_build CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %install %make_install DESTDIR=%{buildroot} @@ -82,6 +82,9 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %changelog +* Wed Mar 03 2021 Martin Gansser - 3.0.6-1 +- Update to 3.0.6 + * Mon Mar 01 2021 Martin Gansser - 3.0.5-1 - Rebuilt for cxxtools/tntnet-3.0 support - Update to 3.0.5 From 61ebbd54abd4c50f33daa86dd8808b96cf2f8a9a Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 3 Mar 2021 12:06:45 +0100 Subject: [PATCH 07/86] Update to 3.0.6 --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 8c2cc62..a484605 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install %make_install DESTDIR=%{buildroot} From bc08974b458516c606dfb46c8fd8d34e65447b6f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 3 Mar 2021 12:09:21 +0100 Subject: [PATCH 08/86] Update to 3.0.6 --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 8c2cc62..a484605 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install %make_install DESTDIR=%{buildroot} From c1cbad8de485f42d114383a5c8b6705b5c55639d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 7 Mar 2021 09:34:09 +0100 Subject: [PATCH 09/86] Update to 3.0.7-0.1.20210307git075080a --- sources | 2 +- vdr-live.spec | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sources b/sources index 2b2ea03..82dc60c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.6.tar.gz) = f60cd14c3a02eeb571ffc181dabd83dd0af0595d378ed34bc9cee1d54b560d74027c758d3b4d69541a71dc6f94b5f64e3972fc51aeb5a9d688be7656636bcf98 +SHA512 (vdr-live-3.0.7-075080a.tar.gz) = f4e75976bec8ffda471954639d32aebe4049f23877c5d8a8cac1f1385b6981bec74cf3e57dfe38414309c5ffd74c90b511ee1ed05f9d452183641c656ba78e11 diff --git a/vdr-live.spec b/vdr-live.spec index a484605..a2190df 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,19 +1,19 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 -%global commit0 5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 +# https://github.com/MarkusEh/vdr-plugin-live/commit/075080afb4f2a9ec1d3a488ba62095867479aee2 +%global commit0 075080afb4f2a9ec1d3a488ba62095867479aee2 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210301 +%global gitdate 20210307 Name: vdr-live -Version: 3.0.6 -# Release: 2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Version: 3.0.7 +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 License: GPLv2+ and 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 @@ -44,8 +44,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 @@ -67,10 +67,6 @@ install -Dpm 644 %{SOURCE1} \ %find_lang %{name} -install -dm 755 %{buildroot}%{vdr_resdir}/plugins/live -cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live - - %files -f %{name}.lang %doc CONTRIBUTORS README %license COPYING @@ -80,8 +76,10 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %files data %{vdr_resdir}/plugins/live/ - %changelog +* Sun Mar 07 2021 Martin Gansser - 3.0.7-0.1.20210307git075080a +- Update to 3.0.7-0.1.20210307git075080a + * Wed Mar 03 2021 Martin Gansser - 3.0.6-1 - Update to 3.0.6 From 88148ae750295011f412b8f73ecf4596ea97e5f7 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 7 Mar 2021 09:36:39 +0100 Subject: [PATCH 10/86] Update to 3.0.7-0.1.20210307git075080a --- sources | 2 +- vdr-live.spec | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sources b/sources index 2b2ea03..82dc60c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.6.tar.gz) = f60cd14c3a02eeb571ffc181dabd83dd0af0595d378ed34bc9cee1d54b560d74027c758d3b4d69541a71dc6f94b5f64e3972fc51aeb5a9d688be7656636bcf98 +SHA512 (vdr-live-3.0.7-075080a.tar.gz) = f4e75976bec8ffda471954639d32aebe4049f23877c5d8a8cac1f1385b6981bec74cf3e57dfe38414309c5ffd74c90b511ee1ed05f9d452183641c656ba78e11 diff --git a/vdr-live.spec b/vdr-live.spec index a484605..a2190df 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,19 +1,19 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 -%global commit0 5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 +# https://github.com/MarkusEh/vdr-plugin-live/commit/075080afb4f2a9ec1d3a488ba62095867479aee2 +%global commit0 075080afb4f2a9ec1d3a488ba62095867479aee2 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210301 +%global gitdate 20210307 Name: vdr-live -Version: 3.0.6 -# Release: 2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Version: 3.0.7 +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 License: GPLv2+ and 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 @@ -44,8 +44,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 @@ -67,10 +67,6 @@ install -Dpm 644 %{SOURCE1} \ %find_lang %{name} -install -dm 755 %{buildroot}%{vdr_resdir}/plugins/live -cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live - - %files -f %{name}.lang %doc CONTRIBUTORS README %license COPYING @@ -80,8 +76,10 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %files data %{vdr_resdir}/plugins/live/ - %changelog +* Sun Mar 07 2021 Martin Gansser - 3.0.7-0.1.20210307git075080a +- Update to 3.0.7-0.1.20210307git075080a + * Wed Mar 03 2021 Martin Gansser - 3.0.6-1 - Update to 3.0.6 From eba174f2385a9e38cec5f7c676aa0141bb6fae6c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 28 Apr 2021 11:13:19 +0200 Subject: [PATCH 11/86] Rebuilt for new VDR API version --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index a2190df..940f7a9 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,7 +5,7 @@ Name: vdr-live Version: 3.0.7 -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 @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Wed Apr 28 2021 Martin Gansser - 3.0.7-0.2.20210307git075080a +- Rebuilt for new VDR API version + * Sun Mar 07 2021 Martin Gansser - 3.0.7-0.1.20210307git075080a - Update to 3.0.7-0.1.20210307git075080a From 8517aa97ebd9e1bd31526648a62715a5930b7434 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 24 May 2021 14:46:56 +0200 Subject: [PATCH 12/86] Update to 3.0.8 --- sources | 2 +- vdr-live.spec | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 82dc60c..0ddba04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.7-075080a.tar.gz) = f4e75976bec8ffda471954639d32aebe4049f23877c5d8a8cac1f1385b6981bec74cf3e57dfe38414309c5ffd74c90b511ee1ed05f9d452183641c656ba78e11 +SHA512 (vdr-live-3.0.8.tar.gz) = 7a58b7db7036db05b05d50bfca9f42f7e4e662cb8f9903a282494359f132c543849c3e6b34793e95e8d9db805eafa53838e54c2f72a93e62a9070d1bba944d25 diff --git a/vdr-live.spec b/vdr-live.spec index 940f7a9..df29076 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,16 +4,16 @@ %global gitdate 20210307 Name: vdr-live -Version: 3.0.7 -Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} -#Release: 1%%{?dist} +Version: 3.0.8 +#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 GPLv2+ except live/js/mootools/ which is MIT License: GPLv2+ and 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 @@ -44,8 +44,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 @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon May 24 2021 Martin Gansser - 3.0.8-1 +- Update to 3.0.8 + * Wed Apr 28 2021 Martin Gansser - 3.0.7-0.2.20210307git075080a - Rebuilt for new VDR API version From a3ba8234bb14509fc86302edd9215fbabc8d0065 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 7 Jun 2021 11:23:33 +0200 Subject: [PATCH 13/86] Update to 3.0.9 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 0ddba04..a56987f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.8.tar.gz) = 7a58b7db7036db05b05d50bfca9f42f7e4e662cb8f9903a282494359f132c543849c3e6b34793e95e8d9db805eafa53838e54c2f72a93e62a9070d1bba944d25 +SHA512 (vdr-live-3.0.9.tar.gz) = e8e9d26c59d3dd6f13a3418760df2dd83ee2639f0ff80a6b77a059c3c022e52917f20c0376b39f80a358150df35afa59c3688c4f4a909cc8169d77416ab30248 diff --git a/vdr-live.spec b/vdr-live.spec index df29076..9912c0a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20210307 Name: vdr-live -Version: 3.0.8 +Version: 3.0.9 #Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Jun 07 2021 Martin Gansser - 3.0.9-1 +- Update to 3.0.9 + * Mon May 24 2021 Martin Gansser - 3.0.8-1 - Update to 3.0.8 From ab4cec7c4123672b9ca5a98795d76254084b1ea3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 18 Jul 2021 18:24:59 +0200 Subject: [PATCH 14/86] Update to 3.0.10 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index a56987f..75bf109 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.9.tar.gz) = e8e9d26c59d3dd6f13a3418760df2dd83ee2639f0ff80a6b77a059c3c022e52917f20c0376b39f80a358150df35afa59c3688c4f4a909cc8169d77416ab30248 +SHA512 (vdr-live-3.0.10.tar.gz) = d6b9139ff3b5df40a8d4580f4c3f7672dcc89f87b3ac43706f19cae4d3d85144fb1c83cef9ed3d0db84ce05e227916053abc4a0786fa7150a4f840a937e5601d diff --git a/vdr-live.spec b/vdr-live.spec index 9912c0a..4e5951a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20210307 Name: vdr-live -Version: 3.0.9 +Version: 3.0.10 #Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -59,7 +59,7 @@ iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install -%make_install DESTDIR=%{buildroot} +%make_install # live.conf install -Dpm 644 %{SOURCE1} \ @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Jul 18 2021 Martin Gansser - 3.0.10-1 +- Update to 3.0.10 + * Mon Jun 07 2021 Martin Gansser - 3.0.9-1 - Update to 3.0.9 From e2125b6b65005760610ae8b116adad486e2e7469 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:21:30 +0000 Subject: [PATCH 15/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 4e5951a..b86017a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -6,7 +6,7 @@ Name: vdr-live Version: 3.0.10 #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 GPLv2+ except live/js/mootools/ which is MIT @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jul 18 2021 Martin Gansser - 3.0.10-1 - Update to 3.0.10 From 3ab699271c975e9ef200c37b182959aaee5cfea0 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 11 Sep 2021 13:44:01 +0200 Subject: [PATCH 16/86] Add vdr-plugin-live-noCopyTimer.patch to avoid copying vdr timer objects --- vdr-live.spec | 10 +- vdr-plugin-live-noCopyTimer.patch | 378 ++++++++++++++++++++++++++++++ 2 files changed, 385 insertions(+), 3 deletions(-) create mode 100644 vdr-plugin-live-noCopyTimer.patch diff --git a/vdr-live.spec b/vdr-live.spec index b86017a..ea5360d 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -6,7 +6,7 @@ Name: vdr-live Version: 3.0.10 #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 GPLv2+ except live/js/mootools/ which is MIT @@ -15,6 +15,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: vdr-plugin-live-noCopyTimer.patch BuildRequires: make BuildRequires: gcc-c++ @@ -77,8 +78,11 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog -* Fri Jul 23 2021 Fedora Release Engineering - 3.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Sat Sep 11 2021 Martin Gansser - 3.0.10-3 +- Add vdr-plugin-live-noCopyTimer.patch to avoid copying vdr timer objects + +* Fri Aug 06 2021 Martin Gansser - 3.0.10-2 +- Rebuilt fixes unresolved symbol * Sun Jul 18 2021 Martin Gansser - 3.0.10-1 - Update to 3.0.10 diff --git a/vdr-plugin-live-noCopyTimer.patch b/vdr-plugin-live-noCopyTimer.patch new file mode 100644 index 0000000..50603ca --- /dev/null +++ b/vdr-plugin-live-noCopyTimer.patch @@ -0,0 +1,378 @@ +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 c9d1acd09fdb9811dab0db865ca74cedf4b97a3f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 11 Sep 2021 13:50:55 +0200 Subject: [PATCH 17/86] Add vdr-plugin-live-noCopyTimer.patch to avoid copying vdr timer objects --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index ea5360d..90d620d 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -79,7 +79,7 @@ install -Dpm 644 %{SOURCE1} \ %changelog * Sat Sep 11 2021 Martin Gansser - 3.0.10-3 -- Add vdr-plugin-live-noCopyTimer.patch to avoid copying vdr timer objects +- Add vdr-plugin-live-noCopyTimer.patch to avoid copying vdr timer objects * Fri Aug 06 2021 Martin Gansser - 3.0.10-2 - Rebuilt fixes unresolved symbol From d22dac3822b45ae2841bb6ba35d6545d6a6f2014 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 15 Oct 2021 11:17:21 +0200 Subject: [PATCH 18/86] Update to 3.0.12 --- sources | 2 +- vdr-live.spec | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 75bf109..8cec65c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.10.tar.gz) = d6b9139ff3b5df40a8d4580f4c3f7672dcc89f87b3ac43706f19cae4d3d85144fb1c83cef9ed3d0db84ce05e227916053abc4a0786fa7150a4f840a937e5601d +SHA512 (vdr-live-3.0.12.tar.gz) = 21c32645caefb3177c9a984de98febcbea6926c744ad2c8cfe3053da6cbd644868ca783c4c9d587c0fd66a26f6051443cb3d22bc7637bebddf70fd8b1559d637 diff --git a/vdr-live.spec b/vdr-live.spec index 90d620d..333cef1 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,9 +4,9 @@ %global gitdate 20210307 Name: vdr-live -Version: 3.0.10 +Version: 3.0.12 #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 GPLv2+ except live/js/mootools/ which is MIT @@ -15,7 +15,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: vdr-plugin-live-noCopyTimer.patch BuildRequires: make BuildRequires: gcc-c++ @@ -78,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Oct 15 2021 Martin Gansser - 3.0.12-1 +- Update to 3.0.12 + * Sat Sep 11 2021 Martin Gansser - 3.0.10-3 - Add vdr-plugin-live-noCopyTimer.patch to avoid copying vdr timer objects From 2cc85c5a87e1c0ca5d2243d3dc62fdd0330a1790 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 28 Oct 2021 11:08:02 +0200 Subject: [PATCH 19/86] Update to 3.1.0 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8cec65c..71eb72f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.12.tar.gz) = 21c32645caefb3177c9a984de98febcbea6926c744ad2c8cfe3053da6cbd644868ca783c4c9d587c0fd66a26f6051443cb3d22bc7637bebddf70fd8b1559d637 +SHA512 (vdr-live-3.1.0.tar.gz) = 2c753816ced623963ce805f17311255534f33b31607d80ce29847d14fc98e2f46dfc8f51d74c0e9292f7b3d14619b98b7add0a261a4b30410c9949c6b3c07934 diff --git a/vdr-live.spec b/vdr-live.spec index 333cef1..4b285a6 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20210307 Name: vdr-live -Version: 3.0.12 +Version: 3.1.0 #Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Oct 28 2021 Martin Gansser - 3.1.0-1 +- Update to 3.1.0 + * Fri Oct 15 2021 Martin Gansser - 3.0.12-1 - Update to 3.0.12 From 2f8ed24037f9b9c957326519472c147ff5bc6a0c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 1 Nov 2021 08:15:36 +0100 Subject: [PATCH 20/86] Update to 3.1.1 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 71eb72f..f1cd35f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.0.tar.gz) = 2c753816ced623963ce805f17311255534f33b31607d80ce29847d14fc98e2f46dfc8f51d74c0e9292f7b3d14619b98b7add0a261a4b30410c9949c6b3c07934 +SHA512 (vdr-live-3.1.1.tar.gz) = 4e9614f9004d908f8143dd2620fd837892f112172cf7fd1b263d97d9aea583c74af80331676706f64e5af7f039cc5d1d62c08512facf70a5420d510a1cec1150 diff --git a/vdr-live.spec b/vdr-live.spec index 4b285a6..4cfce66 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20210307 Name: vdr-live -Version: 3.1.0 +Version: 3.1.1 #Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Nov 01 2021 Martin Gansser - 3.1.1-1 +- Update to 3.1.1 + * Thu Oct 28 2021 Martin Gansser - 3.1.0-1 - Update to 3.1.0 From b0931c51fc77148e5ea0a585e12a0ce7d5941f07 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 6 Nov 2021 09:55:25 +0100 Subject: [PATCH 21/86] Build compatibility to g++11 --- vdr-live.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 4cfce66..fc0e0c6 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -6,7 +6,7 @@ Name: vdr-live Version: 3.1.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 GPLv2+ except live/js/mootools/ which is MIT @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++11 -fPIC" %install %make_install @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Fri Nov 5 2021 Dirk Nehring - 3.1.1-2 +- Build compatibility to g++11 + * Mon Nov 01 2021 Martin Gansser - 3.1.1-1 - Update to 3.1.1 From cb04bcd3c288597060a1d70f09f18ddee0373879 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 15 Nov 2021 08:21:30 +0100 Subject: [PATCH 22/86] Update to 3.1.3 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index f1cd35f..5b89b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.1.tar.gz) = 4e9614f9004d908f8143dd2620fd837892f112172cf7fd1b263d97d9aea583c74af80331676706f64e5af7f039cc5d1d62c08512facf70a5420d510a1cec1150 +SHA512 (vdr-live-3.1.3.tar.gz) = 5f0a6358fae5a351872baddac5522725d4b6ad7a9c45bf02945c9e3f2db77ed3dc8065be93ac1ebe41fd74f61605b6d0ff2486f46b111c60594aab6bc2649897 diff --git a/vdr-live.spec b/vdr-live.spec index fc0e0c6..ccad61e 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,9 +4,9 @@ %global gitdate 20210307 Name: vdr-live -Version: 3.1.1 +Version: 3.1.3 #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 GPLv2+ except live/js/mootools/ which is MIT @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Nov 15 2021 Martin Gansser - 3.1.3-1 +- Update to 3.1.3 + * Fri Nov 5 2021 Dirk Nehring - 3.1.1-2 - Build compatibility to g++11 From 1f0929cbdc9f51ef713f110487d6aea3d612a8bb Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 15 Nov 2021 08:48:05 +0100 Subject: [PATCH 23/86] Update to 3.1.3 --- vdr-live.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vdr-live.spec b/vdr-live.spec index ccad61e..eb4a534 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -56,7 +56,11 @@ 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++11 -fPIC" +%endif %install %make_install From 379ea098b06d19d8d41ce1d4ed8eba28dc6dfeb4 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 28 Dec 2021 11:27:26 +0100 Subject: [PATCH 24/86] Replace obsolete pcre by pcre2 Update to 3.1.4-0.1.20211228git0fbd9b3 --- sources | 2 +- vdr-live.spec | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sources b/sources index 5b89b5e..40e15e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.3.tar.gz) = 5f0a6358fae5a351872baddac5522725d4b6ad7a9c45bf02945c9e3f2db77ed3dc8065be93ac1ebe41fd74f61605b6d0ff2486f46b111c60594aab6bc2649897 +SHA512 (vdr-live-3.1.4-0fbd9b3.tar.gz) = 9f6712ba8d4fec3bd2ac29f3dbeb3ec95825d44f4ee32dd7c962d5072a3e075c3a6281824da1fafc7dd6b8ec804696a7bff6ad0a0c7a40a4b6c976e73d882aa4 diff --git a/vdr-live.spec b/vdr-live.spec index eb4a534..760e2f9 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,25 +1,25 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/075080afb4f2a9ec1d3a488ba62095867479aee2 -%global commit0 075080afb4f2a9ec1d3a488ba62095867479aee2 +# https://github.com/MarkusEh/vdr-plugin-live/commit/0fbd9b32fc6afcdbe8722daa0e772260cd058f41 +%global commit0 0fbd9b32fc6afcdbe8722daa0e772260cd058f41 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210307 +%global gitdate 20211228 Name: vdr-live -Version: 3.1.3 -#Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Version: 3.1.4 +Release: 0.1.%{gitdate}git%{shortcommit0}%{?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 License: GPLv2+ and 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 BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 2.2.0 -BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: tntnet-devel BuildRequires: cxxtools-devel Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -44,8 +44,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 @@ -56,11 +56,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++11 -fPIC" -%endif %install %make_install @@ -81,6 +77,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Tue Dec 28 2021 Martin Gansser - 3.1.4-0.1.20211228git0fbd9b3 +- Replace obsolete pcre by pcre2 +- Update to 3.1.4-0.1.20211228git0fbd9b3 + * Mon Nov 15 2021 Martin Gansser - 3.1.3-1 - Update to 3.1.3 From 6ef5e6014665d969e6f3ce17e5dc849b26bbec1c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 28 Dec 2021 11:39:06 +0100 Subject: [PATCH 25/86] Replace obsolete pcre by pcre2 Update to 3.1.4-0.1.20211228git0fbd9b3 --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 760e2f9..e7ad50e 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++11 -fPIC" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install %make_install From 744e7abc3f63540fe50782abd2e68701c07a56b2 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 30 Dec 2021 16:14:34 +0100 Subject: [PATCH 26/86] Build compatibility to g++11 --- vdr-live.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index e7ad50e..9967ac3 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,7 +5,7 @@ Name: vdr-live Version: 3.1.4 -Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} #Release: 2%%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++11 -fPIC" %install %make_install @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Dec 30 2021 Martin Gansser - 3.1.4-0.2.20211228git0fbd9b3 +- Build compatibility to g++11 + * Tue Dec 28 2021 Martin Gansser - 3.1.4-0.1.20211228git0fbd9b3 - Replace obsolete pcre by pcre2 - Update to 3.1.4-0.1.20211228git0fbd9b3 From 87ecb8b48841387933f71eb525cb7c0dacdaab22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:51:40 +0000 Subject: [PATCH 27/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 9967ac3..4dca783 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,7 +5,7 @@ Name: vdr-live Version: 3.1.4 -Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.3.%{gitdate}git%{shortcommit0}%{?dist} #Release: 2%%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.1.4-0.3.20211228git0fbd9b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 30 2021 Martin Gansser - 3.1.4-0.2.20211228git0fbd9b3 - Build compatibility to g++11 From 90868424753131f8b9158d3f1c7f467839498740 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 29 Jan 2022 12:49:46 +0100 Subject: [PATCH 28/86] Add %undefine _package_note_flags to vdr main package rebuild for rawhide --- vdr-live.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 4dca783..a812547 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -5,7 +5,7 @@ Name: vdr-live Version: 3.1.4 -Release: 0.3.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.4.%{gitdate}git%{shortcommit0}%{?dist} #Release: 2%%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -56,7 +56,11 @@ 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++11 -fPIC" +%endif %install %make_install @@ -77,6 +81,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Jan 29 2022 Martin Gansser - 3.1.4-0.4.20211228git0fbd9b3 +- Add %%undefine _package_note_flags to vdr main package +- rebuild for rawhide + * Sat Jan 22 2022 Fedora Release Engineering - 3.1.4-0.3.20211228git0fbd9b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b93740676d59dc3750aeb1b4affa07bd77041cfe Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 3 Feb 2022 18:21:42 +0100 Subject: [PATCH 29/86] Update to 3.1.5 --- sources | 2 +- vdr-live.spec | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 40e15e3..dded6d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.4-0fbd9b3.tar.gz) = 9f6712ba8d4fec3bd2ac29f3dbeb3ec95825d44f4ee32dd7c962d5072a3e075c3a6281824da1fafc7dd6b8ec804696a7bff6ad0a0c7a40a4b6c976e73d882aa4 +SHA512 (vdr-live-3.1.5.tar.gz) = 9a55505a1bcb5b4c5876d6bdf4694435bd35809d38b75da2c3e5d17a09569b5f5b095dc5a8785faac256dfdd1c43bc3435f7f6ea3d8bec04208bcf9ef3b17112 diff --git a/vdr-live.spec b/vdr-live.spec index a812547..aa62e6d 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,16 +4,16 @@ %global gitdate 20211228 Name: vdr-live -Version: 3.1.4 -Release: 0.4.%{gitdate}git%{shortcommit0}%{?dist} -#Release: 2%%{?dist} +Version: 3.1.5 +#Release: 0.4.%%{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 License: GPLv2+ and 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 @@ -44,8 +44,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 @@ -81,6 +81,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Feb 03 2022 Martin Gansser - 3.1.5-1 +- Update to 3.1.5 + * Sat Jan 29 2022 Martin Gansser - 3.1.4-0.4.20211228git0fbd9b3 - Add %%undefine _package_note_flags to vdr main package - rebuild for rawhide From 6db738a6a16d47df44427228ee2d2140d0359c7d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 26 Feb 2022 17:36:15 +0100 Subject: [PATCH 30/86] Rebuilt --- vdr-live.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index aa62e6d..170560a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -6,7 +6,7 @@ Name: vdr-live Version: 3.1.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 @@ -81,6 +81,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Feb 12 2022 Martin Gansser - 3.1.5-2 +- Rebuilt + * Thu Feb 03 2022 Martin Gansser - 3.1.5-1 - Update to 3.1.5 From 443615e7a66c31a05a0cfee7c1bf19972fed4ffa Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 19 Jun 2022 21:07:52 +0200 Subject: [PATCH 31/86] Updatae to 3.1.6 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index dded6d5..e969d90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.5.tar.gz) = 9a55505a1bcb5b4c5876d6bdf4694435bd35809d38b75da2c3e5d17a09569b5f5b095dc5a8785faac256dfdd1c43bc3435f7f6ea3d8bec04208bcf9ef3b17112 +SHA512 (vdr-live-3.1.6.tar.gz) = a785e2378f63fc751651d99d4041699c699240eb372cbd154fb974e5b3d9a0dc6f6a920e5fccdddea54677885556310ea375ee91cf77dfa760d2e1488b40b571 diff --git a/vdr-live.spec b/vdr-live.spec index 170560a..928f47f 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,9 +4,9 @@ %global gitdate 20211228 Name: vdr-live -Version: 3.1.5 +Version: 3.1.6 #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 @@ -81,6 +81,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sun Jun 19 2022 Martin Gansser - 3.1.6-1 +- Updatae to 3.1.6 + * Sat Feb 12 2022 Martin Gansser - 3.1.5-2 - Rebuilt From 2e322ea2d7ced44be68aff5b93e36e1079ec5b0d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 20 Jun 2022 13:03:34 +0200 Subject: [PATCH 32/86] Built against correct vdr-devel version --- vdr-live.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index 928f47f..8aa1bbd 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -2,11 +2,19 @@ %global commit0 0fbd9b32fc6afcdbe8722daa0e772260cd058f41 %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 +%endif Name: vdr-live Version: 3.1.6 #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 @@ -18,7 +26,7 @@ Source1: %{name}.conf BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: vdr-devel >= 2.2.0 +BuildRequires: vdr-devel >= %{vdr_version} BuildRequires: pcre2-devel BuildRequires: tntnet-devel BuildRequires: cxxtools-devel @@ -81,6 +89,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Jun 20 2022 Martin Gansser - 3.1.6-2 +- Built against correct vdr-devel version + * Sun Jun 19 2022 Martin Gansser - 3.1.6-1 - Updatae to 3.1.6 From f8c89d1fc318b38a2f8161383eaa32481e5feef0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:45:33 +0000 Subject: [PATCH 33/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 8aa1bbd..2a545d2 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -14,7 +14,7 @@ Name: vdr-live Version: 3.1.6 #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 @@ -89,6 +89,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 20 2022 Martin Gansser - 3.1.6-2 - Built against correct vdr-devel version From 4797bf068d57cab2e7625ef2b68b8350052f92d4 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 28 Jul 2022 16:17:31 +0200 Subject: [PATCH 34/86] Updatae to 3.1.7 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e969d90..c947990 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.6.tar.gz) = a785e2378f63fc751651d99d4041699c699240eb372cbd154fb974e5b3d9a0dc6f6a920e5fccdddea54677885556310ea375ee91cf77dfa760d2e1488b40b571 +SHA512 (vdr-live-3.1.7.tar.gz) = d9d39f7a8560eeca6df8b4a7eb6de4ddf80c1802de3d839278fc2091727764ea8037f0111c59d6e51b8f3a39e56f7c025629f138e3d4e24c41a0ba1939103f4b diff --git a/vdr-live.spec b/vdr-live.spec index 2a545d2..efe06b7 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,9 +12,9 @@ %endif Name: vdr-live -Version: 3.1.6 +Version: 3.1.7 #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 @@ -89,6 +89,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Thu Jul 28 2022 Martin Gansser - 3.1.7-1 +- Updatae to 3.1.7 + * Sat Jul 23 2022 Fedora Release Engineering - 3.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0a827ad8a7d4c6d510cbe077eb1cae2519983e2e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 10 Oct 2022 13:52:41 +0200 Subject: [PATCH 35/86] Updatae to 3.1.8 --- sources | 2 +- vdr-live.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c947990..79ed972 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.1.7.tar.gz) = d9d39f7a8560eeca6df8b4a7eb6de4ddf80c1802de3d839278fc2091727764ea8037f0111c59d6e51b8f3a39e56f7c025629f138e3d4e24c41a0ba1939103f4b +SHA512 (vdr-live-3.1.8.tar.gz) = 1f89e1b782ea258726e3cf6cf236a029937ba5df10ce04b6142084afd0912d5513efe601e9a82bd69a5fd5355d23036b90d0399bac616aed666ac00c062d5c9d diff --git a/vdr-live.spec b/vdr-live.spec index efe06b7..528ec0a 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -12,7 +12,7 @@ %endif Name: vdr-live -Version: 3.1.7 +Version: 3.1.8 #Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -89,6 +89,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Oct 10 2022 Martin Gansser - 3.1.8-1 +- Updatae to 3.1.8 + * Thu Jul 28 2022 Martin Gansser - 3.1.7-1 - Updatae to 3.1.7 From 5f85e24c14c2db621d3900f5df8baa816408c056 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Nov 2022 18:36:47 +0100 Subject: [PATCH 36/86] 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 f3e0a44ff00aa6580e81e4acdd8c9191e02d4cfa Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 1 Dec 2022 16:59:40 +0100 Subject: [PATCH 37/86] 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 38/86] 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 39/86] 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 40/86] 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 aa997dbeabc5edf82771076d8e2ede5b1709efde Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 18 Jan 2023 09:19:07 +0100 Subject: [PATCH 41/86] 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 9471ba2f696be25869ddc48ee74621c1a61ac746 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:10:42 +0000 Subject: [PATCH 42/86] 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 43/86] 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 1229db30cf0804d6dec3e20386e0f0128577ad53 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 11 Jun 2023 17:09:53 +0200 Subject: [PATCH 44/86] 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 45/86] 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 46/86] 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 47/86] 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 48/86] 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 fca797fb364e8c0cfac95132930070dc369c1762 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 19 Nov 2023 12:32:22 +0100 Subject: [PATCH 49/86] 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 50/86] 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 51/86] 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 52/86] 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 53/86] 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 54/86] 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 55/86] 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 56/86] 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 57/86] 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 58/86] 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 59/86] 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 60/86] 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 61/86] 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 62/86] 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 63/86] 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 64/86] 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 65/86] 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 66/86] 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 67/86] 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 68/86] 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 69/86] 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 70/86] 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 71/86] 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 72/86] 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 73/86] 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 74/86] 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 75/86] 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 76/86] 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 77/86] 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 78/86] 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 79/86] 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 80/86] 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 81/86] 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 82/86] 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 83/86] 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 84/86] 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 85/86] 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 86/86] 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