[vdr] Update to 1.7.27, re-enable legacy receiver code for now.
Ville Skyttä
scop at fedoraproject.org
Tue Mar 27 20:41:47 UTC 2012
commit 8647d30d167c332766bcd664f40678913c6bc8bf
Author: Ville Skyttä <ville.skytta at steam.fi>
Date: Tue Mar 27 23:41:36 2012 +0300
Update to 1.7.27, re-enable legacy receiver code for now.
sources | 6 +---
vdr-1.7.22-msgidbugs.patch | 12 -----------
vdr-1.7.27-hlcutter.patch | 12 +++++++++++
....25-jumpplay.patch => vdr-1.7.27-jumpplay.patch | 12 +++++-----
vdr-1.7.27-legacy-receiver.patch | 12 +++++++++++
vdr.spec | 21 +++++++++----------
6 files changed, 42 insertions(+), 33 deletions(-)
---
diff --git a/sources b/sources
index c853dca..37d7cc0 100644
--- a/sources
+++ b/sources
@@ -5,7 +5,5 @@ fae3698214bd45de1f675c2b037d5f3b vdr-1.7.21-ttxtsubs.patch
71f7281d55eba1957f4267f596b11e29 vdr.epgsearch-exttimeredit-0.0.2.diff
925d44ca8a2d10a4b84f1d47e617fc46 vdr-1.7.22-hlcutter-0.2.2.diff
d40db7bea1b9af94d7625e611ef3dae2 vdr_1.7.23-1.debian.tar.bz2
-eb57398e44935ecb0bfc532bdfead312 vdr-1.7.26.tar.bz2
-37bc531491e4829083acdce32b930155 vdr-1.7.26-finnish.patch.gz
-4d2008ae755cf3ab56b7f54f7e3c0366 vdr-1.7.26-liemikuutio-1.34.patch.gz
-7e0b3f8a2735651cd55d07011ad3f8ee vdr-1.7.26-dvbsubtitle.patch.gz
+bfeaa79a9e55144bca2b69139c45f1bb vdr-1.7.27.tar.bz2
+b2fac5d9ee86abb8abf294839bdf2fbf vdr-1.7.27-liemikuutio-1.34.patch.gz
diff --git a/vdr-1.7.27-hlcutter.patch b/vdr-1.7.27-hlcutter.patch
new file mode 100644
index 0000000..4c9825e
--- /dev/null
+++ b/vdr-1.7.27-hlcutter.patch
@@ -0,0 +1,12 @@
+diff -up vdr-1.7.27/cutter.c~ vdr-1.7.27/cutter.c
+--- vdr-1.7.27/cutter.c~ 2012-03-26 23:02:40.853801375 +0300
++++ vdr-1.7.27/cutter.c 2012-03-26 23:03:08.292106028 +0300
+@@ -137,7 +137,7 @@ void cCuttingThread::Action(void)
+ // Get file number of next cut mark
+ if (!Mark && !LastMark
+ || Mark
+- && fromIndex->Get(Mark->position, &MarkFileNumber, &MarkFileOffset)
++ && fromIndex->Get(Mark->Position(), &MarkFileNumber, &MarkFileOffset)
+ && (MarkFileNumber != CurrentFileNumber)) {
+ // The current source file will be copied completely.
+ // Start new output file unless we did that already
diff --git a/vdr-1.7.25-jumpplay.patch b/vdr-1.7.27-jumpplay.patch
similarity index 96%
rename from vdr-1.7.25-jumpplay.patch
rename to vdr-1.7.27-jumpplay.patch
index 3335073..564ca36 100644
--- a/vdr-1.7.25-jumpplay.patch
+++ b/vdr-1.7.27-jumpplay.patch
@@ -74,7 +74,7 @@ diff -up vdr-1.7.25/dvbplayer.c~ vdr-1.7.25/dvbplayer.c
if (Index >= 0) {
+ // set resume position to 0 if replay stops at the first mark
+ if (Setup.PlayJump && marks.First() &&
-+ abs(Index - marks.First()->position) <= int(round(RESUMEBACKUP * framesPerSecond)))
++ abs(Index - marks.First()->Position()) <= int(round(RESUMEBACKUP * framesPerSecond)))
+ Index = 0;
Index -= int(round(RESUMEBACKUP * framesPerSecond));
if (Index > 0)
@@ -91,7 +91,7 @@ diff -up vdr-1.7.25/dvbplayer.c~ vdr-1.7.25/dvbplayer.c
isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true, framesPerSecond));
+ if (Setup.PlayJump && readIndex <= 0 && marks.First() && index) {
-+ int Index = marks.First()->position;
++ int Index = marks.First()->Position();
+ uint16_t FileNumber;
+ off_t FileOffset;
+ if (index->Get(Index, &FileNumber, &FileOffset) &&
@@ -128,7 +128,7 @@ diff -up vdr-1.7.25/dvbplayer.c~ vdr-1.7.25/dvbplayer.c
+ m = marks.Next(m);
+ int Index;
+ if (m)
-+ Index = m->position;
++ Index = m->Position();
+ else if (Setup.PauseLastMark) {
+ // pause at last mark
+ isyslog("PauseLastMark: pause at position %d (%s)",
@@ -211,12 +211,12 @@ diff -up vdr-1.7.25/menu.c~ vdr-1.7.25/menu.c
+ bool Play2, Forward2;
+ int Speed;
+ if (Setup.JumpPlay && GetReplayMode(Play2, Forward2, Speed) &&
-+ Play2 && Forward && m->position < Total - SecondsToFrames(3, FramesPerSecond())) {
-+ Goto(m->position);
++ Play2 && Forward && m->Position() < Total - SecondsToFrames(3, FramesPerSecond())) {
++ Goto(m->Position());
+ Play();
+ }
+ else {
-+ Goto(m->position, true);
++ Goto(m->Position(), true);
+ displayFrames = true;
+ }
}
diff --git a/vdr-1.7.27-legacy-receiver.patch b/vdr-1.7.27-legacy-receiver.patch
new file mode 100644
index 0000000..0b666da
--- /dev/null
+++ b/vdr-1.7.27-legacy-receiver.patch
@@ -0,0 +1,12 @@
+diff -up vdr-1.7.27/receiver.h~ vdr-1.7.27/receiver.h
+--- vdr-1.7.27/receiver.h~ 2012-03-11 17:25:40.000000000 +0200
++++ vdr-1.7.27/receiver.h 2012-03-27 23:25:33.119363885 +0300
+@@ -14,7 +14,7 @@
+
+ #define MAXRECEIVEPIDS 64 // the maximum number of PIDs per receiver
+
+-//#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
++#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
+
+ class cReceiver {
+ friend class cDevice;
diff --git a/vdr.spec b/vdr.spec
index 5ec64ac..351cb27 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -24,8 +24,8 @@
%global migrfile %{_var}/run/systemd-migr_%{name}-%{version}-%{release}.%{_arch}
Name: vdr
-Version: 1.7.26
-Release: 2%{?dist}
+Version: 1.7.27
+Release: 1%{?dist}
Summary: Video Disk Recorder
License: GPLv2+
@@ -53,7 +53,7 @@ Source19: %{name}-check-setup.sh
Source20: %{name}-rcu.conf
Patch0: %{name}-channel+epg.patch
Patch1: http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.26-liemikuutio-1.34.patch.gz
+Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.27-liemikuutio-1.34.patch.gz
# Extracted from http://copperhead.htpc-forum.de/downloads/extensionpatch/extpngvdr1.7.21v1.diff.gz
Patch3: %{name}-1.7.21-plugin-missing.patch
Patch4: %{name}-1.7.22-paths.patch
@@ -63,7 +63,7 @@ Patch6: %{name}-1.5.18-syncearly.patch
Patch7: http://projects.vdr-developer.org/projects/plg-ttxtsubs/repository/revisions/master/raw/patches/vdr-1.7.21-ttxtsubs.patch
# Extracted from http://copperhead.htpc-forum.de/downloads/extensionpatch/extpngvdr1.7.21v1.diff.gz
# Original at http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.7.6.diff
-Patch8: %{name}-1.7.25-jumpplay.patch
+Patch8: %{name}-1.7.27-jumpplay.patch
# http://www.udo-richter.de/vdr/patches.en.html#hlcutter
Patch9: http://www.udo-richter.de/vdr/files/vdr-1.7.22-hlcutter-0.2.2.diff
# Sent to hlcutter upstream 2009-06-15 and 2011-10-16
@@ -74,15 +74,14 @@ Patch11: %{name}-1.7.25-mainmenuhooks101.patch
# Modified so that it applies over the timer-info patch
Patch12: %{name}-1.7.21-timercmd.patch
Patch13: http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr-1.5.17-progressbar-support-0.0.1.diff
-Patch14: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.26-finnish.patch.gz
+# Sent to hlcutter upstream 2012-03-26
+Patch14: %{name}-1.7.27-hlcutter.patch
Patch15: %{name}-1.7.21-fedora-pkgconfig.patch
Patch16: %{name}-1.7.21-jumpplay-finnish.patch
Patch17: http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr.epgsearch-exttimeredit-0.0.2.diff
-Patch18: %{name}-1.7.22-msgidbugs.patch
+Patch18: %{name}-1.7.27-legacy-receiver.patch
# http://projects.vdr-developer.org/issues/819
Patch19: %{name}-1.7.22-ttxtsubs-on.patch
-# http://www.linuxtv.fi/viewtopic.php?f=12&p=32248
-Patch20: %{name}-1.7.26-dvbsubtitle.patch.gz
BuildRequires: libjpeg-devel
BuildRequires: libcap-devel
@@ -215,7 +214,6 @@ sed \
#patch17 -p0 -F 3
%patch18 -p1
%patch19 -p1
-%patch20 -p1
for f in CONTRIBUTORS HISTORY UPDATE-1.4.0 README.timer-info ; do
iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -381,7 +379,6 @@ install -Dpm 644 %{name}.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
install -pm 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vdr-config
-install -pm 755 i18n-to-gettext $RPM_BUILD_ROOT%{_bindir}/vdr-i18n-to-gettext
install -pm 755 newplugin $RPM_BUILD_ROOT%{_bindir}/vdr-newplugin
install -pm 644 Make.config Make.global $RPM_BUILD_ROOT%{_libdir}/vdr
ln -s $(abs2rel %{_includedir}/vdr/config.h %{_libdir}/vdr) \
@@ -513,7 +510,6 @@ rm -f %{migrfile} &>/dev/null || :
%endif # docs
%{_sysconfdir}/rpm/macros.vdr
%{_bindir}/vdr-config
-%{_bindir}/vdr-i18n-to-gettext
%{_bindir}/vdr-newplugin
%{_includedir}/libsi/
%{_includedir}/vdr/
@@ -553,6 +549,9 @@ rm -f %{migrfile} &>/dev/null || :
%changelog
+* Mon Mar 26 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.27-1
+- Update to 1.7.27, re-enable legacy receiver code for now.
+
* Sun Mar 18 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.26-2
- Apply Rolf Ahrenberg's subtitles fix.
More information about the scm-commits
mailing list