[vdr] Update vasarajanauloja patch to 2.0.0.
Ville Skyttä
scop at fedoraproject.org
Sun Apr 7 17:15:51 UTC 2013
commit 00ee9b3d47566b862a70aae16d38ffb164a3e7a2
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Sun Apr 7 20:15:45 2013 +0300
Update vasarajanauloja patch to 2.0.0.
- Apply upstream cDevice::keepTracks init patch.
sources | 2 +-
vdr-2.0.0-fixkeeptracksinit.diff | 15 +++++++++++++++
vdr.spec | 11 +++++++++--
3 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 9b2dc94..14d8efb 100644
--- a/sources
+++ b/sources
@@ -5,5 +5,5 @@
da3a3ab8c2a42a320171b1648c3b3258 vdr-1.7.29-hlcutter-0.2.3.diff
c1389b2902865fbda904f82c52b8b7d5 vdr_1.7.28-1.debian.tar.bz2
239727ecce9a79e146aa4ca7866a0e1e vdr-1.7.40-ttxtsubs.patch
-b200b3b7d59e546e79c9063e42d4085e vdr-1.7.42-vasarajanauloja.patch.gz
fd7f481b996e03fae3c00e80b6b0d301 vdr-2.0.0.tar.bz2
+f0e6a02c94741ac693692be7ab6a2e37 vdr-2.0.0-vasarajanauloja.patch.gz
diff --git a/vdr-2.0.0-fixkeeptracksinit.diff b/vdr-2.0.0-fixkeeptracksinit.diff
new file mode 100644
index 0000000..02de396
--- /dev/null
+++ b/vdr-2.0.0-fixkeeptracksinit.diff
@@ -0,0 +1,15 @@
+--- device.c 2013/03/07 13:18:35 3.0
++++ device.c 2013/04/05 10:05:33
+@@ -94,11 +94,11 @@
+
+ player = NULL;
+ isPlayingVideo = false;
++ keepTracks = false; // used in ClrAvailableTracks()!
+ ClrAvailableTracks();
+ currentAudioTrack = ttNone;
+ currentAudioTrackMissingCount = 0;
+ currentSubtitleTrack = ttNone;
+- keepTracks = false;
+ liveSubtitle = NULL;
+ dvbSubtitleConverter = NULL;
+ autoSelectPreferredSubtitleLanguage = true;
diff --git a/vdr.spec b/vdr.spec
index e096246..36be518 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -23,7 +23,7 @@
Name: vdr
Version: 2.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Video Disk Recorder
License: GPLv2+
@@ -51,7 +51,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.42-vasarajanauloja.patch.gz
+Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-2.0.0-vasarajanauloja.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.41-paths.patch
@@ -73,6 +73,8 @@ Patch11: %{name}-1.7.38-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
+# http://www.linuxtv.org/pipermail/vdr/2013-April/027668.html
+Patch14: %{name}-2.0.0-fixkeeptracksinit.diff
Patch15: %{name}-1.7.37-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
@@ -198,6 +200,7 @@ sed \
%patch12 -p1
# TODO: does not apply
#patch13 -p1
+%patch14 -p0
%patch15 -p1
%patch16 -p1
# TODO: build failure
@@ -524,6 +527,10 @@ systemctl daemon-reload &>/dev/null
%changelog
+* Sun Apr 7 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.0.0-2
+- Update vasarajanauloja patch to 2.0.0.
+- Apply upstream cDevice::keepTracks init patch.
+
* Sun Mar 31 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.0.0-1
- Update to 2.0.0.
- Move pre-1.7 changelog entries to CHANGES.package.old.
More information about the scm-commits
mailing list