diff options
Diffstat (limited to 'abs/core/mythtv/stable-0.27')
9 files changed, 212 insertions, 13 deletions
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 9e121ae..54aea3a 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -ca4a2d68aab8723e4424cd808d6865bad2b950f1 +d8dc0e730d93cd9aad597b61374f9a90f675884f diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash_web b/abs/core/mythtv/stable-0.27/git_src/git_hash_web index e1c323c..6cb1e85 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash_web +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash_web @@ -1 +1 @@ -e0c2a3aea94bc96be5836472a1c53e62b5e43c93 +e1fdde1387ec6a5300be0917b95ada9ef5915d80 diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 193c126..5ee9832 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -8,8 +8,8 @@ pkgname=('mytharchive' 'mythnews' 'mythweather' 'mythzoneminder') -pkgver=0.27.4 -pkgrel=10 +pkgver=0.27.6 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 89cc513..4b9f732 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv -pkgver=0.27.4 -pkgrel=10 +pkgver=0.27.6 +pkgrel=3 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -20,9 +20,13 @@ backup=() install='mythtv.install' patches=('myth_settings.patch' + 'ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch' 'videoAlwaysUseBookmark.patch' - 'suggestedstarttime.patch.v1') - #http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb + 'fixQTvirtualkeyboard.patch' + 'suggestedstarttime.patch.v1' + ) + #fixQTvirtualkeyboard.patch: https://code.mythtv.org/trac/ticket/12347 + #suggestedstarttime.patch.v1: http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb optdepends=() replaces=('mythvideo' 'myththemes') @@ -102,6 +106,8 @@ package() { } md5sums=('5f3e43567e62afe17bad39f5a9b604cf' + 'c09908eb42a8c842d6528bfe436dc4b2' '41098e898361a5a3cde3eaae358482a8' + 'a853dff0f5c92ca58fcc1e389cd16266' '35a7fd3e3057691e3b1bf355bb9e8b16' - '65a08d8949431ecdeb51a686dc6f9c21') + '928de4b070d9f3b784d55c0db415eaf3') diff --git a/abs/core/mythtv/stable-0.27/mythtv/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/abs/core/mythtv/stable-0.27/mythtv/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch new file mode 100644 index 0000000..e142829 --- /dev/null +++ b/abs/core/mythtv/stable-0.27/mythtv/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch @@ -0,0 +1,41 @@ +From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 +From: James Zern <jzern@google.com> +Date: Mon, 19 Oct 2015 22:44:11 -0700 +Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings + +VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed +from libvpx and the remaining values were never used here + +Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> +Signed-off-by: James Zern <jzern@google.com> +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- a/mythtv/external/FFmpeg/libavcodec/libvpxenc.c ++++ b/mythtv/external/FFmpeg/libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", +-- +1.7.10.4 + diff --git a/abs/core/mythtv/stable-0.27/mythtv/fixQTvirtualkeyboard.patch b/abs/core/mythtv/stable-0.27/mythtv/fixQTvirtualkeyboard.patch new file mode 100644 index 0000000..1688bd6 --- /dev/null +++ b/abs/core/mythtv/stable-0.27/mythtv/fixQTvirtualkeyboard.patch @@ -0,0 +1,45 @@ +--- src/mythtv/libs/libmythui/mythmainwindow.cpp.orig 2015-08-19 21:24:59.990554429 +0000 ++++ src/mythtv/libs/libmythui/mythmainwindow.cpp 2015-08-19 21:23:33.851546588 +0000 +@@ -1380,7 +1380,7 @@ + .arg(::GetCurrentThreadId())); + #endif + if (currentWidget()) +- { ++#ifdef Q_OS_MAC + // don't disable the current widget, instead we disable all its children + // on mac, disabling the current active widget entirely prevent keyboard to + // work on the newly opened widget. +@@ -1395,8 +1395,9 @@ + d->enabledWidgets[w] = true; + } + } +- } +- ++#else ++ currentWidget()->setEnabled(false); ++#endif + d->widgetList.push_back(child); + child->winId(); + child->raise(); +@@ -1419,11 +1420,8 @@ + d->widgetList.erase(it); + QWidget *current = currentWidget(); + if (!current) +- { + current = this; +- // We're be to the main window, enable it just in case +- setEnabled(true); +- } ++#ifdef Q_OS_MAC + else + { + QList<QWidget*> list = current->findChildren<QWidget *>(); +@@ -1438,6 +1436,8 @@ + } + } + current->raise(); ++#endif ++ current->setEnabled(true); + current->setFocus(); + current->setMouseTracking(true); + diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml index e454959..c9ec7fa 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml @@ -50,7 +50,7 @@ <button> <type>MV_MISC_SETUP_MENU</type> - <text>Miscellanous</text> + <text>Miscellaneous</text> <description>Set timezone, shortcuts & auto updates</description> <action>EXEC mythinstall -s misc </action> </button> diff --git a/abs/core/mythtv/stable-0.27/mythtv/recordings b/abs/core/mythtv/stable-0.27/mythtv/recordings index 7fdde51..984fea9 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/recordings +++ b/abs/core/mythtv/stable-0.27/mythtv/recordings @@ -1,5 +1,112 @@ #!/bin/bash + +#START=$(date +%s) + +#check if mythbackend is running and was just started +for i in 1 2 +do +if [ `cat /service/mythbackend/supervise/pid` ] +then + now=$(date +%s) + mythbackendStartTime=`stat -c %Y /service/mythbackend/supervise/pid` + if [[ $(( $now - $mythbackendStartTime )) -lt 59 ]] + then + #echo "mythbackend started less than a minute ago. Sleeping..." + sleep 60 + fi +else + #echo "mythbackend not running. exiting." + exit +fi +done + if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ] then - su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --link /data/storage/disk0/media/recordings" + recdir="/data/storage/disk0/media/recordings" + tmprecdir="/data/storage/disk0/media/tmp/recordings" + rm -r $tmprecdir + su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --format '%U/%T/%T %- S%ssE%ep %- %oY-%om-%od = %S' --link '$tmprecdir'" + + #delete Deleted recgroup and move files out of other dirs + if [ -d "$tmprecdir/Deleted" ] + then + rm -r "$tmprecdir/Deleted" + fi + #move all links in recgroup dirs out to tmprecdir + for recgroup in $tmprecdir/* + do + if [ -d "$recgroup" ] + then + rsync -a "$recgroup/" "$tmprecdir" + rm -r "$recgroup" + fi + done + #replace SE if no season/episode is in myth + for link in $tmprecdir/**/*\ -\ SE\ -\ * + do + newlink=`echo "$link" | sed 's/ - SE - / - /'` + mv "$link" "$newlink" + done + #replace SEyy if no season is in myth + for link in $tmprecdir/**/*\ -\ SE[0-9][0-9]\ -\ * + do + newlink=`echo "$link" | sed 's/ - SE/ - S00E/'` + mv "$link" "$newlink" + done + #replace SyyE if no episode is in myth + for link in $tmprecdir/**/*\ -\ S[0-9][0-9]E\ -\ * + do + newlink=`echo "$link" | sed 's/E - /E00 - /'` + mv "$link" "$newlink" + done + #replace blank original date + for link in $tmprecdir/**/*\ -\ 0000-00-00\ -\ * + do + newlink=`echo "$link" | sed 's/ - 0000-00-00 - / - /'` + mv "$link" "$newlink" + done + #add dash pt suffix if filename before the subtitle is the same + #so that plex will scan and include in library + uniqs="$(ls $tmprecdir/**/* | sed 's/ = .*//' | sort | uniq -d)" + SAVEIFS=$IFS + IFS=$'\n' + for link in $uniqs + do + i=1 + for dup in `ls -v $link*` + do + newlink=`echo "$dup" | sed "s/ = /-pt$i = /"` + mv "$dup" "$newlink" + i=$((i+1)) + done + done + IFS=$SAVEIFS + + #change symlinks mtime to match the file it is linked to +# for link in $tmprecdir/**/* +# do +# if [ -L "$link" ] +# then +# file=`readlink "$link"` +# touch -hr "$file" "$link" +# fi +# done + + #sync tmprecdir to recdir + #rsync -aOP --delete --ignore-existing "$tmprecdir/" "$recdir/" + rsync -aO --delete "$tmprecdir/" "$recdir/" + + #check if plex media server is running + if [[ `pidof "Plex Media Server"` ]] + then + #get plex section and update + /usr/LH/bin/plexmediascanner.sh -l | grep -i myth | cut -d: -f1 | while read -r line + do + /usr/LH/bin/plexmediascanner.sh --scan --refresh --section $line + done + fi fi + +#END=$(date +%s) +#DIFF=$(( $END - $START )) +#echo "It took $DIFF seconds" diff --git a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD index 9239c46..94f9527 100644 --- a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb -pkgver=0.27 -pkgrel=6 +pkgver=0.27.6 +pkgrel=2 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('i686' 'x86_64') |