Rebuild against libwebsockets 4.5.0

(https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/)

.gitignore

@@ -1 +1,10 @@
 /vdr-osd2web-0.2.48.tgz
+/vdr-osd2web-0.2.49.tar.gz
+/vdr-osd2web-0.2.50.tar.gz
+/vdr-osd2web-0.2.52.tar.gz
+/vdr-osd2web-0.2.54.tar.gz
+/vdr-osd2web-0.2.56.tar.gz
+/vdr-osd2web-0.2.58.tar.gz
+/vdr-osd2web-0.3.0.tar.gz
+/vdr-osd2web-0.3.1.tar.gz
+/vdr-osd2web-0.3.2.tar.gz

sources

@@ -1 +1 @@
-SHA512 (vdr-osd2web-0.2.48.tgz) = e624356c4d5d33a3522bf9e2d57af7c3e4adc0d1b2ad4b0d5dc57ab25a3b3769bb2ac5917caded2960d98354b123bafcb75feb167c89ab266e43188d302d38dd
+SHA512 (vdr-osd2web-0.3.2.tar.gz) = de7bb75a36d9855011e082e4330bb043e4f9e5bcbfa3217219140978de7b81da76ff3e14dacd65a40c2f7097a85b964729fdb13c17a23691615ae59ee31c9caf

vdr-osd2web-ambiguous.patch

@@ -0,0 +1,10 @@
+--- vdr-plugin-osd2web-0.2.54/config.h.orig	2021-07-30 17:41:07.615798295 +0200
++++ vdr-plugin-osd2web-0.2.54/config.h	2021-07-30 17:41:31.476800228 +0200
+@@ -13,6 +13,7 @@
+ #ifndef __O2W_CONFIG_H
+ #define __O2W_CONFIG_H
+ 
++#define DISABLE_TEMPLATES_COLLIDING_WITH_STL
+ #include "lib/config.h"
+ 
+ //***************************************************************************

vdr-osd2web-makefile.patch

@@ -1,18 +1,15 @@
---- vdr-plugin-osd2web-0.2.48/Make.config.orig	2018-11-07 22:57:13.260539078 +0100
-+++ vdr-plugin-osd2web-0.2.48/Make.config	2018-11-07 22:59:38.788808926 +0100
-@@ -32,12 +32,9 @@
+--- vdr-plugin-osd2web-0.2.54/Make.config.orig	2020-09-13 13:24:15.790663741 +0200
++++ vdr-plugin-osd2web-0.2.54/Make.config	2020-09-13 13:25:12.448692331 +0200
+@@ -32,9 +32,9 @@
    CXXFLAGS += -O3
  endif
  
--CXXFLAGS   += -fPIC -Wreturn-type -Wall -Wextra -Wno-unused-parameter -Wformat -pedantic \
--              -Wno-variadic-macros -Wunused-variable -Wunused-label -Wno-unused-result \
--              -Wunused-value -Wunused-function -Wunused-local-typedefs \
--              -Wparentheses -Werror=overloaded-virtual \
--              -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--CXXFLAGS   += -std=c++11 -D__STDC_FORMAT_MACROS
+-CFLAGS += -pthread -fPIC -std=c++17 -Wall -Wreturn-type -Wformat -pedantic -Wunused-variable -Wunused-label \
+-          -Wunused-value -Wunused-function -Wno-long-long -Wno-unused-parameter \
+-          -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 +CFLAGS += @@OPTFLAGS \
 +          -fPIC -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 +          -std=c++11 -D__STDC_FORMAT_MACROS
  
+ 
  ifdef USE_CLANG
-   CXXFLAGS += -x c++ -Wunused-const-variable

vdr-osd2web.spec

@@ -4,18 +4,28 @@
 %global rname   vdr-plugin-osd2web
 %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
+# 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-%{pname}
-Version:        0.2.48
-Release:        3%{?dist}
+Version:        0.3.2
+Release:        20%{?dist}
 Summary:        VDR skin interface for the browser
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            https://github.com/horchi/vdr-plugin-osd2web
-Source0:        https://github.com/horchi/vdr-plugin-osd2web/archive/%{version}/%{name}-%{version}.tgz
-Patch0:         vdr-osd2web-makefile.patch
+Source0:        https://github.com/horchi/vdr-plugin-osd2web/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
 
+BuildRequires:  make
 BuildRequires:  gcc-c++
-BuildRequires:  vdr-devel >= 2.2.0
+BuildRequires:  gettext
+BuildRequires:  vdr-devel >= %{vdr_version}
 BuildRequires:  libwebsockets-devel
 BuildRequires:  zlib-devel
 BuildRequires:  tinyxml2-devel
@@ -30,8 +40,7 @@ osd2web is a VDR skin interface for the browser, which displays the OSD
 and allows all interactions which are possible on the OSD.
 
 %prep
-%setup -q -n %{rname}-%{version}
-%patch0 -p1
+%autosetup -n %{rname}-%{version}
 
 ## Optimization flags in 'Make.config' file
 sed -i \
@@ -72,6 +81,164 @@ install -Dpm 755 scripts/startBrowser.sh %{buildroot}%{vdr_plugindir}/bin/startB
 %{vdr_plugindir}/bin/startBrowser.sh
 
 %changelog
+* Sun Nov 30 2025 Peter Robinson <pbrobinson@fedoraproject.org> - 0.3.2-20
+- Rebuild against libwebsockets 4.5.0
+
+* Sat Aug 23 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 0.3.2-19
+- Rebuilt for tinyxml2 11.0.0
+
+* Fri Jul 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-18
+- Rebuilt for new VDR API version 2.7.7
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jul 21 2025 Peter Robinson <pbrobinson@fedoraproject.org> - 0.3.2-16
+- Rebuild for libwebsockets 4.4
+
+* Sat Jun 21 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-15
+- Rebuilt for new VDR API version 2.7.6
+
+* Tue May 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-14
+- Rebuilt for new VDR API version 2.7.5
+
+* Fri Feb 28 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-13
+- Rebuilt for new VDR API version 2.7.4
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Nov 11 2024 Dominik Mierzejewski <dominik@greysector.net> - 0.3.2-11
+- rebuild for tinyxml2
+
+* Tue Oct 22 2024 Richard W.M. Jones <rjones@redhat.com> - 0.3.2-10
+- Rebuild for Jansson 2.14
+  (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/)
+
+* Wed Oct 09 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-9
+- Rebuilt for new VDR API version 2.7.2
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 0.3.2-8
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jul 15 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-6
+- Rebuilt for new VDR API version 2.6.9
+
+* Fri Jul 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-5
+- Rebuilt for new VDR API version 2.6.8
+
+* Fri Apr 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-4
+- Rebuilt for new VDR API version
+
+* Fri Jan 26 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-3
+- Rebuilt for new VDR API version
+
+* Fri Jan 05 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-2
+- Rebuilt for new VDR API version
+- Add BR gettext for rawhide
+
+* Mon Oct 23 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-1
+- Update to 0.3.2
+
+* Wed Oct 18 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.3.1-1
+- Update to 0.3.1
+
+* Wed Oct 11 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.3.0-1
+- Update to 0.3.0
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.58-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Mar 20 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.2.58-1
+- Update to 0.2.58
+
+* Sun Mar 12 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.2.56-1
+- Update to 0.2.56
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.54-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Dec 14 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-16
+- Rebuilt for new VDR API version
+
+* Thu Dec 01 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-15
+- Rebuilt for new VDR API version
+
+* Sun Sep 25 2022 Rich Mattes <richmattes@gmail.com> - 0.2.54-14
+- Rebuild for tinyxml2-9.0.0
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.54-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Feb 22 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-12
+- Rebuilt due an SONAME bump of libwebsockets to 4.3.1
+
+* Fri Feb 04 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-11
+- Rebuilt for new VDR API version
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.54-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 30 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-9
+- Rebuilt for new VDR API version
+
+* Thu Aug 26 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-8
+- Rebuilt due an SONAME bump of libwebsockets to 4.2.0
+
+* Fri Jul 30 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-7
+- Add %%{name}-ambiguous.patch fixes (BZ#1988033)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.54-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Apr 28 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-5
+- Rebuilt for new VDR API version
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.54-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Jan 03 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-3
+- Rebuilt for new VDR API version
+
+* Wed Oct 21 2020 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-2
+- Rebuilt for new VDR API version
+
+* Sun Sep 13 2020 Martin Gansser <martinkg@fedoraproject.org> - 0.2.54-1
+- Rebuilt for new libwebsockets
+- Update to 0.2.54
+
+* Sun Aug 02 2020 Martin Gansser <martinkg@fedoraproject.org> - 0.2.52-1
+- Update to 0.2.52
+- Rebuilt for new VDR API version
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.50-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Mar 12 2020 Martin Gansser <martinkg@fedoraproject.org> - 0.2.50-1
+- Update to 0.2.50
+- Rebuilt due an SONAME bump of libwebsockets to 4.0.0
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.49-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Sep 19 2019 Martin Gansser <martinkg@fedoraproject.org> - 0.2.49-4
+- Rebuilt for new libwebsocket version 
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.49-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Jun 22 2019 Martin Gansser <martinkg@fedoraproject.org> - 0.2.49-2
+- Rebuilt for new VDR API version
+
+* Fri May 31 2019 Martin Gansser <martinkg@fedoraproject.org> - 0.2.49-1
+- Update to 0.2.49
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.48-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sun Jan 20 2019 Martin Gansser <martinkg@fedoraproject.org> - 0.2.48-3
 - Rebuilt for new libwebsockets