diff --git a/.gitignore b/.gitignore index 181a170..a60a090 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ 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 -/vdr-streamdev-0.6.4.tar.gz diff --git a/sources b/sources index 8a1c907..3a9bc7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-streamdev-0.6.4.tar.gz) = 8687e3f64fdd60257049dfc6955042f3983f30f2f66b2c96525109e1dbe36584054b15aaf3086b93f0026f641541d8322a9b0ada1308f7e1bdffe47db5c2892b +SHA512 (vdr-streamdev-b84b7d85.tar.xz) = 3c06014e103e41a96a5485a58e2f456b3fe4066dd765d4578dd05ad08367122c54af06d182c778f5d5d88d2f1a7781333cc161f87a73883cfd20480eea31505a diff --git a/streamdev-server-2.5.4-patch b/streamdev-server-2.5.4-patch deleted file mode 100644 index aa6235b..0000000 --- a/streamdev-server-2.5.4-patch +++ /dev/null @@ -1,37 +0,0 @@ -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 0b52f53..c91f0a2 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -5,16 +5,7 @@ %global gitshort %(echo %gitver | awk '{print substr($0,1,8)}') %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 - -%if 0%{?gitver:0} +%if 0%{?gitver:1} # 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 @@ -23,20 +14,16 @@ %global setuppath %{name}-%{gitshort} %else # URL for original source file when not using git snapshots - %global srcfile https://github.com/vdr-projects/vdr-plugin-streamdev/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz + %global srcfile http://projects.vdr-developer.org/attachments/download/969/%{name}-%{version}.tgz %global setuppath %{pname}-%{version} %endif Name: vdr-%{pname} -Version: 0.6.4 -%if 0%{?gitver:0} -Release: 0.48%{?gitver:.git%{gitshort}}%{?dist} -%else -Release: 7%{?dist} -%endif +Version: 0.6.1 +Release: 0.28%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR -License: GPL-1.0-or-later AND GPL-2.0-or-later -URL: https://github.com/vdr-projects/vdr-plugin-streamdev +License: GPL+ and GPLv2+ +URL: http://projects.vdr-developer.org/projects/plg-streamdev Source0: %{srcfile} # Configuration files for plugin parameters. These are Fedora specific and not in upstream. @@ -45,11 +32,12 @@ 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: make +BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: vdr-devel >= %{vdr_version} +BuildRequires: vdr-devel >= 1.6.0-41 %description The streamdev plug-in adds streaming capabilities to your VDR. @@ -71,12 +59,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 -%if 0%{?gitver:0} -%autosetup -p1 -n %{setuppath} -%else -%autosetup -p1 -n vdr-plugin-streamdev-%{version} -%endif - +%setup -q -n %{setuppath} +%patch0 -p1 sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile for f in CONTRIBUTORS HISTORY; do @@ -86,7 +70,7 @@ for f in CONTRIBUTORS HISTORY; do done %build -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" +make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" %install %make_install @@ -114,86 +98,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - * Wed Jan 27 2021 Fedora Release Engineering - 0.6.1-0.28.gitb84b7d85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild