summaryrefslogtreecommitdiffstats
path: root/abs/core-testing
diff options
context:
space:
mode:
authorGreg Frost <gregfrost1@bigpond.com>2009-08-05 00:50:18 (GMT)
committerGreg Frost <gregfrost1@bigpond.com>2009-08-05 00:50:18 (GMT)
commit7498f1694307afbd9eaf8f250c93d39ed6f0f71a (patch)
tree609d5266664da0a26fe4111733368965f33f1280 /abs/core-testing
parent4216c43fb3c06eb4b4c65c044e8342d1e7672199 (diff)
parent867ad7675df57b474c20137505d49b7c75dd4df3 (diff)
downloadlinhes_pkgbuild-7498f1694307afbd9eaf8f250c93d39ed6f0f71a.zip
linhes_pkgbuild-7498f1694307afbd9eaf8f250c93d39ed6f0f71a.tar.gz
linhes_pkgbuild-7498f1694307afbd9eaf8f250c93d39ed6f0f71a.tar.bz2
Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing')
-rw-r--r--abs/core-testing/LinHES-system/LinHES-run48
-rw-r--r--abs/core-testing/gtk2/PKGBUILD2
-rw-r--r--abs/core-testing/linhes-scripts/PKGBUILD2
-rw-r--r--abs/core-testing/tweaker/PKGBUILD2
-rwxr-xr-xabs/core-testing/tweaker/bin/twk_dragon.pl4
-rw-r--r--abs/core-testing/v4l-dvb/PKGBUILD2
6 files changed, 28 insertions, 32 deletions
diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run
index 776bdc4..9e975ac 100644
--- a/abs/core-testing/LinHES-system/LinHES-run
+++ b/abs/core-testing/LinHES-system/LinHES-run
@@ -10,10 +10,10 @@ xdotool mousemove -10 -10
/usr/X11R6/bin/unclutter -root -idle 1 -jitter 200 -noevents &
if [ x"$Screensavertype" = "xgscreensaver" ]
then
- gnome-screensaver &
+ gnome-screensaver &
elif [ x"$Screensavertype" = "xxscreensaver" ]
then
- xscreensaver -no-splash &
+ xscreensaver -no-splash &
fi
/usr/bin/xvattr -a XV_COLORKEY -v 0
@@ -29,45 +29,45 @@ fi
if [ ! $SystemType = "Frontend_only" ]
then
- if [ -f ~/.configure ]
- then
+ if [ -f ~/.configure ]
+ then
sudo -E tweaker.pl
/bin/rm /tmp/fps # ??? clean up a temp file that will eventually be obsolete anyway
sudo sv stop mythbackend
xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
sudo sv start mythbackend
- sudo chown -R mythtv.mythtv /home/mythtv
+ sudo chown -R mythtv.mythtv /home/mythtv
nice -n 19 mythfilldatabase --quiet &
rm ~/.configure
- fi
+ fi
fi
if [ x"$UseMythWelcome" = "x1" ]
then
- STARTCMD="/usr/bin/mythwelcome"
+ STARTCMD="/usr/bin/mythwelcome"
else
- STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log"
+ STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log"
fi
echo "====================================================================="
echo "Starting $STARTCMD"
firstboot.sh &
- if [ -f /tmp/nomfe ]
- then
- exit 0
- else
- if [ -f /tmp/debug ]
- then
- echo "using gbd/debug"
- gdb /usr/bin/mythfrontend -x $MV_ROOT/mfegdbcommands.txt
- mv gdb.txt gdb.txt.mythfrontend
- sleep 10
- else
- killall -9 irexec
- /usr/bin/irexec -d
- $STARTCMD 2>&1
- fi
- fi
+if [ -f /tmp/nomfe ]
+then
+ exit 0
+else
+ if [ -f /tmp/debug ]
+ then
+ echo "using gbd/debug"
+ gdb /usr/bin/mythfrontend -x $MV_ROOT/mfegdbcommands.txt
+ mv gdb.txt gdb.txt.mythfrontend
+ sleep 10
+ else
+ killall -9 irexec
+ /usr/bin/irexec -d
+ $STARTCMD 2>&1
+ fi
+fi
diff --git a/abs/core-testing/gtk2/PKGBUILD b/abs/core-testing/gtk2/PKGBUILD
index 4279aee..6cdc6e1 100644
--- a/abs/core-testing/gtk2/PKGBUILD
+++ b/abs/core-testing/gtk2/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=gtk2
pkgver=2.16.1
-pkgrel=5
+pkgrel=6
pkgdesc="The GTK+ Toolkit (v2)"
arch=(i686 x86_64)
url="http://www.gtk.org/"
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 01f4291..a2adaa5 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=1
-pkgrel=18
+pkgrel=19
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
diff --git a/abs/core-testing/tweaker/PKGBUILD b/abs/core-testing/tweaker/PKGBUILD
index 75c893a..662ee75 100644
--- a/abs/core-testing/tweaker/PKGBUILD
+++ b/abs/core-testing/tweaker/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=tweaker
pkgver=1
-pkgrel=49
+pkgrel=50
pkgdesc="applies tweaks to the baseline configuration and attempts to optimize settings for the hardware it finds"
arch=('i686' 'x86_64')
diff --git a/abs/core-testing/tweaker/bin/twk_dragon.pl b/abs/core-testing/tweaker/bin/twk_dragon.pl
index 314c299..be94988 100755
--- a/abs/core-testing/tweaker/bin/twk_dragon.pl
+++ b/abs/core-testing/tweaker/bin/twk_dragon.pl
@@ -31,10 +31,6 @@ sub implement_option {
$dbconnectionstring = get_mythtv_connection_string();
if (connect_to_db("DBI:mysql:$dbconnectionstring")) {
- # Overrides SQL changes made in twk_general.pl
- change_or_make_setting('mythdvd.DVDPlayerCommand', 'mplayer dvd:\/\/ -dvd-device %d -fs -zoom -vc mpeg12,ffmpeg12-vo xv -vf pp=lb') || return -1;
- change_or_make_setting('VCDPlayerCommand', 'mplayer vcd:\/\/ -cdrom-device %d -fs -zoom -vo xv -vf pp=lb') || return -1;
-
# Overrides SQL changes made in twk_tuners.pl
# WARNING: Very big harccoded hack that chooses ATSC tuning over QAM.
do_query("UPDATE cardinput SET sourceid='10' WHERE sourceid='20'") || return -1;
diff --git a/abs/core-testing/v4l-dvb/PKGBUILD b/abs/core-testing/v4l-dvb/PKGBUILD
index 03508eb..21c82e4 100644
--- a/abs/core-testing/v4l-dvb/PKGBUILD
+++ b/abs/core-testing/v4l-dvb/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=v4l-dvb
_kernver=2.6.28-LinHES
pkgver=1
-pkgrel=9
+pkgrel=10
pkgdesc="V4L-DVB drivers from mercurial"
arch=('i686' 'x86_64')
license=('GPL2')