diff --git a/sources b/sources index 05aec3d..1c6234a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-live-5cb665d2718b0e5f950b5796c70d92aaffa60b9f.tar.bz2) = cee8892a727ac7839f77f26528a4820cd7d279758546ab8e1008499b702337e3092eefd5d397de1215e6e82f5b752ab39f717f39b22d1b5e93af08bf503a382e +SHA512 (vdr-live-3.5.3.tar.gz) = b41e559d8bfe1d21301bfc852f91c92155baed49823d2bbf8fe9d36955b93ddd8aaebf4e4ba2fc1427c60876f2889a36846ca894f320fb5e6b7cdb37f6ac2a58 diff --git a/vdr-live-gcc6.patch b/vdr-live-gcc6.patch deleted file mode 100644 index bb6a4f1..0000000 --- a/vdr-live-gcc6.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- stdext.h.orig 2016-02-07 12:55:05.958100061 +0100 -+++ stdext.h 2016-02-07 12:56:49.583375455 +0100 -@@ -3,8 +3,38 @@ - - #if __GNUC__ >= 4 - --# include --# include -+#if __GNUC__ >= 6 -+ -+#include -+#include -+ -+namespace std { -+namespace tr1 { -+ -+ using std::bind; -+ using std::shared_ptr; -+ using std::weak_ptr; -+ -+ namespace placeholders { -+ using std::placeholders::_1; -+ using std::placeholders::_2; -+ using std::placeholders::_3; -+ using std::placeholders::_4; -+ using std::placeholders::_5; -+ using std::placeholders::_6; -+ using std::placeholders::_7; -+ using std::placeholders::_8; -+ using std::placeholders::_9; -+ } -+} // namespace tr1 -+} // namespace std -+ -+#else -+ -+ # include -+ # include -+ -+# endif - - #else - diff --git a/vdr-live-libpages-build.patch b/vdr-live-libpages-build.patch deleted file mode 100644 index 44da9f7..0000000 --- a/vdr-live-libpages-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pages/multischedule.ecpp.orig 2017-02-14 08:59:25.064532876 +0100 -+++ pages/multischedule.ecpp 2017-02-14 09:04:55.481453444 +0100 -@@ -299,7 +299,7 @@ - cChannel* Channel = Channels.GetByNumber( chan ); - if ( ! Channel ) - continue; -- if ( Channel->GroupSep() || Channel->Name() == '\0' ) -+ if ( Channel->GroupSep() || !Channel->Name() || !*Channel->Name() ) - continue; - channel_names[ j ] = Channel->Name(); - channel_IDs[ j ] = Channel->GetChannelID(); diff --git a/vdr-live.spec b/vdr-live.spec index 0eec3cc..4c5997e 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,33 +1,41 @@ -# https://projects.vdr-developer.org/git/vdr-plugin-live.git/commit/?id=5cb665d2718b0e5f950b5796c70d92aaffa60b9f -%global commit0 5cb665d2718b0e5f950b5796c70d92aaffa60b9f +# https://github.com/MarkusEh/vdr-plugin-live/commit/9967f1d6757a4f4855a6b07abf526258838dd5ac +%global commit0 9967f1d6757a4f4855a6b07abf526258838dd5ac %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20170519 +%global gitdate 20241103 +# Set vdr_version based on Fedora version +%if 0%{?fedora} >= 43 +%global vdr_version 2.7.7 +%elif 0%{?fedora} == 42 +%global vdr_version 2.7.4 +%else +%global vdr_version 2.6.9 +%endif Name: vdr-live -Version: 2.3.1 -Release: 3.%{gitdate}git%{shortcommit0}%{?dist} -Summary: An interactive web interface for VDR +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 -Group: Applications/Multimedia -# The entire source code is GPLv2+ except live/js/mootools/ which is MIT -License: GPLv2+ and MIT -URL: http://projects.vdr-developer.org/projects/plg-live -# how to get the tarball -# go to http://projects.vdr-developer.org/git/vdr-plugin-live.git/commit/ -# click the link behind commit, then select the download links below. -Source0: http://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/vdr-plugin-live-%{commit0}.tar.bz2 +# 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 +Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf -Patch0: %{name}-gcc6.patch -Patch1: %{name}-libpages-build.patch -BuildRequires: vdr-devel >= 2.2.0 -BuildRequires: pcre-devel +BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: vdr-devel >= %{vdr_version} +BuildRequires: pcre2-devel BuildRequires: tntnet-devel BuildRequires: cxxtools-devel 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 it's plugins by a web interface. @@ -38,7 +46,6 @@ fast. %package data Summary: Images, themes and JavaScript for %{name} -Group: Applications/Multimedia BuildArch: noarch Requires: %{name} = %{version}-%{release} @@ -46,9 +53,8 @@ Requires: %{name} = %{version}-%{release} This package contains images, themes and JavaScript. %prep -%setup -q -n vdr-plugin-live-%{commit0} -#patch0 -p0 -#patch1 -p0 +#%%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 @@ -58,13 +64,11 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README -sed -i -e 's|std::auto_ptr|std::unique_ptr|' thread.h - %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install -make install DESTDIR=%{buildroot} +%make_install # live.conf install -Dpm 644 %{SOURCE1} \ @@ -72,21 +76,312 @@ 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 %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 +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Tue Oct 03 2023 Martin Gansser - 3.2.1-1 +- Update to 3.2.1 + +* Sat Jul 22 2023 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jun 11 2023 Martin Gansser - 3.2.0-1 +- Update to 3.2.0 + +* 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 + +* 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 + +* 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 + +* Wed Dec 14 2022 Martin Gansser - 3.1.9-3 +- Rebuilt for new VDR API version + +* Thu Dec 01 2022 Martin Gansser - 3.1.9-2 +- Rebuilt for new VDR API version + +* Sun Nov 27 2022 Martin Gansser - 3.1.9-1 +- Updatae to 3.1.9 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Sun Jan 31 2021 Martin Gansser - 3.0.4-1 +- Update to 3.0.4 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Jan 24 2021 Martin Gansser - 3.0.2-1 +- Update to 3.0.2 + +* Thu Jan 21 2021 Martin Gansser - 3.0.1-1 +- Update to 3.0.1 + +* Sat Jan 16 2021 Martin Gansser - 3.0.0-1 +- Update to 3.0.0 + +* Sat Jan 16 2021 Martin Gansser - 2.3.1-20.20210111gitf6cfefa +- Add check_existing_recording.patch + +* Mon Jan 11 2021 Martin Gansser - 2.3.1-19.20210111gitf6cfefa +- Update to 2.3.1-19.20210111gitf6cfefa + +* Mon Jan 11 2021 Martin Gansser - 2.3.1-18.20201122git3b24485 +- Use fork because its under maintenance +- Update to 2.3.1-18.20201122git3b24485 + +* Sun Jan 03 2021 Martin Gansser - 2.3.1-17.20170623gite582514 +- Rebuilt for new VDR API version + +* Tue Dec 08 2020 Jonathan Wakely - 2.3.1-16.20170623gite582514 +- Patched for GCC 11 compatibility. +- Remove sed command that is no longer needed. + +* Thu Aug 27 2020 Martin Gansser - 2.3.1-15.20170623gite582514 +- Rebuilt for new VDR API version + +* Wed Jul 29 2020 Fedora Release Engineering - 2.3.1-14.20170623gite582514 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.3.1-13.20170623gite582514 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.3.1-12.20170623gite582514 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 18 2019 Martin Gansser - 2.3.1-11.20170623gite582514 +- Update to last git version 20170623gite582514 +- Rebuilt for new VDR API version + +* Sun Feb 03 2019 Fedora Release Engineering - 2.3.1-10.20170519git5cb665d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Nov 05 2018 Martin Gansser - 2.3.1-9.20170519git5cb665d +- Add vdr-plugin-live_2018-11-04.diff + +* Wed Oct 10 2018 Martin Gansser - 2.3.1-8.20170519git5cb665d +- Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.3.1-7.20170519git5cb665d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Apr 17 2018 Martin Gansser - 2.3.1-6.20170619git5cb665d +- Rebuilt for vdr-2.4.0 + +* Wed Feb 14 2018 Martin Gansser - 2.3.1-5.20170619git5cb665d +- Disable parallel make due build error on rawhide + +* Fri Feb 09 2018 Fedora Release Engineering - 2.3.1-4.20170519git5cb665d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 2.3.1-3.20170519git5cb665d - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild