From 0ecc23b868bd5e83dda511ed48380a7e20ed49de Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 14 Apr 2016 21:57:50 +0000 Subject: mythtv, plugins, web: update to latest .28 fixes --- abs/core/mythtv/stable-0.28/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.28/git_src/git_hash_web | 2 +- abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 9 +++- .../mythtv/autoskip_reduce_commskip_jumpback.patch | 61 ++++++++++++++++++++++ .../stable-0.28/mythtv/change_msg_types.patch | 53 +++++++++++++++++++ abs/core/mythtv/stable-0.28/mythweb/PKGBUILD | 2 +- 7 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch create mode 100644 abs/core/mythtv/stable-0.28/mythtv/change_msg_types.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 fbd518b..5147976 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 @@ -7c6bfc081609c545e3b7c923f0db4f708a7c1649 +15cf421af9d86bffc3b34aa1d9e45adaa5065a29 diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash_web b/abs/core/mythtv/stable-0.28/git_src/git_hash_web index 0223298..99738a7 100644 --- a/abs/core/mythtv/stable-0.28/git_src/git_hash_web +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash_web @@ -1 +1 @@ -94ec03ada41da6ab7883b0eb037ea58239f05913 +74e21c9a3bdb8d695373918f67b681e899ca8427 diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD index 5ecf00b..545bd37 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=5 +pkgrel=8 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 8bef8cc..025c114 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=6 +pkgrel=8 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -21,9 +21,12 @@ groups=('pvr') backup=() install='mythtv.install' -patches=('myth_settings.patch' +patches=( + 'myth_settings.patch' 'videoAlwaysUseBookmark.patch' 'mediamonitor_use_1st_handler.patch' + 'autoskip_reduce_commskip_jumpback.patch' + 'change_msg_types.patch' ) optdepends=() @@ -103,4 +106,6 @@ package() { md5sums=('e30b482dcd5f3e71c6419fd753bab2b1' '41098e898361a5a3cde3eaae358482a8' '8d26b14af13b7be242ba999a8521f8dd' + '0bf5e92c0609a7eda8f253bf2e032590' + '231754820f7557d3008fbefc302fe832' '928de4b070d9f3b784d55c0db415eaf3') diff --git a/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch b/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch new file mode 100644 index 0000000..b1c90ed --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch @@ -0,0 +1,61 @@ +--- src/mythtv/libs/libmythtv/commbreakmap.cpp 2016-04-08 13:35:22.657983969 +0000 ++++ src/mythtv/libs/libmythtv/commbreakmap.cpp 2016-04-13 21:42:51.461959071 +0000 +@@ -233,7 +233,7 @@ + if (kCommSkipOn == autocommercialskip) + { + //: %1 is the skip time +- comm_msg = tr("Skip %1").arg(skipTime); ++ comm_msg = tr("Skip Commercial: %1").arg(skipTime); + } + else + { +@@ -269,10 +269,9 @@ + if ((skipcommercials == (0 - lastCommSkipDirection)) && + ((time(NULL) - lastCommSkipTime) <= 5)) + { +- comm_msg = tr("Skipping Back."); +- +- if (lastCommSkipStart > (2.0 * video_frame_rate)) +- lastCommSkipStart -= (long long) (2.0 * video_frame_rate); ++ comm_msg = tr("Skipping Back"); ++ if (lastCommSkipStart > (video_frame_rate)) ++ lastCommSkipStart -= (long) (video_frame_rate); + lastCommSkipDirection = 0; + lastCommSkipTime = time(NULL); + jumpToFrame = lastCommSkipStart; +@@ -287,7 +286,7 @@ + if ((commBreakIter == commBreakMap.begin()) && + (skipcommercials < 0)) + { +- comm_msg = tr("Start of program."); ++ comm_msg = tr("Start of Program"); + jumpToFrame = 0; + return true; + } +@@ -297,7 +296,7 @@ + ((totalFrames) && + ((commBreakIter.key() + (10 * video_frame_rate)) > totalFrames)))) + { +- comm_msg = tr("At End, cannot Skip."); ++ comm_msg = tr("At End, Cannot Skip"); + return false; + } + +@@ -313,7 +312,7 @@ + { + if (commBreakIter == commBreakMap.begin()) + { +- comm_msg = tr("Start of program."); ++ comm_msg = tr("Start of Program"); + jumpToFrame = 0; + return true; + } +@@ -341,7 +340,7 @@ + ((commBreakIter.key() + (10 * video_frame_rate)) > + totalFrames))) + { +- comm_msg = tr("At End, cannot Skip."); ++ comm_msg = tr("At End, Cannot Skip"); + return false; + } + } 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 new file mode 100644 index 0000000..919835e --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch @@ -0,0 +1,53 @@ +--- ../git_src/mythtv/mythtv/libs/libmythtv/tv_play.cpp 2016-04-12 21:18:14.577336824 +0000 ++++ src/mythtv/libs/libmythtv/tv_play.cpp 2016-04-14 20:18:44.680018060 +0000 +@@ -12705,18 +12705,18 @@ + if (ctx->playingInfo->QueryAutoExpire() != kDisableAutoExpire) + { + ctx->playingInfo->SaveAutoExpire(kDisableAutoExpire); +- desc = tr("Auto-Expire OFF"); ++ desc = tr("Auto-Expire Off"); + } + else + { + ctx->playingInfo->SaveAutoExpire(kNormalAutoExpire); +- desc = tr("Auto-Expire ON"); ++ desc = tr("Auto-Expire On"); + } + + ctx->UnlockPlayingInfo(__FILE__, __LINE__); + + if (!desc.isEmpty()) +- UpdateOSDSeekMessage(ctx, desc, kOSDTimeout_Med); ++ SetOSDMessage(ctx, desc); + } + + void TV::SetAutoCommercialSkip(const PlayerContext *ctx, +@@ -12733,7 +12733,7 @@ + ctx->UnlockDeletePlayer(__FILE__, __LINE__); + + if (!desc.isEmpty()) +- UpdateOSDSeekMessage(ctx, desc, kOSDTimeout_Med); ++ SetOSDMessage(ctx, desc); + } + + void TV::SetManualZoom(const PlayerContext *ctx, bool zoomON, QString desc) +--- ../git_src/mythtv/mythtv/libs/libmythtv/mythplayer.cpp 2016-04-12 21:18:14.574003917 +0000 ++++ src/mythtv/libs/libmythtv/mythplayer.cpp 2016-04-14 20:05:49.146211278 +0000 +@@ -4267,7 +4267,7 @@ + else if (action == ACTION_SELECT) + { + deleteMap.NewCut(frame); +- SetOSDMessage(tr("New cut added."), kOSDTimeout_Short); ++ SetOSDMessage(tr("New Cut Added"), kOSDTimeout_Short); + refresh = true; + } + else if (action == "DELETE") +@@ -4303,7 +4303,7 @@ + if (handled && (action == "CUTTOBEGINNING" || + action == "CUTTOEND" || action == "NEWCUT")) + { +- SetOSDMessage(tr("New cut added."), kOSDTimeout_Short); ++ SetOSDMessage(tr("New Cut Added"), kOSDTimeout_Short); + } + else if (handled && action == "UNDO") + { diff --git a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD index 9b26bc6..b0423b1 100644 --- a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.28 -pkgrel=2 +pkgrel=3 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12