summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Frost <gregfrost1@bigpond.com>2009-08-05 23:49:42 (GMT)
committerGreg Frost <gregfrost1@bigpond.com>2009-08-05 23:49:42 (GMT)
commit36bd4717729470fa0d81b9320e453251b5deab79 (patch)
treee052d8d27aab351b1d6c4e5604b7f62669dad634
parente7ca4c28bfc6c8084dab195bea3bd408966859d8 (diff)
parent45d7a211c489481f16ba149c0ec849a089c80641 (diff)
downloadlinhes_pkgbuild-36bd4717729470fa0d81b9320e453251b5deab79.zip
linhes_pkgbuild-36bd4717729470fa0d81b9320e453251b5deab79.tar.gz
linhes_pkgbuild-36bd4717729470fa0d81b9320e453251b5deab79.tar.bz2
Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD
-rw-r--r--abs/core-testing/LinHES-system/LinHES-run22
-rw-r--r--abs/core-testing/LinHES-system/PKGBUILD2
-rw-r--r--abs/core-testing/tweaker/PKGBUILD2
-rwxr-xr-xabs/core-testing/tweaker/bin/twk_audio_RP.pl312
-rwxr-xr-xabs/core-testing/tweaker/bin/twk_dragon.pl3
5 files changed, 27 insertions, 314 deletions
diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run
index 9e975ac..640b2f3 100644
--- a/abs/core-testing/LinHES-system/LinHES-run
+++ b/abs/core-testing/LinHES-system/LinHES-run
@@ -26,13 +26,35 @@ then
echo "Alt+h for help" | osd_cat --font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" --shadow=3 --pos=middle --align=centre --offset=200 --color=yellow --delay=5 &
fi
+# Run any scripting that applies to special hardware. These brand-specific commands that run
+# after Tweaker will, of course, override generic or hardware-specific settings.
+SpecialHardwareCommands() {
+ special_hardware_file=/myth/.special_hardware_type
+ special_hardware=`cat $special_hardware_file`
+
+ case $special_hardware in
+ dragon*)
+ sudo -E twk_audio.pl --implement digital
+ sudo -E twk_dragon.pl --implement all
+ ;;
+ ausdragon*)
+ ;;
+ *)
+ # there are no brand-specific commands for configuring whatever
+ # special hardware the user chose
+ ;;
+ esac
+}
if [ ! $SystemType = "Frontend_only" ]
then
if [ -f ~/.configure ]
then
+ # Run Tweaker, which applies generic and hardware-specific settings
sudo -E tweaker.pl
/bin/rm /tmp/fps # ??? clean up a temp file that will eventually be obsolete anyway
+ # Run any brand-specific commands, if necessary.
+ SpecialHardwareCommands
sudo sv stop mythbackend
xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
sudo sv start mythbackend
diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD
index 2920d11..96a8b5e 100644
--- a/abs/core-testing/LinHES-system/PKGBUILD
+++ b/abs/core-testing/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=1.0
-pkgrel=56
+pkgrel=59
arch=('i686')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
diff --git a/abs/core-testing/tweaker/PKGBUILD b/abs/core-testing/tweaker/PKGBUILD
index 662ee75..0ea973e 100644
--- a/abs/core-testing/tweaker/PKGBUILD
+++ b/abs/core-testing/tweaker/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=tweaker
pkgver=1
-pkgrel=50
+pkgrel=51
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_audio_RP.pl b/abs/core-testing/tweaker/bin/twk_audio_RP.pl
deleted file mode 100755
index 9d06493..0000000
--- a/abs/core-testing/tweaker/bin/twk_audio_RP.pl
+++ /dev/null
@@ -1,312 +0,0 @@
-#!/usr/bin/perl -w
-
-# Copyright 2007-2009 Robert ("Bob") Igo of StormLogic, LLC and mythic.tv.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-use Switch;
-use Tweaker::Script;
-package Tweaker::Script;
-
-set_known_options( 'analogstereo', 'analogsurround', 'digital' );
-
-# Poll the system to find the digital output device.
-sub poll_for_digital_output_device {
- my $card=-1;
- my $device=-1;
- my $poll_command = "aplay -l | grep card";
-
- my @digital_matches = ( "digital", "IEC958" );
-
- my $results = execute_shell_command($poll_command);
- if ($results) {
- foreach my $digital_match (@digital_matches) {
- if ($results =~ /card (\d):.*device (\d).*$digital_match.*/i) {
- $card = $1;
- $device = $2;
- }
- }
- } else {
- recommendation_level("not available", "No audio devices detected.");
- exit(-1);
- }
- return ($card, $device);
-}
-
-# Try to implement the given option.
-sub implement_option {
- my($option) = @_;
- use vars qw($card);
- use vars qw($device);
- ($card, $device) = poll_for_digital_output_device;
- use vars qw($asound_conf);
- $asound_conf = "/etc/asound.conf";
- use vars qw($mplayer_conf);
- $mplayer_conf = "/etc/mplayer/mplayer.conf";
- use vars qw($xine_conf);
- $xine_conf = "/home/mythtv/.xine/config";
-
- sub generate_asound_conf {
- my($option) = @_;
- my $command1;
- my $command2;
-
- switch ($option) {
- case "analogstereo" {
- # Analog stereo usually needs no asound.conf, but sometimes it needs to be there to
- # support more than one app using sound simultaneously.
- $command1 = "[ -e $asound_conf ] && /bin/cp $asound_conf $asound_conf-TWEAKERBACKUP";
- # Assumption: The proper analog device is always device 0.
- if ($card >= 0) {
- $command2 = "[ -e $asound_conf ] && sed -i 's/hw:.,./hw:$card,0/g' $asound_conf";
- } else {
- $command2 = "[ -e $asound_conf ] && sed -i 's/hw:.,./hw:0,0/g' $asound_conf";
- }
- }
- case "analogsurround" {
- # Not supported yet.
- }
- case "digital" {
- # Digital audio starts with an asound.conf that references the
- # hardware address on the sound device corresponding to digital
- # output.
- $command1 = "/bin/cp \$TWEAKER_ROOT/fs$asound_conf /etc/";
- if (($card >= 0) && ($device >= 0)) {
- $command2 = "[ -e $asound_conf ] && sed -i 's/hw:.,./hw:$card,$device/g' $asound_conf";
- } else {
- my $logger = get_logger('tweaker.script');
- $logger->error("ERROR: Unable to poll for digital sound output device.");
- exit(-1);
- }
- }
- }
- if (my $error = execute_shell_command($command1)) {
- my $logger = get_logger('tweaker.script');
- $logger->error("ERROR: $error");
- $logger->error("ERROR: Unable to implement option $option.");
- exit(-1);
- }
- if (my $error = execute_shell_command($command2)) {
- my $logger = get_logger('tweaker.script');
- $logger->error("ERROR: $error");
- $logger->error("ERROR: Unable to implement option $option.");
- exit(-1);
- }
- my $logger = get_logger('tweaker.script');
- $logger->info("Generated $asound_conf for $option audio.");
- }
-
- sub edit_mplayer_conf {
- my($option) = @_;
- # delete any old entries that Tweaker made, relevant to this particular edit
- my $delete_old_tweaker_edits = "[ -e $mplayer_conf ] && sed -i '/^.*a[o,c].*=.*#TWEAKER/d' $mplayer_conf";
- # comment out old entries that some other process may have made
- my $comment_out_external_edits = "[ -e $mplayer_conf ] && sed -i 's/^\\(a[o,c].*=.*\\)/#\\1/g' $mplayer_conf";
- my $command1;
- my $command2="";
- my $logger = get_logger('tweaker.script');
-
- if (my $error = execute_shell_command("$delete_old_tweaker_edits && $comment_out_external_edits")) {
- $logger->error("ERROR: $error");
- $logger->error("ERROR: Unable to implement option $option.");
- exit(-1);
- }
-
- switch($option) {
- case "analogstereo" {
- # No additional work needed; the above commands comment out ao and ac entries,
- # leaving a baseline which works with analog stereo.
- }
- case "analogsurround" {
- # Not supported yet.
- }
- case "digital" {
- $command2 = "echo -e 'ac=hwac3,hwdts, #TWEAKER\nao=oss:/dev/adsp #TWEAKER' >> $mplayer_conf";
- if (my $error = execute_shell_command($command2)) {
- $logger->error("ERROR: $error");
- $logger->error("ERROR: Unable to implement option $option.");
- exit(-1);
- }
- }
- }
- $logger->info("Edited $mplayer_conf for $option audio.");
- }
-
- sub edit_xine_conf {
- my($option)=@_;
- # delete any old entries that Tweaker made, relevant to this particular edit
- my $delete_old_tweaker_edits = "[ -e $xine_conf ] && sed -i -e '/^.*audio.output.speaker_arrangement.*#TWEAKER/d' -e '/^.*audio.synchronization.passthrough_offset.*#TWEAKER/d' $xine_conf";
- # comment out entries that some other process may have made
- my $comment_out_external_edits = "[ -e $xine_conf ] && sed -i -e 's/^\\(audio.output.speaker_arrangement.*\\)/#\\1/g' -e 's/^\\(audio.synchronization.passthrough_offset.*\\)/#\\1/g' $xine_conf";
- my $logger = get_logger('tweaker.script');
-
- if (my $error = execute_shell_command("$delete_old_tweaker_edits && $comment_out_external_edits")) {
- $logger->error("ERROR: $error");
- $logger->error("ERROR: Unable to implement option $option.");
- exit(-1);
- }
-
- my $command1;
-
- switch($option) {
- case "analogstereo" {
- $command1 = "echo 'audio.output.speaker_arrangement:Stereo 2.0 #TWEAKER' >> $xine_conf";
- }
- case "analogsurround" {
- # Not supported yet.
- }
- case "digital" {
- $command1 = "echo -e 'audio.output.speaker_arrangement:Pass Through #TWEAKER\naudio.synchronization.passthrough_offset:$device #TWEAKER' >> $xine_conf";
- }
- }
- if (my $error = execute_shell_command($command1)) {
- $logger->error("ERROR: $error");
- $logger->error("ERROR: Unable to implement option $option.");
- exit(-1);
- }
- $logger->info("Edited $xine_conf for $option audio.");
- }
-
- sub reload_modules {
- my($option) = @_;
- my $command = "update-modules; depmod -a; rmmod snd-pcm-oss; modprobe snd-pcm-oss";
- my $logger = get_logger('tweaker.script');
-
- if (my $error = execute_shell_command($command)) {
- $logger->error("ERROR: $error");
- $logger->error("ERROR: Unable to implement option $option.");
- exit(-1);
- }
- $logger->info("Reloaded sound modules for $option audio.");
- }
-
- sub set_mixer_values {
- my($option) = @_;
- my $command = "aumix -v 70 -m 0 -l 0 -l R -w 70";
- my $logger = get_logger('tweaker.script');
-
- if (my $error = execute_shell_command($command)) {
- $logger->error("ERROR: $error");
- $logger->error("ERROR: Unable to implement option $option.");
- exit(-1);
- }
- $logger->info("Reset mixer volume levels for $option audio.");
- }
-
- sub edit_mythtv_configuration {
- my($option)=@_;
-
- $dbconnectionstring = get_mythtv_connection_string();
-
- if (connect_to_db("DBI:mysql:$dbconnectionstring")) {
- switch ($option) {
- case "analogstereo" {
- change_or_make_setting('AudioOutputDevice', '/dev/dsp') || exit -1;
- change_or_make_setting('AC3PassThru', '0') || exit -1;
- change_or_make_setting('DTSPassThru', '0') || exit -1;
- change_or_make_setting('MTDac3Flag', '0') || exit -1;
-
- }
- case "analogsurround" {
- # Not supported yet.
- }
- case "digital" {
- change_or_make_setting('AudioOutputDevice', '/dev/adsp') || exit -1;
- change_or_make_setting('AC3PassThru', '1') || exit -1;
- change_or_make_setting('DTSPassThru', '1') || exit -1;
- change_or_make_setting('MTDac3Flag', '1') || exit -1;
- }
- }
- change_or_make_setting('MusicAudioDevice', 'default') || exit -1;
- change_or_make_setting('MythControlsVolume', '0') || exit -1;
- } else {
- exit -1;
- }
- disconnect_from_db();
- }
-
- generate_asound_conf($option);
- edit_mplayer_conf($option);
- edit_xine_conf($option);
- reload_modules($option);
- set_mixer_values($option);
- edit_mythtv_configuration($option);
-}
-
-# Try to get a Recommendation Level for $option.
-sub poll_options {
- my($option) = @_;
- my @digital_audio_device_patterns = (
- [
- [ ".*0401.*1412.*1724.*1412.*1724" ], # Pattern matches for PCI IDs of perfect devices, comma-separated within the brackets
- "optional|Your sound device works very well in digital mode. Unless you don't have a receiver that can accept digital inputs, you should use digital mode.",
- ],
- [
- [ ".*0403.*8086.*284b.*8086.*2504" ], # Pattern matches for PCI IDs of suboptimal devices, comma-separated within the brackets
- "inadvisable|Your sound device is known to have some problems in digital mode, but you may try it if you like, starting at low volume in your receiver.",
- ],
- [
- [ ], # Leave blank for unknown devices
- "optional|Your sound device may or may not work well in digital mode. Please tell us if it works, and how well.",
- ]
- );
-
- switch ($option) {
- case "analogstereo" {
- my ($card, $device) = poll_for_digital_output_device;
- if (($card >= 0) && ($device >= 0)) { # A digital output device was detected.
- recommendation_level("optional");
- } else {
- recommendation_level("recommended", "You seem to have no digital output option. If this is not true, please tell us.");
- }
- }
- case "analogsurround" {
- recommendation_level("unsupported", "No configuration data exists yet for this option.");
- }
- case "digital" {
- my ($card, $device) = poll_for_digital_output_device;
- if (($card >= 0) && ($device >= 0)) { # A digital output device was detected.
- my $recommendation_return_string;
- foreach my $pattern_and_recommendation_pairing (@digital_audio_device_patterns) {
- $recommendation_return_string=@$pattern_and_recommendation_pairing[1];
- foreach my $patterns (@$pattern_and_recommendation_pairing[0]) {
- foreach my $pattern (@$patterns) {
- if (execute_shell_command('lspci -mn | grep -e "'.$pattern.'"')) {
- recommendation_level($recommendation_return_string);
- return;
- }
- }
- }
- }
- # Because we didn't return a recommendation level above, return a default recommendation level.
- recommendation_level($recommendation_return_string);
- return;
- } else { # No digital output device was detected.
- recommendation_level("not available");
- }
- }
- }
-}
-
-# Unimplemented in 0.7
-sub check_option {
- help;
-}
-
-# Unimplemented in 0.7
-sub count_iterations {
- help;
-}
-
-process_parameters;
diff --git a/abs/core-testing/tweaker/bin/twk_dragon.pl b/abs/core-testing/tweaker/bin/twk_dragon.pl
index be94988..1234f90 100755
--- a/abs/core-testing/tweaker/bin/twk_dragon.pl
+++ b/abs/core-testing/tweaker/bin/twk_dragon.pl
@@ -34,6 +34,9 @@ sub implement_option {
# 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;
+
+ # Use the most beautiful theme
+ change_or_make_setting('Theme', 'blootubelite-wide') || exit -1;
} else {
my $logger = get_logger('tweaker.script');
$logger->error("ERROR: Unable to connect to mythconverg database");