From 5dc84e6979eadec8f7b88d79de1a1bd845bdcd56 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 6 May 2016 21:47:02 +0000
Subject: mythtv & mythplugins: update to latest fixes

remove mediamonitor_use_1st_handler.patch as fix added upstream
---
 abs/core/mythtv/stable-0.28/git_src/git_hash       |  2 +-
 abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD   |  2 +-
 abs/core/mythtv/stable-0.28/mythtv/PKGBUILD        |  4 +--
 .../mythtv/mediamonitor_use_1st_handler.patch      | 38 ----------------------
 4 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 abs/core/mythtv/stable-0.28/mythtv/mediamonitor_use_1st_handler.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 cc8108c..0a4a3b4 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 @@
-1bec90bcf03e9dfd60514c95e1e3872d4ee643bf
+0b08cb422fc0a85faaa846689e5ca3cd68e88696
diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
index b0a2e7f..a6f4297 100644
--- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=0.28
-pkgrel=11
+pkgrel=12
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
index e00b6c8..dcb417d 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=11
+pkgrel=12
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
@@ -24,7 +24,6 @@ install='mythtv.install'
 patches=(
          'myth_settings.patch'
          'videoAlwaysUseBookmark.patch'
-         'mediamonitor_use_1st_handler.patch'
          'autoskip_reduce_commskip_jumpback.patch'
          'change_msg_types.patch'
          'disable_mythnotification_tuner_failure.patch'
@@ -108,7 +107,6 @@ package() {
 
 md5sums=('e30b482dcd5f3e71c6419fd753bab2b1'
          '41098e898361a5a3cde3eaae358482a8'
-         '8d26b14af13b7be242ba999a8521f8dd'
          '0bf5e92c0609a7eda8f253bf2e032590'
          'f8a56ac814722b110dc9859169b9bda9'
          '1cd668136deea20efb79cf3e6310effc'
diff --git a/abs/core/mythtv/stable-0.28/mythtv/mediamonitor_use_1st_handler.patch b/abs/core/mythtv/stable-0.28/mythtv/mediamonitor_use_1st_handler.patch
deleted file mode 100644
index 637a8c7..0000000
--- a/abs/core/mythtv/stable-0.28/mythtv/mediamonitor_use_1st_handler.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/mythtv/libs/libmyth/mythmediamonitor.cpp.orig	2016-04-06 21:44:16.206362097 +0000
-+++ src/mythtv/libs/libmyth/mythmediamonitor.cpp	2016-04-06 21:47:14.753580798 +0000
-@@ -664,33 +664,9 @@
-         return;
-     }
- 
-+    // TODO - Generate a dialog, add buttons for each description,
-+    // if user didn't cancel, selected = handlers.at(choice);
-     int selected = 0;
--    if (handlers.size() > 1)
--    {
--        QStringList buttonmsgs;
--        for (QList<MHData>::const_iterator it = handlers.begin(); it != handlers.end(); ++it)
--            buttonmsgs << ((!it->description.isEmpty()) ? it->description : it->destination);
--        buttonmsgs << tr("Cancel");
--
--        const DialogCode cancelbtn = DialogCode(
--            int(kDialogCodeButton0) + buttonmsgs.size() - 1);
--
--        DialogCode ret = MythPopupBox::ShowButtonPopup(GetMythMainWindow(),
--                                tr("Media Handler Selection"),
--                                tr("The new media contains mixed content "
--                                   "that can be rendered in different ways. "
--                                   "Select your preferred method."),
--                                buttonmsgs, cancelbtn);
--        if (kDialogCodeRejected == ret || cancelbtn == ret)
--        {
--            LOG(VB_MEDIA, LOG_INFO, "User cancelled media handler selection");
--            return;
--        }
--
--        selected = MythDialog::CalcItemIndex(ret);
--        LOG(VB_MEDIA, LOG_NOTICE, QString("User selected '%1'")
--            .arg(handlers.at(selected).destination) );
--    }
- 
-     handlers.at(selected).callback(pMedia);
- }
-- 
cgit v0.12

