diff --git a/sources b/sources index 26e96b8..1c6234a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.3.2.tar.gz) = 1fc6bbb15772578918de22f3fabb13693328bef349b479819c354f4dd9275c86c94e02c81f7515829ac385fe08e6a3538ca1fd9fb8b839d3c7ead3e592757875 +SHA512 (vdr-live-3.5.3.tar.gz) = b41e559d8bfe1d21301bfc852f91c92155baed49823d2bbf8fe9d36955b93ddd8aaebf4e4ba2fc1427c60876f2889a36846ca894f320fb5e6b7cdb37f6ac2a58 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 1930332..4c5997e 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,28 +1,32 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/0fbd9b32fc6afcdbe8722daa0e772260cd058f41 -%global commit0 0fbd9b32fc6afcdbe8722daa0e772260cd058f41 +# https://github.com/MarkusEh/vdr-plugin-live/commit/9967f1d6757a4f4855a6b07abf526258838dd5ac +%global commit0 9967f1d6757a4f4855a6b07abf526258838dd5ac %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 +%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: 3.3.2 -#Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} +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 -# The entire source code is GPLv2+ except live/js/mootools/ which is MIT -License: GPLv2+ and 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 +# 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: gettext BuildRequires: vdr-devel >= %{vdr_version} BuildRequires: pcre2-devel BuildRequires: tntnet-devel @@ -49,7 +53,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-%{commit0} %autosetup -p1 -n vdr-plugin-live-%{version} # delete unused directories and files @@ -76,12 +80,112 @@ 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 +* 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