From f030d7e2822ce9aa63ce5ee98a07fe1758733a5d Mon Sep 17 00:00:00 2001 From: Cecil Date: Thu, 9 Aug 2012 00:05:08 -0700 Subject: LinHES-config:7.4 rdt 9th anniversary release. --- abs/core/LinHES-config/LinHES-release | 2 +- abs/core/LinHES-config/PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release index 3939edc..869ae81 100644 --- a/abs/core/LinHES-config/LinHES-release +++ b/abs/core/LinHES-config/LinHES-release @@ -1 +1 @@ -LinHES R7.3 (Crave) +LinHES R7.4 (rdt) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index e872bcf..7cebf11 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=78 +pkgrel=80 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -118,7 +118,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27' '960017a34d9cc78af6298f45aad6eb8e' 'ecf9e5df20683a769c4a8a8f2d65de85' '6d32a88e76b0a97b0ce67d37ef6394aa' - '40d28d5f5009971c507e94c9639be4a1' + 'eaafce1499980eded37b9ad4e8dce28b' '6aff504ed5e860adc1b7317cd0780900' '55fccb1da0417a896b724f7cfc32dd5a' 'ab2aa42c2947148c2b1cac0ade6d1d55' -- cgit v0.12 From ebee1c1378abe9cd8b87b58a5ed35987521db911 Mon Sep 17 00:00:00 2001 From: Cecil Date: Tue, 21 Aug 2012 09:05:45 -0700 Subject: mythtv:Bumped to latest fixes. Added ./configure items to close #842. --- abs/core/mythtv/stable-0.25/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash index 0891f19..83e574c 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash @@ -1 +1 @@ -a72e341a4653a1b683b7ae5ac87bcaa3092d20fa +46cab93562429cd19029402a2387f63a72aeb898 diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index 53288a6..d4daf76 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.25 -pkgrel=11 +pkgrel=12 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -45,7 +45,8 @@ depends=('mysql-clients' 'openssl' 'libxml2' 'lsdvd' - 'dvdbackup') + 'dvdbackup' + 'x264') #glew for gpu commerical flagging #openssl for roap @@ -102,6 +103,8 @@ build() { --enable-vdpau \ --enable-crystalhd \ --dvb-path=/usr/include \ + --enable-libmp3lame \ + --enable-libx264 \ --with-bindings=perl,python --python=python2 || return 1 make all || return 1 -- cgit v0.12 From 15753e5fe3531b87bbabd21d6ac789b8847ad656 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Tue, 21 Aug 2012 21:00:15 +0000 Subject: linhes-scripts: minor changes to myth2mkv --- abs/core/linhes-scripts/PKGBUILD | 4 ++-- abs/core/linhes-scripts/myth2mkv | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 0fb3dee..ebcc61b 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=45 +pkgrel=46 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -106,6 +106,6 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' 'd8838461af9d446a1fd7e7883fdc75d1' 'cc9cdabcdfc969c2829b58c0e513488c' '54a478660d0f8150fe10112a9ecf2740' - '8fa34662c686b210c9943324b7df2feb' + 'bb8eae5de8a0d22f1722b3e7b2e32468' 'b608044c9e7530a400d8f5b88fdfe6e6' 'e2e24dd59d5d576cc33feafb329fa302') diff --git a/abs/core/linhes-scripts/myth2mkv b/abs/core/linhes-scripts/myth2mkv index f180b31..447e3c4 100644 --- a/abs/core/linhes-scripts/myth2mkv +++ b/abs/core/linhes-scripts/myth2mkv @@ -2,7 +2,7 @@ # # Convert video to AVC-1 / h264 # -# version 0.25-002 +# version 0.25-003 # # Prerequisites: # - mythtv >= 0.25 @@ -204,10 +204,13 @@ if [[ ${QUALITY} = HQ ]] ; then if [[ -n ${CROP} ]] ; then CROP="--crop ${CROP}" else - CROP="--crop 0:0:0:0" + CROP="--crop 0:0:0:0 --strict-anamorphic" fi HB_OPTS="-o ${TMPFILE} -f mkv -m -e x264 ${TUNING} -x b-adapt=2:rc-lookahead=50 -b 5000 -2 -T ${WIDTH} ${HEIGHT} -r ${FPS} --cfr ${CROP} ${DEINT} -a 1 -E copy -s 1" else + if [[ ${CROP} = "--crop 0:0:0:0" ]] ; then + CROP="${CROP} --strict-anamorphic" + fi if [[ ${QUALITY} = LQ ]] ; then HB_OPTS="-o ${TMPFILE} -f mkv -m -e x264 ${TUNING} -b 1250 ${WIDTH} ${HEIGHT} -r ${FPS} --pfr ${CROP} ${DEINT} -a 1 -E lame -B 128 -Q 8 -6 stereo -s 1" else -- cgit v0.12 From 10e0cb3feaadc801927c021b62aba6dd5961d68b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 25 Aug 2012 18:20:03 -0500 Subject: curlftpfs: Initial Inclusion. --- abs/extra/community/curlftpfs/PKGBUILD | 30 +++++++++++++++++++++++++++++ abs/extra/community/curlftpfs/ioerror.patch | 11 +++++++++++ 2 files changed, 41 insertions(+) create mode 100644 abs/extra/community/curlftpfs/PKGBUILD create mode 100644 abs/extra/community/curlftpfs/ioerror.patch diff --git a/abs/extra/community/curlftpfs/PKGBUILD b/abs/extra/community/curlftpfs/PKGBUILD new file mode 100644 index 0000000..242e28f --- /dev/null +++ b/abs/extra/community/curlftpfs/PKGBUILD @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Chris Brannon +# Contributor: Allan McRae +# Contributor: Philip Nilsson + +pkgname=curlftpfs +pkgver=0.9.2 +pkgrel=4 +pkgdesc="A filesystem for acessing FTP hosts based on FUSE and libcurl." +url="http://curlftpfs.sourceforge.net/" +license=('GPL') +depends=('curl>=7.15.4' 'fuse' 'glib2') +makedepends=('pkgconfig>=0.9.0') +arch=('i686' 'x86_64') +source=(http://downloads.sourceforge.net/sourceforge/curlftpfs/$pkgname-$pkgver.tar.gz + ioerror.patch) +md5sums=('b452123f755114cd4461d56c648d9f12' + '7a8db686293463ba3148c7032871c883') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 < "$srcdir/ioerror.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/abs/extra/community/curlftpfs/ioerror.patch b/abs/extra/community/curlftpfs/ioerror.patch new file mode 100644 index 0000000..6ca1afb --- /dev/null +++ b/abs/extra/community/curlftpfs/ioerror.patch @@ -0,0 +1,11 @@ +--- curlftpfs-0.9.2.orig/ftpfs.c 2008-04-30 03:05:47.000000000 +0400 ++++ curlftpfs-0.9.2.orig/ftpfs.c 2011-01-20 20:33:38.000000000 +0300 +@@ -503,7 +503,7 @@ static void *ftpfs_write_thread(void *da + + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1); +- curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1); ++ curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, (curl_off_t)-1); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1); -- cgit v0.12 From 9bd1414fc727d98697851105ccb4e9061707b3af Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 28 Aug 2012 10:29:36 -0500 Subject: LinHES-system: update myth_status.py to work with tuners in error. closes #843 --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/myth_status.py | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 6881e3c..cf2d688 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=52 +pkgrel=53 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -65,7 +65,7 @@ md5sums=('d1a5963c5a440a608031c6d750232633' '542e670e78d117657f93141e9689f54d' '48b763dba127aac6ab05c84643f83b71' 'ba351b92e69bcaf26a9bf80417b09c3c' - '294e54209538018008323d164ce39fb3' + '4545eb39213d40b5a2bdeda5e066cdc4' '962a3e9eaba2d1466251b7ab0956705d' 'd03aedeeeda0f5e9c1eb437411c88477' '94ce8f1d5085c0db7b267db8c2e9a3ff' diff --git a/abs/core/LinHES-system/myth_status.py b/abs/core/LinHES-system/myth_status.py index 4637b90..b4f4375 100644 --- a/abs/core/LinHES-system/myth_status.py +++ b/abs/core/LinHES-system/myth_status.py @@ -60,13 +60,15 @@ for i in a: type = results[0][0] hostname = results[0][1] id = i - c=be.getCurrentRecording(i) - if c.title == None: - current_recording = "Idle" - else: - current_recording = "Recording %s" %c.title - print " Tuner %s (%s) on %s : %s " %(id, type, hostname, current_recording) - + try: + c=be.getCurrentRecording(i) + if c.title == None: + current_recording = "Idle" + else: + current_recording = "Recording %s" %c.title + print " Tuner %s (%s) on %s : %s " %(id, type, hostname, current_recording) + except: + print " Tuner %s (%s) on %s : %s " %(id, type, hostname, "Tuner Error") print "" print "Upcoming Recordings (Next %s scheduled):" %(num_upcoming) -- cgit v0.12 From 33a70885604842fb927102734184881a8ed084f0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 28 Aug 2012 17:31:25 -0500 Subject: v4l-dvb: update to snapshot from 20120828. refs #844 --- abs/core/v4l-dvb/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/v4l-dvb/PKGBUILD b/abs/core/v4l-dvb/PKGBUILD index 36e4609..ac150bb 100644 --- a/abs/core/v4l-dvb/PKGBUILD +++ b/abs/core/v4l-dvb/PKGBUILD @@ -2,7 +2,7 @@ pkgname=v4l-dvb _kernver=`uname -r` -pkgver=20120407 +pkgver=20120828 pkgrel=1 pkgdesc="V4L-DVB device drivers (newer than those included in kernel26)" arch=('i686' 'x86_64') -- cgit v0.12 From e0c0e2b0962375dfc62740cafd1620df719d4d31 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 28 Aug 2012 17:51:14 -0500 Subject: dvb-firmware: add xc5000c firmware. change xc5000 modprobe options. closes #844 --- abs/core/dvb-firmware/PKGBUILD | 6 +++--- abs/core/dvb-firmware/dvb-firmware.tar.bz2 | Bin 13819768 -> 13836324 bytes abs/core/dvb-firmware/xc5000.conf | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/abs/core/dvb-firmware/PKGBUILD b/abs/core/dvb-firmware/PKGBUILD index bbe5031..a9fc3e3 100644 --- a/abs/core/dvb-firmware/PKGBUILD +++ b/abs/core/dvb-firmware/PKGBUILD @@ -3,7 +3,7 @@ pkgname=dvb-firmware pkgver=1 -pkgrel=16 +pkgrel=17 pkgdesc="Firmware for DVB cards" replaces=('hd3000firmware') arch=('i586' 'i686' 'x86_64') @@ -17,5 +17,5 @@ build() { mkdir -p ${pkgdir}/etc/modprobe.d/ install -D -m644 "${srcdir}/xc5000.conf" "${pkgdir}/etc/modprobe.d/" } -md5sums=('32e19e3f9f849e667c6f7db1186180b9' - 'e3e7c5da698fb79aee7a135bdb9b7c5c') +md5sums=('2307b2e9ce2da591d64ed611b79ecf17' + '08c7619f37757f0d6191866701212575') diff --git a/abs/core/dvb-firmware/dvb-firmware.tar.bz2 b/abs/core/dvb-firmware/dvb-firmware.tar.bz2 index e5b0d18..57019f5 100644 Binary files a/abs/core/dvb-firmware/dvb-firmware.tar.bz2 and b/abs/core/dvb-firmware/dvb-firmware.tar.bz2 differ diff --git a/abs/core/dvb-firmware/xc5000.conf b/abs/core/dvb-firmware/xc5000.conf index b1cf373..93b3ab4 100644 --- a/abs/core/dvb-firmware/xc5000.conf +++ b/abs/core/dvb-firmware/xc5000.conf @@ -1,4 +1,6 @@ # xc5000 # Disable power cycling and firmware reloads # -options xc5000 no_poweroff=1 +# When v4l-dvb is installed no_poweroff=1 is no longer needed. +# +#options xc5000 no_poweroff=1 -- cgit v0.12 From d58b5e36883c4d17fc24946dcf4c90a2e63cfab0 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Sat, 1 Sep 2012 00:47:47 +0000 Subject: linhes-scripts: tweak myth2mkv. Update version to 0.25-004 --- abs/core/linhes-scripts/PKGBUILD | 4 ++-- abs/core/linhes-scripts/myth2mkv | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index ebcc61b..0dfb4e7 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=46 +pkgrel=47 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -106,6 +106,6 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' 'd8838461af9d446a1fd7e7883fdc75d1' 'cc9cdabcdfc969c2829b58c0e513488c' '54a478660d0f8150fe10112a9ecf2740' - 'bb8eae5de8a0d22f1722b3e7b2e32468' + '503df99218373dfc75e7e7f5e449a44e' 'b608044c9e7530a400d8f5b88fdfe6e6' 'e2e24dd59d5d576cc33feafb329fa302') diff --git a/abs/core/linhes-scripts/myth2mkv b/abs/core/linhes-scripts/myth2mkv index 447e3c4..aedccff 100644 --- a/abs/core/linhes-scripts/myth2mkv +++ b/abs/core/linhes-scripts/myth2mkv @@ -2,7 +2,7 @@ # # Convert video to AVC-1 / h264 # -# version 0.25-003 +# version 0.25-004 # # Prerequisites: # - mythtv >= 0.25 -- cgit v0.12 From 2fc24e3699697bf406338eea7b9f8c475399e79b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 1 Sep 2012 16:55:46 -0500 Subject: LinHES-system: Add scripts for misc status in MythWeb. closes #845. --- abs/core/LinHES-system/LinHES-system.install | 12 + abs/core/LinHES-system/PKGBUILD | 15 +- abs/core/LinHES-system/misc_recent_recordings.pl | 194 ++++++++++++ abs/core/LinHES-system/misc_status_config.py | 15 + abs/core/LinHES-system/misc_status_info.sh | 23 ++ abs/core/LinHES-system/misc_upcoming_recordings.pl | 328 +++++++++++++++++++++ abs/core/LinHES-system/misc_which_recorder.pl | 105 +++++++ 7 files changed, 690 insertions(+), 2 deletions(-) create mode 100644 abs/core/LinHES-system/LinHES-system.install create mode 100755 abs/core/LinHES-system/misc_recent_recordings.pl create mode 100755 abs/core/LinHES-system/misc_status_config.py create mode 100755 abs/core/LinHES-system/misc_status_info.sh create mode 100755 abs/core/LinHES-system/misc_upcoming_recordings.pl create mode 100755 abs/core/LinHES-system/misc_which_recorder.pl diff --git a/abs/core/LinHES-system/LinHES-system.install b/abs/core/LinHES-system/LinHES-system.install new file mode 100644 index 0000000..f2185cd --- /dev/null +++ b/abs/core/LinHES-system/LinHES-system.install @@ -0,0 +1,12 @@ +## arg 1: the new package version +post_install() { + /usr/LH/bin/misc_status_config.py +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + /usr/LH/bin/misc_status_config.py +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index cf2d688..9a62ccf 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=53 +pkgrel=54 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -8,6 +8,7 @@ install=LinHES.install pkgdesc="scripts and things related to having an automated system" depends=(linhes-sounds xdotool fluxbox tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'runit-scripts>=2.1.1-43' 'udisks' 'LinHES-config>=2.3-59') backup=(etc/modprobe.d/alsa-base) +install=LinHES-system.install binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run firstboot.sh load-modules-mythvantage.sh @@ -21,7 +22,12 @@ binfiles="LinHES-start optimize_mythdb.py lh_system_all_host_update add_storage.py diskspace.sh - cacheclean lh_message.sh switch_web.sh" + cacheclean lh_message.sh switch_web.sh + misc_recent_recordings.pl + misc_status_config.py + misc_status_info.sh + misc_upcoming_recordings.pl + misc_which_recorder.pl" source=(LinHES-session LinHES-profile.sh $binfiles alsa-base myth_mtc.lr diskspace smolt.cron cacheclean.cron) @@ -78,6 +84,11 @@ md5sums=('d1a5963c5a440a608031c6d750232633' '9603b0ca6e090eff31e76482a3c335e7' 'b798ee0796d1b760a2998f90eb8ce9cc' '4a3cd8f9b33b2b86fdba47a8f1fa2859' + '06a628469051237943b7c874f2e29b8a' + '0512f859cd5ea1d9eb972840caef2f0e' + '45f46d1f9193c8dde18e56369ec29a1e' + 'a8edbe7bc37e9932e8749d9f5f89c16f' + '14cea9e87654441b766a97576233ba5a' 'eb879fee9603a05d5420d4ce8ed9e450' 'f1870a9522c79e6b248fcbf81dec3280' '84492954db16740f949d795b74383189' diff --git a/abs/core/LinHES-system/misc_recent_recordings.pl b/abs/core/LinHES-system/misc_recent_recordings.pl new file mode 100755 index 0000000..92dda8a --- /dev/null +++ b/abs/core/LinHES-system/misc_recent_recordings.pl @@ -0,0 +1,194 @@ +#!/usr/bin/perl -w +# +# Outputs information about the most-recently-recorded shows. +# +# Automatically detects database settings. +# + +# Includes + use DBI; + use Getopt::Long; + use MythTV; + +# Some variables we'll use here + our ($num_recordings, $live, $heading, $plain_text, $text_format, $usage); + our ($hours, $minutes, $seconds); + our ($dnum_recordings, $dheading, $dtext_format); + our ($dhours, $dminutes, $dseconds); + our ($status_text_format, $status_value_format); + our ($dstatus_text_format, $dstatus_value_format); + +# Default number of recent recordings to show + $dnum_recordings = 5; +# Default period in which to show recordings + $dhours = -1; + $dminutes = -1; + $dseconds = -1; +# Default status output heading + $dheading='Recent Recordings:\n'; +# Default format of plain-text output + $dtext_format='%n/%j, %g:%i %A - %cc\n%T - %S\n%R\n\n'; +# Default format of status output display text + $dstatus_text_format= '%n/%j %g:%i %A - %cc - %T - %S
'. + '%T %n/%j, %g:%i %A
'. + '%S

%R
'; +# Default format of status output value + $dstatus_value_format = '%n/%j, %g:%i %A - %T - %S'; + +# Provide default values for GetOptions + $num_recordings = $dnum_recordings; + $hours = $dhours; + $minutes = $dminutes; + $seconds = $dseconds; + $heading = $dheading; + $text_format = $dtext_format; + $status_text_format = $dstatus_text_format; + $status_value_format = $dstatus_value_format; + +# Load the cli options + GetOptions('num_recordings|recordings=s' => \$num_recordings, + 'hours|o=i' => \$hours, + 'minutes=i' => \$minutes, + 'seconds|e=i' => \$seconds, + 'live' => \$live, + 'heading=s' => \$heading, + 'plain_text' => \$plain_text, + 'text_format=s' => \$text_format, + 'status_text_format=s' => \$status_text_format, + 'status_value_format=s' => \$status_value_format, + 'usage|help' => \$usage + ); + +# Print usage + if ($usage) { + print < 0); + $start_after = $start_after - ($minutes * 60) if ($minutes > 0); + $start_after = $start_after - $seconds if ($seconds > 0); + $start_after = 0 if (!($start_after < $now)); + +# Fix the heading. + if (defined($plain_text)) { + $heading =~ s/\\r/\r/g; + $heading =~ s/\\n/\n/g; + } + else { + # Remove line break format specifiers from heading for status output + $heading =~ s/(\\r|\\n)//g; + } + +# Connect to mythbackend + my $Myth = new MythTV(); + +# Get the list of recordings + my $count = 0; + my %rows = $Myth->backend_rows('QUERY_RECORDINGS Delete'); + our $show; + foreach my $row (@{$rows{'rows'}}) { + last unless (($count < $num_recordings) || ($num_recordings < 0)); + $show = new MythTV::Program(@$row); + # Skip LiveTV recordings? + next unless (defined($live) || $show->{'recgroup'} ne 'LiveTV'); + # Within the period of interest? + last if (($start_after) && ($show->{'recstartts'} < $start_after)); + # Print the recording information in the desired format + if (defined($plain_text)) { + text_print($count); + } + else { + status_print($count); + } + $count++; + } + +# Print the output for use in the backend status page. + sub status_print { + my $count = shift; + my $text = $show->format_name($status_text_format, ' ', ' ', 1, 0 ,1); + my $value = $show->format_name($status_value_format, ' ', ' ', + 1, 0 ,1); + print("$heading
") if ($count == 0); + print("$text"); + print("
") if ($count == ($num_recordings - 1)); + print("[]:[]recording$count"); + print("[]:[]$value\n"); + } + +# Print the output in plain text format + sub text_print { + my $count = shift; + my $text = $show->format_name($text_format, ' ', ' ', 1, 0 ,1); + $text =~ s/\\r/\r/g; + $text =~ s/\\n/\n/g; + print("$heading") if ($count == 0); + print("$text"); + } diff --git a/abs/core/LinHES-system/misc_status_config.py b/abs/core/LinHES-system/misc_status_config.py new file mode 100755 index 0000000..0a0ba6c --- /dev/null +++ b/abs/core/LinHES-system/misc_status_config.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python2 + +# This script will configure the myth db to use the misc_status_info scripts + +from socket import gethostname +from MythTV import MythDB +mythdb = MythDB() +localhostname = gethostname() + +# mythtv-setup +if mythdb.settings[localhostname].MiscStatusScript == u'': + mythdb.settings[localhostname].MiscStatusScript = u'/usr/LH/bin/misc_status_info.sh' + print 'The MythTV database setting MiscStatusScript was updated to /usr/LH/bin/misc_status_info.sh.' +else: + print 'The MythTV database setting MiscStatusScript is already set and will not be updated.' diff --git a/abs/core/LinHES-system/misc_status_info.sh b/abs/core/LinHES-system/misc_status_info.sh new file mode 100755 index 0000000..14a972c --- /dev/null +++ b/abs/core/LinHES-system/misc_status_info.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Show all upcoming conflicts +/usr/LH/bin/misc_upcoming_recordings.pl --recordings -1 \ + --no_show_scheduled \ + --heading '

Recording Conflicts

' \ + --no_conflicts_message '

No Recording Conflicts

' + +# Show all the shows recorded today +/usr/LH/bin/misc_recent_recordings.pl --recordings=-1 --hours=24 \ + --heading '

Shows Recorded In The Last 24 Hours

' + +# Get Encoder that was used for recordings from the backend log +firstrun=1 +loglist=`find /var/log/ -name *_mythbackend.*.log*` +for i in `ls -t $loglist` +do + if [ $firstrun -eq 1 ]; then + echo "

Encoder Information

'. + '%T %n/%j, %g:%i %A
'. + '%S

%R
'; +# Default format of status output value + $dstatus_value_format = '%n/%j %g:%i %A - %T - %S'; + +# Provide default values for GetOptions + $num_recordings = $dnum_recordings; + $hours = $dhours; + $minutes = $dminutes; + $seconds = $dseconds; + $scheduled = $dscheduled; + $duplicates = $dduplicates; + $deactivated = $ddeactivated; + $conflicts = $dconflicts; + $heading = $dheading; + $text_format = $dtext_format; + $no_conflicts_message = $dno_conflicts_message; + $status_text_format = $dstatus_text_format; + $status_value_format = $dstatus_value_format; + +# Load the cli options + GetOptions('num_recordings|recordings=s' => \$num_recordings, + 'hours|o=i' => \$hours, + 'minutes=i' => \$minutes, + 'seconds|s=i' => \$seconds, + 'show_scheduled|_show_scheduled|scheduled|_scheduled|e!' + => \$scheduled, + 'show_duplicates|_show_duplicates|duplicates|_duplicates|p!' + => \$duplicates, + 'show_deactivated|_show_deactivated|deactivated|_deactivated|v!' + => \$deactivated, + 'show_conflicts|_show_conflicts|conflicts|_conflicts!' + => \$conflicts, + 'heading=s' => \$heading, + 'plain_text' => \$plain_text, + 'text_format=s' => \$text_format, + 'no_conflicts_message=s' => \$no_conflicts_message, + 'status_text_format=s' => \$status_text_format, + 'status_value_format=s' => \$status_value_format, + 'usage|help' => \$usage + ); + +# Print usage + if ($usage) { + # Make default "--show_*" options readable + $dscheduled = ($dscheduled ? '--show_scheduled' : + '--no_show_scheduled'); + $dduplicates = ($dduplicates ? '--show_duplicates' : + '--no_show_duplicates'); + $ddeactivated = ($ddeactivated ? '--show_deactivated' : + '--no_show_deactivated'); + $dconflicts = ($dconflicts ? '--show_conflicts' : + '--no_show_conflicts'); + print < 0); + $start_before = $start_before + ($minutes * 60) if ($minutes > 0); + $start_before = $start_before + $seconds if ($seconds > 0); + $start_before = 0 if (!($start_before > $now)); + +# Fix the heading. + if (defined($plain_text)) { + $heading =~ s/\\r/\r/g; + $heading =~ s/\\n/\n/g; + } + else { + # Remove line break format specifiers from heading for status output + $heading =~ s/(\\r|\\n)//g; + } + +# Connect to mythbackend + my $Myth = new MythTV(); + +# Get the list of recordings + my $count = 0; + my %rows = $Myth->backend_rows('QUERY_GETALLPENDING', 2); + my $has_conflicts = $rows{'offset'}[0]; + if ((!$has_conflicts) && + (($conflicts) && + (!(($scheduled) || ($duplicates) || ($deactivated))))) { + $no_conflicts_message =~ s/\\r/\r/g; + $no_conflicts_message =~ s/\\n/\n/g; + print "$no_conflicts_message"; + exit 0; + } + my $num_scheduled = $rows{'offset'}[1]; + our $show; + foreach my $row (@{$rows{'rows'}}) { + last unless (($count < $num_recordings) || ($num_recordings < 0)); + $show = new MythTV::Program(@$row); + last if (($start_before) && ($show->{'recstartts'} > $start_before)); + next if ((!$scheduled) && (is_scheduled($show->{'recstatus'}))); + next if ((!$duplicates) && (is_duplicate($show->{'recstatus'}))); + next if ((!$deactivated) && (is_deactivated($show->{'recstatus'}))); + next if ((!$conflicts) && (is_conflict($show->{'recstatus'}))); + + # Print the recording information in the desired format + if (defined($plain_text)) { + text_print($count); + } + else { + status_print($count); + } + $count++; + } + +# Returns true if the show is scheduled to record + sub is_scheduled { + my $recstatus = (shift() or 0); + return (($MythTV::recstatus_willrecord == $recstatus) || + ($MythTV::recstatus_recorded == $recstatus) || + ($MythTV::recstatus_recording == $recstatus)); + } + +# Returns true if the show is a duplicate + sub is_duplicate { + my $recstatus = (shift() or 0); + return (($MythTV::recstatus_repeat == $recstatus) || + ($MythTV::recstatus_previousrecording == $recstatus) || + ($MythTV::recstatus_currentrecording == $recstatus)); + } + +# Returns true if the recording is deactivated + sub is_deactivated { + my $recstatus = (shift() or 0); + return (($MythTV::recstatus_inactive == $recstatus) || + ($MythTV::recstatus_toomanyrecordings == $recstatus) || + ($MythTV::recstatus_cancelled == $recstatus) || + ($MythTV::recstatus_deleted == $recstatus) || + ($MythTV::recstatus_aborted == $recstatus) || + ($MythTV::recstatus_notlisted == $recstatus) || + ($MythTV::recstatus_dontrecord == $recstatus) || + ($MythTV::recstatus_lowdiskspace == $recstatus) || + ($MythTV::recstatus_tunerbusy == $recstatus) || + ($MythTV::recstatus_neverrecord == $recstatus) || + ($MythTV::recstatus_earliershowing == $recstatus) || + ($MythTV::recstatus_latershowing == $recstatus)); + } + +# Returns true if the show cannot be recorded due to a conflict + sub is_conflict { + my $recstatus = (shift() or 0); + return ($MythTV::recstatus_conflict == $recstatus); + } + +# Print the output for use in the backend status page. + sub status_print { + my $count = shift; + my $text = $show->format_name($status_text_format, ' ', ' ', 1, 0 ,1); + $text =~ s/%rs/$MythTV::RecStatus_Types{$show->{'recstatus'}}/g; + my $value = $show->format_name($status_value_format, ' ', ' ', + 1, 0 ,1); + $value =~ s/%rs/$MythTV::RecStatus_Types{$show->{'recstatus'}}/g; + print("$heading
") if ($count == 0); + print("$text"); + print("
") if ($count == ($num_recordings - 1)); + print("[]:[]recording$count"); + print("[]:[]$value\n"); + } + +# Print the output in plain text format + sub text_print { + my $count = shift; + my $text = $show->format_name($text_format, ' ', ' ', 1, 0 ,1); + $text =~ s/%rs/$MythTV::RecStatus_Types{$show->{'recstatus'}}/g; + $text =~ s/\\r/\r/g; + $text =~ s/\\n/\n/g; + print("$heading") if ($count == 0); + print("$text"); + } diff --git a/abs/core/LinHES-system/misc_which_recorder.pl b/abs/core/LinHES-system/misc_which_recorder.pl new file mode 100755 index 0000000..f8a1022 --- /dev/null +++ b/abs/core/LinHES-system/misc_which_recorder.pl @@ -0,0 +1,105 @@ +#!/usr/bin/perl -w +# +# Parses the backend log file and includes information on which encoder was used to record shows. + +my ($time, $title, $subtitle, $chanid, $cardid, $sourceid); +my $index = 0; + +sub print_text +{ + print "$time - $title"; + print ": $subtitle" if ($subtitle); + print "\n"; + print " - Encoder ID: $cardid\n"; + print " - Video Source ID: $sourceid\n"; + print " - Channel ID: $chanid\n"; +} + +sub print_xml +{ + print "$time - $title"; + print ": $subtitle" if ($subtitle); + print " - Encoder: $cardid
". + "$title $time
"; + print "$subtitle
" if ($subtitle); + print "
Channel ID: $chanid
Encoder ID: $cardid
". + "Video Source ID: $sourceid
"; + # For XML parsers + print "[]:[]capture_info$index\[]:[]time='$time':title='$title'". + ":subtitle='$subtitle':chanid='$chanid':cardid='$cardid'". + ":sourceid='$sourceid'\n"; +} + +my $mode = shift; +my $log_file = shift; + +if (($mode ne "--text") && ($mode ne "--noheader")) +{ + $log_file = $mode; +} + +if ($log_file =~ m/^--.*/i) +{ + die ("Only one option can be used at a time.\n"); +} + +if ($log_file =~ /\.gz$/) +{ +# read top down +# open($fh, "gunzip -c $log_file |") or die "Unable to open log file '$log_file', stopping:"; + open($fh, "gunzip -c $log_file |tac |") or die "Unable to open log file '$log_file', stopping:"; +} +else +{ +# read top down +# open($fh, "<$log_file") or die "Unable to open log file '$log_file', stopping:"; + open($fh, "tac $log_file |") or die "Unable to open log file '$log_file', stopping:"; +} + +while (<$fh>) +{ +# Myth .24 regex to find start of recording +# if (/^(.*)(?:\d(?: I )?|I.* -) (?:Started|Tuning) recording: (.*): channel (\d+) on cardid (\d+), sourceid (\d+)/) + if (/^(\d+-\d+-\d+T\d+\:\d+\:\d+)(?:.*) (?:Started|Tuning) recording: (.*): channel (\d+) on cardid (\d+), sourceid (\d+)/) + { + if ($mode eq "--noheader") + { + print "
" + if (($index == 0) && ($mode ne "--text")); + } + else + { + print "

Encoder Information

" + if (($index == 0) && ($mode ne "--text")); + } + $index++; + + ($time, $title, $chanid, $cardid, $sourceid) = ($1, $2, $3, $4, $5); + $time = `date -d $time +%a' '%m/%d' '%H:%M' '%p`; + chomp ($time); + if (($title =~ /"?(.+)"?:"?(.*)"?/) || ($title =~ /(.+) "(.*)"/)) + { + $title = $1; + $subtitle = $2; + } + else + { + $subtitle = ''; + } + $title =~ s/^"//; + $subtitle =~ s/^"//; + $title =~ s/"$//; + $subtitle =~ s/"$//; + if ($mode eq "--text") + { + print_text; + } + else + { + print_xml; + } + } +} +print "
" if (($index > 0) && ($mode ne "--text")); + +close $fh; -- cgit v0.12 From c966be940a08c876c5b09b139cae981b299eb644 Mon Sep 17 00:00:00 2001 From: Cecil Date: Sun, 2 Sep 2012 20:48:03 -0700 Subject: aacskeys:initial inclusion. closes #801 --- abs/extra/aacskeys/PKGBUILD | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 abs/extra/aacskeys/PKGBUILD diff --git a/abs/extra/aacskeys/PKGBUILD b/abs/extra/aacskeys/PKGBUILD new file mode 100644 index 0000000..977aef5 --- /dev/null +++ b/abs/extra/aacskeys/PKGBUILD @@ -0,0 +1,51 @@ +# Submitter: Paul Burton +# Maintainer: Zebulon +pkgname=aacskeys +pkgver="0.4.0e" +pkgrel=2 +pkgdesc="A library and program to retrieve decryption keys for HD discs" +arch=('i686' 'x86_64') +url="http://forum.doom9.org/showthread.php?t=123311" +license=('custom') +depends=('openssl') +makedepends=('java-environment' 'premake') +source=(http://debian-multimedia.org/pool/main/a/aacskeys/${pkgname}_0.4.0e.orig.tar.gz + http://deb-multimedia.org/pool/main/a/aacskeys/aacskeys_0.4.0e-dmo2.diff.gz) +sha1sums=('8790f0d4098d6bc83304ad2136cc9681374df83a' + '325504f38a5ac1e9f7be740a602faa2c8d4b812c') + +build() { + + cd "${srcdir}/$pkgname-$pkgver" + patch -Np1 -i ../${pkgname}_$pkgver-dmo2.diff + + # Paranoia: remove binaries, make sure they aren't used + rm -rf bin lib + + # If java-environement is installed for the first time + # we need to source profile to set JAVA_HOME + # source /etc/profile + + sed -i 's|/usr/local/ssl/include|/usr/include|' premake.lua + sed -i 's|/usr/local/ssl/lib|/usr/lib|' premake.lua + sed -i "s|/usr/lib/jvm/java-6-sun/include|$JAVA_HOME/include|" premake.lua + + make || return 1 +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + + # Install lib + mkdir -p ${pkgdir}/usr/lib + cp lib/linux/libaacskeys.so ${pkgdir}/usr/lib/ || return 1 + + # Install program + mkdir -p ${pkgdir}/usr/bin + cp bin/linux/aacskeys ${pkgdir}/usr/bin || return 1 + + # Install resources + mkdir -p ${pkgdir}/usr/share/$pkgname + cp ./debian/HostKeyCertificate_PS3.txt ${pkgdir}/usr/share/$pkgname/HostKeyCertificate.txt || return 1 + cp ./debian/ProcessingDeviceKeysSimple.txt ${pkgdir}/usr/share/$pkgname/ || return 1 +} -- cgit v0.12 From 0f974e2ffd930b90d7ac04f8ac2db296882e0dec Mon Sep 17 00:00:00 2001 From: Cecil Date: Sun, 2 Sep 2012 20:48:17 -0700 Subject: libaacs-git:initial inclusion. closes #801 --- abs/extra/libaacs-git/PKGBUILD | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 abs/extra/libaacs-git/PKGBUILD diff --git a/abs/extra/libaacs-git/PKGBUILD b/abs/extra/libaacs-git/PKGBUILD new file mode 100644 index 0000000..e88a6e4 --- /dev/null +++ b/abs/extra/libaacs-git/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Gustavo Alvarez + +pkgname=libaacs-git +pkgver=20120508 +pkgrel=1 +pkgdesc="Advanced Access Content System (GIT version)" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://www.videolan.org/developers/libaacs.html" +depends=('libgcrypt') +makedepends=('git' 'flex' 'bison') +options=('!libtool') +provides=('libaacs') +conflicts=('libaacs') + +_gitroot="git://git.videolan.org/libaacs.git" +_gitname="libaacs" + +build() { + msg "Connecting to GIT server..." + + if [ -d "${srcdir}"/"${_gitname}" ] ; then + cd "${_gitname}" && git pull + else + git clone --depth=1 "${_gitroot}" + fi + + [ -d "${srcdir}"/"${_gitname}"-build ] && rm -fr "${srcdir}"/"${_gitname}"-build + cp -R "${srcdir}"/"${_gitname}" "${srcdir}"/"${_gitname}"-build + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + cd "${srcdir}"/"${_gitname}"-build + ./bootstrap + ./configure --prefix=/usr + make +} +package() { + cd "${srcdir}"/"${_gitname}"-build + make DESTDIR="${pkgdir}" install +} +md5sums=() -- cgit v0.12 From 5b60b2a21e504020b1724a2c01c5f398b04b8f79 Mon Sep 17 00:00:00 2001 From: Cecil Date: Sun, 2 Sep 2012 20:48:25 -0700 Subject: premake:initial inclusion. closes #801 --- abs/extra/premake/PKGBUILD | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 abs/extra/premake/PKGBUILD diff --git a/abs/extra/premake/PKGBUILD b/abs/extra/premake/PKGBUILD new file mode 100644 index 0000000..f4343e1 --- /dev/null +++ b/abs/extra/premake/PKGBUILD @@ -0,0 +1,25 @@ +# Contributor: Anders Bergh +# Contributor: Mildred +# Maintainer: Daniel J Griffiths + +pkgname=premake +pkgver=3.7 +pkgrel=1 +pkgdesc="A build configuration tool. Describe your build using Lua and generate \ +the project files for your specific toolset." +arch=('i686' 'x86_64') +url="http://premake.sourceforge.net" +license=('GPL') +makedepends=() +source=("http://downloads.sourceforge.net/sourceforge/premake/premake-src-${pkgver}.zip") +md5sums=('8d30dc5bbc52aad81abb1509c1dd7d8f') + +build() { + cd ${srcdir}/Premake-${pkgver} + make || return 1 +} + +package() { + cd ${srcdir}/Premake-${pkgver} + install -Dm755 bin/premake ${pkgdir}/usr/bin/premake +} -- cgit v0.12 From 39c2b6d5a91924d235fcd803ec3e71ed00cfc468 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 3 Sep 2012 12:02:56 -0500 Subject: runit-scripts: enable cron logging to syslog --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runitscripts/services/cron/log/run | 5 +++++ abs/core/runit-scripts/runitscripts/services/cron/run | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100755 abs/core/runit-scripts/runitscripts/services/cron/log/run diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 9e73603..9e6396e 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=66 +pkgrel=67 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/cron/log/run b/abs/core/runit-scripts/runitscripts/services/cron/log/run new file mode 100755 index 0000000..9dd37e3 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/cron/log/run @@ -0,0 +1,5 @@ +#!/bin/sh +exec 2>&1 +. /etc/systemconfig + /usr/bin/logger -p local6.info -t cron + diff --git a/abs/core/runit-scripts/runitscripts/services/cron/run b/abs/core/runit-scripts/runitscripts/services/cron/run index 0894236..3d358d3 100755 --- a/abs/core/runit-scripts/runitscripts/services/cron/run +++ b/abs/core/runit-scripts/runitscripts/services/cron/run @@ -6,4 +6,4 @@ stat_runit "Starting Cron" exec 2>&1 -exec /usr/sbin/crond -f >/dev/null 2>/dev/null +exec /usr/sbin/crond -f -M /dev/null -l info -- cgit v0.12 From fde38eda71f1f6efbd2c870b31c4fc71b5c576af Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 3 Sep 2012 12:07:43 -0500 Subject: rsyslog: increase log retention to 2 weeks --- abs/core/rsyslog/PKGBUILD | 4 ++-- abs/core/rsyslog/log_care.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD index 5ea3587..129b0d1 100644 --- a/abs/core/rsyslog/PKGBUILD +++ b/abs/core/rsyslog/PKGBUILD @@ -3,7 +3,7 @@ pkgname=rsyslog pkgver=5.8.6 -pkgrel=4 +pkgrel=5 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') @@ -51,4 +51,4 @@ md5sums=('c46db0496066b82faf735bd4222208d7' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '1a0cd4530dd5d1439456d5ae230574d9' 'fae023a980db26f0ee27bd2f80d3e6f2' - '86a7e28b59ad80998b2163860d5d612a') + '2f795681e12f8bc43e8bea28dc020dcb') diff --git a/abs/core/rsyslog/log_care.sh b/abs/core/rsyslog/log_care.sh index ea1db56..9023a82 100644 --- a/abs/core/rsyslog/log_care.sh +++ b/abs/core/rsyslog/log_care.sh @@ -7,7 +7,7 @@ do echo "Compressing log files" find /var/log/$DATE* -mtime +1 -exec gzip -9 {} \; echo "Deleting old log files" - find /var/log/$DATE* -mtime +7 -exec rm -rf {} \; + find /var/log/$DATE* -mtime +12 -exec rm -rf {} \; echo "Deleting empty directories" find /var/log/$DATE* -depth -type d -empty -exec rm -rf {} \; done -- cgit v0.12 From a261b10e32d0353c9a0720fa0528e372376eb81c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 3 Sep 2012 12:39:49 -0500 Subject: keylaunch: update .keylaunchrc to run mythtv-setup as user --- abs/core/keylaunch/PKGBUILD | 4 ++-- abs/core/keylaunch/example_rc | 2 +- abs/core/keylaunch/keylaunch.install | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/abs/core/keylaunch/PKGBUILD b/abs/core/keylaunch/PKGBUILD index 2a21d9f..6c22fa5 100644 --- a/abs/core/keylaunch/PKGBUILD +++ b/abs/core/keylaunch/PKGBUILD @@ -1,6 +1,6 @@ pkgname=keylaunch pkgver=1.3.9 -pkgrel=4 +pkgrel=5 arch=('i686') pkgdesc="KeyLaunch is a small utility for binding commands to a hot key. " url="http://www.oroborus.org/" @@ -16,4 +16,4 @@ build() { install -D -m0755 ../example_rc $startdir/pkg/etc/keylaunchrc } md5sums=('710f68a3e7026b4139cc94ea790576c3' - 'd465a4c892daedd558ec83e59734877e') + '24a962d246fe893b6ae0e02d0d0977fc') diff --git a/abs/core/keylaunch/example_rc b/abs/core/keylaunch/example_rc index 650e078..5296517 100644 --- a/abs/core/keylaunch/example_rc +++ b/abs/core/keylaunch/example_rc @@ -10,7 +10,7 @@ key=*..Return:xterm -fn *-18-* key=..*x:/usr/LH/bin/tvterm.sh -key=..*s:sudo /usr/bin/mythtv-setup +key=..*s:/usr/bin/mythtv-setup key=..*u:/usr/LH/bin/unclutter-toggle.sh key=.**u:/usr/LH/bin/unclutter-toggle.sh key=..*h:/usr/MythVantage/bin/mythinstall -H diff --git a/abs/core/keylaunch/keylaunch.install b/abs/core/keylaunch/keylaunch.install index 42bc9eb..faa176b 100644 --- a/abs/core/keylaunch/keylaunch.install +++ b/abs/core/keylaunch/keylaunch.install @@ -13,7 +13,9 @@ post_install() { then echo "setting symlink for keylaunch" ln -s /etc/keylaunchrc $MHOME/.keylaunchrc -fi + fi + echo "updating .keylaunchrc to run mythtv-setup as user" + sed -i 's/key=..*s:sudo\ \/usr\/bin\/mythtv-setup/key=..*s:\/usr\/bin\/mythtv-setup/g' $MHOME/.keylaunchrc } # arg 1: the new package version -- cgit v0.12 From 4ce51f94fe711b9088813e556c7e1e24fe43cb70 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 3 Sep 2012 13:06:58 -0500 Subject: LinHES-system: remove dup .install remove old fluxbox keys update as we now use keylaunch --- abs/core/LinHES-system/LinHES-system.install | 12 ------------ abs/core/LinHES-system/LinHES.install | 9 ++------- abs/core/LinHES-system/PKGBUILD | 3 +-- abs/core/mythdb-initial/PKGBUILD | 5 +---- 4 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 abs/core/LinHES-system/LinHES-system.install diff --git a/abs/core/LinHES-system/LinHES-system.install b/abs/core/LinHES-system/LinHES-system.install deleted file mode 100644 index f2185cd..0000000 --- a/abs/core/LinHES-system/LinHES-system.install +++ /dev/null @@ -1,12 +0,0 @@ -## arg 1: the new package version -post_install() { - /usr/LH/bin/misc_status_config.py -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - /usr/LH/bin/misc_status_config.py -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/LinHES-system/LinHES.install b/abs/core/LinHES-system/LinHES.install index c9950f2..7ae0616 100644 --- a/abs/core/LinHES-system/LinHES.install +++ b/abs/core/LinHES-system/LinHES.install @@ -51,14 +51,9 @@ grep -q "pam_limits.so" /etc/pam.d/su fi -# Update mythtv's fluxbox keys files to use the tvterm.sh script to get -# an xterm. Then signal fluxbox to re-read the keys file. - -sed -i.orig 's/^Mod1 x :.*xterm.*$/Mod1 x :ExecCommand tvterm.sh/g' \ - ~mythtv/.fluxbox/keys -pkill -HUP fluxbox - +# Add db entry for misc status in MythWeb +/usr/LH/bin/misc_status_config.py } diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 9a62ccf..6518d1e 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=54 +pkgrel=55 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -8,7 +8,6 @@ install=LinHES.install pkgdesc="scripts and things related to having an automated system" depends=(linhes-sounds xdotool fluxbox tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'runit-scripts>=2.1.1-43' 'udisks' 'LinHES-config>=2.3-59') backup=(etc/modprobe.d/alsa-base) -install=LinHES-system.install binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run firstboot.sh load-modules-mythvantage.sh diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD index 981a8f0..ed3cedc 100755 --- a/abs/core/mythdb-initial/PKGBUILD +++ b/abs/core/mythdb-initial/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythdb-initial pkgver=2 -pkgrel=14 +pkgrel=15 pkgdesc="setup the initial mythtv database for linhes" url="" license="" @@ -19,6 +19,3 @@ build() { cp permissions.sql $startdir/pkg/data/database/permissions.sql cp custom.sql $startdir/pkg/data/database/custom.sql } -md5sums=('8ba101d2a59f7f655f98af60d5d5ad48' - 'ad0e57ac5e7c3677808a670e16634bba' - '9d894eb3640b2b75cd53606a7955973d') -- cgit v0.12 From a9ca69f7f9f03281d39c136a53ef185af15bd71d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 3 Sep 2012 13:22:51 -0500 Subject: mythdb-initial: add MiscStatusScript value to initial db. refs #845. --- abs/core/mythdb-initial/PKGBUILD | 5 ++++- abs/core/mythdb-initial/mc.sql | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD index ed3cedc..b51df9d 100755 --- a/abs/core/mythdb-initial/PKGBUILD +++ b/abs/core/mythdb-initial/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythdb-initial pkgver=2 -pkgrel=15 +pkgrel=16 pkgdesc="setup the initial mythtv database for linhes" url="" license="" @@ -19,3 +19,6 @@ build() { cp permissions.sql $startdir/pkg/data/database/permissions.sql cp custom.sql $startdir/pkg/data/database/custom.sql } +md5sums=('1968039d3fec19ce9df1d7c216f58064' + 'ad0e57ac5e7c3677808a670e16634bba' + '9d894eb3640b2b75cd53606a7955973d') diff --git a/abs/core/mythdb-initial/mc.sql b/abs/core/mythdb-initial/mc.sql index 7b4e3c5..37f5abe 100644 --- a/abs/core/mythdb-initial/mc.sql +++ b/abs/core/mythdb-initial/mc.sql @@ -2656,7 +2656,7 @@ CREATE TABLE `settings` ( LOCK TABLES `settings` WRITE; /*!40000 ALTER TABLE `settings` DISABLE KEYS */; -INSERT INTO `settings` VALUES ('mythfilldatabaseLastRunStart','',NULL),('mythfilldatabaseLastRunEnd','',NULL),('mythfilldatabaseLastRunStatus','',NULL),('DataDirectMessage','',NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1299',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('MythFillFixProgramIDsHasRunOnce','1','larch5'),('Language','EN_US','larch5'),('BackendServerIP','127.0.0.1','larch5'),('BackendServerPort','6543','larch5'),('BackendStatusPort','6544','larch5'),('SecurityPin','','larch5'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','1',NULL),('TruncateDeletesSlowly','0','larch5'),('HDRingbufferSize','9400',NULL),('MiscStatusScript','','larch5'),('DisableFirewireReset','0','larch5'),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','larch5'),('JobQueueCheckFrequency','60','larch5'),('JobQueueWindowStart','00:00','larch5'),('JobQueueWindowEnd','23:59','larch5'),('JobQueueCPU','0','larch5'),('JobAllowCommFlag','1','larch5'),('JobAllowTranscode','1','larch5'),('JobAllowUserJob1','0','larch5'),('JobAllowUserJob2','0','larch5'),('JobAllowUserJob3','0','larch5'),('JobAllowUserJob4','0','larch5'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJob1','',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('DefaultVideoPlaybackProfile','Normal','73be'),('RealtimePriority','1','larch5'),('DecodeExtraAudio','1','larch5'),('AudioNag','1','larch5'),('UseVideoTimebase','0','larch5'),('ClearSavedPosition','1','larch5'),('AltClearSavedPosition','1','larch5'),('JumpToProgramOSD','1','larch5'),('ContinueEmbeddedTVPlay','0','larch5'),('AutomaticSetWatched','0','larch5'),('AlwaysStreamFiles','1','larch5'),('UseOpenGLVSync','0','larch5'),('UseOutputPictureControls','1','larch5'),('AspectOverride','0','larch5'),('AdjustFill','0','larch5'),('LetterboxColour','0','larch5'),('PIPLocation','0','larch5'),('PlaybackExitPrompt','2','larch5'),('EndOfRecordingExitPrompt','1','larch5'),('PlayBoxOrdering','1','larch5'),('PlayBoxEpisodeSort','Date','larch5'),('GeneratePreviewPixmaps','0','larch5'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','larch5'),('PlaybackPreview','1','larch5'),('PlaybackBoxStartInTitle','1','larch5'),('ShowGroupInfo','0','larch5'),('DisplayRecGroup','All Programs','larch5'),('QueryInitialFilter','0','larch5'),('RememberRecGroup','1','larch5'),('DispRecGroupAsAllProg','0','larch5'),('LiveTVInAllPrograms','0','larch5'),('DisplayGroupDefaultView','0','larch5'),('DisplayGroupTitleSort','0','larch5'),('PlaybackWatchList','1','larch5'),('PlaybackWLStart','0','larch5'),('PlaybackWLAutoExpire','0','larch5'),('PlaybackWLMaxAge','60','larch5'),('PlaybackWLBlackOut','2','larch5'),('SmartForward','0','larch5'),('StickyKeys','0','larch5'),('FFRewReposTime','100','larch5'),('FFRewReverse','1','larch5'),('ExactSeeking','0','larch5'),('AutoCommercialSkip','0','larch5'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('PVR350OutputEnable','0','larch5'),('PVR350EPGAlphaValue','164','larch5'),('PVR350InternalAudioOnly','0','larch5'),('OSDTheme','blueosd','larch5'),('OSDGeneralTimeout','2','larch5'),('OSDProgramInfoTimeout','3','larch5'),('OSDFont','FreeMono.ttf','larch5'),('OSDThemeFontSizeType','default','larch5'),('EnableMHEG','0','larch5'),('PersistentBrowseMode','1','larch5'),('OSDNotifyTimeout','5','larch5'),('UDPNotifyPort','6948','larch5'),('OSDCCFont','FreeMono.ttf','larch5'),('CCBackground','0','larch5'),('DefaultCCMode','0','larch5'),('Prefer708Captions','1','larch5'),('OSDCC708TextZoom','100','larch5'),('OSDCC708DefaultFontType','MonoSerif','larch5'),('OSDCC708MonoSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708CasualFont','FreeMono.ttf','larch5'),('OSDCC708CursiveFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsFont','FreeMono.ttf','larch5'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708CasualItalicFont','FreeMono.ttf','larch5'),('OSDCC708CursiveItalicFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','larch5'),('ChannelOrdering','channum','larch5'),('ChannelFormat',' ','larch5'),('LongChannelFormat',' ','larch5'),('SmartChannelChange','0','larch5'),('LastFreeCard','0',NULL),('LiveTVPriority','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDefault','1',NULL),('RerecordWatched','1',NULL),('AutoExpireWatchedPriority','0',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireExtraSpace','1',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('CommercialSkipMethod','7',NULL),('AggressiveCommDetect','1',NULL),('AutoCommercialFlag','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('EPGFillType','12','larch5'),('EPGShowCategoryColors','1','larch5'),('EPGShowCategoryText','1','larch5'),('EPGScrollType','1','larch5'),('EPGShowChannelIcon','1','larch5'),('EPGShowFavorites','0','larch5'),('WatchTVGuide','0','larch5'),('chanPerPage','5','larch5'),('timePerPage','4','larch5'),('UnknownTitle','Unknown','larch5'),('UnknownCategory','Unknown','larch5'),('DefaultTVChannel','3','larch5'),('SelectChangesChannel','0','larch5'),('SelChangeRecThreshold','16','larch5'),('EPGEnableJumpToChannel','0',NULL),('Theme','LinHES','larch5'),('RandomTheme','0','larch5'),('ThemeCacheSize','1','larch5'),('ThemePainter','qt','larch5'),('Style','Desktop Style','larch5'),('ThemeFontSizeType','default','larch5'),('MenuTheme','default','larch5'),('XineramaScreen','0','larch5'),('XineramaMonitorAspectRatio','1.3333','larch5'),('GuiSizeForTV','1','larch5'),('HideMouseCursor','1','larch5'),('RunFrontendInWindow','0','larch5'),('UseVideoModes','0','larch5'),('GuiVidModeResolution','640x480','larch5'),('TVVidModeResolution','320x200','larch5'),('TVVidModeForceAspect','0.0','larch5'),('TVVidModeResolution0','320x200','larch5'),('TVVidModeForceAspect0','0.0','larch5'),('TVVidModeResolution1','320x200','larch5'),('TVVidModeForceAspect1','0.0','larch5'),('TVVidModeResolution2','320x200','larch5'),('TVVidModeForceAspect2','0.0','larch5'),('ISO639Language0','eng',NULL),('ISO639Language1','eng',NULL),('DateFormat','ddd MMM d','larch5'),('ShortDateFormat','M/d','larch5'),('TimeFormat','h:mm AP','larch5'),('QtFontSmall','12','larch5'),('QtFontMedium','16','larch5'),('QtFontBig','25','larch5'),('PlayBoxTransparency','1','larch5'),('PlayBoxShading','0','larch5'),('UseVirtualKeyboard','1','larch5'),('LCDEnable','0','larch5'),('LCDShowTime','1','larch5'),('LCDShowMenu','1','larch5'),('LCDShowMusic','1','larch5'),('LCDShowMusicItems','ArtistTitle','larch5'),('LCDShowChannel','1','larch5'),('LCDShowRecStatus','0','larch5'),('LCDShowVolume','1','larch5'),('LCDShowGeneric','1','larch5'),('LCDBacklightOn','1','larch5'),('LCDHeartBeatOn','0','larch5'),('LCDBigClock','0','larch5'),('LCDKeyString','ABCDEF','larch5'),('LCDPopupTime','5','larch5'),('AudioOutputDevice','ALSA:default','larch5'),('PassThruOutputDevice','Default','larch5'),('MaxChannels','2','larch5'),('AudioUpmixType','0','larch5'),('AC3PassThru','0','larch5'),('DTSPassThru','0','larch5'),('AggressiveSoundcardBuffer','0','larch5'),('MythControlsVolume','1','larch5'),('MixerDevice','ALSA:default','larch5'),('MixerControl','PCM','larch5'),('MasterMixerVolume','100','larch5'),('PCMMixerVolume','50','larch5'),('IndividualMuteControl','0','larch5'),('LircKeyPressedApp','','larch5'),('AllowQuitShutdown','4','larch5'),('NoPromptOnExit','1','larch5'),('UseArrowAccels','1','larch5'),('NetworkControlEnabled','0','larch5'),('NetworkControlPort','6546','larch5'),('MonitorDrives','0','larch5'),('MediaChangeEvents','0','larch5'),('IgnoreDevices','','larch5'),('SetupPinCodeRequired','0','larch5'),('OverrideExitMenu','3','larch5'),('HaltCommand','sudo /sbin/halt','larch5'),('RebootCommand','sudo /sbin/reboot','larch5'),('EnableXbox','0','larch5'),('LogEnabled','0',NULL),('LogMaxCount','100','larch5'),('LogPrintLevel','8','larch5'),('LogCleanEnabled','0','larch5'),('LogCleanPeriod','14','larch5'),('LogCleanDays','14','larch5'),('LogCleanMax','30','larch5'),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('SchedOpenEnd','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('SingleRecordRecPriority','1',NULL),('FindOneRecordRecPriority','-1',NULL),('ArchiveDBSchemaVer','1005',NULL),('MythArchiveTempDir','/myth/tmp','larch5'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','larch5'),('MythArchiveVideoFormat','NTSC','larch5'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','larch5'),('MythArchiveDVDLocation','/dev/dvd','larch5'),('MythArchiveDVDPlayerCmd','Internal','larch5'),('MythArchiveEncodeToAc3','0','larch5'),('MythArchiveCopyRemoteFiles','0','larch5'),('MythArchiveAlwaysUseMythTranscode','1','larch5'),('MythArchiveUseProjectX','0','larch5'),('MythArchiveAddSubtitles','0','larch5'),('MythArchiveUseFIFO','1','larch5'),('MythArchiveDefaultEncProfile','SP','larch5'),('MythArchiveMainMenuAR','16:9','larch5'),('MythArchiveChapterMenuAR','Video','larch5'),('MythArchiveDateFormat','%a %b %d','larch5'),('MythArchiveTimeFormat','%I:%M %p','larch5'),('MythArchiveFfmpegCmd','ffmpeg','larch5'),('MythArchiveMplexCmd','mplex','larch5'),('MythArchiveDvdauthorCmd','dvdauthor','larch5'),('MythArchiveSpumuxCmd','spumux','larch5'),('MythArchiveMpeg2encCmd','mpeg2enc','larch5'),('MythArchiveMkisofsCmd','mkisofs','larch5'),('MythArchiveGrowisofsCmd','growisofs','larch5'),('MythArchiveTcrequantCmd','tcrequant','larch5'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','larch5'),('MythArchiveProjectXCmd','projectx','larch5'),('FlixDBSchemaVer','1004',NULL),('GalleryDBSchemaVer','1003',NULL),('GalleryDir','/myth/gallery','larch5'),('GalleryThumbnailLocation','1','larch5'),('GallerySortOrder','20','larch5'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','larch5'),('GalleryMoviePlayerCmd','Internal','larch5'),('SlideshowUseOpenGL','0','larch5'),('SlideshowDelay','5','larch5'),('SlideshowOpenGLTransition','none','larch5'),('SlideshowOpenGLTransitionLength','2000','larch5'),('SlideshowTransition','random','larch5'),('SlideshowBackground','black','larch5'),('GameDBSchemaVer','1018',NULL),('MusicDBSchemaVer','1019',NULL),('VisualMode','','larch5'),('MusicLocation','/myth/music/','larch5'),('MusicAudioDevice','default','larch5'),('CDDevice','/dev/cdrom','larch5'),('AutoLookupCD','1','larch5'),('AutoPlayCD','0','larch5'),('KeyboardAccelerators','1','larch5'),('TreeLevels','splitartist artist album title','larch5'),('ArtistTreeGroups','0','larch5'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','larch5'),('Ignore_ID3','0','larch5'),('MusicTagEncoding','utf16','larch5'),('CDWriterEnabled','1','larch5'),('CDDiskSize','1','larch5'),('CDCreateDir','1','larch5'),('CDWriteSpeed','0','larch5'),('CDBlankType','fast','larch5'),('PlayMode','none','larch5'),('ResumeMode','off','larch5'),('MaxSearchResults','300','larch5'),('MusicShowRatings','0','larch5'),('ShowWholeTree','0','larch5'),('ListAsShuffled','0','larch5'),('IntelliRatingWeight','35','larch5'),('IntelliPlayCountWeight','25','larch5'),('IntelliLastPlayWeight','25','larch5'),('IntelliRandomWeight','15','larch5'),('VisualCycleOnSongChange','0','larch5'),('VisualAlbumArtOnSongChange','0','larch5'),('VisualRandomize','0','larch5'),('VisualModeDelay','0','larch5'),('VisualScaleWidth','1','larch5'),('VisualScaleHeight','1','larch5'),('ParanoiaLevel','Full','larch5'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','larch5'),('NoWhitespace','0','larch5'),('PostCDRipScript','','larch5'),('EjectCDAfterRipping','1','larch5'),('EncoderType','ogg','larch5'),('DefaultRipQuality','1','larch5'),('Mp3UseVBR','0','larch5'),('PhoneDBSchemaVer','1001',NULL),('SipRegisterWithProxy','1','larch5'),('SipProxyName','fwd.pulver.com','larch5'),('SipProxyAuthName','','larch5'),('SipProxyAuthPassword','','larch5'),('MySipName','Me','larch5'),('SipAutoanswer','0','larch5'),('SipBindInterface','eth0','larch5'),('SipLocalPort','5060','larch5'),('NatTraversalMethod','None','larch5'),('NatIpAddress','http://checkip.dyndns.org','larch5'),('AudioLocalPort','21232','larch5'),('VideoLocalPort','21234','larch5'),('MicrophoneDevice','None','larch5'),('CodecPriorityList','GSM;G.711u;G.711a','larch5'),('PlayoutAudioCall','40','larch5'),('PlayoutVideoCall','110','larch5'),('TxResolution','176x144','larch5'),('TransmitFPS','5','larch5'),('TransmitBandwidth','256','larch5'),('CaptureResolution','352x288','larch5'),('TimeToAnswer','10','larch5'),('DefaultVxmlUrl','http://127.0.0.1/vxml/index.vxml','larch5'),('DefaultVoicemailPrompt','I am not at home, please leave a message after the tone','larch5'),('BackendServerIP6','::1','larch5'),('VideoStartupDir','/myth/video','larch5'),('VideoArtworkDir','/myth/video_stuff/coverart','larch5'),('Default MythVideo View','2','larch5'),('VideoListUnknownFiletypes','1','larch5'),('VideoBrowserNoDB','1','larch5'),('VideoGalleryNoDB','1','larch5'),('VideoTreeNoDB','1','larch5'),('VideoTreeLoadMetaData','1','larch5'),('VideoNewBrowsable','1','larch5'),('mythvideo.sort_ignores_case','1','larch5'),('mythvideo.db_folder_view','1','larch5'),('mythvideo.VideoTreeRemember','1','larch5'),('mythvideo.ImageCacheSize','50','larch5'),('DVDDeviceLocation','/dev/dvd','larch5'),('VCDDeviceLocation','/dev/cdrom','larch5'),('DVDOnInsertDVD','1','larch5'),('DVDDriveSpeed','2','larch5'),('EnableDVDBookmark','1','larch5'),('DVDBookmarkPrompt','1','larch5'),('DVDBookmarkDays','10','larch5'),('mythvideo.fanartDir','/myth/video_stuff/fanart','larch5'),('mythvideo.screenshotDir','/myth/video_stuff/screenshots','larch5'),('mythvideo.bannerDir','/myth/video_stuff/banners','larch5'),('VideoGalleryColsPerPage','4','larch5'),('VideoGalleryRowsPerPage','3','larch5'),('VideoGallerySubtitle','1','larch5'),('VideoDefaultParentalLevel','4','larch5'),('VideoAggressivePC','0','larch5'),('mythvideo.ParentalLevelFromRating','0','larch5'),('mythvideo.AutoR2PL1','G','larch5'),('mythvideo.AutoR2PL2','PG','larch5'),('mythvideo.AutoR2PL3','PG-13','larch5'),('mythvideo.AutoR2PL4','R:NC-17','larch5'),('VideoDefaultPlayer','Internal','larch5'),('mythdvd.DVDPlayerCommand','Internal','larch5'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','larch5'),('DVDRipLocation','/myth/tmp','larch5'),('TitlePlayCommand','Internal','larch5'),('SubTitleCommand','-sid %s','larch5'),('TranscodeCommand','transcode','larch5'),('MTDPort','2442','larch5'),('MTDNiceLevel','20','larch5'),('MTDConcurrentTranscodes','1','larch5'),('MTDLogFlag','0','larch5'),('MTDac3Flag','0','larch5'),('MTDxvidFlag','1','larch5'),('mythvideo.TrustTranscodeFRDetect','1','larch5'),('WeatherDBSchemaVer','1006',NULL),('TVVidModeRefreshRate','0','larch5'),('TVVidModeRefreshRate0','0','larch5'),('TVVidModeRefreshRate1','0','larch5'),('TVVidModeRefreshRate2','0','larch5'),('GalleryRecursiveSlideshow','1','larch5'),('WebBrowserZoomLevel','20','larch5'),('WebBrowserCommand','Internal','larch5'),('WebBrowserScrollMode','1','larch5'),('WebBrowserScrollSpeed','4','larch5'),('WebBrowserHideScrollbars','0','larch5'),('RepeatMode','all','larch5'),('MusicAutoShowPlayer','1','larch5'),('NetworkControlEnabled','1','larch5'),('NetworkControlEnabled','1','larch5'),('WOLbackendReconnectWaitTime','5',NULL),('BackupDBLastRunStart','2012-04-22 14:27:05',NULL),('BackupDBLastRunEnd','2012-04-22 14:27:05',NULL),('StorageScheduler','Combination',NULL),('DisableAutomaticBackup','0',NULL),('BackendStopCommand','sudo sv stop mythbackend',NULL),('BackendStartCommand','sudo sv start mythbackend',NULL),('UPnP/WMPSource','0',NULL),('UPnP/RebuildDelay','30','larch5'),('GeneratePreviewRemotely','0','larch5'),('HWAccelPlaybackPreview','0','larch5'),('BrowseAllTuners','0','larch5'),('SubtitleCodec','UTF-8','larch5'),('ChannelGroupRememberLast','0','larch5'),('ChannelGroupDefault','-1','larch5'),('BrowseChannelGroup','0','larch5'),('UseFixedWindowSize','1','larch5'),('ScreenShotPath','/myth/video_stuff/screenshots','larch5'),('LircSocket','/var/run/lirc/lircd','larch5'),('BrowserDBSchemaVer','1002',NULL),('CDWriterDevice','default','larch5'),('MusicExitAction','prompt','larch5'),('mythvideo.db_group_view','1','larch5'),('mythvideo.db_group_type','0','larch5'),('MovieListCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -M','larch5'),('MoviePosterCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -P','larch5'),('MovieFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -B','larch5'),('MovieDataCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -D','larch5'),('mythvideo.TrailersDir','/myth/video_stuff/trailers','larch5'),('mythvideo.TrailersRandomEnabled','1','larch5'),('mythvideo.TrailersRandomCount','3','larch5'),('mythvideo.TVListCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -M','larch5'),('mythvideo.TVPosterCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -P','larch5'),('mythvideo.TVFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -F','larch5'),('mythvideo.TVBannerCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -B','larch5'),('mythvideo.TVDataCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -D','larch5'),('mythvideo.TVTitleSubCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -N','larch5'),('mythvideo.TVScreenshotCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -S','larch5'),('mythvideo.EnableAlternatePlayer','1','larch5'),('mythvideo.VideoAlternatePlayer','mplayer -fs -zoom -quiet -vo xv %s','larch5'),('AudioDefaultUpmix','1','larch5'),('AdvancedAudioSettings','0','larch5'),('SRCQualityOverride','0','larch5'),('SRCQuality','1','larch5'),('MusicDefaultUpmix','0','larch5'),('Country','US','larch5'),('OSDSubFont','FreeSans','larch5'),('CommFlagFast','0',NULL),('MultiChannelPCM','0','larch5'),('Audio48kOverride','0','larch5'),('PassThruDeviceOverride','0','larch5'),('MythArchiveM2VRequantiserCmd','M2VRequantiser','larch5'),('Country','US','73be'),('DateFormat','ddd MMM d yyyy','73be'),('Language','en_US','73be'),('MythArchiveDateFormat','%a %b %d %Y','73be'),('MythArchiveTimeFormat','%I:%M %p','73be'),('MythArchiveVideoFormat','NTSC','73be'),('ShortDateFormat','M/d','73be'),('TimeFormat','h:mm AP','73be'),('RealtimePriority','1','73be'),('DecodeExtraAudio','1','73be'),('JumpToProgramOSD','1','73be'),('ClearSavedPosition','1','73be'),('AltClearSavedPosition','1','73be'),('AutomaticSetWatched','0','73be'),('ContinueEmbeddedTVPlay','0','73be'),('AspectOverride','0','73be'),('AdjustFill','0','73be'),('LetterboxColour','0','73be'),('PIPLocation','0','73be'),('PlaybackExitPrompt','0','73be'),('EndOfRecordingExitPrompt','0','73be'),('PlayBoxOrdering','1','73be'),('PlayBoxEpisodeSort','Date','73be'),('PlaybackBoxStartInTitle','1','73be'),('DisplayRecGroup','All Programs','73be'),('QueryInitialFilter','0','73be'),('RememberRecGroup','1','73be'),('DispRecGroupAsAllProg','0','73be'),('DisplayGroupTitleSort','0','73be'),('PlaybackWatchList','1','73be'),('PlaybackWLStart','0','73be'),('PlaybackWLAutoExpire','0','73be'),('PlaybackWLMaxAge','60','73be'),('PlaybackWLBlackOut','2','73be'),('SmartForward','0','73be'),('FFRewReposTime','100','73be'),('FFRewReverse','1','73be'),('ExactSeeking','0','73be'),('AutoCommercialSkip','0','73be'),('EnableMHEG','0','73be'),('PersistentBrowseMode','1','73be'),('BrowseAllTuners','0','73be'),('CCBackground','0','73be'),('DefaultCCMode','0','73be'),('Prefer708Captions','1','73be'),('DefaultSubtitleFont','FreeMono','73be'),('OSDCC708TextZoom','100','73be'),('SubtitleCodec','UTF-8','73be'),('ChannelOrdering','channum','73be'),('ChannelFormat',' ','73be'),('LongChannelFormat',' ','73be'),('AutoMetadataLookup','1',NULL),('ChannelGroupRememberLast','0','73be'),('ChannelGroupDefault','-1','73be'),('BrowseChannelGroup','0','73be'),('WatchTVGuide','0','73be'),('DefaultTVChannel','3','73be'),('SelChangeRecThreshold','16','73be'),('ThemePainter','qt','73be'),('MenuTheme','defaultmenu','73be'),('GuiSizeForTV','1','73be'),('HideMouseCursor','0','73be'),('RunFrontendInWindow','0','73be'),('UseFixedWindowSize','1','73be'),('UseVideoModes','0','73be'),('GuiVidModeResolution','640x480','73be'),('TVVidModeResolution','320x200','73be'),('TVVidModeForceAspect','0.0','73be'),('TVVidModeResolution0','320x200','73be'),('TVVidModeForceAspect0','0.0','73be'),('TVVidModeResolution1','320x200','73be'),('TVVidModeForceAspect1','0.0','73be'),('TVVidModeResolution2','320x200','73be'),('TVVidModeForceAspect2','0.0','73be'),('LCDEnable','0','73be'),('LCDShowTime','1','73be'),('LCDShowMenu','1','73be'),('LCDShowMusic','1','73be'),('LCDShowMusicItems','ArtistTitle','73be'),('LCDShowChannel','1','73be'),('LCDShowRecStatus','0','73be'),('LCDShowVolume','1','73be'),('LCDShowGeneric','1','73be'),('LCDBacklightOn','1','73be'),('LCDHeartBeatOn','0','73be'),('LCDBigClock','0','73be'),('LCDKeyString','ABCDEF','73be'),('LCDPopupTime','5','73be'),('SetupPinCodeRequired','0','73be'),('UseVirtualKeyboard','1','73be'),('ScreenShotPath','/tmp/','73be'),('MonitorDrives','0','73be'),('FrontendIdleTimeout','90','73be'),('OverrideExitMenu','0','73be'),('LircSocket','/var/run/lirc/lircd','73be'),('NetworkControlEnabled','0','73be'),('NetworkControlPort','6546','73be'),('UDPNotifyPort','6948','73be'),('VideoStartupDir','/share/Movies/dvd','73be'),('mythvideo.TrailersDir','/home/mythtv/.mythtv/Video/Trailers','73be'),('VideoArtworkDir','/home/mythtv/.mythtv/Video/Artwork','73be'),('mythvideo.screenshotDir','/home/mythtv/.mythtv/Video/Screenshots','73be'),('mythvideo.bannerDir','/home/mythtv/.mythtv/Video/Banners','73be'),('mythvideo.fanartDir','/home/mythtv/.mythtv/Video/Fanart','73be'),('DVDOnInsertDVD','1','73be'),('mythvideo.VideoTreeRemember','0','73be'),('VideoDefaultParentalLevel','4','73be'),('VideoAggressivePC','0','73be'),('mythvideo.ParentalLevelFromRating','0','73be'),('mythvideo.AutoR2PL1','G','73be'),('mythvideo.AutoR2PL2','PG','73be'),('mythvideo.AutoR2PL3','PG-13','73be'),('mythvideo.AutoR2PL4','R:NC-17','73be'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','73be'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','73be'),('MythArchiveDVDLocation','/dev/dvd','73be'),('MythArchiveDVDPlayerCmd','Internal','73be'),('MythArchiveCopyRemoteFiles','0','73be'),('MythArchiveAlwaysUseMythTranscode','1','73be'),('MythArchiveUseProjectX','0','73be'),('MythArchiveAddSubtitles','0','73be'),('MythArchiveUseFIFO','1','73be'),('MythArchiveDefaultEncProfile','SP','73be'),('MythArchiveMainMenuAR','16:9','73be'),('MythArchiveChapterMenuAR','Video','73be'),('MythArchiveMplexCmd','mplex','73be'),('MythArchiveDvdauthorCmd','dvdauthor','73be'),('MythArchiveSpumuxCmd','spumux','73be'),('MythArchiveMpeg2encCmd','mpeg2enc','73be'),('MythArchiveMkisofsCmd','mkisofs','73be'),('MythArchiveGrowisofsCmd','growisofs','73be'),('MythArchiveM2VRequantiserCmd','M2VRequantiser','73be'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','73be'),('MythArchiveProjectXCmd','projectx','73be'),('WebBrowserCommand','Internal','73be'),('WebBrowserZoomLevel','1.4','73be'),('GalleryDir','/var/lib/pictures','73be'),('GalleryThumbnailLocation','1','73be'),('GallerySortOrder','3','73be'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','73be'),('GalleryAutoLoad','0','73be'),('GalleryFilterType','0','73be'),('SlideshowUseOpenGL','0','73be'),('SlideshowDelay','5','73be'),('SlideshowOpenGLTransition','none','73be'),('SlideshowOpenGLTransitionLength','2000','73be'),('SlideshowTransition','none','73be'),('SlideshowBackground','theme','73be'),('NewsDBSchemaVer','1001',NULL),('ThemeUpdateStatus','','73be'),('MusicBookmark','-1','73be'),('MusicBookmarkPosition','0','73be'),('PlayMode','none','73be'),('RepeatMode','all','73be'),('MusicAutoShowPlayer','1','73be'),('Hostpluginmythappletrailers','1','larch5'); +INSERT INTO `settings` VALUES ('mythfilldatabaseLastRunStart','',NULL),('mythfilldatabaseLastRunEnd','',NULL),('mythfilldatabaseLastRunStatus','',NULL),('DataDirectMessage','',NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1299',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('MythFillFixProgramIDsHasRunOnce','1','larch5'),('Language','EN_US','larch5'),('BackendServerIP','127.0.0.1','larch5'),('BackendServerPort','6543','larch5'),('BackendStatusPort','6544','larch5'),('SecurityPin','','larch5'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','1',NULL),('TruncateDeletesSlowly','0','larch5'),('HDRingbufferSize','9400',NULL),('MiscStatusScript','/usr/LH/bin/misc_status_info.sh','larch5'),('DisableFirewireReset','0','larch5'),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','larch5'),('JobQueueCheckFrequency','60','larch5'),('JobQueueWindowStart','00:00','larch5'),('JobQueueWindowEnd','23:59','larch5'),('JobQueueCPU','0','larch5'),('JobAllowCommFlag','1','larch5'),('JobAllowTranscode','1','larch5'),('JobAllowUserJob1','0','larch5'),('JobAllowUserJob2','0','larch5'),('JobAllowUserJob3','0','larch5'),('JobAllowUserJob4','0','larch5'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJob1','',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('DefaultVideoPlaybackProfile','Normal','73be'),('RealtimePriority','1','larch5'),('DecodeExtraAudio','1','larch5'),('AudioNag','1','larch5'),('UseVideoTimebase','0','larch5'),('ClearSavedPosition','1','larch5'),('AltClearSavedPosition','1','larch5'),('JumpToProgramOSD','1','larch5'),('ContinueEmbeddedTVPlay','0','larch5'),('AutomaticSetWatched','0','larch5'),('AlwaysStreamFiles','1','larch5'),('UseOpenGLVSync','0','larch5'),('UseOutputPictureControls','1','larch5'),('AspectOverride','0','larch5'),('AdjustFill','0','larch5'),('LetterboxColour','0','larch5'),('PIPLocation','0','larch5'),('PlaybackExitPrompt','2','larch5'),('EndOfRecordingExitPrompt','1','larch5'),('PlayBoxOrdering','1','larch5'),('PlayBoxEpisodeSort','Date','larch5'),('GeneratePreviewPixmaps','0','larch5'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','larch5'),('PlaybackPreview','1','larch5'),('PlaybackBoxStartInTitle','1','larch5'),('ShowGroupInfo','0','larch5'),('DisplayRecGroup','All Programs','larch5'),('QueryInitialFilter','0','larch5'),('RememberRecGroup','1','larch5'),('DispRecGroupAsAllProg','0','larch5'),('LiveTVInAllPrograms','0','larch5'),('DisplayGroupDefaultView','0','larch5'),('DisplayGroupTitleSort','0','larch5'),('PlaybackWatchList','1','larch5'),('PlaybackWLStart','0','larch5'),('PlaybackWLAutoExpire','0','larch5'),('PlaybackWLMaxAge','60','larch5'),('PlaybackWLBlackOut','2','larch5'),('SmartForward','0','larch5'),('StickyKeys','0','larch5'),('FFRewReposTime','100','larch5'),('FFRewReverse','1','larch5'),('ExactSeeking','0','larch5'),('AutoCommercialSkip','0','larch5'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('PVR350OutputEnable','0','larch5'),('PVR350EPGAlphaValue','164','larch5'),('PVR350InternalAudioOnly','0','larch5'),('OSDTheme','blueosd','larch5'),('OSDGeneralTimeout','2','larch5'),('OSDProgramInfoTimeout','3','larch5'),('OSDFont','FreeMono.ttf','larch5'),('OSDThemeFontSizeType','default','larch5'),('EnableMHEG','0','larch5'),('PersistentBrowseMode','1','larch5'),('OSDNotifyTimeout','5','larch5'),('UDPNotifyPort','6948','larch5'),('OSDCCFont','FreeMono.ttf','larch5'),('CCBackground','0','larch5'),('DefaultCCMode','0','larch5'),('Prefer708Captions','1','larch5'),('OSDCC708TextZoom','100','larch5'),('OSDCC708DefaultFontType','MonoSerif','larch5'),('OSDCC708MonoSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708CasualFont','FreeMono.ttf','larch5'),('OSDCC708CursiveFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsFont','FreeMono.ttf','larch5'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708CasualItalicFont','FreeMono.ttf','larch5'),('OSDCC708CursiveItalicFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','larch5'),('ChannelOrdering','channum','larch5'),('ChannelFormat',' ','larch5'),('LongChannelFormat',' ','larch5'),('SmartChannelChange','0','larch5'),('LastFreeCard','0',NULL),('LiveTVPriority','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDefault','1',NULL),('RerecordWatched','1',NULL),('AutoExpireWatchedPriority','0',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireExtraSpace','1',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('CommercialSkipMethod','7',NULL),('AggressiveCommDetect','1',NULL),('AutoCommercialFlag','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('EPGFillType','12','larch5'),('EPGShowCategoryColors','1','larch5'),('EPGShowCategoryText','1','larch5'),('EPGScrollType','1','larch5'),('EPGShowChannelIcon','1','larch5'),('EPGShowFavorites','0','larch5'),('WatchTVGuide','0','larch5'),('chanPerPage','5','larch5'),('timePerPage','4','larch5'),('UnknownTitle','Unknown','larch5'),('UnknownCategory','Unknown','larch5'),('DefaultTVChannel','3','larch5'),('SelectChangesChannel','0','larch5'),('SelChangeRecThreshold','16','larch5'),('EPGEnableJumpToChannel','0',NULL),('Theme','LinHES','larch5'),('RandomTheme','0','larch5'),('ThemeCacheSize','1','larch5'),('ThemePainter','qt','larch5'),('Style','Desktop Style','larch5'),('ThemeFontSizeType','default','larch5'),('MenuTheme','default','larch5'),('XineramaScreen','0','larch5'),('XineramaMonitorAspectRatio','1.3333','larch5'),('GuiSizeForTV','1','larch5'),('HideMouseCursor','1','larch5'),('RunFrontendInWindow','0','larch5'),('UseVideoModes','0','larch5'),('GuiVidModeResolution','640x480','larch5'),('TVVidModeResolution','320x200','larch5'),('TVVidModeForceAspect','0.0','larch5'),('TVVidModeResolution0','320x200','larch5'),('TVVidModeForceAspect0','0.0','larch5'),('TVVidModeResolution1','320x200','larch5'),('TVVidModeForceAspect1','0.0','larch5'),('TVVidModeResolution2','320x200','larch5'),('TVVidModeForceAspect2','0.0','larch5'),('ISO639Language0','eng',NULL),('ISO639Language1','eng',NULL),('DateFormat','ddd MMM d','larch5'),('ShortDateFormat','M/d','larch5'),('TimeFormat','h:mm AP','larch5'),('QtFontSmall','12','larch5'),('QtFontMedium','16','larch5'),('QtFontBig','25','larch5'),('PlayBoxTransparency','1','larch5'),('PlayBoxShading','0','larch5'),('UseVirtualKeyboard','1','larch5'),('LCDEnable','0','larch5'),('LCDShowTime','1','larch5'),('LCDShowMenu','1','larch5'),('LCDShowMusic','1','larch5'),('LCDShowMusicItems','ArtistTitle','larch5'),('LCDShowChannel','1','larch5'),('LCDShowRecStatus','0','larch5'),('LCDShowVolume','1','larch5'),('LCDShowGeneric','1','larch5'),('LCDBacklightOn','1','larch5'),('LCDHeartBeatOn','0','larch5'),('LCDBigClock','0','larch5'),('LCDKeyString','ABCDEF','larch5'),('LCDPopupTime','5','larch5'),('AudioOutputDevice','ALSA:default','larch5'),('PassThruOutputDevice','Default','larch5'),('MaxChannels','2','larch5'),('AudioUpmixType','0','larch5'),('AC3PassThru','0','larch5'),('DTSPassThru','0','larch5'),('AggressiveSoundcardBuffer','0','larch5'),('MythControlsVolume','1','larch5'),('MixerDevice','ALSA:default','larch5'),('MixerControl','PCM','larch5'),('MasterMixerVolume','100','larch5'),('PCMMixerVolume','50','larch5'),('IndividualMuteControl','0','larch5'),('LircKeyPressedApp','','larch5'),('AllowQuitShutdown','4','larch5'),('NoPromptOnExit','1','larch5'),('UseArrowAccels','1','larch5'),('NetworkControlEnabled','0','larch5'),('NetworkControlPort','6546','larch5'),('MonitorDrives','0','larch5'),('MediaChangeEvents','0','larch5'),('IgnoreDevices','','larch5'),('SetupPinCodeRequired','0','larch5'),('OverrideExitMenu','3','larch5'),('HaltCommand','sudo /sbin/halt','larch5'),('RebootCommand','sudo /sbin/reboot','larch5'),('EnableXbox','0','larch5'),('LogEnabled','0',NULL),('LogMaxCount','100','larch5'),('LogPrintLevel','8','larch5'),('LogCleanEnabled','0','larch5'),('LogCleanPeriod','14','larch5'),('LogCleanDays','14','larch5'),('LogCleanMax','30','larch5'),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('SchedOpenEnd','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('SingleRecordRecPriority','1',NULL),('FindOneRecordRecPriority','-1',NULL),('ArchiveDBSchemaVer','1005',NULL),('MythArchiveTempDir','/myth/tmp','larch5'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','larch5'),('MythArchiveVideoFormat','NTSC','larch5'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','larch5'),('MythArchiveDVDLocation','/dev/dvd','larch5'),('MythArchiveDVDPlayerCmd','Internal','larch5'),('MythArchiveEncodeToAc3','0','larch5'),('MythArchiveCopyRemoteFiles','0','larch5'),('MythArchiveAlwaysUseMythTranscode','1','larch5'),('MythArchiveUseProjectX','0','larch5'),('MythArchiveAddSubtitles','0','larch5'),('MythArchiveUseFIFO','1','larch5'),('MythArchiveDefaultEncProfile','SP','larch5'),('MythArchiveMainMenuAR','16:9','larch5'),('MythArchiveChapterMenuAR','Video','larch5'),('MythArchiveDateFormat','%a %b %d','larch5'),('MythArchiveTimeFormat','%I:%M %p','larch5'),('MythArchiveFfmpegCmd','ffmpeg','larch5'),('MythArchiveMplexCmd','mplex','larch5'),('MythArchiveDvdauthorCmd','dvdauthor','larch5'),('MythArchiveSpumuxCmd','spumux','larch5'),('MythArchiveMpeg2encCmd','mpeg2enc','larch5'),('MythArchiveMkisofsCmd','mkisofs','larch5'),('MythArchiveGrowisofsCmd','growisofs','larch5'),('MythArchiveTcrequantCmd','tcrequant','larch5'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','larch5'),('MythArchiveProjectXCmd','projectx','larch5'),('FlixDBSchemaVer','1004',NULL),('GalleryDBSchemaVer','1003',NULL),('GalleryDir','/myth/gallery','larch5'),('GalleryThumbnailLocation','1','larch5'),('GallerySortOrder','20','larch5'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','larch5'),('GalleryMoviePlayerCmd','Internal','larch5'),('SlideshowUseOpenGL','0','larch5'),('SlideshowDelay','5','larch5'),('SlideshowOpenGLTransition','none','larch5'),('SlideshowOpenGLTransitionLength','2000','larch5'),('SlideshowTransition','random','larch5'),('SlideshowBackground','black','larch5'),('GameDBSchemaVer','1018',NULL),('MusicDBSchemaVer','1019',NULL),('VisualMode','','larch5'),('MusicLocation','/myth/music/','larch5'),('MusicAudioDevice','default','larch5'),('CDDevice','/dev/cdrom','larch5'),('AutoLookupCD','1','larch5'),('AutoPlayCD','0','larch5'),('KeyboardAccelerators','1','larch5'),('TreeLevels','splitartist artist album title','larch5'),('ArtistTreeGroups','0','larch5'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','larch5'),('Ignore_ID3','0','larch5'),('MusicTagEncoding','utf16','larch5'),('CDWriterEnabled','1','larch5'),('CDDiskSize','1','larch5'),('CDCreateDir','1','larch5'),('CDWriteSpeed','0','larch5'),('CDBlankType','fast','larch5'),('PlayMode','none','larch5'),('ResumeMode','off','larch5'),('MaxSearchResults','300','larch5'),('MusicShowRatings','0','larch5'),('ShowWholeTree','0','larch5'),('ListAsShuffled','0','larch5'),('IntelliRatingWeight','35','larch5'),('IntelliPlayCountWeight','25','larch5'),('IntelliLastPlayWeight','25','larch5'),('IntelliRandomWeight','15','larch5'),('VisualCycleOnSongChange','0','larch5'),('VisualAlbumArtOnSongChange','0','larch5'),('VisualRandomize','0','larch5'),('VisualModeDelay','0','larch5'),('VisualScaleWidth','1','larch5'),('VisualScaleHeight','1','larch5'),('ParanoiaLevel','Full','larch5'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','larch5'),('NoWhitespace','0','larch5'),('PostCDRipScript','','larch5'),('EjectCDAfterRipping','1','larch5'),('EncoderType','ogg','larch5'),('DefaultRipQuality','1','larch5'),('Mp3UseVBR','0','larch5'),('PhoneDBSchemaVer','1001',NULL),('SipRegisterWithProxy','1','larch5'),('SipProxyName','fwd.pulver.com','larch5'),('SipProxyAuthName','','larch5'),('SipProxyAuthPassword','','larch5'),('MySipName','Me','larch5'),('SipAutoanswer','0','larch5'),('SipBindInterface','eth0','larch5'),('SipLocalPort','5060','larch5'),('NatTraversalMethod','None','larch5'),('NatIpAddress','http://checkip.dyndns.org','larch5'),('AudioLocalPort','21232','larch5'),('VideoLocalPort','21234','larch5'),('MicrophoneDevice','None','larch5'),('CodecPriorityList','GSM;G.711u;G.711a','larch5'),('PlayoutAudioCall','40','larch5'),('PlayoutVideoCall','110','larch5'),('TxResolution','176x144','larch5'),('TransmitFPS','5','larch5'),('TransmitBandwidth','256','larch5'),('CaptureResolution','352x288','larch5'),('TimeToAnswer','10','larch5'),('DefaultVxmlUrl','http://127.0.0.1/vxml/index.vxml','larch5'),('DefaultVoicemailPrompt','I am not at home, please leave a message after the tone','larch5'),('BackendServerIP6','::1','larch5'),('VideoStartupDir','/myth/video','larch5'),('VideoArtworkDir','/myth/video_stuff/coverart','larch5'),('Default MythVideo View','2','larch5'),('VideoListUnknownFiletypes','1','larch5'),('VideoBrowserNoDB','1','larch5'),('VideoGalleryNoDB','1','larch5'),('VideoTreeNoDB','1','larch5'),('VideoTreeLoadMetaData','1','larch5'),('VideoNewBrowsable','1','larch5'),('mythvideo.sort_ignores_case','1','larch5'),('mythvideo.db_folder_view','1','larch5'),('mythvideo.VideoTreeRemember','1','larch5'),('mythvideo.ImageCacheSize','50','larch5'),('DVDDeviceLocation','/dev/dvd','larch5'),('VCDDeviceLocation','/dev/cdrom','larch5'),('DVDOnInsertDVD','1','larch5'),('DVDDriveSpeed','2','larch5'),('EnableDVDBookmark','1','larch5'),('DVDBookmarkPrompt','1','larch5'),('DVDBookmarkDays','10','larch5'),('mythvideo.fanartDir','/myth/video_stuff/fanart','larch5'),('mythvideo.screenshotDir','/myth/video_stuff/screenshots','larch5'),('mythvideo.bannerDir','/myth/video_stuff/banners','larch5'),('VideoGalleryColsPerPage','4','larch5'),('VideoGalleryRowsPerPage','3','larch5'),('VideoGallerySubtitle','1','larch5'),('VideoDefaultParentalLevel','4','larch5'),('VideoAggressivePC','0','larch5'),('mythvideo.ParentalLevelFromRating','0','larch5'),('mythvideo.AutoR2PL1','G','larch5'),('mythvideo.AutoR2PL2','PG','larch5'),('mythvideo.AutoR2PL3','PG-13','larch5'),('mythvideo.AutoR2PL4','R:NC-17','larch5'),('VideoDefaultPlayer','Internal','larch5'),('mythdvd.DVDPlayerCommand','Internal','larch5'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','larch5'),('DVDRipLocation','/myth/tmp','larch5'),('TitlePlayCommand','Internal','larch5'),('SubTitleCommand','-sid %s','larch5'),('TranscodeCommand','transcode','larch5'),('MTDPort','2442','larch5'),('MTDNiceLevel','20','larch5'),('MTDConcurrentTranscodes','1','larch5'),('MTDLogFlag','0','larch5'),('MTDac3Flag','0','larch5'),('MTDxvidFlag','1','larch5'),('mythvideo.TrustTranscodeFRDetect','1','larch5'),('WeatherDBSchemaVer','1006',NULL),('TVVidModeRefreshRate','0','larch5'),('TVVidModeRefreshRate0','0','larch5'),('TVVidModeRefreshRate1','0','larch5'),('TVVidModeRefreshRate2','0','larch5'),('GalleryRecursiveSlideshow','1','larch5'),('WebBrowserZoomLevel','20','larch5'),('WebBrowserCommand','Internal','larch5'),('WebBrowserScrollMode','1','larch5'),('WebBrowserScrollSpeed','4','larch5'),('WebBrowserHideScrollbars','0','larch5'),('RepeatMode','all','larch5'),('MusicAutoShowPlayer','1','larch5'),('NetworkControlEnabled','1','larch5'),('NetworkControlEnabled','1','larch5'),('WOLbackendReconnectWaitTime','5',NULL),('BackupDBLastRunStart','2012-04-22 14:27:05',NULL),('BackupDBLastRunEnd','2012-04-22 14:27:05',NULL),('StorageScheduler','Combination',NULL),('DisableAutomaticBackup','0',NULL),('BackendStopCommand','sudo sv stop mythbackend',NULL),('BackendStartCommand','sudo sv start mythbackend',NULL),('UPnP/WMPSource','0',NULL),('UPnP/RebuildDelay','30','larch5'),('GeneratePreviewRemotely','0','larch5'),('HWAccelPlaybackPreview','0','larch5'),('BrowseAllTuners','0','larch5'),('SubtitleCodec','UTF-8','larch5'),('ChannelGroupRememberLast','0','larch5'),('ChannelGroupDefault','-1','larch5'),('BrowseChannelGroup','0','larch5'),('UseFixedWindowSize','1','larch5'),('ScreenShotPath','/myth/video_stuff/screenshots','larch5'),('LircSocket','/var/run/lirc/lircd','larch5'),('BrowserDBSchemaVer','1002',NULL),('CDWriterDevice','default','larch5'),('MusicExitAction','prompt','larch5'),('mythvideo.db_group_view','1','larch5'),('mythvideo.db_group_type','0','larch5'),('MovieListCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -M','larch5'),('MoviePosterCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -P','larch5'),('MovieFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -B','larch5'),('MovieDataCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -D','larch5'),('mythvideo.TrailersDir','/myth/video_stuff/trailers','larch5'),('mythvideo.TrailersRandomEnabled','1','larch5'),('mythvideo.TrailersRandomCount','3','larch5'),('mythvideo.TVListCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -M','larch5'),('mythvideo.TVPosterCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -P','larch5'),('mythvideo.TVFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -F','larch5'),('mythvideo.TVBannerCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -B','larch5'),('mythvideo.TVDataCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -D','larch5'),('mythvideo.TVTitleSubCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -N','larch5'),('mythvideo.TVScreenshotCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -S','larch5'),('mythvideo.EnableAlternatePlayer','1','larch5'),('mythvideo.VideoAlternatePlayer','mplayer -fs -zoom -quiet -vo xv %s','larch5'),('AudioDefaultUpmix','1','larch5'),('AdvancedAudioSettings','0','larch5'),('SRCQualityOverride','0','larch5'),('SRCQuality','1','larch5'),('MusicDefaultUpmix','0','larch5'),('Country','US','larch5'),('OSDSubFont','FreeSans','larch5'),('CommFlagFast','0',NULL),('MultiChannelPCM','0','larch5'),('Audio48kOverride','0','larch5'),('PassThruDeviceOverride','0','larch5'),('MythArchiveM2VRequantiserCmd','M2VRequantiser','larch5'),('Country','US','73be'),('DateFormat','ddd MMM d yyyy','73be'),('Language','en_US','73be'),('MythArchiveDateFormat','%a %b %d %Y','73be'),('MythArchiveTimeFormat','%I:%M %p','73be'),('MythArchiveVideoFormat','NTSC','73be'),('ShortDateFormat','M/d','73be'),('TimeFormat','h:mm AP','73be'),('RealtimePriority','1','73be'),('DecodeExtraAudio','1','73be'),('JumpToProgramOSD','1','73be'),('ClearSavedPosition','1','73be'),('AltClearSavedPosition','1','73be'),('AutomaticSetWatched','0','73be'),('ContinueEmbeddedTVPlay','0','73be'),('AspectOverride','0','73be'),('AdjustFill','0','73be'),('LetterboxColour','0','73be'),('PIPLocation','0','73be'),('PlaybackExitPrompt','0','73be'),('EndOfRecordingExitPrompt','0','73be'),('PlayBoxOrdering','1','73be'),('PlayBoxEpisodeSort','Date','73be'),('PlaybackBoxStartInTitle','1','73be'),('DisplayRecGroup','All Programs','73be'),('QueryInitialFilter','0','73be'),('RememberRecGroup','1','73be'),('DispRecGroupAsAllProg','0','73be'),('DisplayGroupTitleSort','0','73be'),('PlaybackWatchList','1','73be'),('PlaybackWLStart','0','73be'),('PlaybackWLAutoExpire','0','73be'),('PlaybackWLMaxAge','60','73be'),('PlaybackWLBlackOut','2','73be'),('SmartForward','0','73be'),('FFRewReposTime','100','73be'),('FFRewReverse','1','73be'),('ExactSeeking','0','73be'),('AutoCommercialSkip','0','73be'),('EnableMHEG','0','73be'),('PersistentBrowseMode','1','73be'),('BrowseAllTuners','0','73be'),('CCBackground','0','73be'),('DefaultCCMode','0','73be'),('Prefer708Captions','1','73be'),('DefaultSubtitleFont','FreeMono','73be'),('OSDCC708TextZoom','100','73be'),('SubtitleCodec','UTF-8','73be'),('ChannelOrdering','channum','73be'),('ChannelFormat',' ','73be'),('LongChannelFormat',' ','73be'),('AutoMetadataLookup','1',NULL),('ChannelGroupRememberLast','0','73be'),('ChannelGroupDefault','-1','73be'),('BrowseChannelGroup','0','73be'),('WatchTVGuide','0','73be'),('DefaultTVChannel','3','73be'),('SelChangeRecThreshold','16','73be'),('ThemePainter','qt','73be'),('MenuTheme','defaultmenu','73be'),('GuiSizeForTV','1','73be'),('HideMouseCursor','0','73be'),('RunFrontendInWindow','0','73be'),('UseFixedWindowSize','1','73be'),('UseVideoModes','0','73be'),('GuiVidModeResolution','640x480','73be'),('TVVidModeResolution','320x200','73be'),('TVVidModeForceAspect','0.0','73be'),('TVVidModeResolution0','320x200','73be'),('TVVidModeForceAspect0','0.0','73be'),('TVVidModeResolution1','320x200','73be'),('TVVidModeForceAspect1','0.0','73be'),('TVVidModeResolution2','320x200','73be'),('TVVidModeForceAspect2','0.0','73be'),('LCDEnable','0','73be'),('LCDShowTime','1','73be'),('LCDShowMenu','1','73be'),('LCDShowMusic','1','73be'),('LCDShowMusicItems','ArtistTitle','73be'),('LCDShowChannel','1','73be'),('LCDShowRecStatus','0','73be'),('LCDShowVolume','1','73be'),('LCDShowGeneric','1','73be'),('LCDBacklightOn','1','73be'),('LCDHeartBeatOn','0','73be'),('LCDBigClock','0','73be'),('LCDKeyString','ABCDEF','73be'),('LCDPopupTime','5','73be'),('SetupPinCodeRequired','0','73be'),('UseVirtualKeyboard','1','73be'),('ScreenShotPath','/tmp/','73be'),('MonitorDrives','0','73be'),('FrontendIdleTimeout','90','73be'),('OverrideExitMenu','0','73be'),('LircSocket','/var/run/lirc/lircd','73be'),('NetworkControlEnabled','0','73be'),('NetworkControlPort','6546','73be'),('UDPNotifyPort','6948','73be'),('VideoStartupDir','/share/Movies/dvd','73be'),('mythvideo.TrailersDir','/home/mythtv/.mythtv/Video/Trailers','73be'),('VideoArtworkDir','/home/mythtv/.mythtv/Video/Artwork','73be'),('mythvideo.screenshotDir','/home/mythtv/.mythtv/Video/Screenshots','73be'),('mythvideo.bannerDir','/home/mythtv/.mythtv/Video/Banners','73be'),('mythvideo.fanartDir','/home/mythtv/.mythtv/Video/Fanart','73be'),('DVDOnInsertDVD','1','73be'),('mythvideo.VideoTreeRemember','0','73be'),('VideoDefaultParentalLevel','4','73be'),('VideoAggressivePC','0','73be'),('mythvideo.ParentalLevelFromRating','0','73be'),('mythvideo.AutoR2PL1','G','73be'),('mythvideo.AutoR2PL2','PG','73be'),('mythvideo.AutoR2PL3','PG-13','73be'),('mythvideo.AutoR2PL4','R:NC-17','73be'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','73be'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','73be'),('MythArchiveDVDLocation','/dev/dvd','73be'),('MythArchiveDVDPlayerCmd','Internal','73be'),('MythArchiveCopyRemoteFiles','0','73be'),('MythArchiveAlwaysUseMythTranscode','1','73be'),('MythArchiveUseProjectX','0','73be'),('MythArchiveAddSubtitles','0','73be'),('MythArchiveUseFIFO','1','73be'),('MythArchiveDefaultEncProfile','SP','73be'),('MythArchiveMainMenuAR','16:9','73be'),('MythArchiveChapterMenuAR','Video','73be'),('MythArchiveMplexCmd','mplex','73be'),('MythArchiveDvdauthorCmd','dvdauthor','73be'),('MythArchiveSpumuxCmd','spumux','73be'),('MythArchiveMpeg2encCmd','mpeg2enc','73be'),('MythArchiveMkisofsCmd','mkisofs','73be'),('MythArchiveGrowisofsCmd','growisofs','73be'),('MythArchiveM2VRequantiserCmd','M2VRequantiser','73be'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','73be'),('MythArchiveProjectXCmd','projectx','73be'),('WebBrowserCommand','Internal','73be'),('WebBrowserZoomLevel','1.4','73be'),('GalleryDir','/var/lib/pictures','73be'),('GalleryThumbnailLocation','1','73be'),('GallerySortOrder','3','73be'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','73be'),('GalleryAutoLoad','0','73be'),('GalleryFilterType','0','73be'),('SlideshowUseOpenGL','0','73be'),('SlideshowDelay','5','73be'),('SlideshowOpenGLTransition','none','73be'),('SlideshowOpenGLTransitionLength','2000','73be'),('SlideshowTransition','none','73be'),('SlideshowBackground','theme','73be'),('NewsDBSchemaVer','1001',NULL),('ThemeUpdateStatus','','73be'),('MusicBookmark','-1','73be'),('MusicBookmarkPosition','0','73be'),('PlayMode','none','73be'),('RepeatMode','all','73be'),('MusicAutoShowPlayer','1','73be'),('Hostpluginmythappletrailers','1','larch5'); /*!40000 ALTER TABLE `settings` ENABLE KEYS */; UNLOCK TABLES; -- cgit v0.12 From 4510b7c0fb05c0d6c28bfaa1c9753836b6cda96b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 3 Sep 2012 23:25:04 -0500 Subject: v4l-dvb: fix conflicting kernel modules. refs #844 --- abs/core/v4l-dvb/PKGBUILD | 9 +++++---- abs/core/v4l-dvb/v4l-dvb.install | 8 +------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/abs/core/v4l-dvb/PKGBUILD b/abs/core/v4l-dvb/PKGBUILD index ac150bb..f19c2fa 100644 --- a/abs/core/v4l-dvb/PKGBUILD +++ b/abs/core/v4l-dvb/PKGBUILD @@ -2,7 +2,7 @@ pkgname=v4l-dvb _kernver=`uname -r` -pkgver=20120828 +pkgver=20120904 pkgrel=1 pkgdesc="V4L-DVB device drivers (newer than those included in kernel26)" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ build() { msg "Connecting to GIT server...." if [ -d "${srcdir}/${_gitname}" ] ; then - cd ${_gitname} && git checkout -- . && git pull --rebase + cd ${_gitname} && git pull --rebase else git clone ${_gitroot} fi @@ -42,7 +42,8 @@ build() { package() { cd "${srcdir}/${_gitname}" - make DESTDIR="${pkgdir}" install - rm -fr ${pkgdir}/lib/modules/$_kernver/modules* + make DESTDIR="${pkgdir}/lib/modules/$_kernver/updates" install + # compress new kernel modules + find ${pkgdir}/lib/modules/$_kernver/updates/ -not -name 'media.ko' -name '*.ko' -exec gzip '{}' \; } md5sums=() diff --git a/abs/core/v4l-dvb/v4l-dvb.install b/abs/core/v4l-dvb/v4l-dvb.install index ec6382d..f7b7197 100644 --- a/abs/core/v4l-dvb/v4l-dvb.install +++ b/abs/core/v4l-dvb/v4l-dvb.install @@ -1,18 +1,12 @@ post_install() { - echo ">>> Removing duplicate compressed kernel modules..." - for file in `find /lib/modules -name "*.ko"`; do if [[ -e $file.gz ]]; then rm "$file.gz"; fi; done echo ">>> Running depmod..." depmod } post_upgrade() { - echo ">>> Removing duplicate compressed kernel modules..." - for file in `find /lib/modules -name "*.ko"`; do if [[ -e $file.gz ]]; then rm "$file.gz"; fi; done - echo ">>> Running depmod..." - depmod + post_install } post_remove() { echo ">>> v4l-dvb has been removed" - echo ">>> kernel26 & dvb-firmware & linux-firmware should be reinstalled" } -- cgit v0.12 From 0e4b2437946b776a1bd0c00ed43b68cec344a1b2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 4 Sep 2012 02:09:11 -0500 Subject: mythtv: fixed and cleaned some menus. Closes #846 --- abs/core/mythtv/stable-0.25/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 2 +- .../stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml | 93 +++++++++-------- .../stable-0.25/mythtv/menu-xml/info_menu.xml | 76 ++++++++++++++ .../mythtv/stable-0.25/mythtv/menu-xml/linhes.xml | 1 + .../mythtv/stable-0.25/mythtv/menu-xml/setup.xml | 111 --------------------- 6 files changed, 125 insertions(+), 160 deletions(-) create mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash index 83e574c..8e5da8e 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash @@ -1 +1 @@ -46cab93562429cd19029402a2387f63a72aeb898 +d51927663b67c7c035108270a31bf14aed68bcdb diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index d4daf76..9ccfdbd 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.25 -pkgrel=12 +pkgrel=13 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml index c436423..895c337 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml @@ -1,78 +1,77 @@ - + + - + - + - + - - - + - + - + - + - + - + MV_SYSTEM_SETUP_MENU + System Type + EXEC mythinstall -s hostype + + + + + + + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml index 01b6ffa..342766d 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml @@ -34,6 +34,7 @@ diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml deleted file mode 100644 index f56bb6f..0000000 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - -- cgit v0.12 From a53f0abbe6f6d2420bb1bd6f6e517bb2ebe2208c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 4 Sep 2012 16:01:43 -0500 Subject: LinHES-system: mythfrontend-start: fork start command so that mythfrontend-start will exit. closes #847 --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/mythfrontend-start | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 6518d1e..20a2c67 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=55 +pkgrel=56 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -68,7 +68,7 @@ md5sums=('d1a5963c5a440a608031c6d750232633' 'dc3eef2a624754e16805d72bbe488b67' 'dc0be354ce77ba2b89868fc29b942c43' '542e670e78d117657f93141e9689f54d' - '48b763dba127aac6ab05c84643f83b71' + 'ec975dd053ca28c2b537b027611993fe' 'ba351b92e69bcaf26a9bf80417b09c3c' '4545eb39213d40b5a2bdeda5e066cdc4' '962a3e9eaba2d1466251b7ab0956705d' diff --git a/abs/core/LinHES-system/mythfrontend-start b/abs/core/LinHES-system/mythfrontend-start index 1f48449..9aac881 100755 --- a/abs/core/LinHES-system/mythfrontend-start +++ b/abs/core/LinHES-system/mythfrontend-start @@ -19,11 +19,11 @@ then fi question="There $diagtext running. Do you really want to start another one?" - mythvantage -q "${question}" + mythvantage -Q "${question}" if [ $? = 16 ] then - $STARTCMD 2>&1 + $STARTCMD 2>&1 & fi else - $STARTCMD 2>&1 + $STARTCMD 2>&1 & fi -- cgit v0.12 From ef93372c8ce35aa6ca16c065cc3a64ae4f08d6d6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 4 Sep 2012 16:36:05 -0500 Subject: LinHES-system: misc_status_config.py: add SystemType check and only update db for Standalone and masterbackend --- abs/core/LinHES-system/PKGBUILD | 4 +-- abs/core/LinHES-system/misc_status_config.py | 37 +++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 20a2c67..b5f6ab3 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=56 +pkgrel=57 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -84,7 +84,7 @@ md5sums=('d1a5963c5a440a608031c6d750232633' 'b798ee0796d1b760a2998f90eb8ce9cc' '4a3cd8f9b33b2b86fdba47a8f1fa2859' '06a628469051237943b7c874f2e29b8a' - '0512f859cd5ea1d9eb972840caef2f0e' + '54ebcc024db2e0ebe8121305d8926767' '45f46d1f9193c8dde18e56369ec29a1e' 'a8edbe7bc37e9932e8749d9f5f89c16f' '14cea9e87654441b766a97576233ba5a' diff --git a/abs/core/LinHES-system/misc_status_config.py b/abs/core/LinHES-system/misc_status_config.py index 0a0ba6c..cc82534 100755 --- a/abs/core/LinHES-system/misc_status_config.py +++ b/abs/core/LinHES-system/misc_status_config.py @@ -7,9 +7,34 @@ from MythTV import MythDB mythdb = MythDB() localhostname = gethostname() -# mythtv-setup -if mythdb.settings[localhostname].MiscStatusScript == u'': - mythdb.settings[localhostname].MiscStatusScript = u'/usr/LH/bin/misc_status_info.sh' - print 'The MythTV database setting MiscStatusScript was updated to /usr/LH/bin/misc_status_info.sh.' -else: - print 'The MythTV database setting MiscStatusScript is already set and will not be updated.' +# Function to set db setting. This setting is set in mythtv-setup. +def dbSettingChange(): + if mythdb.settings[localhostname].MiscStatusScript == u'': + mythdb.settings[localhostname].MiscStatusScript = u'/usr/LH/bin/misc_status_info.sh' + print 'The MythTV database setting MiscStatusScript was updated to /usr/LH/bin/misc_status_info.sh.' + else: + print 'The MythTV database setting MiscStatusScript is already set and will not be updated.' + return + +#taken from systemconfig.py +#this is how you populate the dict +systemconfig = {} +file_name = "/etc/systemconfig" +try: + config_file = open(file_name) +except: + logging.critical("%s could not be opened", file_name) + sys.exit(1) + +for line in config_file: + line = line.strip() + if line and line[0] is not "#" and line[-1] is not "=": + var, val = line.rsplit("=", 1) + val = val.strip('"') + systemconfig[var.strip()] = val.strip() + +#this is how you reference a value from mv_hostype.py +if (systemconfig.get("SystemType") == "Standalone"): + dbSettingChange() +elif systemconfig.get("SystemType") == "Master_backend": + dbSettingChange() -- cgit v0.12 From 4f938e227ac669190de7632fb064d01a892ac3ad Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 4 Sep 2012 19:58:34 -0500 Subject: LinHES-system: mythfrontend-start: revert fork of startcmd Forking startcmd causes MythWelcome to act on remote keypresses when mythfrontend-start quits. linhes-scripts: pause-mythcommflag.sh: only look for 1 instance of mythfrontend. refs #847 --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/mythfrontend-start | 4 ++-- abs/core/linhes-scripts/PKGBUILD | 8 ++++---- abs/core/linhes-scripts/limit-mythcommflag.sh | 4 ++-- abs/core/linhes-scripts/pause-mythcommflag.sh | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index b5f6ab3..6b33779 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=57 +pkgrel=58 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -68,7 +68,7 @@ md5sums=('d1a5963c5a440a608031c6d750232633' 'dc3eef2a624754e16805d72bbe488b67' 'dc0be354ce77ba2b89868fc29b942c43' '542e670e78d117657f93141e9689f54d' - 'ec975dd053ca28c2b537b027611993fe' + '41951459ea9d2b0567be521b67e6285a' 'ba351b92e69bcaf26a9bf80417b09c3c' '4545eb39213d40b5a2bdeda5e066cdc4' '962a3e9eaba2d1466251b7ab0956705d' diff --git a/abs/core/LinHES-system/mythfrontend-start b/abs/core/LinHES-system/mythfrontend-start index 9aac881..5cfc9b7 100755 --- a/abs/core/LinHES-system/mythfrontend-start +++ b/abs/core/LinHES-system/mythfrontend-start @@ -22,8 +22,8 @@ then mythvantage -Q "${question}" if [ $? = 16 ] then - $STARTCMD 2>&1 & + $STARTCMD 2>&1 fi else - $STARTCMD 2>&1 & + $STARTCMD 2>&1 fi diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 0dfb4e7..4ffdc6f 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=47 +pkgrel=48 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -59,7 +59,7 @@ build() { cd ${srcdir} install -d ${pkgdir}/usr/LH/bin install -d ${pkgdir}/usr/LH/etc - install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* pause_* LinHES* ${pkgdir}/usr/LH/bin/ + install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* LinHES* ${pkgdir}/usr/LH/bin/ install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/ mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run @@ -77,13 +77,13 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' 'f8df7665903ddf822f5148bc8a074e4a' '18263972b6326e140bbef0bb7dfa2da9' '410795ef9039e4c6c0484e706ecfd567' - '0750d7c65109d12aa536f312a38410d1' + 'ad98d51e79f83df7c03f828dbeaea7f4' 'ac2a4a6b4100f4d7bfb9ecd9356c8c6e' 'd2b475821f902c5e081e7da43a35e6ac' '95c092f67036a361ef7a57436f44332e' '565ebca7b88bcd083322b7324f8e56e5' '3b776bbff68906ddc2f62b7e0dde3fe4' - '15f3143d2b1369da431e4268029aba40' + 'a57641fb63d7bb6d92a438f1ea779a57' '3d0adf26280cde55a0c47188fff34826' '25dd5b8ec0482d561b481bfce051d648' 'b2c3dd48a4abb976eda2d5fbf22a173a' diff --git a/abs/core/linhes-scripts/limit-mythcommflag.sh b/abs/core/linhes-scripts/limit-mythcommflag.sh index 5cd81bb..63a2872 100755 --- a/abs/core/linhes-scripts/limit-mythcommflag.sh +++ b/abs/core/linhes-scripts/limit-mythcommflag.sh @@ -48,8 +48,8 @@ cpulimit_pid=0 while true; do PROCCOMMFLAG=`pidof mythcommflag` if [ -n "${PROCCOMMFLAG}" ]; then - BACKENDCPU=`top -bn1u mythtv | grep -m 1 mythbackend | awk '{ print $9 }'` - FRONTENDCPU=`top -bn1u mythtv | grep -m 1 mythfrontend | awk '{ print $9 }'` + BACKENDCPU=`top -bn1u mythtv | grep -m 1 'mythbackend ' | awk '{ print $9 }'` + FRONTENDCPU=`top -bn1u mythtv | grep -m 1 'mythfrontend ' | awk '{ print $9 }'` if [ "$FRONTENDCPU" = "" ]; then FRONTENDCPU=0 fi diff --git a/abs/core/linhes-scripts/pause-mythcommflag.sh b/abs/core/linhes-scripts/pause-mythcommflag.sh index 4da808b..1db6db6 100755 --- a/abs/core/linhes-scripts/pause-mythcommflag.sh +++ b/abs/core/linhes-scripts/pause-mythcommflag.sh @@ -29,7 +29,7 @@ while true; do PROCCOMMFLAG=`pidof mythcommflag` if [ -n "${PROCCOMMFLAG}" ] then - FRONTENDCPU=`top -bn1u mythtv | grep mythfrontend | awk '{ print $9 }'` + FRONTENDCPU=`top -bn1u mythtv | grep -m 1 'mythfrontend ' | awk '{ print $9 }'` if [ $COMMFLAGSTATE -eq 1 ] then CPUTHRESHOLD1=$CPUTHRESHOLD -- cgit v0.12 From e20ff8d0fd0fb85a3c74c856931d2396df0b9d5c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Sep 2012 11:00:39 -0500 Subject: LinHES-system: misc_which_recorder.pl: add search for analog mpeg recordings --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/misc_which_recorder.pl | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 6b33779..9112d73 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=58 +pkgrel=59 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -87,7 +87,7 @@ md5sums=('d1a5963c5a440a608031c6d750232633' '54ebcc024db2e0ebe8121305d8926767' '45f46d1f9193c8dde18e56369ec29a1e' 'a8edbe7bc37e9932e8749d9f5f89c16f' - '14cea9e87654441b766a97576233ba5a' + 'afd621cd8a8cf5fcff5d00b9f340a9a9' 'eb879fee9603a05d5420d4ce8ed9e450' 'f1870a9522c79e6b248fcbf81dec3280' '84492954db16740f949d795b74383189' diff --git a/abs/core/LinHES-system/misc_which_recorder.pl b/abs/core/LinHES-system/misc_which_recorder.pl index f8a1022..56d076c 100755 --- a/abs/core/LinHES-system/misc_which_recorder.pl +++ b/abs/core/LinHES-system/misc_which_recorder.pl @@ -60,7 +60,8 @@ while (<$fh>) { # Myth .24 regex to find start of recording # if (/^(.*)(?:\d(?: I )?|I.* -) (?:Started|Tuning) recording: (.*): channel (\d+) on cardid (\d+), sourceid (\d+)/) - if (/^(\d+-\d+-\d+T\d+\:\d+\:\d+)(?:.*) (?:Started|Tuning) recording: (.*): channel (\d+) on cardid (\d+), sourceid (\d+)/) +# Myth .25 regex to find start of recording for digital and analog MPEG + if (/^(\d+-\d+-\d+T\d+\:\d+\:\d+)(?:.*) (?:Started|Tuning) recording: (.*): channel (\d+) on cardid (\d+), sourceid (\d+)/ || /^(\d+-\d+-\d+T\d+\:\d+\:\d+)(?:.*) \(UpdateRecStatus\) Updating status for (.*)() on cardid (\d+) \(Will Record => Recording\)()/) { if ($mode eq "--noheader") { @@ -75,7 +76,8 @@ while (<$fh>) $index++; ($time, $title, $chanid, $cardid, $sourceid) = ($1, $2, $3, $4, $5); - $time = `date -d $time +%a' '%m/%d' '%H:%M' '%p`; + $time =~ s/T/ /; + $time = `date -d $time +%a' '%m/%d' '%l:%M' '%p`; chomp ($time); if (($title =~ /"?(.+)"?:"?(.*)"?/) || ($title =~ /(.+) "(.*)"/)) { -- cgit v0.12 From 5bc75e0637c516274b1ab88fa26de298a44a6009 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 12 Sep 2012 16:07:31 -0500 Subject: LinHES-system: misc_which_recorder.pl: forgot some quotes --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/misc_which_recorder.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 9112d73..686d3bc 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=59 +pkgrel=60 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -87,7 +87,7 @@ md5sums=('d1a5963c5a440a608031c6d750232633' '54ebcc024db2e0ebe8121305d8926767' '45f46d1f9193c8dde18e56369ec29a1e' 'a8edbe7bc37e9932e8749d9f5f89c16f' - 'afd621cd8a8cf5fcff5d00b9f340a9a9' + '116b0f62ed4e8dd6e437930deeb6e49e' 'eb879fee9603a05d5420d4ce8ed9e450' 'f1870a9522c79e6b248fcbf81dec3280' '84492954db16740f949d795b74383189' diff --git a/abs/core/LinHES-system/misc_which_recorder.pl b/abs/core/LinHES-system/misc_which_recorder.pl index 56d076c..6952b3f 100755 --- a/abs/core/LinHES-system/misc_which_recorder.pl +++ b/abs/core/LinHES-system/misc_which_recorder.pl @@ -76,7 +76,7 @@ while (<$fh>) $index++; ($time, $title, $chanid, $cardid, $sourceid) = ($1, $2, $3, $4, $5); - $time =~ s/T/ /; + $time =~ s/T/' '/; $time = `date -d $time +%a' '%m/%d' '%l:%M' '%p`; chomp ($time); if (($title =~ /"?(.+)"?:"?(.*)"?/) || ($title =~ /(.+) "(.*)"/)) -- cgit v0.12 From 027c37cc0adf68c10e68cf53aec856aea1680a7f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 18 Sep 2012 09:27:25 -0500 Subject: php: enable json in php.ini for MythWeb Program Guide --- abs/core/php/PKGBUILD | 4 ++-- abs/core/php/php.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD index 394f495..404edc0 100644 --- a/abs/core/php/PKGBUILD +++ b/abs/core/php/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=php pkgname=('php' 'php-cgi' 'php-pear') pkgver=5.3.3 -pkgrel=8 +pkgrel=9 _suhosinver=${pkgver}-0.9.10 pkgdesc='A high-level scripting language' arch=('i686' 'x86_64') @@ -183,5 +183,5 @@ package_php-pear() { } md5sums=('21ceeeb232813c10283a5ca1b4c87b48' 'b66b27c43b1332400ef8982944c3b95b' - '25bf81e701f7914a3d8472a5636640e7' + 'b210db564281600c42f8eaa264eac3a5' '96ca078be6729b665be8a865535a97bf') diff --git a/abs/core/php/php.ini b/abs/core/php/php.ini index 50413b9..3f70777 100644 --- a/abs/core/php/php.ini +++ b/abs/core/php/php.ini @@ -1266,7 +1266,7 @@ soap.wsdl_cache_ttl=86400 extension=gettext.so ;extension=iconv.so ;extension=imap.so -;extension=json.so +extension=json.so ;extension=ldap.so ;extension=mcrypt.so ;extension=mime_magic.so -- cgit v0.12 From 44e4acec5a35087de51e3c87a347ffea61fc2c74 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 18 Sep 2012 09:50:23 -0500 Subject: gnu-netcat: fix error on pkg install --- abs/extra/gnu-netcat/PKGBUILD | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/abs/extra/gnu-netcat/PKGBUILD b/abs/extra/gnu-netcat/PKGBUILD index 82c90f3..05411c4 100644 --- a/abs/extra/gnu-netcat/PKGBUILD +++ b/abs/extra/gnu-netcat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49781 2009-08-15 16:06:57Z jgc $ +# $Id$ # Maintainer: Tom K pkgname=gnu-netcat pkgver=0.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="GNU rewrite of netcat, the network piping application" depends=('glibc' 'texinfo') arch=('i686' 'x86_64') @@ -12,12 +12,16 @@ license=('GPL') replaces=('netcat') provides=('netcat') install=gnu-netcat.install -source=(http://internap.dl.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2) +source=("http://downloads.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2") md5sums=('0a29eff1736ddb5effd0b1ec1f6fe0ef') build() { cd "${srcdir}/netcat-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + make +} + +package() { + cd "${srcdir}/netcat-${pkgver}" + make DESTDIR="${pkgdir}" install } -- cgit v0.12 From 3df4252b00aca3d018cd3362ad2aab9b969d9e46 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 18 Sep 2012 10:24:15 -0500 Subject: linhes-scripts: idle.sh: Check if frontends are playing. closes #851. Add -d option that will include mythshutdown daily wake in system busy calculation. Default excludes daily wake in system busy calculation. This is needed to use idle.sh as the PreCheck for system shutdown. Add -w option to check for open windows. Before checking for windows was default but in some cases the user won't want the check. Adding window check as an option makes it consistant with the login check. --- abs/core/linhes-scripts/PKGBUILD | 6 ++-- abs/core/linhes-scripts/idle.sh | 63 ++++++++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 4ffdc6f..6f70ebe 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,12 +3,12 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=48 +pkgrel=49 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') depends=('xosd' 'cpulimit' 'screen' 'mencoder' 'tablet-encode' 'mplayer' - 'normalize' 'handbrake-cli' 'mkvtoolnix') + 'normalize' 'handbrake-cli' 'mkvtoolnix' 'gnu-netcat') url="http://linhes.org/" install="linhes-scripts.install" source=( @@ -85,7 +85,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '3b776bbff68906ddc2f62b7e0dde3fe4' 'a57641fb63d7bb6d92a438f1ea779a57' '3d0adf26280cde55a0c47188fff34826' - '25dd5b8ec0482d561b481bfce051d648' + '439026b38a9d3d27478078887639152b' 'b2c3dd48a4abb976eda2d5fbf22a173a' 'b527b01d119d3bc33b8fa69bdf1082bb' '9d077c24d102fa02e4f417d639d8b00a' diff --git a/abs/core/linhes-scripts/idle.sh b/abs/core/linhes-scripts/idle.sh index 70db6f0..7733b27 100755 --- a/abs/core/linhes-scripts/idle.sh +++ b/abs/core/linhes-scripts/idle.sh @@ -1,12 +1,14 @@ #!/bin/bash usage () { - echo "Usage: $0 [-h] [-s] [-t ] [-l] [-v]" + echo "Usage: $0 [-h] [-s] [-t ] [-l] [-w] [-d] [-v]" echo echo "-h - Print this help/usage message and quit" echo "-s - Run silently (default is verbose)" echo "-t - Minutes of idle time needed (default is 20)" echo "-l - Check for user logins (default: false - do not check)" + echo "-w - Check for open windows (default: false - do not check)" + echo "-d - Include mythshutdown daily wake in system busy (default: daily wake is system idle)" echo "-v - Be more verbose for debugging" echo echo "Silent mode is recommended for use in cron jobs or scripts." @@ -24,15 +26,19 @@ mysql_cmd () { # Command line argument handling VERBOSE=1 LOGINS=0 +WINDOWS=0 +DAILY=0 TIME_BEFORE=20 TIME_AFTER=5 # Only adjustable by editing here -while getopts "hslt:v" OPT ; do +while getopts "hslwdt:v" OPT ; do case $OPT in h) usage 0 ;; s) VERBOSE=0 ;; t) TIME_BEFORE=$OPTARG ;; l) LOGINS=1 ;; + w) WINDOWS=1 ;; + d) DAILY=1 ;; v) VERBOSE=2 ;; *) usage 1 ;; esac @@ -41,14 +47,17 @@ done shift $(($OPTIND - 1)) [ -n "$*" ] && usage 1 -msg "Checking what MythTV is doing now or plans within $TIME_BEFORE minutes..." +msg "Checking what MythTV is doing now or plans to within $TIME_BEFORE minutes..." msg /usr/bin/mythshutdown -s 1 BUSY="$?" msg "mythshutdown returned $BUSY" -# Ignore certain non-zero flag values -BUSY=$(($BUSY & 0x2F)) +if [ "$DAILY" -eq 0 ] ; then + msg " including daily wake (64) as system idle" + # Ignore certain non-zero flag values + BUSY=$(($BUSY & 0x2F)) +fi SCHEMALOCK=$(mysql_cmd "select count(*) from schemalock") msg "schemalock $SCHEMALOCK" @@ -95,24 +104,54 @@ if [ "$VERBOSE" -ge 2 ] ; then }' fi +# Check all frontends if they are playing +HOSTNAMES=$(mysql_cmd "select hostname from settings where value = 'FrontendIdleTimeout'") +PLAYING=0 +for HOST in $HOSTNAMES +do + if [ "$VERBOSE" -ge 2 ]; then + msg "Checking if $HOST is playing recordings or videos..." + fi +ncOUTPUT=$(nc $HOST 6546 << EOF +query location +quit +EOF +) + if [[ "$ncOUTPUT" == *"# Playback "* ]]; then + PLAYING=$(( $PLAYING + 1 )) + msg "$HOST is playing a recording or video" + else + msg "$HOST is NOT playing a recording or video" + fi +done + +# Check for users logged in if [ "$LOGINS" -ge 1 ] ; then USERS=`/usr/bin/last | /bin/grep "still logged in" | awk '{ print $1 }'` if [ -n "$USERS" ] ; then LOGINS=1 - msg "The following user(s) are still logged in: ${USERS}" + msg "The following user(s) are still logged in:" + msg "${USERS}" else LOGINS=0 - msg "No user(s) are logged in..." + msg "No users are logged in" fi fi # Check for open windows -/usr/LH/bin/xwin_find.sh -q '.*(mythtv@|xterm|Firefox|Namoroka|Opera).*' -WINDOWS="$?" -WINDOWS=$(($WINDOWS == 0)) -msg "windows $WINDOWS" +FOUNDWINDOWS=0 +if [ "$WINDOWS" -ge 1 ] ; then + /usr/LH/bin/xwin_find.sh -q '.*(mythtv@|xterm|Firefox|Namoroka|Opera|Chromium).*' + FOUNDWINDOWS="$?" + FOUNDWINDOWS=$(($FOUNDWINDOWS == 0)) + if [ "$FOUNDWINDOWS" -eq 0 ] ; then + msg "no application windows open" + else + msg "one or more application windows open" + fi +fi -activities=$(($BUSY + $SCHEMALOCK + $JOBS + $INUSE + $UPCOMING + $LOGINS + $WINDOWS)) +activities=$(($BUSY + $SCHEMALOCK + $JOBS + $INUSE + $UPCOMING + $PLAYING + $LOGINS + $FOUNDWINDOWS)) msg if [ "$activities" -eq 0 ] ; then msg "System is idle" -- cgit v0.12 From 4602b681336dd8fb41ecad73d836780d0da68850 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 18 Sep 2012 12:14:15 -0500 Subject: linhes-scripts: mythwelcome-config.py: use idle.sh for pre shutdown check. refs #851 --- abs/core/linhes-scripts/PKGBUILD | 4 ++-- abs/core/linhes-scripts/mythwelcome-config.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 6f70ebe..51f7a0b 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=49 +pkgrel=50 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -81,7 +81,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' 'ac2a4a6b4100f4d7bfb9ecd9356c8c6e' 'd2b475821f902c5e081e7da43a35e6ac' '95c092f67036a361ef7a57436f44332e' - '565ebca7b88bcd083322b7324f8e56e5' + '20ffe6edf6a0114237734baa0d2e84fd' '3b776bbff68906ddc2f62b7e0dde3fe4' 'a57641fb63d7bb6d92a438f1ea779a57' '3d0adf26280cde55a0c47188fff34826' diff --git a/abs/core/linhes-scripts/mythwelcome-config.py b/abs/core/linhes-scripts/mythwelcome-config.py index a8a8960..c0f442e 100755 --- a/abs/core/linhes-scripts/mythwelcome-config.py +++ b/abs/core/linhes-scripts/mythwelcome-config.py @@ -24,4 +24,4 @@ if mythdb.settings[localhostname].idleTimeoutSecs == u'0': mythdb.settings.NULL.WakeupTimeFormat = u'yyyy-MM-ddThh:mm:ss' mythdb.settings.NULL.SetWakeuptimeCommand = u'/usr/bin/mythshutdown --setwakeup $time' mythdb.settings.NULL.ServerHaltCommand = u'/usr/bin/mythshutdown --shutdown' -mythdb.settings.NULL.preSDWUCheckCommand = u'/usr/bin/mythshutdown --check' +mythdb.settings.NULL.preSDWUCheckCommand = u'/usr/LH/bin/idle.sh -s -d' -- cgit v0.12 From 4f80b9dc91ddf2133b9faeaec5c1ab00c03495f8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 20 Sep 2012 14:40:43 -0500 Subject: linhes-scripts: idle.sh: rework upcoming recordings to use misc_upcoming_recordings.pl as it is quicker. refs #851 change -d to -m as it includes more than just daily wake add -r to check if mythfrontend is running on the hosts mythwelcome-config.py: update preSDWUCheckCommand with new options --- abs/core/linhes-scripts/PKGBUILD | 6 +- abs/core/linhes-scripts/idle.sh | 81 +++++++++++---------------- abs/core/linhes-scripts/mythwelcome-config.py | 2 +- 3 files changed, 37 insertions(+), 52 deletions(-) diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 51f7a0b..1dfe1ed 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=50 +pkgrel=51 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -81,11 +81,11 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' 'ac2a4a6b4100f4d7bfb9ecd9356c8c6e' 'd2b475821f902c5e081e7da43a35e6ac' '95c092f67036a361ef7a57436f44332e' - '20ffe6edf6a0114237734baa0d2e84fd' + '92950f0ffb1faf1ed64c6be2b8fbc3f6' '3b776bbff68906ddc2f62b7e0dde3fe4' 'a57641fb63d7bb6d92a438f1ea779a57' '3d0adf26280cde55a0c47188fff34826' - '439026b38a9d3d27478078887639152b' + 'c3ada01d3a739abe3f920b02d4ea3f6e' 'b2c3dd48a4abb976eda2d5fbf22a173a' 'b527b01d119d3bc33b8fa69bdf1082bb' '9d077c24d102fa02e4f417d639d8b00a' diff --git a/abs/core/linhes-scripts/idle.sh b/abs/core/linhes-scripts/idle.sh index 7733b27..4f6174c 100755 --- a/abs/core/linhes-scripts/idle.sh +++ b/abs/core/linhes-scripts/idle.sh @@ -1,14 +1,16 @@ #!/bin/bash usage () { - echo "Usage: $0 [-h] [-s] [-t ] [-l] [-w] [-d] [-v]" + echo "Usage: $0 [-h] [-s] [-t ] [-l] [-w] [-m] [-r] [-v]" echo echo "-h - Print this help/usage message and quit" echo "-s - Run silently (default is verbose)" echo "-t - Minutes of idle time needed (default is 20)" echo "-l - Check for user logins (default: false - do not check)" echo "-w - Check for open windows (default: false - do not check)" - echo "-d - Include mythshutdown daily wake in system busy (default: daily wake is system idle)" + echo "-m - Include mythshutdown daily wake, locked, & about to start wake in system busy" + echo " (default: daily wake, locked & about to start wake is system idle)" + echo "-r - Check if mythfrontends are running (default: false - do not check)" echo "-v - Be more verbose for debugging" echo echo "Silent mode is recommended for use in cron jobs or scripts." @@ -28,17 +30,19 @@ VERBOSE=1 LOGINS=0 WINDOWS=0 DAILY=0 +RUNNING=0 TIME_BEFORE=20 TIME_AFTER=5 # Only adjustable by editing here -while getopts "hslwdt:v" OPT ; do +while getopts "hslwmrt:v" OPT ; do case $OPT in h) usage 0 ;; s) VERBOSE=0 ;; t) TIME_BEFORE=$OPTARG ;; l) LOGINS=1 ;; w) WINDOWS=1 ;; - d) DAILY=1 ;; + m) DAILY=1 ;; + r) RUNNING=1 ;; v) VERBOSE=2 ;; *) usage 1 ;; esac @@ -50,13 +54,14 @@ shift $(($OPTIND - 1)) msg "Checking what MythTV is doing now or plans to within $TIME_BEFORE minutes..." msg -/usr/bin/mythshutdown -s 1 +/usr/bin/mythshutdown --status BUSY="$?" msg "mythshutdown returned $BUSY" if [ "$DAILY" -eq 0 ] ; then - msg " including daily wake (64) as system idle" - # Ignore certain non-zero flag values + msg " including daily wake, locked, and about to start wake as system idle" + # Ignore daily wake, locked and about to start wake flag values BUSY=$(($BUSY & 0x2F)) + msg " mythshutdown returned $BUSY" fi SCHEMALOCK=$(mysql_cmd "select count(*) from schemalock") @@ -68,60 +73,40 @@ msg "running jobs $JOBS" INUSE=$(mysql_cmd "select count(*) from inuseprograms") msg "inuse programs $INUSE" -POTENTIAL=$(mysql_cmd "select count(*) from recordmatch as rm, program as p - where rm.chanid = p.chanid and rm.starttime = p.starttime - and rm.starttime < now() + interval $TIME_BEFORE minute - and now() < p.endtime + interval $TIME_AFTER minute") -msg "potential recordings $POTENTIAL" -# See if any of the potential upcoming recordings are real. -# This is ugly, but only the backend knows what programs it really -# plans to record or ignore, so we can't just check the DB. :-( -if [ "$VERBOSE" -ge 2 ] ; then - mysql_cmd "select p.starttime, p.endtime, p.title, subtitle - from recordmatch as rm, program as p - where rm.chanid = p.chanid and rm.starttime = p.starttime - and rm.starttime < now() + interval $TIME_BEFORE minute - and now() < p.endtime + interval $TIME_AFTER minute - order by p.starttime, p.endtime" -fi -UPCOMING=$(/usr/bin/mythbackend --printsched 2>&1 | - /bin/awk -v potential=$POTENTIAL ' - BEGIN {item=-1;real=0} - /--- print list start ---/,/--- print list end ---/ { - if (item>0 && item<=potential && substr($0,70,1) ~ "[0-9]") real+=1; - item += 1; - } - END {print real} -') +UPCOMING=$(timeout 3 misc_upcoming_recordings.pl --plain_text --text_format "%rs " --heading "" --minutes $TIME_BEFORE --recordings -1 | wc -w) msg "planned recordings $UPCOMING" if [ "$VERBOSE" -ge 2 ] ; then - /usr/bin/mythbackend --printsched 2>&1 | - /bin/awk -v potential=$POTENTIAL ' - BEGIN {item=-1} - /--- print list start ---/,/--- print list end ---/ { - if (item>0 && item<=potential) print $0; - item += 1; - }' + msg + timeout 3 /usr/LH/bin/misc_upcoming_recordings.pl --plain_text --minutes $TIME_BEFORE --recordings -1 fi -# Check all frontends if they are playing +# Check all host's mythfrontends if they are running and playing HOSTNAMES=$(mysql_cmd "select hostname from settings where value = 'FrontendIdleTimeout'") +FERUNNING=0 PLAYING=0 for HOST in $HOSTNAMES do if [ "$VERBOSE" -ge 2 ]; then - msg "Checking if $HOST is playing recordings or videos..." + msg "Checking $HOST's mythfrontend status..." fi -ncOUTPUT=$(nc $HOST 6546 << EOF +ncOUTPUT=$(timeout 2 nc $HOST 6546 << EOF query location quit EOF ) + if [ "$RUNNING" -ge 1 ] ; then + if [[ "$ncOUTPUT" == *"# "* ]]; then + FERUNNING=$(( $FERUNNING + 1 )) + msg "$HOST's mythfrontend is running $FERUNNING" + else + msg "$HOST's mythfrontend is NOT running $FERUNNING" + fi + fi if [[ "$ncOUTPUT" == *"# Playback "* ]]; then PLAYING=$(( $PLAYING + 1 )) - msg "$HOST is playing a recording or video" + msg "$HOST is playing a recording or video $PLAYING" else - msg "$HOST is NOT playing a recording or video" + msg "$HOST is NOT playing a recording or video $PLAYING" fi done @@ -134,7 +119,7 @@ if [ "$LOGINS" -ge 1 ] ; then msg "${USERS}" else LOGINS=0 - msg "No users are logged in" + msg "No users are logged in $LOGINS" fi fi @@ -145,13 +130,13 @@ if [ "$WINDOWS" -ge 1 ] ; then FOUNDWINDOWS="$?" FOUNDWINDOWS=$(($FOUNDWINDOWS == 0)) if [ "$FOUNDWINDOWS" -eq 0 ] ; then - msg "no application windows open" + msg "no application windows open $FOUNDWINDOWS" else - msg "one or more application windows open" + msg "one or more application windows open $FOUNDWINDOWS" fi fi -activities=$(($BUSY + $SCHEMALOCK + $JOBS + $INUSE + $UPCOMING + $PLAYING + $LOGINS + $FOUNDWINDOWS)) +activities=$(($BUSY + $SCHEMALOCK + $JOBS + $INUSE + $UPCOMING + $FERUNNING + $PLAYING + $LOGINS + $FOUNDWINDOWS)) msg if [ "$activities" -eq 0 ] ; then msg "System is idle" diff --git a/abs/core/linhes-scripts/mythwelcome-config.py b/abs/core/linhes-scripts/mythwelcome-config.py index c0f442e..5ab24b0 100755 --- a/abs/core/linhes-scripts/mythwelcome-config.py +++ b/abs/core/linhes-scripts/mythwelcome-config.py @@ -24,4 +24,4 @@ if mythdb.settings[localhostname].idleTimeoutSecs == u'0': mythdb.settings.NULL.WakeupTimeFormat = u'yyyy-MM-ddThh:mm:ss' mythdb.settings.NULL.SetWakeuptimeCommand = u'/usr/bin/mythshutdown --setwakeup $time' mythdb.settings.NULL.ServerHaltCommand = u'/usr/bin/mythshutdown --shutdown' -mythdb.settings.NULL.preSDWUCheckCommand = u'/usr/LH/bin/idle.sh -s -d' +mythdb.settings.NULL.preSDWUCheckCommand = u'/usr/LH/bin/idle.sh -s -m -r' -- cgit v0.12