Rebuilt for new VDR API version 2.7.7

Rebuilt for new VDR API version 2.7.4
Rebuilt for new VDR API version 2.7.4

.gitignore

@@ -3,3 +3,6 @@ vdr-streamdev-0.5.0.tgz
 /vdr-streamdev-0.6.0.tgz
 /vdr-streamdev-10db11ac.tar.xz
 /vdr-streamdev-84c6f6b6.tar.xz
+/vdr-streamdev-b84b7d85.tar.xz
+/vdr-streamdev-0.6.3.tar.gz
+/vdr-streamdev-0.6.4.tar.gz

0001-Fixed-compilation-for-vdr-2.3.7.diff

@@ -0,0 +1,36 @@
+From ce74c3ab559d579c37ad8ac29ddfc188d2f3ba26 Mon Sep 17 00:00:00 2001
+From: Jasmin Jessich <jasmin@anw.at>
+Date: Sun, 11 Jun 2017 21:01:01 +0200
+Subject: [PATCH] Fixed compilation for vdr 2.3.7
+
+---
+ server/connectionVTP.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/server/connectionVTP.c b/server/connectionVTP.c
+index 1b8dd96..346ca45 100644
+--- a/server/connectionVTP.c
++++ b/server/connectionVTP.c
+@@ -41,7 +41,9 @@ private:
+ 	enum eStates { Channel, Event, Title, Subtitle, Description, Vps, Content, Rating,
+ 	               EndEvent, EndChannel, EndEPG };
+ 	cConnectionVTP    *m_Client;
++#if APIVERSNUM < 20300
+ 	cSchedulesLock    *m_SchedulesLock;
++#endif
+ 	const cSchedules  *m_Schedules;
+ 	const cSchedule   *m_Schedule;
+ 	const cEvent      *m_Event;
+@@ -210,7 +212,9 @@ cLSTEHandler::cLSTEHandler(cConnectionVTP *Client, const char *Option):
+ 
+ cLSTEHandler::~cLSTEHandler()
+ {
++#if APIVERSNUM < 20300
+ 	delete m_SchedulesLock;
++#endif
+ }
+ 
+ bool cLSTEHandler::Next(bool &Last)
+-- 
+2.7.4
+

sources

@@ -1 +1 @@
-a423976db5df43893fb00e50a6aa44e7  vdr-streamdev-84c6f6b6.tar.xz
+SHA512 (vdr-streamdev-0.6.4.tar.gz) = 8687e3f64fdd60257049dfc6955042f3983f30f2f66b2c96525109e1dbe36584054b15aaf3086b93f0026f641541d8322a9b0ada1308f7e1bdffe47db5c2892b

streamdev-server-2.5.4-patch

@@ -0,0 +1,37 @@
+diff -r -Bc a/server/connectionVTP.c b/server/connectionVTP.c
+*** a/server/connectionVTP.c	2021-05-22 10:33:01.633332698 +0200
+--- b/server/connectionVTP.c	2021-05-22 10:27:50.000000000 +0200
+***************
+*** 1882,1888 ****
+  #endif
+  									}
+  									else {
+! 										cDevice::SetCurrentChannel(CurrentChannel);
+  									}
+  								}
+  								isyslog("channel %d moved to %d", FromNumber, ToNumber);
+--- 1882,1888 ----
+  #endif
+  									}
+  									else {
+! 										cDevice::SetCurrentChannel(CurrentChannel->Number());
+  									}
+  								}
+  								isyslog("channel %d moved to %d", FromNumber, ToNumber);
+***************
+*** 1983,1989 ****
+  							Channels.SwitchTo(CurrentChannel->Number());
+  #endif
+  						else
+! 							cDevice::SetCurrentChannel(CurrentChannel);
+  					}
+  					Reply(250, "Channel \"%s\" deleted", Option);
+  				}
+--- 1983,1989 ----
+  							Channels.SwitchTo(CurrentChannel->Number());
+  #endif
+  						else
+! 							cDevice::SetCurrentChannel(CurrentChannel->Number());
+  					}
+  					Reply(250, "Channel \"%s\" deleted", Option);
+  				}

vdr-streamdev.spec

@@ -1,29 +1,42 @@
 %global pname     streamdev
 # If this variable is set the spec file assumes it's building a git snapshot
 # Also see info below on generating snapshots
-%global gitver    84c6f6b6f363549e88efd01d12df35ae6e336578
+%global gitver    b84b7d858cf4f6f3473ba72d456326c048946cb0
 %global gitshort  %(echo %gitver | awk '{print substr($0,1,8)}')
 %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
-%if 0%{?gitver:1}
+# 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
+
+%if 0%{?gitver:0}
   # Use vdr-streamdev-snapshot.sh contained in the source of the package to
   # generate new snapshots
   # You can also create snapshots for specific commit hashes
-  # Example: sh vdr-streamdev-snapshot.sh 10db11acd9a9785443182da1ec032c1d83db271a
+  # Example: sh vdr-streamdev-snapshot.sh b84b7d858cf4f6f3473ba72d456326c048946cb0
   %global srcfile   %{name}-%{gitshort}.tar.xz
   %global setuppath %{name}-%{gitshort}
 %else
   # URL for original source file when not using git snapshots
-  %global srcfile   http://projects.vdr-developer.org/attachments/download/969/%{name}-%{version}.tgz
+  %global srcfile   https://github.com/vdr-projects/vdr-plugin-streamdev/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
   %global setuppath %{pname}-%{version}
 %endif
 
 Name:           vdr-%{pname}
-Version:        0.6.1
+Version:        0.6.4
-Release:        0.14%{?gitver:.git%{gitshort}}%{?dist}
+%if 0%{?gitver:0}
+Release:        0.48%{?gitver:.git%{gitshort}}%{?dist}
+%else
+Release:        7%{?dist}
+%endif
 Summary:        Streaming plug-in for VDR
-License:        GPL+ and GPLv2+
+License:        GPL-1.0-or-later AND GPL-2.0-or-later
-URL:            http://projects.vdr-developer.org/projects/plg-streamdev
+URL:            https://github.com/vdr-projects/vdr-plugin-streamdev
 
 Source0:        %{srcfile}
 # Configuration files for plugin parameters. These are Fedora specific and not in upstream.
@@ -33,12 +46,14 @@ Source2:        %{name}-client.conf
 # listed here so that it's pulled into the SRPM
 Source3:        %{name}-snapshot.sh
 
-BuildRequires:  vdr-devel >= 1.6.0-41
+BuildRequires:  make
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  vdr-devel >= %{vdr_version}
 
 %description
 The streamdev plug-in adds streaming capabilities to your VDR.
 
-
 %package server
 Summary:        Streaming server plug-in for VDR
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -47,7 +62,6 @@ Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 Lets your VDR act as a streaming server for other clients.
 This will let you watch TV or Recordings across the network.
 
-
 %package client
 Summary:        Streaming client plug-in for VDR
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -56,9 +70,13 @@ Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 Lets your VDR in conjunction with a streamdev-server act as a streaming client.
 VDR will then be able to work even without a DVB device.
 
-
 %prep
-%setup -q -n %{setuppath}
+%if 0%{?gitver:0}
+%autosetup -p1 -n %{setuppath}
+%else
+%autosetup -p1 -n vdr-plugin-streamdev-%{version}
+%endif
+
 sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile
 
 for f in CONTRIBUTORS HISTORY; do
@@ -67,10 +85,8 @@ for f in CONTRIBUTORS HISTORY; do
   mv $f.conv $f
 done
 
-
 %build
-make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"
+%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"
-
 
 %install
 %make_install
@@ -84,7 +100,6 @@ install -Dpm 644 %{SOURCE2} \
 %find_lang %{name}-server
 %find_lang %{name}-client
 
-
 %files server -f %{name}-server.lang
 %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
 %{vdr_plugindir}/libvdr-%{pname}-server.so.%{vdr_apiversion}
@@ -98,8 +113,131 @@ install -Dpm 644 %{SOURCE2} \
 %{vdr_plugindir}/libvdr-%{pname}-client.so.%{vdr_apiversion}
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf
 
-
 %changelog
+* Fri Jul 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.6.4-7
+- Rebuilt for new VDR API version 2.7.7
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jun 21 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.6.4-5
+- Rebuilt for new VDR API version 2.7.6
+
+* Tue May 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.6.4-4
+- Rebuilt for new VDR API version 2.7.5
+
+* Fri Feb 28 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.6.4-3
+- Rebuilt for new VDR API version 2.7.4
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan 02 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.6.4-1
+- Update to 0.6.4
+
+* Wed Oct 09 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-14
+- Rebuilt for new VDR API version 2.7.2
+
+* Wed Aug 07 2024 Miroslav Suchý <msuchy@redhat.com> - 0.6.3-13
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jul 15 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-11
+- Rebuilt for new VDR API version 2.6.9
+
+* Thu Jul 11 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-10
+- Rebuilt for new VDR API version 2.6.8
+
+* Fri Apr 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-9
+- Rebuilt for new VDR API version
+
+* Fri Jan 26 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-8
+- Rebuilt for new VDR API version
+
+* Fri Jan 05 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-7
+- Rebuilt for new VDR API version
+- Add BR gettext for rawhide
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Dec 14 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-4
+- Rebuilt for new VDR API version
+
+* Thu Dec 01 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-3
+- Rebuilt for new VDR API version
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jun 19 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.6.3-1
+- Update to 0.6.3
+
+* Sat Feb 05 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.6.1-0.33.gitb84b7d85
+- Rebuilt for new VDR API version
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.32.gitb84b7d85
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 30 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.6.1-0.31.gitb84b7d85
+- Rebuilt for new VDR API version
+- Add streamdev-server-2.5.4-patch
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.30.gitb84b7d85
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Apr 28 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.6.1-0.29.gitb84b7d85
+- Rebuilt for new VDR API version
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.28.gitb84b7d85
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Jan 03 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.6.1-0.27.gitb84b7d85
+- Rebuilt for new VDR API version
+
+* Fri Aug 28 2020 Martin Gansser <martinkg@fedoraproject.org> - 0.6.1-0.26.gitb84b7d85
+- Rebuilt for new VDR API version
+
+* Fri Aug 14 2020 Jeff Law <law@redhat.com> - 0.6.1-0.25.gitb84b7d85
+- Force C++14 as this code is not C++17 ready
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.24.gitb84b7d85
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.23.gitb84b7d85
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.22.gitb84b7d85
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 18 2019 Martin Gansser <martinkg@fedoraproject.org> - 0.6.1-0.21.gitb84b7d85
+- Rebuilt for new VDR API version
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.20.gitb84b7d85
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.19.gitb84b7d85
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Apr 18 2018 Martin Gansser <martinkg@fedoraproject.org> - 0.6.1-0.18.gitb84b7d85
+- Rebuild for vdr-2.4.0
+- Update to 0.6.1-0.18.gitb84b7d8
+- Add 0001-Fixed-compilation-for-vdr-2.3.7.diff
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.17.git84c6f6b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.16.git84c6f6b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.15.git84c6f6b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-0.14.git84c6f6b6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild