[vdr] Fix build with g++ 4.7.0. Turn on teletext subtitles by default for 1.6.x backwards compat.

[Ville Skyttä]

commit 18efde98c09933bd6d68efe71856d06aa09cc2ad
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Jan 4 22:06:30 2012 +0200

    Fix build with g++ 4.7.0.
    Turn on teletext subtitles by default for 1.6.x backwards compat.

 .gitignore                                |    1 +
 0007-Fix-build-with-g-4.7.0.patch         |   25 ++
 sources                                   |    1 +
 vdr-1.7.21-hlcutter-delwhilecutting.patch |   14 -
 vdr-1.7.22-hlcutter-0.2.2.diff            |  556 -----------------------------
 vdr-1.7.22-ttxtsubs-on.patch              |   12 +
 vdr.spec                                  |   17 +-
 7 files changed, 50 insertions(+), 576 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c4cc295..10fa5c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /vdr-1.7.21-ttxtsubs.patch
 /vdr-timer-info-0.5-1.7.13.diff
 /vdr.epgsearch-exttimeredit-0.0.2.diff
+/vdr-1.7.22-hlcutter-0.2.2.diff
diff --git a/0007-Fix-build-with-g-4.7.0.patch b/0007-Fix-build-with-g-4.7.0.patch
new file mode 100644
index 0000000..054a945
--- /dev/null
+++ b/0007-Fix-build-with-g-4.7.0.patch
@@ -0,0 +1,25 @@
+From 92a304310d79b000892caaf49427cba3f7a0e3c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Wed, 4 Jan 2012 21:58:37 +0200
+Subject: [PATCH 7/7] Fix build with g++ 4.7.0.
+
+---
+ config.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.h b/config.h
+index 7825364..b0233a9 100644
+--- a/config.h
++++ b/config.h
+@@ -122,7 +122,7 @@ public:
+                 if (!isempty(s)) {
+                    T *l = new T;
+                    if (l->Parse(s))
+-                      Add(l);
++                      this->Add(l);
+                    else {
+                       esyslog("ERROR: error in %s, line %d", fileName, line);
+                       delete l;
+-- 
+1.7.7.5
+
diff --git a/sources b/sources
index 1e7f83a..a31ac01 100644
--- a/sources
+++ b/sources
@@ -8,3 +8,4 @@ fae3698214bd45de1f675c2b037d5f3b  vdr-1.7.21-ttxtsubs.patch
 b9c0fe1aac8e653c0d0234bc72c2bb2c  vdr-1.7.22.tar.bz2
 612ff95c5f67fffe331c10c0d33340e8  vdr-1.7.22-liemikuutio-1.33.patch.gz
 8d1ecfd83dc6bef54f8263ad25d9186c  vdr-1.7.22-finnish.patch.gz
+925d44ca8a2d10a4b84f1d47e617fc46  vdr-1.7.22-hlcutter-0.2.2.diff
diff --git a/vdr-1.7.22-ttxtsubs-on.patch b/vdr-1.7.22-ttxtsubs-on.patch
new file mode 100644
index 0000000..72f9a9a
--- /dev/null
+++ b/vdr-1.7.22-ttxtsubs-on.patch
@@ -0,0 +1,12 @@
+diff -up vdr-1.7.22/config.c~ vdr-1.7.22/config.c
+--- vdr-1.7.22/config.c~	2011-12-10 00:12:51.710871792 +0200
++++ vdr-1.7.22/config.c	2011-12-10 00:13:14.325025772 +0200
+@@ -397,7 +397,7 @@ cSetup::cSetup(void)
+   MarginStop = 10;
+   AudioLanguages[0] = -1;
+   DisplaySubtitles = 0;
+-  SupportTeletext = 0;
++  SupportTeletext = 1;
+   SubtitleLanguages[0] = -1;
+   SubtitleOffset = 0;
+   SubtitleFgTransparency = 0;
diff --git a/vdr.spec b/vdr.spec
index 76b3095..3fbf1e6 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -23,7 +23,7 @@
 
 Name:           vdr
 Version:        1.7.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video Disk Recorder
 
 License:        GPLv2+
@@ -61,9 +61,7 @@ Patch7:         http://projects.vdr-developer.org/projects/plg-ttxtsubs/reposito
 # Original at http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.7.6.diff
 Patch8:        %{name}-1.7.21-jumpplay.patch
 # http://www.udo-richter.de/vdr/patches.en.html#hlcutter
-# http://www.udo-richter.de/vdr/files/vdr-1.7.14-hlcutter-0.2.2.diff
-# Modified so that it applies to 1.7.22
-Patch9:         %{name}-1.7.22-hlcutter-0.2.2.diff
+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
 Patch10:        %{name}-1.7.21-hlcutter-0.2.2-finnish.patch
 # http://article.gmane.org/gmane.linux.vdr/43590
@@ -77,8 +75,10 @@ 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
-# Sent to hlcutter upstream 2011-11-21
-Patch19:        %{name}-1.7.21-hlcutter-delwhilecutting.patch
+# http://projects.vdr-developer.org/issues/819
+Patch19:        %{name}-1.7.22-ttxtsubs-on.patch
+# Sent upstream 2012-01-04
+Patch20:        0007-Fix-build-with-g-4.7.0.patch
 
 BuildRequires:  libjpeg-devel
 BuildRequires:  libcap-devel
@@ -200,6 +200,7 @@ 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
@@ -512,6 +513,10 @@ fi
 
 
 %changelog
+* Wed Jan  4 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.22-2
+- Fix build with g++ 4.7.0.
+- Turn on teletext subtitles by default for 1.6.x backwards compat.
+
 * Sun Dec  4 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.7.22-1
 - Update to 1.7.22.
 - Build docs by default.