From 0e5a34d2ca728f6848cb9b9fa605ec7dae103ecd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 20 Apr 2016 13:32:43 +0000
Subject: mythtv: update to latest -fixes

---
 abs/core/mythtv/stable-0.28/git_src/git_hash       |  2 +-
 abs/core/mythtv/stable-0.28/mythtv/PKGBUILD        |  8 +++--
 .../stable-0.28/mythtv/change_msg_types.patch      | 20 ++++++++++-
 .../disable_mythnotification_tuner_failure.patch   | 42 ++++++++++++++++++++++
 .../stable-0.28/mythtv/tv.cpp_fix_caps.patch       | 13 +++++++
 5 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 abs/core/mythtv/stable-0.28/mythtv/disable_mythnotification_tuner_failure.patch
 create mode 100644 abs/core/mythtv/stable-0.28/mythtv/tv.cpp_fix_caps.patch

diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash
index 5147976..ebcc91a 100644
--- a/abs/core/mythtv/stable-0.28/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.28/git_src/git_hash
@@ -1 +1 @@
-15cf421af9d86bffc3b34aa1d9e45adaa5065a29
+b4e03c8d87c18f499f573ec7af5ee5b59ef653f6
diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
index 025c114..bae5905 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.28
-pkgrel=8
+pkgrel=9
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
@@ -27,6 +27,8 @@ patches=(
          'mediamonitor_use_1st_handler.patch'
          'autoskip_reduce_commskip_jumpback.patch'
          'change_msg_types.patch'
+         'disable_mythnotification_tuner_failure.patch'
+         'tv.cpp_fix_caps.patch'
          )
 
 optdepends=()
@@ -107,5 +109,7 @@ md5sums=('e30b482dcd5f3e71c6419fd753bab2b1'
          '41098e898361a5a3cde3eaae358482a8'
          '8d26b14af13b7be242ba999a8521f8dd'
          '0bf5e92c0609a7eda8f253bf2e032590'
-         '231754820f7557d3008fbefc302fe832'
+         'f8a56ac814722b110dc9859169b9bda9'
+         '1cd668136deea20efb79cf3e6310effc'
+         '62c42b1043ebf65959fa9eced9ca3ed8'
          '928de4b070d9f3b784d55c0db415eaf3')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch b/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch
index 919835e..5db23c9 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch
+++ b/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch
@@ -1,5 +1,23 @@
---- ../git_src/mythtv/mythtv/libs/libmythtv/tv_play.cpp	2016-04-12 21:18:14.577336824 +0000
+--- src/mythtv/libs/libmythtv/tv_play.cpp.orig	2016-04-12 21:18:14.577336824 +0000
 +++ src/mythtv/libs/libmythtv/tv_play.cpp	2016-04-14 20:18:44.680018060 +0000
+@@ -10905,7 +10905,7 @@
+     else if (action == ACTION_TOGGLEOSDDEBUG)
+         ToggleOSDDebug(actx);
+     else if (action == "TOGGLEMANUALZOOM")
+-        SetManualZoom(actx, true, tr("Zoom Mode ON"));
++        SetManualZoom(actx, true, tr("Zoom Mode On"));
+     else if (action == "TOGGLESTRETCH")
+         ToggleTimeStretch(actx);
+     else if (action == ACTION_ENABLEUPMIX)
+@@ -12228,7 +12228,7 @@
+             {
+                 active = m_tvm_is_on;
+                 BUTTON2(actionName,
+-                        tr("Turn Auto-Expire OFF"), tr("Turn Auto-Expire ON"));
++                        tr("Turn Auto-Expire Off"), tr("Turn Auto-Expire On"));
+             }
+         }
+         else if (actionName == "QUEUETRANSCODE")
 @@ -12705,18 +12705,18 @@
      if (ctx->playingInfo->QueryAutoExpire() != kDisableAutoExpire)
      {
diff --git a/abs/core/mythtv/stable-0.28/mythtv/disable_mythnotification_tuner_failure.patch b/abs/core/mythtv/stable-0.28/mythtv/disable_mythnotification_tuner_failure.patch
new file mode 100644
index 0000000..dee880d
--- /dev/null
+++ b/abs/core/mythtv/stable-0.28/mythtv/disable_mythnotification_tuner_failure.patch
@@ -0,0 +1,42 @@
+--- src/mythtv/libs/libmythtv/tv_rec.cpp.orig	2016-04-15 16:17:06.197470998 +0000
++++ src/mythtv/libs/libmythtv/tv_rec.cpp	2016-04-15 16:17:53.558049686 +0000
+@@ -3931,19 +3931,6 @@
+             newRecStatus = RecStatus::Failing;
+             curRecording->SaveVideoProperties(VID_DAMAGED, VID_DAMAGED);
+ 
+-            QString desc = tr("Good signal seen after %1 ms")
+-                           .arg(genOpt.channel_timeout +
+-                        startRecordingDeadline.msecsTo(MythDate::current()));
+-            QString title = curRecording->GetTitle();
+-            if (!curRecording->GetSubtitle().isEmpty())
+-                title += " - " + curRecording->GetSubtitle();
+-
+-            MythNotification mn(MythNotification::Check, desc,
+-                                "Recording", title,
+-                                tr("See 'Tuning timeout' in mythtv-setup "
+-                                   "for this input."));
+-            gCoreContext->SendEvent(MythEvent(mn));
+-
+             LOG(VB_GENERAL, LOG_WARNING, LOC +
+                 QString("It took longer than %1 ms to get a signal lock. "
+                         "Keeping status of '%2'")
+@@ -3984,19 +3971,6 @@
+ 
+         SendMythSystemRecEvent("REC_FAILING", curRecording);
+ 
+-        QString desc = tr("Taking more than %1 ms to get a lock.")
+-                       .arg(genOpt.channel_timeout);
+-        QString title = curRecording->GetTitle();
+-        if (!curRecording->GetSubtitle().isEmpty())
+-            title += " - " + curRecording->GetSubtitle();
+-
+-        MythNotification mn(MythNotification::Error, desc,
+-                            "Recording", title,
+-                            tr("See 'Tuning timeout' in mythtv-setup "
+-                               "for this input."));
+-        mn.SetDuration(30);
+-        gCoreContext->SendEvent(MythEvent(mn));
+-
+         LOG(VB_GENERAL, LOG_WARNING, LOC +
+             QString("TuningSignalCheck: taking more than %1 ms to get a lock. "
+                     "marking this recording as '%2'.")
diff --git a/abs/core/mythtv/stable-0.28/mythtv/tv.cpp_fix_caps.patch b/abs/core/mythtv/stable-0.28/mythtv/tv.cpp_fix_caps.patch
new file mode 100644
index 0000000..dbe9553
--- /dev/null
+++ b/abs/core/mythtv/stable-0.28/mythtv/tv.cpp_fix_caps.patch
@@ -0,0 +1,13 @@
+--- src/mythtv/libs/libmythtv/tv.cpp.orig	2016-04-15 16:11:21.498478075 +0000
++++ src/mythtv/libs/libmythtv/tv.cpp	2016-04-15 16:11:49.338228155 +0000
+@@ -82,8 +82,8 @@
+ {
+     const QString kCommSkipTitles[] =
+     {
+-        QObject::tr("Auto-Skip OFF"),
+-        QObject::tr("Auto-Skip ON"),
++        QObject::tr("Auto-Skip Off"),
++        QObject::tr("Auto-Skip On"),
+         QObject::tr("Auto-Skip Notify"),
+     };
+ 
-- 
cgit v0.12

