From e7dd382233e1c5376b45b9b3f00841a3dcae0029 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sun, 25 Jul 2010 08:59:16 +0000 Subject: [PATCH 01/76] - update to final 0.5.0 release --- .cvsignore | 2 +- sources | 2 +- vdr-streamdev.spec | 27 ++++++++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 47206c7..2347db0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vdr-streamdev-0.5.0-pre-20090706.tgz +vdr-streamdev-0.5.0.tgz diff --git a/sources b/sources index 9b7b612..2d1b102 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4675d8cd204defad941c65b020bfb04a vdr-streamdev-0.5.0-pre-20090706.tgz +2dd785198e3ed25515c347fcd5261a21 vdr-streamdev-0.5.0.tgz diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index c1d3976..9cb661f 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -1,13 +1,13 @@ %define pname streamdev -%define prever 20090706 +#define prever 20090706 %define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR) %define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR) %define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR) Name: vdr-%{pname} Version: 0.5.0 -Release: 0.2.pre%{prever}%{?dist} -Summary: Streaming plugin for VDR +Release: 1%{?dist} +Summary: Streaming plug-in for VDR Group: Applications/Multimedia License: GPL+ and GPLv2+ @@ -18,14 +18,14 @@ Source1: %{name}-server.conf Source2: %{name}-client.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: vdr-devel >= 1.3.47 +BuildRequires: vdr-devel >= 1.5.9 BuildRequires: gettext %description -The streamdev plugin adds streaming capabilities to your VDR. +The streamdev plug-in adds streaming capabilities to your VDR. %package server -Summary: Streaming server plugin for VDR +Summary: Streaming server plug-in for VDR Group: Applications/Multimedia Requires: vdr(abi) = %{apiver} @@ -34,7 +34,7 @@ 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 plugin for VDR +Summary: Streaming client plug-in for VDR Group: Applications/Multimedia Requires: vdr(abi) = %{apiver} @@ -45,6 +45,8 @@ VDR will then be able to work even without a DVB device. %prep %setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}} +sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile + for f in CONTRIBUTORS HISTORY; do iconv -f iso8859-1 -t utf-8 $f >$f.conv touch -r $f $f.conv @@ -58,10 +60,10 @@ make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$RPM_BUILD_ROOT%{_ rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{plugindir} install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins -install -pm 755 libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} -install -pm 755 libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} -install -Dpm 644 streamdev/streamdevhosts.conf $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf -install -Dpm 755 streamdev/externremux.sh $RPM_BUILD_ROOT%{_libdir}/vdr/bin/externremux.sh +install -pm 755 server/libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} +install -pm 755 client/libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} +install -Dpm 644 streamdev-server/streamdevhosts.conf $RPM_BUILD_ROOT%{configdir}/plugins/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} \ @@ -85,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sun Jul 25 2010 Felix Kaechele - 0.5.0-1 +- update to final 0.5.0 release + * Sat Jan 02 2010 Felix Kaechele - 0.5.0-0.2.pre20090706 - added missing BuildReq: gettext From d59a8b73977f550b084d5629eac3ffd0d3726eb5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:56:03 +0000 Subject: [PATCH 02/76] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 692cbb9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdr-streamdev -# $Id: Makefile,v 1.1 2008/09/12 05:49:33 huzaifas Exp $ -NAME := vdr-streamdev -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 9c01806..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -vdr-streamdev-0_3_4-2_fc9:HEAD:vdr-streamdev-0.3.4-2.fc9.src.rpm:1221203534 From b2563a6f0796462dc0929f8f1fadc680e68f90f8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:10:14 -0600 Subject: [PATCH 03/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 9cb661f..746402c 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Jul 25 2010 Felix Kaechele - 0.5.0-1 - update to final 0.5.0 release From abbe2b2e5aae006762908200207e4f4df9300c91 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sun, 20 Feb 2011 12:29:01 +0100 Subject: [PATCH 04/76] - update to latest upstream release - see HISTORY for full changelog --- .gitignore | 1 + sources | 2 +- vdr-streamdev.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2347db0..a0d2e13 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vdr-streamdev-0.5.0.tgz +/vdr-streamdev-0.5.1.tgz diff --git a/sources b/sources index 2d1b102..6f6e24c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2dd785198e3ed25515c347fcd5261a21 vdr-streamdev-0.5.0.tgz +6abebb62f5825324092ae1c7df3692c8 vdr-streamdev-0.5.1.tgz diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 746402c..31990d1 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -5,14 +5,14 @@ %define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR) Name: vdr-%{pname} -Version: 0.5.0 -Release: 2%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia License: GPL+ and GPLv2+ -URL: http://streamdev.vdr-developer.org -Source0: http://streamdev.vdr-developer.org/releases/vdr-streamdev-%{version}%{?prever:-pre-%{prever}}.tgz +URL: http://projects.vdr-developer.org/projects/plg-streamdev +Source0: http://projects.vdr-developer.org/attachments/download/497/vdr-streamdev-%{version}.tgz # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}-server.conf Source2: %{name}-client.conf @@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sat Feb 12 2011 Felix Kaechele - 0.5.1-1 +- update to latest upstream release +- see HISTORY for full changelog + * Mon Feb 07 2011 Fedora Release Engineering - 0.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From c7ea6da977cee389a512b98603187f58bdffac21 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sat, 8 Oct 2011 15:41:53 +0200 Subject: [PATCH 05/76] move streamdevhosts.conf to the right directory --- vdr-streamdev.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 31990d1..266e7a4 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -59,10 +59,10 @@ make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$RPM_BUILD_ROOT%{_ %install rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{plugindir} -install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins +install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/streamdev-server install -pm 755 server/libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} install -pm 755 client/libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} -install -Dpm 644 streamdev-server/streamdevhosts.conf $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf +install -Dpm 644 streamdev-server/streamdevhosts.conf $RPM_BUILD_ROOT%{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 @@ -77,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT %{plugindir}/libvdr-%{pname}-server.so.%{apiver} %{_libdir}/vdr/bin/externremux.sh %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf -%config(noreplace) %{configdir}/plugins/streamdevhosts.conf +%config(noreplace) %{configdir}/plugins/streamdev-server/streamdevhosts.conf %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %files client @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sat Oct 08 2011 Felix Kaechele - 0.5.1-2 +- move streamdevhosts.conf to the right directory + * Sat Feb 12 2011 Felix Kaechele - 0.5.1-1 - update to latest upstream release - see HISTORY for full changelog From 061037bad62387f87d34c7687854302fca0d59ef Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sun, 23 Oct 2011 21:38:10 +0200 Subject: [PATCH 06/76] own the configuration dir add patch to fix the GPL in COPYING and the FSF address in some source files --- vdr-streamdev-gpl-fsf-fix.patch | 183 ++++++++++++++++++++++++++++++++ vdr-streamdev.spec | 9 +- 2 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 vdr-streamdev-gpl-fsf-fix.patch diff --git a/vdr-streamdev-gpl-fsf-fix.patch b/vdr-streamdev-gpl-fsf-fix.patch new file mode 100644 index 0000000..54888aa --- /dev/null +++ b/vdr-streamdev-gpl-fsf-fix.patch @@ -0,0 +1,183 @@ +diff -ruN streamdev-0.5.1.orig/COPYING streamdev-0.5.1/COPYING +--- streamdev-0.5.1.orig/COPYING 2008-04-01 16:29:55.000000000 +0200 ++++ streamdev-0.5.1/COPYING 2010-03-24 00:34:05.000000000 +0100 +@@ -1,12 +1,12 @@ +- GNU GENERAL PUBLIC LICENSE +- Version 2, June 1991 ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +- Preamble ++ Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -15,7 +15,7 @@ + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by +-the GNU Library General Public License instead.) You can apply it to ++the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not +@@ -55,8 +55,8 @@ + + The precise terms and conditions for copying, distribution and + modification follow. +- +- GNU GENERAL PUBLIC LICENSE ++ ++ GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +@@ -110,7 +110,7 @@ + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +- ++ + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in +@@ -168,7 +168,7 @@ + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. +- ++ + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is +@@ -225,7 +225,7 @@ + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. +- ++ + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License +@@ -255,7 +255,7 @@ + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +@@ -277,9 +277,9 @@ + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + +- END OF TERMS AND CONDITIONS +- +- How to Apply These Terms to Your New Programs ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it +@@ -303,10 +303,9 @@ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Also add information on how to contact you by electronic and paper mail. + +@@ -336,5 +335,5 @@ + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the +-library. If this is what you want to do, use the GNU Library General ++library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. +diff -ruN streamdev-0.5.1.orig/libdvbmpeg/ctools.c streamdev-0.5.1/libdvbmpeg/ctools.c +--- streamdev-0.5.1.orig/libdvbmpeg/ctools.c 2008-04-01 16:29:56.000000000 +0200 ++++ streamdev-0.5.1/libdvbmpeg/ctools.c 2011-10-23 21:32:27.158208794 +0200 +@@ -19,7 +19,7 @@ + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + +diff -ruN streamdev-0.5.1.orig/libdvbmpeg/ctools.h streamdev-0.5.1/libdvbmpeg/ctools.h +--- streamdev-0.5.1.orig/libdvbmpeg/ctools.h 2008-04-01 16:29:56.000000000 +0200 ++++ streamdev-0.5.1/libdvbmpeg/ctools.h 2011-10-23 21:32:27.160208800 +0200 +@@ -19,7 +19,7 @@ + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + +diff -ruN streamdev-0.5.1.orig/libdvbmpeg/remux.c streamdev-0.5.1/libdvbmpeg/remux.c +--- streamdev-0.5.1.orig/libdvbmpeg/remux.c 2008-04-01 16:29:56.000000000 +0200 ++++ streamdev-0.5.1/libdvbmpeg/remux.c 2011-10-23 21:32:27.165208817 +0200 +@@ -19,7 +19,7 @@ + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + +diff -ruN streamdev-0.5.1.orig/libdvbmpeg/remux.h streamdev-0.5.1/libdvbmpeg/remux.h +--- streamdev-0.5.1.orig/libdvbmpeg/remux.h 2008-04-01 16:29:56.000000000 +0200 ++++ streamdev-0.5.1/libdvbmpeg/remux.h 2011-10-23 21:32:27.166208821 +0200 +@@ -20,7 +20,7 @@ + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + +diff -ruN streamdev-0.5.1.orig/libdvbmpeg/transform.c streamdev-0.5.1/libdvbmpeg/transform.c +--- streamdev-0.5.1.orig/libdvbmpeg/transform.c 2008-04-01 16:29:56.000000000 +0200 ++++ streamdev-0.5.1/libdvbmpeg/transform.c 2011-10-23 21:32:27.178208860 +0200 +@@ -19,7 +19,7 @@ + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + +diff -ruN streamdev-0.5.1.orig/libdvbmpeg/transform.h streamdev-0.5.1/libdvbmpeg/transform.h +--- streamdev-0.5.1.orig/libdvbmpeg/transform.h 2009-06-12 15:16:14.000000000 +0200 ++++ streamdev-0.5.1/libdvbmpeg/transform.h 2011-10-23 21:32:27.179208863 +0200 +@@ -19,7 +19,7 @@ + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 266e7a4..323d3e5 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -16,6 +16,7 @@ Source0: http://projects.vdr-developer.org/attachments/download/497/vdr-s # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}-server.conf Source2: %{name}-client.conf +Patch0: %{name}-gpl-fsf-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vdr-devel >= 1.5.9 @@ -44,6 +45,7 @@ VDR will then be able to work even without a DVB device. %prep %setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}} +%patch0 -p1 sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile @@ -77,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT %{plugindir}/libvdr-%{pname}-server.so.%{apiver} %{_libdir}/vdr/bin/externremux.sh %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf +%dir %{configdir}/plugins/streamdev-server %config(noreplace) %{configdir}/plugins/streamdev-server/streamdevhosts.conf %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README @@ -87,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sun Oct 23 2011 Felix Kaechele - 0.5.1-3 +- own the configuration dir +- add patch to fix the GPL in COPYING and the FSF address in some source files + * Sat Oct 08 2011 Felix Kaechele - 0.5.1-2 - move streamdevhosts.conf to the right directory From e2b04fa43cbf40bce13e4f2276533ee5a30bb715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Nov 2011 19:43:52 +0200 Subject: [PATCH 07/76] Install locale files (#750084). --- vdr-streamdev.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 323d3e5..9257772 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -56,7 +56,7 @@ for f in CONTRIBUTORS HISTORY; do done %build -make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$RPM_BUILD_ROOT%{_libdir}/vdr/locale all +make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$PWD/locale all %install rm -rf $RPM_BUILD_ROOT @@ -70,11 +70,15 @@ 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 %clean rm -rf $RPM_BUILD_ROOT -%files server +%files server -f %{name}-server.lang %defattr(-,root,root,-) %{plugindir}/libvdr-%{pname}-server.so.%{apiver} %{_libdir}/vdr/bin/externremux.sh @@ -83,13 +87,16 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{configdir}/plugins/streamdev-server/streamdevhosts.conf %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README -%files client +%files client -f %{name}-client.lang %defattr(-,root,root,-) %{plugindir}/libvdr-%{pname}-client.so.%{apiver} %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sun Nov 6 2011 Ville Skyttä - 0.5.1-4 +- Install locale files (#750084). + * Sun Oct 23 2011 Felix Kaechele - 0.5.1-3 - own the configuration dir - add patch to fix the GPL in COPYING and the FSF address in some source files From 3c87874cec37d4dbff707b5443bdeab5cfdda322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Nov 2011 20:11:15 +0200 Subject: [PATCH 08/76] Fix build with Liemikuutio patch 1.32. --- 0001-Fix-build-with-liemikuutio-1.32.patch | 34 ++++++++++++++++++++++ vdr-streamdev.spec | 8 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-build-with-liemikuutio-1.32.patch diff --git a/0001-Fix-build-with-liemikuutio-1.32.patch b/0001-Fix-build-with-liemikuutio-1.32.patch new file mode 100644 index 0000000..385237f --- /dev/null +++ b/0001-Fix-build-with-liemikuutio-1.32.patch @@ -0,0 +1,34 @@ +From d57c62998eb9c5402edc43460f3ba844287b9013 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Sun, 6 Nov 2011 20:03:48 +0200 +Subject: [PATCH] Fix build with liemikuutio 1.32. + +--- + server/connectionVTP.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/server/connectionVTP.c b/server/connectionVTP.c +index 8224d1d..9ffa540 100644 +--- a/server/connectionVTP.c ++++ b/server/connectionVTP.c +@@ -1750,7 +1750,7 @@ bool cConnectionVTP::CmdDELR(const char *Option) + bool cConnectionVTP::CmdRENR(const char *Option) + { + INIT_WRAPPER(); +-#if defined(LIEMIKUUTIO) ++#if defined(LIEMIKUUTIO) && LIEMIKUUTIO < 132 + bool recordings = Recordings.Update(true); + if (recordings) { + if (*Option) { +@@ -1790,7 +1790,7 @@ bool cConnectionVTP::CmdRENR(const char *Option) + Reply(550, "No recordings available"); + } + #else +- Reply(501, "Rename not supported, please use LIEMIEXT"); ++ Reply(501, "Rename not supported, please use LIEMIKUUTIO < 1.32"); + #endif /* LIEMIKUUTIO */ + EXIT_WRAPPER(); + } +-- +1.7.6 + diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 9257772..2ad5cc5 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -17,6 +17,8 @@ Source0: http://projects.vdr-developer.org/attachments/download/497/vdr-s Source1: %{name}-server.conf Source2: %{name}-client.conf Patch0: %{name}-gpl-fsf-fix.patch +# http://projects.vdr-developer.org/issues/786 +Patch1: 0001-Fix-build-with-liemikuutio-1.32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vdr-devel >= 1.5.9 @@ -46,6 +48,7 @@ VDR will then be able to work even without a DVB device. %prep %setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}} %patch0 -p1 +%patch1 -p1 sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile @@ -94,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sun Nov 6 2011 Ville Skyttä - 0.5.1-5 +- Fix build with Liemikuutio patch 1.32. + * Sun Nov 6 2011 Ville Skyttä - 0.5.1-4 - Install locale files (#750084). From 76974f73f21f097b5b1099fd3aa7da1497705d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 5 Dec 2011 14:32:06 +0200 Subject: [PATCH 09/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 2ad5cc5..4a47875 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Mon Dec 5 2011 Ville Skyttä - 0.5.1-6 +- Rebuild. + * Sun Nov 6 2011 Ville Skyttä - 0.5.1-5 - Fix build with Liemikuutio patch 1.32. From e423e61c8513e85f225d555568ca5044522d3c10 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:48:09 -0600 Subject: [PATCH 10/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 4a47875..b39c933 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Dec 5 2011 Ville Skyttä - 0.5.1-6 - Rebuild. From e5f27e061dd49caed99fdbc4206f101dc4d10216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 15 Jan 2012 21:33:10 +0200 Subject: [PATCH 11/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index b39c933..d276627 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sun Jan 15 2012 Ville Skyttä - 0.5.1-8 +- Rebuild. + * Sat Jan 14 2012 Fedora Release Engineering - 0.5.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From d43900dbbc35af1e501fe7a7c85e6239167efcae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 21 Feb 2012 07:09:04 +0200 Subject: [PATCH 12/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index d276627..dae3759 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Mon Feb 20 2012 Ville Skyttä - 0.5.1-9 +- Rebuild. + * Sun Jan 15 2012 Ville Skyttä - 0.5.1-8 - Rebuild. From 50a9915146c55c5756ee275e05dbbd2e26a7e759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 6 Mar 2012 23:16:24 +0200 Subject: [PATCH 13/76] Apply upstream VDR 1.7.25+ patches. --- vdr-streamdev-0.5.1-vdr1725.patch | 220 ++++++++++++++++++++++++++++++ vdr-streamdev.spec | 7 +- 2 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 vdr-streamdev-0.5.1-vdr1725.patch diff --git a/vdr-streamdev-0.5.1-vdr1725.patch b/vdr-streamdev-0.5.1-vdr1725.patch new file mode 100644 index 0000000..064695d --- /dev/null +++ b/vdr-streamdev-0.5.1-vdr1725.patch @@ -0,0 +1,220 @@ +commit 26af4459d806d4dbfbe53ec7c69e2ee498cee6e3 +Author: Frank Schmirler +Date: Sun Mar 4 01:15:40 2012 +0100 + + Use the new streamdev-client setup option "Live TV Priority" to control + precedence among multiple clients. The VDR option "Primary Limit" which + has previouly been used for this purpose has been dropped in VDR 1.7.25. + +diff --git a/client/device.c b/client/device.c +index 2dec904..ad7a6bd 100644 +--- a/client/device.c ++++ b/client/device.c +@@ -321,8 +321,9 @@ void cStreamdevDevice::UpdatePriority(void) { + m_Device->Lock(); + if (m_Device->m_UpdatePriority && ClientSocket.DataSocket(siLive)) { + int Priority = m_Device->Priority(); +- if (m_Device == cDevice::ActualDevice() && Priority < Setup.PrimaryLimit) +- Priority = Setup.PrimaryLimit; ++ // override TRANSFERPRIORITY (-1) with live TV priority from setup ++ if (m_Device == cDevice::ActualDevice() && Priority == -1) ++ Priority = StreamdevClientSetup.LivePriority; + if (m_Device->m_Priority != Priority && ClientSocket.SetPriority(Priority)) + m_Device->m_Priority = Priority; + } +diff --git a/client/po/de_DE.po b/client/po/de_DE.po +index 5635b96..2b817ef 100644 +--- a/client/po/de_DE.po ++++ b/client/po/de_DE.po +@@ -46,6 +46,9 @@ msgstr "Timeout (s)" + msgid "Filter Streaming" + msgstr "Filter-Daten streamen" + ++msgid "Live TV Priority" ++msgstr "Live TV Priorität" ++ + msgid "Minimum Priority" + msgstr "Minimale Priorität" + +diff --git a/client/po/fi_FI.po b/client/po/fi_FI.po +index ca1dc1c..1d56d49 100644 +--- a/client/po/fi_FI.po ++++ b/client/po/fi_FI.po +@@ -46,6 +46,9 @@ msgstr "" + msgid "Filter Streaming" + msgstr "Suodatetun tiedon suoratoisto" + ++msgid "Live TV Priority" ++msgstr "" ++ + msgid "Minimum Priority" + msgstr "Pienin prioriteetti" + +diff --git a/client/po/fr_FR.po b/client/po/fr_FR.po +index 1a01535..81e228b 100644 +--- a/client/po/fr_FR.po ++++ b/client/po/fr_FR.po +@@ -46,6 +46,9 @@ msgstr "" + msgid "Filter Streaming" + msgstr "Filtre streaming" + ++msgid "Live TV Priority" ++msgstr "" ++ + msgid "Minimum Priority" + msgstr "" + +diff --git a/client/po/it_IT.po b/client/po/it_IT.po +index 355238c..342c7ad 100644 +--- a/client/po/it_IT.po ++++ b/client/po/it_IT.po +@@ -48,6 +48,9 @@ msgstr "" + msgid "Filter Streaming" + msgstr "Filtra trasmissione" + ++msgid "Live TV Priority" ++msgstr "" ++ + msgid "Minimum Priority" + msgstr "Priorità minima" + +diff --git a/client/po/lt_LT.po b/client/po/lt_LT.po +index 02929f8..a8f7412 100644 +--- a/client/po/lt_LT.po ++++ b/client/po/lt_LT.po +@@ -46,6 +46,9 @@ msgstr "" + msgid "Filter Streaming" + msgstr "Filtruoti transliavimÄ…" + ++msgid "Live TV Priority" ++msgstr "" ++ + msgid "Minimum Priority" + msgstr "Minimalus prioritetas" + +diff --git a/client/po/ru_RU.po b/client/po/ru_RU.po +index 14d30ae..c6528b1 100644 +--- a/client/po/ru_RU.po ++++ b/client/po/ru_RU.po +@@ -46,6 +46,9 @@ msgstr "" + msgid "Filter Streaming" + msgstr "ÄØÛìâà ßÞâÞÚÐ" + ++msgid "Live TV Priority" ++msgstr "" ++ + msgid "Minimum Priority" + msgstr "" + +diff --git a/client/po/sk_SK.po b/client/po/sk_SK.po +index 2deffc1..54a9419 100644 +--- a/client/po/sk_SK.po ++++ b/client/po/sk_SK.po +@@ -48,6 +48,9 @@ msgstr "" + msgid "Filter Streaming" + msgstr "filtrova» prúdy" + ++msgid "Live TV Priority" ++msgstr "" ++ + msgid "Minimum Priority" + msgstr "minimálna priorita" + +diff --git a/client/setup.c b/client/setup.c +index 9d4452e..c671c63 100644 +--- a/client/setup.c ++++ b/client/setup.c +@@ -15,4 +15,5 @@ cStreamdevClientSetup::cStreamdevClientSetup(void) { + StreamFilters = false; + HideMenuEntry = false; ++ LivePriority = 0; + MinPriority = -1; + MaxPriority = MAXPRIORITY; +@@ -35,4 +36,5 @@ bool cStreamdevClientSetup::SetupParse(const char *Name, const char *Value) { + else if (strcmp(Name, "StreamFilters") == 0) StreamFilters = atoi(Value); + else if (strcmp(Name, "HideMenuEntry") == 0) HideMenuEntry = atoi(Value); ++ else if (strcmp(Name, "LivePriority") == 0) LivePriority = atoi(Value); + else if (strcmp(Name, "MinPriority") == 0) MinPriority = atoi(Value); + else if (strcmp(Name, "MaxPriority") == 0) MaxPriority = atoi(Value); +@@ -53,4 +55,5 @@ cStreamdevClientMenuSetupPage::cStreamdevClientMenuSetupPage(void) { + Add(new cMenuEditIntItem (tr("Remote Port"), &m_NewSetup.RemotePort, 0, 65535)); + Add(new cMenuEditBoolItem(tr("Filter Streaming"), &m_NewSetup.StreamFilters)); ++ Add(new cMenuEditIntItem (tr("Live TV Priority"), &m_NewSetup.LivePriority, 0, MAXPRIORITY)); + Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -1, MAXPRIORITY)); + Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -1, MAXPRIORITY)); +@@ -81,4 +84,5 @@ void cStreamdevClientMenuSetupPage::Store(void) { + SetupStore("StreamFilters", m_NewSetup.StreamFilters); + SetupStore("HideMenuEntry", m_NewSetup.HideMenuEntry); ++ SetupStore("LivePriority", m_NewSetup.LivePriority); + SetupStore("MinPriority", m_NewSetup.MinPriority); + SetupStore("MaxPriority", m_NewSetup.MaxPriority); +diff --git a/client/setup.h b/client/setup.h +index 591bbd2..7bcf889 100644 +--- a/client/setup.h ++++ b/client/setup.h +@@ -18,4 +18,5 @@ struct cStreamdevClientSetup { + int StreamFilters; + int HideMenuEntry; ++ int LivePriority; + int MinPriority; + int MaxPriority; +commit 83b05a629222b48a045c4f885739ef146d09cd15 +Author: Frank Schmirler +Date: Tue Mar 6 15:27:12 2012 +0100 + + Updated Finnish translation (thanks to Rolf Ahrenberg) + +diff --git a/client/po/fi_FI.po b/client/po/fi_FI.po +index 1d56d49..e356147 100644 +--- a/client/po/fi_FI.po ++++ b/client/po/fi_FI.po +@@ -47,7 +47,7 @@ + msgstr "Suodatetun tiedon suoratoisto" + + msgid "Live TV Priority" +-msgstr "" ++msgstr "Live-katselun prioriteetti" + + msgid "Minimum Priority" + msgstr "Pienin prioriteetti" +commit a63f7247cb78954d1a25fb1d6e2996c0e39f12cd +Author: Frank Schmirler +Date: Sun Mar 4 01:20:57 2012 +0100 + + With VDR 1.7.25 priorities down to -99 will be used + +diff --git a/client/device.c b/client/device.c +index ad7a6bd..f82e7d5 100644 +--- a/client/device.c ++++ b/client/device.c +@@ -34,7 +34,7 @@ cStreamdevDevice::cStreamdevDevice(void) { + + m_Device = this; + m_Pids = 0; +- m_Priority = -1; ++ m_Priority = -100; + m_DvrClosed = true; + } + +diff --git a/client/setup.c b/client/setup.c +index c671c63..dbb2dcc 100644 +--- a/client/setup.c ++++ b/client/setup.c +@@ -16,7 +16,7 @@ cStreamdevClientSetup::cStreamdevClientSetup(void) { + StreamFilters = false; + HideMenuEntry = false; + LivePriority = 0; +- MinPriority = -1; ++ MinPriority = -MAXPRIORITY; + MaxPriority = MAXPRIORITY; + #if APIVERSNUM >= 10700 + NumProvidedSystems = 1; +@@ -56,6 +56,6 @@ cStreamdevClientMenuSetupPage::cStreamdevClientMenuSetupPage(void) { + Add(new cMenuEditBoolItem(tr("Filter Streaming"), &m_NewSetup.StreamFilters)); + Add(new cMenuEditIntItem (tr("Live TV Priority"), &m_NewSetup.LivePriority, 0, MAXPRIORITY)); +- Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -1, MAXPRIORITY)); +- Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -1, MAXPRIORITY)); ++ Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -MAXPRIORITY, MAXPRIORITY)); ++ Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -MAXPRIORITY, MAXPRIORITY)); + #if APIVERSNUM >= 10715 + Add(new cMenuEditIntItem (tr("Broadcast Systems / Cost"), &m_NewSetup.NumProvidedSystems, 1, 15)); diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index dae3759..1442a07 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -19,6 +19,7 @@ Source2: %{name}-client.conf Patch0: %{name}-gpl-fsf-fix.patch # http://projects.vdr-developer.org/issues/786 Patch1: 0001-Fix-build-with-liemikuutio-1.32.patch +Patch2: %{name}-0.5.1-vdr1725.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vdr-devel >= 1.5.9 @@ -49,6 +50,7 @@ VDR will then be able to work even without a DVB device. %setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}} %patch0 -p1 %patch1 -p1 +%patch2 -p1 -F 2 sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile @@ -97,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Tue Mar 6 2012 Ville Skyttä - 0.5.1-10 +- Apply upstream VDR 1.7.25+ patches. + * Mon Feb 20 2012 Ville Skyttä - 0.5.1-9 - Rebuild. From 1b876a0872c211c3c76bea0f18ccb037ec1f0e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 11 Mar 2012 19:07:45 +0200 Subject: [PATCH 14/76] Apply upstream VDR 1.7.26+ patches. --- vdr-streamdev-0.5.1-vdr1726.patch | 359 ++++++++++++++++++++++++++++++ vdr-streamdev.spec | 7 +- 2 files changed, 365 insertions(+), 1 deletion(-) create mode 100644 vdr-streamdev-0.5.1-vdr1726.patch diff --git a/vdr-streamdev-0.5.1-vdr1726.patch b/vdr-streamdev-0.5.1-vdr1726.patch new file mode 100644 index 0000000..9727ede --- /dev/null +++ b/vdr-streamdev-0.5.1-vdr1726.patch @@ -0,0 +1,359 @@ +commit c06970123cd68bd1b2f2695326596430d236f230 +Author: Frank Schmirler +Date: Mon Mar 7 21:37:08 2011 +0100 + + Live TV must be switched in VDR main thread (fixes #568). + +diff --git a/server/connection.c b/server/connection.c +index 78a023a..3bf0ad5 100644 +--- a/server/connection.c ++++ b/server/connection.c +@@ -8,11 +8,60 @@ + #include "common.h" + + #include ++#include + #include + #include + #include + #include + ++class cSwitchLive { ++private: ++ cMutex mutex; ++ cCondWait switched; ++ cDevice *device; ++ const cChannel *channel; ++public: ++ cDevice* Switch(cDevice *Device, const cChannel *Channel); ++ void Switch(void); ++ cSwitchLive(void); ++}; ++ ++cSwitchLive::cSwitchLive(): device(NULL), channel(NULL) ++{ ++} ++ ++cDevice* cSwitchLive::Switch(cDevice *Device, const cChannel *Channel) ++{ ++ mutex.Lock(); ++ device = Device; ++ channel = Channel; ++ mutex.Unlock(); ++ switched.Wait(); ++ return device; ++} ++ ++void cSwitchLive::Switch(void) ++{ ++ mutex.Lock(); ++ if (channel && device) { ++ cDevice::SetAvoidDevice(device); ++ if (!Channels.SwitchTo(cDevice::CurrentChannel())) { ++ if (StreamdevServerSetup.SuspendMode == smAlways) { ++ Channels.SwitchTo(channel->Number()); ++ Skins.Message(mtInfo, tr("Streaming active")); ++ } ++ else { ++ esyslog("streamdev: Can't receive channel %d (%s) from device %d. Moving live TV to other device failed (PrimaryDevice=%d, ActualDevice=%d)", channel->Number(), channel->Name(), device->CardIndex(), cDevice::PrimaryDevice()->CardIndex(), cDevice::ActualDevice()->CardIndex()); ++ device = NULL; ++ } ++ } ++ // make sure we don't come in here next time ++ channel = NULL; ++ switched.Signal(); ++ } ++ mutex.Unlock(); ++} ++ + cServerConnection::cServerConnection(const char *Protocol, int Type): + cTBSocket(Type), + m_Protocol(Protocol), +@@ -22,10 +71,12 @@ cServerConnection::cServerConnection(const char *Protocol, int Type): + m_WriteBytes(0), + m_WriteIndex(0) + { ++ m_SwitchLive = new cSwitchLive(); + } + + cServerConnection::~cServerConnection() + { ++ delete m_SwitchLive; + } + + const cChannel* cServerConnection::ChannelFromString(const char *String, int *Apid, int *Dpid) { +@@ -302,34 +353,7 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority) + && UsedByLiveTV(device)) { + // now we would have to switch away live tv...let's see if live tv + // can be handled by another device +-#if VDRVERSNUM >= 10516 +- cDevice::SetAvoidDevice(device); +- if (!Channels.SwitchTo(cDevice::CurrentChannel())) { +- if (StreamdevServerSetup.SuspendMode == smAlways) { +- Channels.SwitchTo(Channel->Number()); +- Skins.QueueMessage(mtInfo, tr("Streaming active")); +- } +- else { +- dsyslog("streamdev: GetDevice: Live TV not suspended"); +- device = NULL; +- } +- } +-#else +- const cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel()); +- cDevice *newdev = current ? CheckDevice(current, 0, true, device) : NULL; +- if (newdev) { +- dsyslog("streamdev: GetDevice: Trying to move live TV to device %d", newdev->CardIndex()); +- newdev->SwitchChannel(current, true); +- } +- else if (StreamdevServerSetup.SuspendMode == smAlways) { +- Channels.SwitchTo(Channel->Number()); +- Skins.QueueMessage(mtInfo, tr("Streaming active")); +- } +- else { +- dsyslog("streamdev: GetDevice: Live TV not suspended"); +- device = NULL; +- } +-#endif ++ device = m_SwitchLive->Switch(device, Channel); + } + + if (!device) { +@@ -371,3 +395,8 @@ bool cServerConnection::ProvidesChannel(const cChannel *Channel, int Priority) + } + return device; + } ++ ++void cServerConnection::MainThreadHook() ++{ ++ m_SwitchLive->Switch(); ++} +diff --git a/server/connection.h b/server/connection.h +index 01a070c..6cc6764 100644 +--- a/server/connection.h ++++ b/server/connection.h +@@ -15,6 +15,7 @@ typedef std::pair tStrStr; + + class cChannel; + class cDevice; ++class cSwitchLive; + + /* Basic capabilities of a straight text-based protocol, most functions + virtual to support more complicated protocols */ +@@ -33,6 +34,8 @@ private: + uint m_WriteBytes; + uint m_WriteIndex; + ++ cSwitchLive *m_SwitchLive; ++ + tStrStrMap m_Headers; + + /* Check if a device would be available for transfering the given +@@ -108,6 +111,9 @@ public: + /* Test if a call to GetDevice would return a usable device. */ + bool ProvidesChannel(const cChannel *Channel, int Priority); + ++ /* Do things which must be done in VDR's main loop */ ++ void MainThreadHook(); ++ + virtual void Flushed(void) {} + + virtual void Detach(void) = 0; +diff --git a/server/server.c b/server/server.c +index 1bdb20a..c7fa96f 100644 +--- a/server/server.c ++++ b/server/server.c +@@ -121,7 +121,9 @@ void cStreamdevServer::Action(void) + cServerConnection *client = c->Accept(); + if (!client) + continue; ++ Lock(); + m_Clients.Add(client); ++ Unlock(); + + if (m_Clients.Count() > StreamdevServerSetup.MaxClients) { + esyslog("streamdev: too many clients, rejecting %s:%d", +@@ -153,17 +155,21 @@ void cStreamdevServer::Action(void) + isyslog("streamdev: closing streamdev connection to %s:%d", + s->RemoteIp().c_str(), s->RemotePort()); + s->Close(); ++ Lock(); + m_Clients.Del(s); ++ Unlock(); + } + s = next; + } + } + ++ Lock(); + while (m_Clients.Count() > 0) { + cServerConnection *s = m_Clients.First(); + s->Close(); + m_Clients.Del(s); + } ++ Unlock(); + + while (m_Servers.Count() > 0) { + cServerComponent *c = m_Servers.First(); +@@ -171,3 +177,10 @@ void cStreamdevServer::Action(void) + m_Servers.Del(c); + } + } ++ ++void cStreamdevServer::MainThreadHook(void) ++{ ++ cThreadLock lock(m_Instance); ++ for (cServerConnection *s = m_Clients.First(); s; s = m_Clients.Next(s)) ++ s->MainThreadHook(); ++} +diff --git a/server/server.h b/server/server.h +index a44df1c..dfe9cc1 100644 +--- a/server/server.h ++++ b/server/server.h +@@ -36,6 +36,7 @@ public: + static void Initialize(void); + static void Destruct(void); + static bool Active(void); ++ static void MainThreadHook(void); + }; + + inline bool cStreamdevServer::Active(void) +diff --git a/server/streamdev-server.c b/server/streamdev-server.c +index b444df7..f31576c 100644 +--- a/server/streamdev-server.c ++++ b/server/streamdev-server.c +@@ -130,6 +130,11 @@ cOsdObject *cPluginStreamdevServer::MainMenuAction(void) + return NULL; + } + ++void cPluginStreamdevServer::MainThreadHook(void) ++{ ++ cStreamdevServer::MainThreadHook(); ++} ++ + cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void) + { + return new cStreamdevServerMenuSetupPage; +diff --git a/server/streamdev-server.h b/server/streamdev-server.h +index 4083689..f1be8aa 100644 +--- a/server/streamdev-server.h ++++ b/server/streamdev-server.h +@@ -26,6 +26,7 @@ public: + virtual cString Active(void); + virtual const char *MainMenuEntry(void); + virtual cOsdObject *MainMenuAction(void); ++ virtual void MainThreadHook(void); + virtual cMenuSetupPage *SetupMenu(void); + virtual bool SetupParse(const char *Name, const char *Value); + }; +commit 5a3c5357781d8c8e04c28a1799d6f6a0e2065daf +Author: Frank Schmirler +Date: Sat Mar 10 23:44:51 2012 +0100 + + API change of VDR 1.7.26: Use "occupied" instead of "avoid device". + +diff --git a/server/connection.c b/server/connection.c +index 9b57980..0f1d3f3 100644 +--- a/server/connection.c ++++ b/server/connection.c +@@ -44,7 +44,12 @@ void cSwitchLive::Switch(void) + { + mutex.Lock(); + if (channel && device) { ++#if APIVERSNUM >= 10722 ++ cDevice *d = device; ++ d->SetOccupied(10); ++#else + cDevice::SetAvoidDevice(device); ++#endif + if (!Channels.SwitchTo(cDevice::CurrentChannel())) { + if (StreamdevServerSetup.SuspendMode == smAlways) { + Channels.SwitchTo(channel->Number()); +@@ -55,6 +60,9 @@ void cSwitchLive::Switch(void) + device = NULL; + } + } ++#if APIVERSNUM >= 10722 ++ d->SetOccupied(0); ++#endif + // make sure we don't come in here next time + channel = NULL; + switched.Signal(); +commit a1797719de296b381a18ae889294b00dd5850667 +Author: Frank Schmirler +Date: Sun Mar 11 09:41:33 2012 +0100 + + Using SetOccupied() won't work as it isn't considered in GetDevice(). Trying + to compensate the loss of SetAvoidDevice() with streamdevs CheckConnection(), + ignoring the current live TV device. If a new device is returned it is just + switched to the new channel. Hopefully the main loop will pick it up later, + after streamdev switched aways live TV. + +diff --git a/server/connection.c b/server/connection.c +index 0f1d3f3..ced28e1 100644 +--- a/server/connection.c ++++ b/server/connection.c +@@ -44,12 +44,24 @@ void cSwitchLive::Switch(void) + { + mutex.Lock(); + if (channel && device) { +-#if APIVERSNUM >= 10722 +- cDevice *d = device; +- d->SetOccupied(10); ++#if APIVERSNUM >= 10726 ++ cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel()); ++ cDevice *newdev = cServerConnection::CheckDevice(current, 0, true, device); ++ if (!newdev) { ++ if (StreamdevServerSetup.SuspendMode == smAlways) { ++ Channels.SwitchTo(channel->Number()); ++ Skins.Message(mtInfo, tr("Streaming active")); ++ } ++ else { ++ esyslog("streamdev: Can't receive channel %d (%s) from device %d. Moving live TV to other device failed (PrimaryDevice=%d, ActualDevice=%d)", channel->Number(), channel->Name(), device->CardIndex(), cDevice::PrimaryDevice()->CardIndex(), cDevice::ActualDevice()->CardIndex()); ++ device = NULL; ++ } ++ } ++ else { ++ newdev->SwitchChannel(current, true); ++ } + #else + cDevice::SetAvoidDevice(device); +-#endif + if (!Channels.SwitchTo(cDevice::CurrentChannel())) { + if (StreamdevServerSetup.SuspendMode == smAlways) { + Channels.SwitchTo(channel->Number()); +@@ -60,8 +72,6 @@ void cSwitchLive::Switch(void) + device = NULL; + } + } +-#if APIVERSNUM >= 10722 +- d->SetOccupied(0); + #endif + // make sure we don't come in here next time + channel = NULL; +diff --git a/server/connection.h b/server/connection.h +index 0d7a1a0..3c6d9a3 100644 +--- a/server/connection.h ++++ b/server/connection.h +@@ -38,11 +38,6 @@ private: + + tStrStrMap m_Headers; + +- /* Check if a device would be available for transfering the given +- channel. This call has no side effects except for temporarily +- detaching this connection's receivers. */ +- cDevice *CheckDevice(const cChannel *Channel, int Priority, bool LiveView, const cDevice *AvoidDevice = NULL); +- + /* Test if device is in use as the transfer mode receiver device + or a FF card, displaying live TV from internal tuner */ + static bool UsedByLiveTV(cDevice *device); +@@ -106,6 +101,10 @@ public: + /* Close the socket */ + virtual bool Close(void); + ++ /* Check if a device would be available for transfering the given ++ channel. This call has no side effects. */ ++ static cDevice *CheckDevice(const cChannel *Channel, int Priority, bool LiveView, const cDevice *AvoidDevice = NULL); ++ + /* Will retrieve an unused device for transmitting data. Receivers have + already been attached from the device if necessary. Use the returned + cDevice in a following call to StartTransfer */ diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 1442a07..b406adf 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -20,6 +20,7 @@ Patch0: %{name}-gpl-fsf-fix.patch # http://projects.vdr-developer.org/issues/786 Patch1: 0001-Fix-build-with-liemikuutio-1.32.patch Patch2: %{name}-0.5.1-vdr1725.patch +Patch3: %{name}-0.5.1-vdr1726.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vdr-devel >= 1.5.9 @@ -51,6 +52,7 @@ VDR will then be able to work even without a DVB device. %patch0 -p1 %patch1 -p1 %patch2 -p1 -F 2 +%patch3 -p1 -F 2 sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile @@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sun Mar 11 2012 Ville Skyttä - 0.5.1-11 +- Apply upstream VDR 1.7.26+ patches. + * Tue Mar 6 2012 Ville Skyttä - 0.5.1-10 - Apply upstream VDR 1.7.25+ patches. From 7f65ec049758925c253faf31b52a0221ddfab465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 27 Mar 2012 23:54:34 +0300 Subject: [PATCH 15/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index b406adf..2c5e0a2 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.5.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Tue Mar 27 2012 Ville Skyttä - 0.5.1-12 +- Rebuild. + * Sun Mar 11 2012 Ville Skyttä - 0.5.1-11 - Apply upstream VDR 1.7.26+ patches. From ce7c16777c9de16b961e5e6de19938d9d539b303 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Wed, 4 Jul 2012 21:10:07 +0200 Subject: [PATCH 16/76] update to 0.6.0 - drop all patches as upstream includes them already --- .gitignore | 1 + 0001-Fix-build-with-liemikuutio-1.32.patch | 34 -- sources | 2 +- vdr-streamdev-0.5.1-vdr1725.patch | 220 ------------- vdr-streamdev-0.5.1-vdr1726.patch | 359 --------------------- vdr-streamdev-gpl-fsf-fix.patch | 183 ----------- vdr-streamdev.spec | 19 +- 7 files changed, 9 insertions(+), 809 deletions(-) delete mode 100644 0001-Fix-build-with-liemikuutio-1.32.patch delete mode 100644 vdr-streamdev-0.5.1-vdr1725.patch delete mode 100644 vdr-streamdev-0.5.1-vdr1726.patch delete mode 100644 vdr-streamdev-gpl-fsf-fix.patch diff --git a/.gitignore b/.gitignore index a0d2e13..0c6a16b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vdr-streamdev-0.5.0.tgz /vdr-streamdev-0.5.1.tgz +/vdr-streamdev-0.6.0.tgz diff --git a/0001-Fix-build-with-liemikuutio-1.32.patch b/0001-Fix-build-with-liemikuutio-1.32.patch deleted file mode 100644 index 385237f..0000000 --- a/0001-Fix-build-with-liemikuutio-1.32.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d57c62998eb9c5402edc43460f3ba844287b9013 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Sun, 6 Nov 2011 20:03:48 +0200 -Subject: [PATCH] Fix build with liemikuutio 1.32. - ---- - server/connectionVTP.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/server/connectionVTP.c b/server/connectionVTP.c -index 8224d1d..9ffa540 100644 ---- a/server/connectionVTP.c -+++ b/server/connectionVTP.c -@@ -1750,7 +1750,7 @@ bool cConnectionVTP::CmdDELR(const char *Option) - bool cConnectionVTP::CmdRENR(const char *Option) - { - INIT_WRAPPER(); --#if defined(LIEMIKUUTIO) -+#if defined(LIEMIKUUTIO) && LIEMIKUUTIO < 132 - bool recordings = Recordings.Update(true); - if (recordings) { - if (*Option) { -@@ -1790,7 +1790,7 @@ bool cConnectionVTP::CmdRENR(const char *Option) - Reply(550, "No recordings available"); - } - #else -- Reply(501, "Rename not supported, please use LIEMIEXT"); -+ Reply(501, "Rename not supported, please use LIEMIKUUTIO < 1.32"); - #endif /* LIEMIKUUTIO */ - EXIT_WRAPPER(); - } --- -1.7.6 - diff --git a/sources b/sources index 6f6e24c..293213f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6abebb62f5825324092ae1c7df3692c8 vdr-streamdev-0.5.1.tgz +da39a8bc12935dfd2c66c9d6f74430dd vdr-streamdev-0.6.0.tgz diff --git a/vdr-streamdev-0.5.1-vdr1725.patch b/vdr-streamdev-0.5.1-vdr1725.patch deleted file mode 100644 index 064695d..0000000 --- a/vdr-streamdev-0.5.1-vdr1725.patch +++ /dev/null @@ -1,220 +0,0 @@ -commit 26af4459d806d4dbfbe53ec7c69e2ee498cee6e3 -Author: Frank Schmirler -Date: Sun Mar 4 01:15:40 2012 +0100 - - Use the new streamdev-client setup option "Live TV Priority" to control - precedence among multiple clients. The VDR option "Primary Limit" which - has previouly been used for this purpose has been dropped in VDR 1.7.25. - -diff --git a/client/device.c b/client/device.c -index 2dec904..ad7a6bd 100644 ---- a/client/device.c -+++ b/client/device.c -@@ -321,8 +321,9 @@ void cStreamdevDevice::UpdatePriority(void) { - m_Device->Lock(); - if (m_Device->m_UpdatePriority && ClientSocket.DataSocket(siLive)) { - int Priority = m_Device->Priority(); -- if (m_Device == cDevice::ActualDevice() && Priority < Setup.PrimaryLimit) -- Priority = Setup.PrimaryLimit; -+ // override TRANSFERPRIORITY (-1) with live TV priority from setup -+ if (m_Device == cDevice::ActualDevice() && Priority == -1) -+ Priority = StreamdevClientSetup.LivePriority; - if (m_Device->m_Priority != Priority && ClientSocket.SetPriority(Priority)) - m_Device->m_Priority = Priority; - } -diff --git a/client/po/de_DE.po b/client/po/de_DE.po -index 5635b96..2b817ef 100644 ---- a/client/po/de_DE.po -+++ b/client/po/de_DE.po -@@ -46,6 +46,9 @@ msgstr "Timeout (s)" - msgid "Filter Streaming" - msgstr "Filter-Daten streamen" - -+msgid "Live TV Priority" -+msgstr "Live TV Priorität" -+ - msgid "Minimum Priority" - msgstr "Minimale Priorität" - -diff --git a/client/po/fi_FI.po b/client/po/fi_FI.po -index ca1dc1c..1d56d49 100644 ---- a/client/po/fi_FI.po -+++ b/client/po/fi_FI.po -@@ -46,6 +46,9 @@ msgstr "" - msgid "Filter Streaming" - msgstr "Suodatetun tiedon suoratoisto" - -+msgid "Live TV Priority" -+msgstr "" -+ - msgid "Minimum Priority" - msgstr "Pienin prioriteetti" - -diff --git a/client/po/fr_FR.po b/client/po/fr_FR.po -index 1a01535..81e228b 100644 ---- a/client/po/fr_FR.po -+++ b/client/po/fr_FR.po -@@ -46,6 +46,9 @@ msgstr "" - msgid "Filter Streaming" - msgstr "Filtre streaming" - -+msgid "Live TV Priority" -+msgstr "" -+ - msgid "Minimum Priority" - msgstr "" - -diff --git a/client/po/it_IT.po b/client/po/it_IT.po -index 355238c..342c7ad 100644 ---- a/client/po/it_IT.po -+++ b/client/po/it_IT.po -@@ -48,6 +48,9 @@ msgstr "" - msgid "Filter Streaming" - msgstr "Filtra trasmissione" - -+msgid "Live TV Priority" -+msgstr "" -+ - msgid "Minimum Priority" - msgstr "Priorità minima" - -diff --git a/client/po/lt_LT.po b/client/po/lt_LT.po -index 02929f8..a8f7412 100644 ---- a/client/po/lt_LT.po -+++ b/client/po/lt_LT.po -@@ -46,6 +46,9 @@ msgstr "" - msgid "Filter Streaming" - msgstr "Filtruoti transliavimÄ…" - -+msgid "Live TV Priority" -+msgstr "" -+ - msgid "Minimum Priority" - msgstr "Minimalus prioritetas" - -diff --git a/client/po/ru_RU.po b/client/po/ru_RU.po -index 14d30ae..c6528b1 100644 ---- a/client/po/ru_RU.po -+++ b/client/po/ru_RU.po -@@ -46,6 +46,9 @@ msgstr "" - msgid "Filter Streaming" - msgstr "ÄØÛìâà ßÞâÞÚÐ" - -+msgid "Live TV Priority" -+msgstr "" -+ - msgid "Minimum Priority" - msgstr "" - -diff --git a/client/po/sk_SK.po b/client/po/sk_SK.po -index 2deffc1..54a9419 100644 ---- a/client/po/sk_SK.po -+++ b/client/po/sk_SK.po -@@ -48,6 +48,9 @@ msgstr "" - msgid "Filter Streaming" - msgstr "filtrova» prúdy" - -+msgid "Live TV Priority" -+msgstr "" -+ - msgid "Minimum Priority" - msgstr "minimálna priorita" - -diff --git a/client/setup.c b/client/setup.c -index 9d4452e..c671c63 100644 ---- a/client/setup.c -+++ b/client/setup.c -@@ -15,4 +15,5 @@ cStreamdevClientSetup::cStreamdevClientSetup(void) { - StreamFilters = false; - HideMenuEntry = false; -+ LivePriority = 0; - MinPriority = -1; - MaxPriority = MAXPRIORITY; -@@ -35,4 +36,5 @@ bool cStreamdevClientSetup::SetupParse(const char *Name, const char *Value) { - else if (strcmp(Name, "StreamFilters") == 0) StreamFilters = atoi(Value); - else if (strcmp(Name, "HideMenuEntry") == 0) HideMenuEntry = atoi(Value); -+ else if (strcmp(Name, "LivePriority") == 0) LivePriority = atoi(Value); - else if (strcmp(Name, "MinPriority") == 0) MinPriority = atoi(Value); - else if (strcmp(Name, "MaxPriority") == 0) MaxPriority = atoi(Value); -@@ -53,4 +55,5 @@ cStreamdevClientMenuSetupPage::cStreamdevClientMenuSetupPage(void) { - Add(new cMenuEditIntItem (tr("Remote Port"), &m_NewSetup.RemotePort, 0, 65535)); - Add(new cMenuEditBoolItem(tr("Filter Streaming"), &m_NewSetup.StreamFilters)); -+ Add(new cMenuEditIntItem (tr("Live TV Priority"), &m_NewSetup.LivePriority, 0, MAXPRIORITY)); - Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -1, MAXPRIORITY)); - Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -1, MAXPRIORITY)); -@@ -81,4 +84,5 @@ void cStreamdevClientMenuSetupPage::Store(void) { - SetupStore("StreamFilters", m_NewSetup.StreamFilters); - SetupStore("HideMenuEntry", m_NewSetup.HideMenuEntry); -+ SetupStore("LivePriority", m_NewSetup.LivePriority); - SetupStore("MinPriority", m_NewSetup.MinPriority); - SetupStore("MaxPriority", m_NewSetup.MaxPriority); -diff --git a/client/setup.h b/client/setup.h -index 591bbd2..7bcf889 100644 ---- a/client/setup.h -+++ b/client/setup.h -@@ -18,4 +18,5 @@ struct cStreamdevClientSetup { - int StreamFilters; - int HideMenuEntry; -+ int LivePriority; - int MinPriority; - int MaxPriority; -commit 83b05a629222b48a045c4f885739ef146d09cd15 -Author: Frank Schmirler -Date: Tue Mar 6 15:27:12 2012 +0100 - - Updated Finnish translation (thanks to Rolf Ahrenberg) - -diff --git a/client/po/fi_FI.po b/client/po/fi_FI.po -index 1d56d49..e356147 100644 ---- a/client/po/fi_FI.po -+++ b/client/po/fi_FI.po -@@ -47,7 +47,7 @@ - msgstr "Suodatetun tiedon suoratoisto" - - msgid "Live TV Priority" --msgstr "" -+msgstr "Live-katselun prioriteetti" - - msgid "Minimum Priority" - msgstr "Pienin prioriteetti" -commit a63f7247cb78954d1a25fb1d6e2996c0e39f12cd -Author: Frank Schmirler -Date: Sun Mar 4 01:20:57 2012 +0100 - - With VDR 1.7.25 priorities down to -99 will be used - -diff --git a/client/device.c b/client/device.c -index ad7a6bd..f82e7d5 100644 ---- a/client/device.c -+++ b/client/device.c -@@ -34,7 +34,7 @@ cStreamdevDevice::cStreamdevDevice(void) { - - m_Device = this; - m_Pids = 0; -- m_Priority = -1; -+ m_Priority = -100; - m_DvrClosed = true; - } - -diff --git a/client/setup.c b/client/setup.c -index c671c63..dbb2dcc 100644 ---- a/client/setup.c -+++ b/client/setup.c -@@ -16,7 +16,7 @@ cStreamdevClientSetup::cStreamdevClientSetup(void) { - StreamFilters = false; - HideMenuEntry = false; - LivePriority = 0; -- MinPriority = -1; -+ MinPriority = -MAXPRIORITY; - MaxPriority = MAXPRIORITY; - #if APIVERSNUM >= 10700 - NumProvidedSystems = 1; -@@ -56,6 +56,6 @@ cStreamdevClientMenuSetupPage::cStreamdevClientMenuSetupPage(void) { - Add(new cMenuEditBoolItem(tr("Filter Streaming"), &m_NewSetup.StreamFilters)); - Add(new cMenuEditIntItem (tr("Live TV Priority"), &m_NewSetup.LivePriority, 0, MAXPRIORITY)); -- Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -1, MAXPRIORITY)); -- Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -1, MAXPRIORITY)); -+ Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -MAXPRIORITY, MAXPRIORITY)); -+ Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -MAXPRIORITY, MAXPRIORITY)); - #if APIVERSNUM >= 10715 - Add(new cMenuEditIntItem (tr("Broadcast Systems / Cost"), &m_NewSetup.NumProvidedSystems, 1, 15)); diff --git a/vdr-streamdev-0.5.1-vdr1726.patch b/vdr-streamdev-0.5.1-vdr1726.patch deleted file mode 100644 index 9727ede..0000000 --- a/vdr-streamdev-0.5.1-vdr1726.patch +++ /dev/null @@ -1,359 +0,0 @@ -commit c06970123cd68bd1b2f2695326596430d236f230 -Author: Frank Schmirler -Date: Mon Mar 7 21:37:08 2011 +0100 - - Live TV must be switched in VDR main thread (fixes #568). - -diff --git a/server/connection.c b/server/connection.c -index 78a023a..3bf0ad5 100644 ---- a/server/connection.c -+++ b/server/connection.c -@@ -8,11 +8,60 @@ - #include "common.h" - - #include -+#include - #include - #include - #include - #include - -+class cSwitchLive { -+private: -+ cMutex mutex; -+ cCondWait switched; -+ cDevice *device; -+ const cChannel *channel; -+public: -+ cDevice* Switch(cDevice *Device, const cChannel *Channel); -+ void Switch(void); -+ cSwitchLive(void); -+}; -+ -+cSwitchLive::cSwitchLive(): device(NULL), channel(NULL) -+{ -+} -+ -+cDevice* cSwitchLive::Switch(cDevice *Device, const cChannel *Channel) -+{ -+ mutex.Lock(); -+ device = Device; -+ channel = Channel; -+ mutex.Unlock(); -+ switched.Wait(); -+ return device; -+} -+ -+void cSwitchLive::Switch(void) -+{ -+ mutex.Lock(); -+ if (channel && device) { -+ cDevice::SetAvoidDevice(device); -+ if (!Channels.SwitchTo(cDevice::CurrentChannel())) { -+ if (StreamdevServerSetup.SuspendMode == smAlways) { -+ Channels.SwitchTo(channel->Number()); -+ Skins.Message(mtInfo, tr("Streaming active")); -+ } -+ else { -+ esyslog("streamdev: Can't receive channel %d (%s) from device %d. Moving live TV to other device failed (PrimaryDevice=%d, ActualDevice=%d)", channel->Number(), channel->Name(), device->CardIndex(), cDevice::PrimaryDevice()->CardIndex(), cDevice::ActualDevice()->CardIndex()); -+ device = NULL; -+ } -+ } -+ // make sure we don't come in here next time -+ channel = NULL; -+ switched.Signal(); -+ } -+ mutex.Unlock(); -+} -+ - cServerConnection::cServerConnection(const char *Protocol, int Type): - cTBSocket(Type), - m_Protocol(Protocol), -@@ -22,10 +71,12 @@ cServerConnection::cServerConnection(const char *Protocol, int Type): - m_WriteBytes(0), - m_WriteIndex(0) - { -+ m_SwitchLive = new cSwitchLive(); - } - - cServerConnection::~cServerConnection() - { -+ delete m_SwitchLive; - } - - const cChannel* cServerConnection::ChannelFromString(const char *String, int *Apid, int *Dpid) { -@@ -302,34 +353,7 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority) - && UsedByLiveTV(device)) { - // now we would have to switch away live tv...let's see if live tv - // can be handled by another device --#if VDRVERSNUM >= 10516 -- cDevice::SetAvoidDevice(device); -- if (!Channels.SwitchTo(cDevice::CurrentChannel())) { -- if (StreamdevServerSetup.SuspendMode == smAlways) { -- Channels.SwitchTo(Channel->Number()); -- Skins.QueueMessage(mtInfo, tr("Streaming active")); -- } -- else { -- dsyslog("streamdev: GetDevice: Live TV not suspended"); -- device = NULL; -- } -- } --#else -- const cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel()); -- cDevice *newdev = current ? CheckDevice(current, 0, true, device) : NULL; -- if (newdev) { -- dsyslog("streamdev: GetDevice: Trying to move live TV to device %d", newdev->CardIndex()); -- newdev->SwitchChannel(current, true); -- } -- else if (StreamdevServerSetup.SuspendMode == smAlways) { -- Channels.SwitchTo(Channel->Number()); -- Skins.QueueMessage(mtInfo, tr("Streaming active")); -- } -- else { -- dsyslog("streamdev: GetDevice: Live TV not suspended"); -- device = NULL; -- } --#endif -+ device = m_SwitchLive->Switch(device, Channel); - } - - if (!device) { -@@ -371,3 +395,8 @@ bool cServerConnection::ProvidesChannel(const cChannel *Channel, int Priority) - } - return device; - } -+ -+void cServerConnection::MainThreadHook() -+{ -+ m_SwitchLive->Switch(); -+} -diff --git a/server/connection.h b/server/connection.h -index 01a070c..6cc6764 100644 ---- a/server/connection.h -+++ b/server/connection.h -@@ -15,6 +15,7 @@ typedef std::pair tStrStr; - - class cChannel; - class cDevice; -+class cSwitchLive; - - /* Basic capabilities of a straight text-based protocol, most functions - virtual to support more complicated protocols */ -@@ -33,6 +34,8 @@ private: - uint m_WriteBytes; - uint m_WriteIndex; - -+ cSwitchLive *m_SwitchLive; -+ - tStrStrMap m_Headers; - - /* Check if a device would be available for transfering the given -@@ -108,6 +111,9 @@ public: - /* Test if a call to GetDevice would return a usable device. */ - bool ProvidesChannel(const cChannel *Channel, int Priority); - -+ /* Do things which must be done in VDR's main loop */ -+ void MainThreadHook(); -+ - virtual void Flushed(void) {} - - virtual void Detach(void) = 0; -diff --git a/server/server.c b/server/server.c -index 1bdb20a..c7fa96f 100644 ---- a/server/server.c -+++ b/server/server.c -@@ -121,7 +121,9 @@ void cStreamdevServer::Action(void) - cServerConnection *client = c->Accept(); - if (!client) - continue; -+ Lock(); - m_Clients.Add(client); -+ Unlock(); - - if (m_Clients.Count() > StreamdevServerSetup.MaxClients) { - esyslog("streamdev: too many clients, rejecting %s:%d", -@@ -153,17 +155,21 @@ void cStreamdevServer::Action(void) - isyslog("streamdev: closing streamdev connection to %s:%d", - s->RemoteIp().c_str(), s->RemotePort()); - s->Close(); -+ Lock(); - m_Clients.Del(s); -+ Unlock(); - } - s = next; - } - } - -+ Lock(); - while (m_Clients.Count() > 0) { - cServerConnection *s = m_Clients.First(); - s->Close(); - m_Clients.Del(s); - } -+ Unlock(); - - while (m_Servers.Count() > 0) { - cServerComponent *c = m_Servers.First(); -@@ -171,3 +177,10 @@ void cStreamdevServer::Action(void) - m_Servers.Del(c); - } - } -+ -+void cStreamdevServer::MainThreadHook(void) -+{ -+ cThreadLock lock(m_Instance); -+ for (cServerConnection *s = m_Clients.First(); s; s = m_Clients.Next(s)) -+ s->MainThreadHook(); -+} -diff --git a/server/server.h b/server/server.h -index a44df1c..dfe9cc1 100644 ---- a/server/server.h -+++ b/server/server.h -@@ -36,6 +36,7 @@ public: - static void Initialize(void); - static void Destruct(void); - static bool Active(void); -+ static void MainThreadHook(void); - }; - - inline bool cStreamdevServer::Active(void) -diff --git a/server/streamdev-server.c b/server/streamdev-server.c -index b444df7..f31576c 100644 ---- a/server/streamdev-server.c -+++ b/server/streamdev-server.c -@@ -130,6 +130,11 @@ cOsdObject *cPluginStreamdevServer::MainMenuAction(void) - return NULL; - } - -+void cPluginStreamdevServer::MainThreadHook(void) -+{ -+ cStreamdevServer::MainThreadHook(); -+} -+ - cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void) - { - return new cStreamdevServerMenuSetupPage; -diff --git a/server/streamdev-server.h b/server/streamdev-server.h -index 4083689..f1be8aa 100644 ---- a/server/streamdev-server.h -+++ b/server/streamdev-server.h -@@ -26,6 +26,7 @@ public: - virtual cString Active(void); - virtual const char *MainMenuEntry(void); - virtual cOsdObject *MainMenuAction(void); -+ virtual void MainThreadHook(void); - virtual cMenuSetupPage *SetupMenu(void); - virtual bool SetupParse(const char *Name, const char *Value); - }; -commit 5a3c5357781d8c8e04c28a1799d6f6a0e2065daf -Author: Frank Schmirler -Date: Sat Mar 10 23:44:51 2012 +0100 - - API change of VDR 1.7.26: Use "occupied" instead of "avoid device". - -diff --git a/server/connection.c b/server/connection.c -index 9b57980..0f1d3f3 100644 ---- a/server/connection.c -+++ b/server/connection.c -@@ -44,7 +44,12 @@ void cSwitchLive::Switch(void) - { - mutex.Lock(); - if (channel && device) { -+#if APIVERSNUM >= 10722 -+ cDevice *d = device; -+ d->SetOccupied(10); -+#else - cDevice::SetAvoidDevice(device); -+#endif - if (!Channels.SwitchTo(cDevice::CurrentChannel())) { - if (StreamdevServerSetup.SuspendMode == smAlways) { - Channels.SwitchTo(channel->Number()); -@@ -55,6 +60,9 @@ void cSwitchLive::Switch(void) - device = NULL; - } - } -+#if APIVERSNUM >= 10722 -+ d->SetOccupied(0); -+#endif - // make sure we don't come in here next time - channel = NULL; - switched.Signal(); -commit a1797719de296b381a18ae889294b00dd5850667 -Author: Frank Schmirler -Date: Sun Mar 11 09:41:33 2012 +0100 - - Using SetOccupied() won't work as it isn't considered in GetDevice(). Trying - to compensate the loss of SetAvoidDevice() with streamdevs CheckConnection(), - ignoring the current live TV device. If a new device is returned it is just - switched to the new channel. Hopefully the main loop will pick it up later, - after streamdev switched aways live TV. - -diff --git a/server/connection.c b/server/connection.c -index 0f1d3f3..ced28e1 100644 ---- a/server/connection.c -+++ b/server/connection.c -@@ -44,12 +44,24 @@ void cSwitchLive::Switch(void) - { - mutex.Lock(); - if (channel && device) { --#if APIVERSNUM >= 10722 -- cDevice *d = device; -- d->SetOccupied(10); -+#if APIVERSNUM >= 10726 -+ cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel()); -+ cDevice *newdev = cServerConnection::CheckDevice(current, 0, true, device); -+ if (!newdev) { -+ if (StreamdevServerSetup.SuspendMode == smAlways) { -+ Channels.SwitchTo(channel->Number()); -+ Skins.Message(mtInfo, tr("Streaming active")); -+ } -+ else { -+ esyslog("streamdev: Can't receive channel %d (%s) from device %d. Moving live TV to other device failed (PrimaryDevice=%d, ActualDevice=%d)", channel->Number(), channel->Name(), device->CardIndex(), cDevice::PrimaryDevice()->CardIndex(), cDevice::ActualDevice()->CardIndex()); -+ device = NULL; -+ } -+ } -+ else { -+ newdev->SwitchChannel(current, true); -+ } - #else - cDevice::SetAvoidDevice(device); --#endif - if (!Channels.SwitchTo(cDevice::CurrentChannel())) { - if (StreamdevServerSetup.SuspendMode == smAlways) { - Channels.SwitchTo(channel->Number()); -@@ -60,8 +72,6 @@ void cSwitchLive::Switch(void) - device = NULL; - } - } --#if APIVERSNUM >= 10722 -- d->SetOccupied(0); - #endif - // make sure we don't come in here next time - channel = NULL; -diff --git a/server/connection.h b/server/connection.h -index 0d7a1a0..3c6d9a3 100644 ---- a/server/connection.h -+++ b/server/connection.h -@@ -38,11 +38,6 @@ private: - - tStrStrMap m_Headers; - -- /* Check if a device would be available for transfering the given -- channel. This call has no side effects except for temporarily -- detaching this connection's receivers. */ -- cDevice *CheckDevice(const cChannel *Channel, int Priority, bool LiveView, const cDevice *AvoidDevice = NULL); -- - /* Test if device is in use as the transfer mode receiver device - or a FF card, displaying live TV from internal tuner */ - static bool UsedByLiveTV(cDevice *device); -@@ -106,6 +101,10 @@ public: - /* Close the socket */ - virtual bool Close(void); - -+ /* Check if a device would be available for transfering the given -+ channel. This call has no side effects. */ -+ static cDevice *CheckDevice(const cChannel *Channel, int Priority, bool LiveView, const cDevice *AvoidDevice = NULL); -+ - /* Will retrieve an unused device for transmitting data. Receivers have - already been attached from the device if necessary. Use the returned - cDevice in a following call to StartTransfer */ diff --git a/vdr-streamdev-gpl-fsf-fix.patch b/vdr-streamdev-gpl-fsf-fix.patch deleted file mode 100644 index 54888aa..0000000 --- a/vdr-streamdev-gpl-fsf-fix.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff -ruN streamdev-0.5.1.orig/COPYING streamdev-0.5.1/COPYING ---- streamdev-0.5.1.orig/COPYING 2008-04-01 16:29:55.000000000 +0200 -+++ streamdev-0.5.1/COPYING 2010-03-24 00:34:05.000000000 +0100 -@@ -1,12 +1,12 @@ -- GNU GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - -- Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -15,7 +15,7 @@ - General Public License applies to most of the Free Software - Foundation's software and to any other program whose authors commit to - using it. (Some other Free Software Foundation software is covered by --the GNU Library General Public License instead.) You can apply it to -+the GNU Lesser General Public License instead.) You can apply it to - your programs, too. - - When we speak of free software, we are referring to freedom, not -@@ -55,8 +55,8 @@ - - The precise terms and conditions for copying, distribution and - modification follow. -- -- GNU GENERAL PUBLIC LICENSE -+ -+ GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -@@ -110,7 +110,7 @@ - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) -- -+ - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, - and can be reasonably considered independent and separate works in -@@ -168,7 +168,7 @@ - access to copy the source code from the same place counts as - distribution of the source code, even though third parties are not - compelled to copy the source along with the object code. -- -+ - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt - otherwise to copy, modify, sublicense or distribute the Program is -@@ -225,7 +225,7 @@ - - This section is intended to make thoroughly clear what is believed to - be a consequence of the rest of this License. -- -+ - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License -@@ -255,7 +255,7 @@ - of preserving the free status of all derivatives of our free software and - of promoting the sharing and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -@@ -277,9 +277,9 @@ - PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - -- END OF TERMS AND CONDITIONS -- -- How to Apply These Terms to Your New Programs -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it -@@ -303,10 +303,9 @@ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - Also add information on how to contact you by electronic and paper mail. - -@@ -336,5 +335,5 @@ - This General Public License does not permit incorporating your program into - proprietary programs. If your program is a subroutine library, you may - consider it more useful to permit linking proprietary applications with the --library. If this is what you want to do, use the GNU Library General -+library. If this is what you want to do, use the GNU Lesser General - Public License instead of this License. -diff -ruN streamdev-0.5.1.orig/libdvbmpeg/ctools.c streamdev-0.5.1/libdvbmpeg/ctools.c ---- streamdev-0.5.1.orig/libdvbmpeg/ctools.c 2008-04-01 16:29:56.000000000 +0200 -+++ streamdev-0.5.1/libdvbmpeg/ctools.c 2011-10-23 21:32:27.158208794 +0200 -@@ -19,7 +19,7 @@ - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - * - -diff -ruN streamdev-0.5.1.orig/libdvbmpeg/ctools.h streamdev-0.5.1/libdvbmpeg/ctools.h ---- streamdev-0.5.1.orig/libdvbmpeg/ctools.h 2008-04-01 16:29:56.000000000 +0200 -+++ streamdev-0.5.1/libdvbmpeg/ctools.h 2011-10-23 21:32:27.160208800 +0200 -@@ -19,7 +19,7 @@ - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - * - -diff -ruN streamdev-0.5.1.orig/libdvbmpeg/remux.c streamdev-0.5.1/libdvbmpeg/remux.c ---- streamdev-0.5.1.orig/libdvbmpeg/remux.c 2008-04-01 16:29:56.000000000 +0200 -+++ streamdev-0.5.1/libdvbmpeg/remux.c 2011-10-23 21:32:27.165208817 +0200 -@@ -19,7 +19,7 @@ - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - * - -diff -ruN streamdev-0.5.1.orig/libdvbmpeg/remux.h streamdev-0.5.1/libdvbmpeg/remux.h ---- streamdev-0.5.1.orig/libdvbmpeg/remux.h 2008-04-01 16:29:56.000000000 +0200 -+++ streamdev-0.5.1/libdvbmpeg/remux.h 2011-10-23 21:32:27.166208821 +0200 -@@ -20,7 +20,7 @@ - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - * - -diff -ruN streamdev-0.5.1.orig/libdvbmpeg/transform.c streamdev-0.5.1/libdvbmpeg/transform.c ---- streamdev-0.5.1.orig/libdvbmpeg/transform.c 2008-04-01 16:29:56.000000000 +0200 -+++ streamdev-0.5.1/libdvbmpeg/transform.c 2011-10-23 21:32:27.178208860 +0200 -@@ -19,7 +19,7 @@ - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - * - -diff -ruN streamdev-0.5.1.orig/libdvbmpeg/transform.h streamdev-0.5.1/libdvbmpeg/transform.h ---- streamdev-0.5.1.orig/libdvbmpeg/transform.h 2009-06-12 15:16:14.000000000 +0200 -+++ streamdev-0.5.1/libdvbmpeg/transform.h 2011-10-23 21:32:27.179208863 +0200 -@@ -19,7 +19,7 @@ - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - * - diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 2c5e0a2..512ec8c 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -5,22 +5,17 @@ %define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR) Name: vdr-%{pname} -Version: 0.5.1 -Release: 12%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev -Source0: http://projects.vdr-developer.org/attachments/download/497/vdr-streamdev-%{version}.tgz +Source0: http://projects.vdr-developer.org/attachments/download/969/vdr-streamdev-%{version}.tgz # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}-server.conf Source2: %{name}-client.conf -Patch0: %{name}-gpl-fsf-fix.patch -# http://projects.vdr-developer.org/issues/786 -Patch1: 0001-Fix-build-with-liemikuutio-1.32.patch -Patch2: %{name}-0.5.1-vdr1725.patch -Patch3: %{name}-0.5.1-vdr1726.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vdr-devel >= 1.5.9 @@ -49,10 +44,6 @@ VDR will then be able to work even without a DVB device. %prep %setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -F 2 -%patch3 -p1 -F 2 sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile @@ -101,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Wed Jul 04 2012 Felix Kaechele - 0.6.0-1 +- update to 0.6.0 +- drop all patches as upstream includes them already + * Tue Mar 27 2012 Ville Skyttä - 0.5.1-12 - Rebuild. From 917ccbd2f2fa5ee8c1fb3089be0e5a86c8ed6f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 19 Jul 2012 08:59:20 +0300 Subject: [PATCH 17/76] Make vdr(abi) deps arch qualified. --- vdr-streamdev.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 512ec8c..daaf531 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -27,7 +27,7 @@ The streamdev plug-in adds streaming capabilities to your VDR. %package server Summary: Streaming server plug-in for VDR Group: Applications/Multimedia -Requires: vdr(abi) = %{apiver} +Requires: vdr(abi)%{?_isa} = %{apiver} %description server Lets your VDR act as a streaming server for other clients. @@ -36,7 +36,7 @@ This will let you watch TV or Recordings across the network. %package client Summary: Streaming client plug-in for VDR Group: Applications/Multimedia -Requires: vdr(abi) = %{apiver} +Requires: vdr(abi)%{?_isa} = %{apiver} %description client Lets your VDR in conjunction with a streamdev-server act as a streaming client. @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Thu Jul 19 2012 Ville Skyttä - 0.6.0-2 +- Make vdr(abi) deps arch qualified. + * Wed Jul 04 2012 Felix Kaechele - 0.6.0-1 - update to 0.6.0 - drop all patches as upstream includes them already From 4717e69e9d7dcecde065e071ec43a04cb1ce50b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 13 Sep 2012 21:22:41 +0300 Subject: [PATCH 18/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index daaf531..11215fa 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Thu Sep 13 2012 Ville Skyttä - 0.6.0-3 +- Rebuild. + * Thu Jul 19 2012 Ville Skyttä - 0.6.0-2 - Make vdr(abi) deps arch qualified. From 8b8d196b4e23cd8b0ae0ef8efbaa2e24e46562df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 2 Oct 2012 21:55:22 +0300 Subject: [PATCH 19/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 11215fa..a716ad3 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Tue Oct 02 2012 Ville Skyttä - 0.6.0-4 +- Rebuild. + * Thu Sep 13 2012 Ville Skyttä - 0.6.0-3 - Rebuild. From 2696a9031daf425f2440952b4b99ceb550281dd6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:41:45 -0600 Subject: [PATCH 20/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index a716ad3..426f6f5 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Streaming plug-in for VDR Group: Applications/Multimedia @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Oct 02 2012 Ville Skyttä - 0.6.0-4 - Rebuild. From c40f36563fd907c4da6d93b2635ae30f73f0bbe1 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Fri, 22 Feb 2013 17:10:48 +0100 Subject: [PATCH 21/76] update to latest git snapshot for VDR 1.7.38 support - modified spec to easily support git snapshots - cleanup spec: remove old macros and constructs --- .gitignore | 1 + sources | 2 +- vdr-streamdev-snapshot.sh | 17 ++++++++ vdr-streamdev.spec | 87 +++++++++++++++++++++++---------------- 4 files changed, 71 insertions(+), 36 deletions(-) create mode 100644 vdr-streamdev-snapshot.sh diff --git a/.gitignore b/.gitignore index 0c6a16b..9726c06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vdr-streamdev-0.5.0.tgz /vdr-streamdev-0.5.1.tgz /vdr-streamdev-0.6.0.tgz +/vdr-streamdev-10db11ac.tar.xz diff --git a/sources b/sources index 293213f..ba703dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da39a8bc12935dfd2c66c9d6f74430dd vdr-streamdev-0.6.0.tgz +e5011fd1a4b0624b192911f37c6040e3 vdr-streamdev-10db11ac.tar.xz diff --git a/vdr-streamdev-snapshot.sh b/vdr-streamdev-snapshot.sh new file mode 100644 index 0000000..3760157 --- /dev/null +++ b/vdr-streamdev-snapshot.sh @@ -0,0 +1,17 @@ +NAME=vdr-streamdev +REPO=git://projects.vdr-developer.org/vdr-plugin-streamdev.git +TMPDIR=`mktemp -d` + +pushd $TMPDIR + git clone $REPO $NAME + pushd $NAME + if [ -z $1 ]; then + GITVER=`git rev-parse HEAD` + else + GITVER=$1 + fi + git archive --format=tar --prefix=${NAME}-${GITVER:0:8}/ ${GITVER} | xz > ${NAME}-${GITVER:0:8}.tar.xz + popd +popd +mv $TMPDIR/$NAME/${NAME}-${GITVER:0:8}.tar.xz . +rm -rf $TMPDIR diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 426f6f5..4bee19d 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -1,50 +1,64 @@ -%define pname streamdev -#define prever 20090706 -%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR) -%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR) -%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR) +%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 gitshort %(echo %gitver | awk '{print substr($0,1,8)}') +%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ + +%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 + # Example: sh vdr-streamdev-snapshot.sh 10db11acd9a9785443182da1ec032c1d83db271a + %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 setuppath %{pname}-%{version} +%endif Name: vdr-%{pname} -Version: 0.6.0 -Release: 5%{?dist} +Version: 0.6.1 +Release: 0.1%{?gitver:.git%{gitshort}}%{?dist} Summary: Streaming plug-in for VDR - -Group: Applications/Multimedia License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-streamdev -Source0: http://projects.vdr-developer.org/attachments/download/969/vdr-streamdev-%{version}.tgz + +Source0: %{srcfile} # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}-server.conf Source2: %{name}-client.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Script to generate git snapshots +# listed here so that it's pulled into the SRPM +Source3: %{name}-snapshot.sh -BuildRequires: vdr-devel >= 1.5.9 -BuildRequires: gettext +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 -Group: Applications/Multimedia -Requires: vdr(abi)%{?_isa} = %{apiver} +Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} %description server 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 -Group: Applications/Multimedia -Requires: vdr(abi)%{?_isa} = %{apiver} +Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} %description client 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 %{pname}-%{version}%{?prever:-pre-%{prever}} +%prep +%setup -q -n %{setuppath} sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile for f in CONTRIBUTORS HISTORY; do @@ -53,16 +67,17 @@ for f in CONTRIBUTORS HISTORY; do mv $f.conv $f done + %build make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$PWD/locale all + %install -rm -rf $RPM_BUILD_ROOT -install -dm 755 $RPM_BUILD_ROOT%{plugindir} -install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/streamdev-server -install -pm 755 server/libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} -install -pm 755 client/libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} -install -Dpm 644 streamdev-server/streamdevhosts.conf $RPM_BUILD_ROOT%{configdir}/plugins/streamdev-server/streamdevhosts.conf +install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir} +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 @@ -73,25 +88,27 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale %find_lang %{name}-server %find_lang %{name}-client -%clean -rm -rf $RPM_BUILD_ROOT %files server -f %{name}-server.lang -%defattr(-,root,root,-) -%{plugindir}/libvdr-%{pname}-server.so.%{apiver} +%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README +%{vdr_plugindir}/libvdr-%{pname}-server.so.%{vdr_apiversion} %{_libdir}/vdr/bin/externremux.sh %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf -%dir %{configdir}/plugins/streamdev-server -%config(noreplace) %{configdir}/plugins/streamdev-server/streamdevhosts.conf -%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README +%dir %{vdr_configdir}/plugins/streamdev-server +%config(noreplace) %{vdr_configdir}/plugins/streamdev-server/streamdevhosts.conf %files client -f %{name}-client.lang -%defattr(-,root,root,-) -%{plugindir}/libvdr-%{pname}-client.so.%{apiver} -%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README +%{vdr_plugindir}/libvdr-%{pname}-client.so.%{vdr_apiversion} +%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf + %changelog +* Thu Feb 21 2013 Felix Kaechele - 0.6.1-0.1.git10db11ac +- update to latest git snapshot for VDR 1.7.38 support +- modified spec to easily support git snapshots +- cleanup spec: remove old macros and constructs + * Fri Feb 15 2013 Fedora Release Engineering - 0.6.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 8bdaa2a7df18a68f71f19b8b6b0f9ac9b4c1dfc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 3 Mar 2013 22:03:06 +0200 Subject: [PATCH 22/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 4bee19d..38f020e 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.1%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.2%{?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 03 2013 Ville Skyttä - 0.6.1-0.2.git10db11ac +- Rebuild. + * Thu Feb 21 2013 Felix Kaechele - 0.6.1-0.1.git10db11ac - update to latest git snapshot for VDR 1.7.38 support - modified spec to easily support git snapshots From 908c6b1e5ed71242132243dabd08b7efc32d7ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 14 Mar 2013 21:48:35 +0200 Subject: [PATCH 23/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 38f020e..3394640 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.2%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.3%{?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 +* Wed Mar 13 2013 Ville Skyttä - 0.6.1-0.3.git10db11ac +- Rebuild. + * Sun Mar 03 2013 Ville Skyttä - 0.6.1-0.2.git10db11ac - Rebuild. From bbac46b9863d7a07932c4077381c89d0aa90f0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 16 Mar 2013 21:19:31 +0200 Subject: [PATCH 24/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 3394640..5662c54 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.3%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.4%{?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 +* Sat Mar 16 2013 Ville Skyttä - 0.6.1-0.4.git10db11ac +- Rebuild. + * Wed Mar 13 2013 Ville Skyttä - 0.6.1-0.3.git10db11ac - Rebuild. From cb8077fb11edaf174820883c7cb8817e09636486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 31 Mar 2013 19:10:30 +0300 Subject: [PATCH 25/76] Rebuild. --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 5662c54..4c5561c 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.4%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.5%{?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 31 2013 Ville Skyttä - 0.6.1-0.5.git10db11ac +- Rebuild. + * Sat Mar 16 2013 Ville Skyttä - 0.6.1-0.4.git10db11ac - Rebuild. From 56e2b9d420eb7b70fa89e08ca9f53d38457296f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:01:59 -0500 Subject: [PATCH 26/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vdr-streamdev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 4c5561c..97d3639 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -20,7 +20,7 @@ Name: vdr-%{pname} Version: 0.6.1 -Release: 0.5%{?gitver:.git%{gitshort}}%{?dist} +Release: 0.6%{?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 Aug 04 2013 Fedora Release Engineering - 0.6.1-0.6.git10db11ac +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sun Mar 31 2013 Ville Skyttä - 0.6.1-0.5.git10db11ac - Rebuild. 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 27/76] 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 28/76] 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 29/76] - 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 30/76] - 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 31/76] 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 32/76] - 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 33/76] - 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 34/76] - 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 35/76] - 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 36/76] - 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 37/76] - 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 38/76] 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 39/76] - 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 40/76] 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 41/76] - 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 42/76] 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 43/76] - 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 44/76] - 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 45/76] - 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 46/76] 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 47/76] 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 48/76] 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 49/76] 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 50/76] - 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 51/76] 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 52/76] - 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 53/76] 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 54/76] - 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 55/76] 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 56/76] 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 57/76] 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 58/76] 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 59/76] 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 60/76] 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 61/76] 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 62/76] 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 63/76] 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 64/76] 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 65/76] 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 66/76] 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 67/76] 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 68/76] 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 69/76] 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 70/76] 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 71/76] 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 72/76] 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 73/76] 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 74/76] 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 75/76] 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 76/76] 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