From 64c099a81ff7c7c5c082f7219e86ada7a4532539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 23 Mar 2014 16:40:52 +0200 Subject: [PATCH 01/50] Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 97d3639..22a1033 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.6%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.7%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,6 +104,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale %changelog +* Sun Mar 23 2014 Ville Skyttä - 0.6.1-0.7.git10db11ac +- Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0.6.1-0.6.git10db11ac - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From ee55261403b7606c2f5bd730ecab6ee0b695f713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 24 Apr 2014 14:44:02 +0300 Subject: [PATCH 02/50] Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 22a1033..003584a 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.7%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.8%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,6 +104,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale %changelog +* Thu Apr 24 2014 Ville Skyttä - 0.6.1-0.8.git10db11ac +- Rebuild + * Sun Mar 23 2014 Ville Skyttä - 0.6.1-0.7.git10db11ac - Rebuild From 2d365fedd5e0820497e908bbba0b3d9b60700ba2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:26:44 -0500 Subject: [PATCH 03/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 003584a..9a4f696 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.8%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.9%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,6 +104,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.6.1-0.9.git10db11ac +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Apr 24 2014 Ville Skyttä - 0.6.1-0.8.git10db11ac - Rebuild From 7392053aba33472fc8853b4633a3a65f49f6dd9b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:42:16 +0000 Subject: [PATCH 04/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 9a4f696..3bd0e58 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.9%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.10%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,6 +104,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.6.1-0.10.git10db11ac +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 0.6.1-0.9.git10db11ac - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 8b1aeb60a1a35190cb4007c9a1c1ba1ce4006e78 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sat, 11 Apr 2015 10:38:44 +0200 Subject: [PATCH 05/50] fix compile for VDR 2.2 and F22+ - use make install --- .gitignore | 1 + sources | 2 +- vdr-streamdev.spec | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9726c06..6301ae2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ vdr-streamdev-0.5.0.tgz /vdr-streamdev-0.5.1.tgz /vdr-streamdev-0.6.0.tgz /vdr-streamdev-10db11ac.tar.xz +/vdr-streamdev-84c6f6b6.tar.xz diff --git a/sources b/sources index ba703dd..d77240d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e5011fd1a4b0624b192911f37c6040e3 vdr-streamdev-10db11ac.tar.xz +a423976db5df43893fb00e50a6aa44e7 vdr-streamdev-84c6f6b6.tar.xz diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 3bd0e58..67ece94 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -1,7 +1,7 @@ %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 10db11acd9a9785443182da1ec032c1d83db271a +%global gitver 84c6f6b6f363549e88efd01d12df35ae6e336578 %global gitshort %(echo %gitver | awk '{print substr($0,1,8)}') %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.10%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.11%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -69,22 +69,18 @@ done %build -make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$PWD/locale all +make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install -install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir} +%make_install install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/streamdev-server -install -pm 755 server/libvdr-%{pname}-server.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir} -install -pm 755 client/libvdr-%{pname}-client.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir} install -Dpm 644 streamdev-server/streamdevhosts.conf $RPM_BUILD_ROOT%{vdr_configdir}/plugins/streamdev-server/streamdevhosts.conf install -Dpm 755 streamdev-server/externremux.sh $RPM_BUILD_ROOT%{_libdir}/vdr/bin/externremux.sh install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf install -Dpm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale -cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale %find_lang %{name}-server %find_lang %{name}-client @@ -104,6 +100,10 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale %changelog +* Tue Apr 07 2015 Felix Kaechele - 0.6.1-0.11.git84c6f6b6 +- fix compile for VDR 2.2 and F22+ +- use make install + * Mon Aug 18 2014 Fedora Release Engineering - 0.6.1-0.10.git10db11ac - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 8712573f4eb0780813f866e18d8e3465862cc7d7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:54:08 +0000 Subject: [PATCH 06/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 67ece94..6afbb33 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.11%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.12%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -100,6 +100,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.6.1-0.12.git84c6f6b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Apr 07 2015 Felix Kaechele - 0.6.1-0.11.git84c6f6b6 - fix compile for VDR 2.2 and F22+ - use make install From 17286f0eb8f9333483204aaab331a32d45d82428 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:37:07 +0000 Subject: [PATCH 07/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 6afbb33..beb3e0e 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.12%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.13%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -100,6 +100,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.6.1-0.13.git84c6f6b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0.6.1-0.12.git84c6f6b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From df046faa3faedf1559c20d2ac373afc4f98ae851 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:59:55 +0000 Subject: [PATCH 08/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index beb3e0e..510be51 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.13%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.14%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -100,6 +100,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.6.1-0.14.git84c6f6b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0.6.1-0.13.git84c6f6b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 794e9d808dfbb5ca6615851f4aa93c26f00cb9df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:14:28 +0000 Subject: [PATCH 09/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 510be51..3ab398e 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.14%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.15%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -100,6 +100,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.6.1-0.15.git84c6f6b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.6.1-0.14.git84c6f6b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 6939954e7ff213de1c420a5f0004ea3d2788452a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:01:22 +0000 Subject: [PATCH 10/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 3ab398e..74a684a 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.15%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.16%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -100,6 +100,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.6.1-0.16.git84c6f6b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.6.1-0.15.git84c6f6b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From eaf6a62e589564523a7708e77fe911f3c7eebcd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:24:28 +0000 Subject: [PATCH 11/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 74a684a..401bafc 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.16%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.17%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -100,6 +100,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.6.1-0.17.git84c6f6b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.6.1-0.16.git84c6f6b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 87097209bec67c19607096974d68ac5c5779ef12 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Thu, 26 Apr 2018 13:23:22 +0200 Subject: [PATCH 12/50] updated package from Martin --- .gitignore | 1 + 0001-Fixed-compilation-for-vdr-2.3.7.diff | 36 +++++++++++++++++++++++ sources | 2 +- vdr-streamdev.spec | 14 +++++++-- 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 0001-Fixed-compilation-for-vdr-2.3.7.diff diff --git a/.gitignore b/.gitignore index 6301ae2..a60a090 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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 diff --git a/0001-Fixed-compilation-for-vdr-2.3.7.diff b/0001-Fixed-compilation-for-vdr-2.3.7.diff new file mode 100644 index 0000000..2a128af --- /dev/null +++ b/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 +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 + diff --git a/sources b/sources index d77240d..3a9bc7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a423976db5df43893fb00e50a6aa44e7 vdr-streamdev-84c6f6b6.tar.xz +SHA512 (vdr-streamdev-b84b7d85.tar.xz) = 3c06014e103e41a96a5485a58e2f456b3fe4066dd765d4578dd05ad08367122c54af06d182c778f5d5d88d2f1a7781333cc161f87a73883cfd20480eea31505a diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 401bafc..cdb2543 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -1,7 +1,7 @@ %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.*$ @@ -9,7 +9,7 @@ # 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 @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.17%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.18%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -32,6 +32,8 @@ Source2: %{name}-client.conf # Script to generate git snapshots # listed here so that it's pulled into the SRPM Source3: %{name}-snapshot.sh +# https://www.vdr-portal.de/index.php?attachment/41040-0001-fixed-compilation-for-vdr-2-3-7-diff/ +Patch0: 0001-Fixed-compilation-for-vdr-2.3.7.diff BuildRequires: vdr-devel >= 1.6.0-41 @@ -59,6 +61,7 @@ VDR will then be able to work even without a DVB device. %prep %setup -q -n %{setuppath} +%patch0 -p1 sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile for f in CONTRIBUTORS HISTORY; do @@ -100,6 +103,11 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Wed Apr 18 2018 Martin Gansser - 0.6.1-0.18.gitb84b7d8 +- 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 - 0.6.1-0.17.git84c6f6b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d91414ed355c92bdcc4b84021083e5d3b1d8602f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:28:23 +0000 Subject: [PATCH 13/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index cdb2543..a560286 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.18%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.19%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -103,6 +103,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.6.1-0.19.gitb84b7d85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Apr 18 2018 Martin Gansser - 0.6.1-0.18.gitb84b7d8 - Rebuild for vdr-2.4.0 - Update to 0.6.1-0.18.gitb84b7d8 From 29fb6536923d5928c81750efc8e9d73b50537e1b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:42 +0200 Subject: [PATCH 14/50] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- vdr-streamdev.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index a560286..c01ba81 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -35,6 +35,7 @@ Source3: %{name}-snapshot.sh # https://www.vdr-portal.de/index.php?attachment/41040-0001-fixed-compilation-for-vdr-2-3-7-diff/ Patch0: 0001-Fixed-compilation-for-vdr-2.3.7.diff +BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 1.6.0-41 %description From 0fb336420aa9c5bd6b5044c974a813b082474b6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:11:13 +0000 Subject: [PATCH 15/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index c01ba81..249cc6f 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.19%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.20%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,6 +104,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.6.1-0.20.gitb84b7d85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.6.1-0.19.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 3e25e948646faa766321069914e2ae05febe430e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 20 Jun 2019 18:44:35 +0200 Subject: [PATCH 16/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 249cc6f..cdf6a7e 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.20%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.21%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,13 +104,16 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Tue Jun 18 2019 Martin Gansser - 0.6.1-0.21.gitb84b7d85 +- Rebuilt for new VDR API version + * Sun Feb 03 2019 Fedora Release Engineering - 0.6.1-0.20.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Sat Jul 14 2018 Fedora Release Engineering - 0.6.1-0.19.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Wed Apr 18 2018 Martin Gansser - 0.6.1-0.18.gitb84b7d8 +* Wed Apr 18 2018 Martin Gansser - 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 From fa5c96f4d46aa8d3372e1db84c40e5f2ce03bb89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:52:57 +0000 Subject: [PATCH 17/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index cdf6a7e..041e877 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.21%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.22%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,6 +104,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.6.1-0.22.gitb84b7d85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 18 2019 Martin Gansser - 0.6.1-0.21.gitb84b7d85 - Rebuilt for new VDR API version From ace613aba4908ff345fb09a4fc2bbce4781c60ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:02:26 +0000 Subject: [PATCH 18/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 041e877..d3e97f0 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.22%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.23%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,6 +104,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.6.1-0.23.gitb84b7d85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.6.1-0.22.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From fc573d64ad59799eca8f5b95e46737d6502bcd9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:37:32 +0000 Subject: [PATCH 19/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index d3e97f0..2f33a30 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.23%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.24%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -104,6 +104,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.6.1-0.24.gitb84b7d85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.6.1-0.23.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8ae15c5ed3d73d57ad9c27c057fba16cc8d9cbea Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 18 Aug 2020 14:41:19 -0600 Subject: [PATCH 20/50] Force C++14 as this code is not C++17 ready --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 2f33a30..1d98187 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.24%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.25%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -73,7 +73,7 @@ done %build -make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" +make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" %install @@ -104,6 +104,9 @@ install -Dpm 644 %{SOURCE2} \ %changelog +* Tue Aug 14 2020 Jeff Law - 0.6.1-0.25.gitb84b7d85 +- Force C++14 as this code is not C++17 ready + * Wed Jul 29 2020 Fedora Release Engineering - 0.6.1-0.24.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f3fc120c59979b0b9f2691d55d0c47c30f9b731a Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Aug 2020 14:39:29 +0200 Subject: [PATCH 21/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 1d98187..d8c7fc1 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.25%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.26%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -41,7 +41,6 @@ BuildRequires: vdr-devel >= 1.6.0-41 %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} @@ -50,7 +49,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} @@ -59,7 +57,6 @@ 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} %patch0 -p1 @@ -71,11 +68,9 @@ for f in CONTRIBUTORS HISTORY; do mv $f.conv $f done - %build make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" - %install %make_install install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/streamdev-server @@ -88,7 +83,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} @@ -102,9 +96,11 @@ install -Dpm 644 %{SOURCE2} \ %{vdr_plugindir}/libvdr-%{pname}-client.so.%{vdr_apiversion} %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf - %changelog -* Tue Aug 14 2020 Jeff Law - 0.6.1-0.25.gitb84b7d85 +* Fri Aug 28 2020 Martin Gansser - 0.6.1-0.26.gitb84b7d85 +- Rebuilt for new VDR API version + +* Fri Aug 14 2020 Jeff Law - 0.6.1-0.25.gitb84b7d85 - Force C++14 as this code is not C++17 ready * Wed Jul 29 2020 Fedora Release Engineering - 0.6.1-0.24.gitb84b7d85 From 4335688947d5e9263414762dcb88b5bbecbf0738 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 3 Jan 2021 18:31:25 +0100 Subject: [PATCH 22/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index d8c7fc1..9912e63 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.26%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.27%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -97,6 +97,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sun Jan 03 2021 Martin Gansser - 0.6.1-0.27.gitb84b7d85 +- Rebuilt for new VDR API version + * Fri Aug 28 2020 Martin Gansser - 0.6.1-0.26.gitb84b7d85 - Rebuilt for new VDR API version From d4b08f28af8b8ea4ff2cd1db090d815d37716249 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:39:47 +0000 Subject: [PATCH 23/50] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vdr-streamdev.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 9912e63..0300b8f 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -35,6 +35,7 @@ Source3: %{name}-snapshot.sh # https://www.vdr-portal.de/index.php?attachment/41040-0001-fixed-compilation-for-vdr-2-3-7-diff/ Patch0: 0001-Fixed-compilation-for-vdr-2.3.7.diff +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 1.6.0-41 From 9d01222611ff9c13c5edd4a79ef7122d29554130 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:59:02 +0000 Subject: [PATCH 24/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 0300b8f..c91f0a2 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.27%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.28%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -98,6 +98,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.6.1-0.28.gitb84b7d85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 03 2021 Martin Gansser - 0.6.1-0.27.gitb84b7d85 - Rebuilt for new VDR API version From 565e1be6191fc9cffc6a1b66dd4c15168ceefa90 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 28 Apr 2021 12:40:47 +0200 Subject: [PATCH 25/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index c91f0a2..866912c 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.28%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.29%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -98,6 +98,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Wed Apr 28 2021 Martin Gansser - 0.6.1-0.29.gitb84b7d85 +- Rebuilt for new VDR API version + * Wed Jan 27 2021 Fedora Release Engineering - 0.6.1-0.28.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From c9122835fbd60834bb72b04cb3fd682f3376e32d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:22:53 +0000 Subject: [PATCH 26/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 866912c..aa0d38d 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.29%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.30%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -98,6 +98,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.6.1-0.30.gitb84b7d85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Apr 28 2021 Martin Gansser - 0.6.1-0.29.gitb84b7d85 - Rebuilt for new VDR API version From 2448799e9f1e75d97e48e961eac421ea86d7bad5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 30 Dec 2021 19:57:26 +0100 Subject: [PATCH 27/50] Rebuilt for new VDR API version Add streamdev-server-2.5.4-patch --- streamdev-server-2.5.4-patch | 37 ++++++++++++++++++++++++++++++++++++ vdr-streamdev.spec | 13 +++++++++---- 2 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 streamdev-server-2.5.4-patch diff --git a/streamdev-server-2.5.4-patch b/streamdev-server-2.5.4-patch new file mode 100644 index 0000000..aa6235b --- /dev/null +++ b/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); + } diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index aa0d38d..11cfc94 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.30%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.31%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -34,6 +34,7 @@ Source2: %{name}-client.conf Source3: %{name}-snapshot.sh # https://www.vdr-portal.de/index.php?attachment/41040-0001-fixed-compilation-for-vdr-2-3-7-diff/ Patch0: 0001-Fixed-compilation-for-vdr-2.3.7.diff +Patch1: %{pname}-server-2.5.4-patch BuildRequires: make BuildRequires: gcc-c++ @@ -59,8 +60,8 @@ 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} -%patch0 -p1 +%autosetup -p1 -n %{setuppath} + sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile for f in CONTRIBUTORS HISTORY; do @@ -70,7 +71,7 @@ for f in CONTRIBUTORS HISTORY; do done %build -make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install %make_install @@ -98,6 +99,10 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Thu Dec 30 2021 Martin Gansser - 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 - 0.6.1-0.30.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 38f6719141c6d6d6f261f870b834024e13a51803 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:53:04 +0000 Subject: [PATCH 28/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 11cfc94..31a29b4 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.31%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.32%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -99,6 +99,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.6.1-0.32.gitb84b7d85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 30 2021 Martin Gansser - 0.6.1-0.31.gitb84b7d85 - Rebuilt for new VDR API version - Add streamdev-server-2.5.4-patch From cb14ae5b7ea65956ff1a471bbc174f105c567097 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 5 Feb 2022 11:27:41 +0100 Subject: [PATCH 29/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 31a29b4..623cc3f 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.32%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.33%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -99,6 +99,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sat Feb 05 2022 Martin Gansser - 0.6.1-0.33.gitb84b7d85 +- Rebuilt for new VDR API version + * Sat Jan 22 2022 Fedora Release Engineering - 0.6.1-0.32.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0b897c97fae346e6bf4344f6dd3ec38f07dcaffd Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 19 Jun 2022 20:06:07 +0200 Subject: [PATCH 30/50] Update to 0.6.3 --- .gitignore | 1 + sources | 2 +- vdr-streamdev.spec | 20 ++++++++++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a60a090..eea7853 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ vdr-streamdev-0.5.0.tgz /vdr-streamdev-10db11ac.tar.xz /vdr-streamdev-84c6f6b6.tar.xz /vdr-streamdev-b84b7d85.tar.xz +/vdr-streamdev-0.6.3.tar.gz diff --git a/sources b/sources index 3a9bc7c..db44926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-streamdev-b84b7d85.tar.xz) = 3c06014e103e41a96a5485a58e2f456b3fe4066dd765d4578dd05ad08367122c54af06d182c778f5d5d88d2f1a7781333cc161f87a73883cfd20480eea31505a +SHA512 (vdr-streamdev-0.6.3.tar.gz) = 2c949f08f399f2570a54da67809235b6882d594fc5583b27df96b3e87951bcfc62f96c9aef715130540620cbe54f028106598941fe8cbdb80b3d0943009c039f diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 623cc3f..f21042b 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -5,7 +5,7 @@ %global gitshort %(echo %gitver | awk '{print substr($0,1,8)}') %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ -%if 0%{?gitver:1} +%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 @@ -14,13 +14,17 @@ %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.3 +%if 0%{?gitver:0} Release: 0.33%{?gitver:.git%{gitshort}}%{?dist} +%else +Release: 1%{?dist} +%endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev @@ -32,9 +36,6 @@ Source2: %{name}-client.conf # Script to generate git snapshots # listed here so that it's pulled into the SRPM Source3: %{name}-snapshot.sh -# https://www.vdr-portal.de/index.php?attachment/41040-0001-fixed-compilation-for-vdr-2-3-7-diff/ -Patch0: 0001-Fixed-compilation-for-vdr-2.3.7.diff -Patch1: %{pname}-server-2.5.4-patch BuildRequires: make BuildRequires: gcc-c++ @@ -60,7 +61,11 @@ 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 +%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 @@ -99,6 +104,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sun Jun 19 2022 Martin Gansser - 0.6.3-1 +- Update to 0.6.3 + * Sat Feb 05 2022 Martin Gansser - 0.6.1-0.33.gitb84b7d85 - Rebuilt for new VDR API version From 8641f44585cb7f351fb7663a114f0997b3fb0071 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:47:03 +0000 Subject: [PATCH 31/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index f21042b..b89343e 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -21,9 +21,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.33%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.34%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -104,6 +104,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jun 19 2022 Martin Gansser - 0.6.3-1 - Update to 0.6.3 From f6029071d304dcb5000886344060bee4b29c3da9 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 1 Dec 2022 16:51:14 +0100 Subject: [PATCH 32/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index b89343e..936702e 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -5,6 +5,12 @@ %global gitshort %(echo %gitver | awk '{print substr($0,1,8)}') %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ +# version we want build against +%global vdr_version 2.6.1 +%if 0%{?fedora} >= 38 +%global vdr_version 2.6.2 +%endif + %if 0%{?gitver:0} # Use vdr-streamdev-snapshot.sh contained in the source of the package to # generate new snapshots @@ -21,9 +27,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.34%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.35%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 2%{?dist} +Release: 3%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -39,7 +45,7 @@ Source3: %{name}-snapshot.sh BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: vdr-devel >= 1.6.0-41 +BuildRequires: vdr-devel >= %{vdr_version} %description The streamdev plug-in adds streaming capabilities to your VDR. @@ -104,6 +110,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Thu Dec 01 2022 Martin Gansser - 0.6.3-3 +- Rebuilt for new VDR API version + * Sat Jul 23 2022 Fedora Release Engineering - 0.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 00dbc40dc56372a0fadd55beafa2f757915b6dd2 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 14 Dec 2022 16:45:12 +0100 Subject: [PATCH 33/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 936702e..c312710 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -8,7 +8,7 @@ # 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 %if 0%{?gitver:0} @@ -27,9 +27,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.35%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.36%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 3%{?dist} +Release: 4%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -110,6 +110,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Wed Dec 14 2022 Martin Gansser - 0.6.3-4 +- Rebuilt for new VDR API version + * Thu Dec 01 2022 Martin Gansser - 0.6.3-3 - Rebuilt for new VDR API version From d701f6135310806e71f8e563d58f54306fbaf9a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:12:11 +0000 Subject: [PATCH 34/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index c312710..b556e85 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -27,9 +27,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.36%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.37%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 4%{?dist} +Release: 5%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -110,6 +110,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.6.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 14 2022 Martin Gansser - 0.6.3-4 - Rebuilt for new VDR API version From 9bee036b02d190d9f647da51dac2fee5e9a317b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:31:32 +0000 Subject: [PATCH 35/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index b556e85..417449e 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -27,9 +27,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.37%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.38%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 5%{?dist} +Release: 6%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -110,6 +110,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.6.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.6.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4c4e6e134ca459d1653644f7fe78500ef3855160 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 20:09:32 +0100 Subject: [PATCH 36/50] Rebuilt for new VDR API version Add BR gettext for rawhide --- vdr-streamdev.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 417449e..4726584 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,9 +6,9 @@ %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ # 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 %if 0%{?gitver:0} @@ -29,7 +29,7 @@ Version: 0.6.3 %if 0%{?gitver:0} Release: 0.38%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 6%{?dist} +Release: 7%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -43,8 +43,9 @@ Source2: %{name}-client.conf # listed here so that it's pulled into the SRPM Source3: %{name}-snapshot.sh -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ +BuildRequires: gettext BuildRequires: vdr-devel >= %{vdr_version} %description @@ -110,6 +111,10 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Fri Jan 05 2024 Martin Gansser - 0.6.3-7 +- Rebuilt for new VDR API version +- Add BR gettext for rawhide + * Sat Jul 22 2023 Fedora Release Engineering - 0.6.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ec38a13bc069a17c635ddd685ac8bba3449aed10 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 26 Jan 2024 11:43:05 +0100 Subject: [PATCH 37/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 4726584..df0a222 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -8,7 +8,7 @@ # 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 %if 0%{?gitver:0} @@ -27,9 +27,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.38%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.39%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 7%{?dist} +Release: 8%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -111,6 +111,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Fri Jan 26 2024 Martin Gansser - 0.6.3-8 +- Rebuilt for new VDR API version + * Fri Jan 05 2024 Martin Gansser - 0.6.3-7 - Rebuilt for new VDR API version - Add BR gettext for rawhide From aa5a24c381fbb91df2d74e40074b941782950be7 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 12 Apr 2024 16:18:37 +0200 Subject: [PATCH 38/50] Rebuilt for new VDR API version --- vdr-streamdev.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index df0a222..f560e82 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -8,7 +8,7 @@ # 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 %if 0%{?gitver:0} @@ -27,9 +27,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.39%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.40%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 8%{?dist} +Release: 9%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -111,6 +111,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Fri Apr 12 2024 Martin Gansser - 0.6.3-9 +- Rebuilt for new VDR API version + * Fri Jan 26 2024 Martin Gansser - 0.6.3-8 - Rebuilt for new VDR API version From b125cb7a0cba6179b3a2fac3c3113f35f4b55772 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 11 Jul 2024 16:21:12 +0200 Subject: [PATCH 39/50] Rebuilt for new VDR API version 2.6.8 --- vdr-streamdev.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index f560e82..8e79d92 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -8,7 +8,7 @@ # 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 %if 0%{?gitver:0} @@ -27,13 +27,13 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.40%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.41%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 9%{?dist} +Release: 10%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ -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. @@ -111,6 +111,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Thu Jul 11 2024 Martin Gansser - 0.6.3-10 +- Rebuilt for new VDR API version 2.6.8 + * Fri Apr 12 2024 Martin Gansser - 0.6.3-9 - Rebuilt for new VDR API version From 1f270e63d229a310c79c027936270d05004639c1 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 15 Jul 2024 16:26:17 +0200 Subject: [PATCH 40/50] Rebuilt for new VDR API version 2.6.9 --- vdr-streamdev.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 8e79d92..e854edc 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -8,7 +8,7 @@ # 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 %if 0%{?gitver:0} @@ -27,9 +27,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.41%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.42%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 10%{?dist} +Release: 11%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -111,6 +111,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Mon Jul 15 2024 Martin Gansser - 0.6.3-11 +- Rebuilt for new VDR API version 2.6.9 + * Thu Jul 11 2024 Martin Gansser - 0.6.3-10 - Rebuilt for new VDR API version 2.6.8 From 82259d6d9dc995ee81e587d6ff1d7b6554b66f47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:40:38 +0000 Subject: [PATCH 41/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index e854edc..fb05d3b 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -27,9 +27,9 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.42%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.43%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 11%{?dist} +Release: 12%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL+ and GPLv2+ @@ -111,6 +111,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.6.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Martin Gansser - 0.6.3-11 - Rebuilt for new VDR API version 2.6.9 From 7071ef83c9d8b8428ac7e62e02ad0e2fcd01f77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 10:19:24 +0200 Subject: [PATCH 42/50] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vdr-streamdev.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index fb05d3b..a64d619 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -29,10 +29,11 @@ Version: 0.6.3 %if 0%{?gitver:0} Release: 0.43%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 12%{?dist} +Release: 13%{?dist} %endif Summary: Streaming plug-in for VDR -License: GPL+ and GPLv2+ +# Automatically converted from old format: GPL+ and GPLv2+ - review is highly recommended. +License: GPL-1.0-or-later AND GPL-2.0-or-later URL: https://github.com/vdr-projects/vdr-plugin-streamdev Source0: %{srcfile} @@ -111,6 +112,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Wed Aug 07 2024 Miroslav Suchý - 0.6.3-13 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.6.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From fd8ebd74b154314d64046883c427672aacd95c36 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 9 Oct 2024 15:09:31 +0200 Subject: [PATCH 43/50] Rebuilt for new VDR API version 2.7.2 --- vdr-streamdev.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index a64d619..521460d 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -5,9 +5,12 @@ %global gitshort %(echo %gitver | awk '{print substr($0,1,8)}') %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ -# version we want build against +# 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 @@ -27,12 +30,11 @@ Name: vdr-%{pname} Version: 0.6.3 %if 0%{?gitver:0} -Release: 0.43%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.44%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 13%{?dist} +Release: 14%{?dist} %endif Summary: Streaming plug-in for VDR -# Automatically converted from old format: GPL+ and GPLv2+ - review is highly recommended. License: GPL-1.0-or-later AND GPL-2.0-or-later URL: https://github.com/vdr-projects/vdr-plugin-streamdev @@ -112,6 +114,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Wed Oct 09 2024 Martin Gansser - 0.6.3-14 +- Rebuilt for new VDR API version 2.7.2 + * Wed Aug 07 2024 Miroslav Suchý - 0.6.3-13 - convert license to SPDX From fbd760e49659320dc2db497d0b957742a0e69786 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 2 Jan 2025 19:09:50 +0100 Subject: [PATCH 44/50] Update to 0.6.4 Update to 0.6.4 Update to 0.6.4 --- .gitignore | 1 + sources | 2 +- vdr-streamdev.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eea7853..181a170 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ vdr-streamdev-0.5.0.tgz /vdr-streamdev-84c6f6b6.tar.xz /vdr-streamdev-b84b7d85.tar.xz /vdr-streamdev-0.6.3.tar.gz +/vdr-streamdev-0.6.4.tar.gz diff --git a/sources b/sources index db44926..8a1c907 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-streamdev-0.6.3.tar.gz) = 2c949f08f399f2570a54da67809235b6882d594fc5583b27df96b3e87951bcfc62f96c9aef715130540620cbe54f028106598941fe8cbdb80b3d0943009c039f +SHA512 (vdr-streamdev-0.6.4.tar.gz) = 8687e3f64fdd60257049dfc6955042f3983f30f2f66b2c96525109e1dbe36584054b15aaf3086b93f0026f641541d8322a9b0ada1308f7e1bdffe47db5c2892b diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 521460d..a89b798 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -28,11 +28,11 @@ %endif Name: vdr-%{pname} -Version: 0.6.3 +Version: 0.6.4 %if 0%{?gitver:0} Release: 0.44%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 14%{?dist} +Release: 1%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL-1.0-or-later AND GPL-2.0-or-later @@ -114,6 +114,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Thu Jan 02 2025 Martin Gansser - 0.6.4-1 +- Update to 0.6.4 + * Wed Oct 09 2024 Martin Gansser - 0.6.3-14 - Rebuilt for new VDR API version 2.7.2 From 570f2f30ac97c4d9ffa1838dcd721e3b89f161c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:13:49 +0000 Subject: [PATCH 45/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index a89b798..f5f5d92 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -30,9 +30,9 @@ Name: vdr-%{pname} Version: 0.6.4 %if 0%{?gitver:0} -Release: 0.44%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.45%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL-1.0-or-later AND GPL-2.0-or-later @@ -114,6 +114,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 02 2025 Martin Gansser - 0.6.4-1 - Update to 0.6.4 From 4c0fbd2b5c54ab5b5f8e24b709336ab50b3ec992 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Feb 2025 13:17:31 +0100 Subject: [PATCH 46/50] Rebuilt for new VDR API version 2.7.4 Rebuilt for new VDR API version 2.7.4 Rebuilt for new VDR API version 2.7.4 --- vdr-streamdev.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index f5f5d92..8dafbe8 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,12 +6,10 @@ %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ # 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 %if 0%{?gitver:0} @@ -32,7 +30,7 @@ Version: 0.6.4 %if 0%{?gitver:0} Release: 0.45%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 2%{?dist} +Release: 3%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL-1.0-or-later AND GPL-2.0-or-later @@ -114,6 +112,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Fri Feb 28 2025 Martin Gansser - 0.6.4-3 +- Rebuilt for new VDR API version 2.7.4 + * Sun Jan 19 2025 Fedora Release Engineering - 0.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 12d20bb95f3ac4f77125245d9cb5534f51a06052 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 27 May 2025 17:12:25 +0200 Subject: [PATCH 47/50] Rebuilt for new VDR API version 2.7.5 --- vdr-streamdev.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 8dafbe8..34c8be7 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -5,11 +5,13 @@ %global gitshort %(echo %gitver | awk '{print substr($0,1,8)}') %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ -# 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 %if 0%{?gitver:0} @@ -28,9 +30,9 @@ Name: vdr-%{pname} Version: 0.6.4 %if 0%{?gitver:0} -Release: 0.45%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.46%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 3%{?dist} +Release: 4%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL-1.0-or-later AND GPL-2.0-or-later @@ -112,6 +114,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Tue May 27 2025 Martin Gansser - 0.6.4-4 +- Rebuilt for new VDR API version 2.7.5 + * Fri Feb 28 2025 Martin Gansser - 0.6.4-3 - Rebuilt for new VDR API version 2.7.4 From a8c81775910a26b429cb908f254e7e8f47732b0c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Jun 2025 12:28:01 +0200 Subject: [PATCH 48/50] Rebuilt for new VDR API version 2.7.6 --- vdr-streamdev.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 34c8be7..d197ae6 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -7,7 +7,7 @@ # 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 @@ -30,9 +30,9 @@ Name: vdr-%{pname} Version: 0.6.4 %if 0%{?gitver:0} -Release: 0.46%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.47%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 4%{?dist} +Release: 5%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL-1.0-or-later AND GPL-2.0-or-later @@ -114,6 +114,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Sat Jun 21 2025 Martin Gansser - 0.6.4-5 +- Rebuilt for new VDR API version 2.7.6 + * Tue May 27 2025 Martin Gansser - 0.6.4-4 - Rebuilt for new VDR API version 2.7.5 From c470ee837b141f776a87c0314102ffc69effb0fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:01:52 +0000 Subject: [PATCH 49/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index d197ae6..c2d3fc5 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -30,9 +30,9 @@ Name: vdr-%{pname} Version: 0.6.4 %if 0%{?gitver:0} -Release: 0.47%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.48%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 5%{?dist} +Release: 6%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL-1.0-or-later AND GPL-2.0-or-later @@ -114,6 +114,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.6.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jun 21 2025 Martin Gansser - 0.6.4-5 - Rebuilt for new VDR API version 2.7.6 From f4c91acf013f52e76a453bbeb7da3528160113ab Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Jul 2025 18:45:54 +0200 Subject: [PATCH 50/50] Rebuilt for new VDR API version 2.7.7 --- vdr-streamdev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index c2d3fc5..0b52f53 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -7,7 +7,7 @@ # 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 @@ -32,7 +32,7 @@ Version: 0.6.4 %if 0%{?gitver:0} Release: 0.48%{?gitver:.git%{gitshort}}%{?dist} %else -Release: 6%{?dist} +Release: 7%{?dist} %endif Summary: Streaming plug-in for VDR License: GPL-1.0-or-later AND GPL-2.0-or-later @@ -114,6 +114,9 @@ install -Dpm 644 %{SOURCE2} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %changelog +* Fri Jul 25 2025 Martin Gansser - 0.6.4-7 +- Rebuilt for new VDR API version 2.7.7 + * Fri Jul 25 2025 Fedora Release Engineering - 0.6.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild