Revision: 5813 Author: pebender Date: Tue Nov 10 21:37:09 2009 Log: - Modified how MM_HULU_URL and MM_FLASH_URL are defaulted.
http://code.google.com/p/minimyth/source/detail?r=5813 Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html /trunk/gar-minimyth/html/minimyth/index.html /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_FLASH.pm /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HULU.pm /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/flash.pm /trunk/gar-minimyth/script/minimyth.conf.mk ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Nov 10 21:00:46 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Nov 10 21:37:09 2009 @@ -24,6 +24,7 @@ - Separated D-Bus init from GTK init. - Added MM_BLUETOOTH_DEVICE_LIST for specifying the Bluetooth devices to init. + - Modified how MM_HULU_URL and MM_FLASH_URL are defaulted. Improved MythV slave backend support - Added firmware autodetection for the Hauppauge WinTV-HVR-2200 and ======================================= --- /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Thu Nov 5 18:59:16 2009 +++ /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Tue Nov 10 21:37:09 2009 @@ -1820,13 +1820,18 @@ '/usr/lib/browser/plugins/libflashplayer.so'. </p> <p> - If the value is 'auto', + Usually, if the value is 'auto', then MiniMyth will assume that the file is a shared library file located in the MiniMyth read-write configuration directory and having the name 'libflashplayer.{arch}.so', where {arch} is 32 or 64. That is, MiniMyth will assume MM_FLASH_URL='confrw:libflashplayer.32.so' when compiled for a 32-bit architecture and MM_FLASH_URL='confrw:libflashplayer.64.so' when compiled for a 64-bit architecture. + However, as only MythBrowser and Hulu Desktop use Adobe Flash Player, + if the value is 'auto', + <a href="#MM_PLUGIN_BROWSER_ENABLED">MM_PLUGIN_BROWSER_ENABLED</a>='no' and + <a href="#MM_HULU_URL">MM_HULU_URL</a>='none', + then MiniMyth will assume that the value is 'none'. </p> <p> The Myth frontend menus contain the 'MiniMyth Tools' menu @@ -1898,8 +1903,7 @@ '/usr/bin/huludesktop'. </p> <p> - If the value is 'auto' and - <a href="MM_FLASH_URL">'MM_FLASH_URL'</a> is not 'none', + If the value is 'auto', then MiniMyth will assume that the file is an executable file located in the MiniMyth read-write configuration directory and having the name 'huludesktop.{arch}', where {arch} is 32 or 64. @@ -2482,7 +2486,6 @@ <dd> <p> The list of Bluetooth host controller interface devices to be configured. - Valid values are / Valid values are the Bluetooth devices in directory '/sys/class/bluetooth', 'none' and 'auto', with 'auto' the default. </p> @@ -3474,7 +3477,7 @@ alt="Valid CSS!" height="31" width="88" /></a> </div> <div class="version"> - Last Updated on 2009-11-05 + Last Updated on 2009-11-10 <br /> < mailto : webmaster at minimyth dot org > </div> ======================================= --- /trunk/gar-minimyth/html/minimyth/index.html Tue Nov 10 21:01:33 2009 +++ /trunk/gar-minimyth/html/minimyth/index.html Tue Nov 10 21:37:09 2009 @@ -28,27 +28,27 @@ <div class="heading">Upgrading</div> <p> If you are upgrading to a new version of MythTV (e.g. from 0.21 to 0.22), please do the following: - <ol> - <li> - Read and follow the instructions in the - "<a href="http://www.gossamer-threads.com/lists/mythtv/users/405443";>warning before upgrading</a>" - thread, and - </li> - <li> - Upgrade MiniMyth in two steps: - <ol> - <li> - upgrade to the latest MiniMyth containing the same MythTV version (e.g. MiniMyth 0.21.0-72) - and test for any problems, and - </li> - <li> - upgrade to the latest MiniMyth containing the new MythTV version (e.g. MiniMyth 0.22.0-72) and - test for any problems. - </li> - </ol> - </li> - <ol> </p> + <ol> + <li> + Read and follow the instructions in the + "<a href="http://www.gossamer-threads.com/lists/mythtv/users/405443";>warning before upgrading</a>" + thread, and + </li> + <li> + Upgrade MiniMyth in two steps: + <ol> + <li> + upgrade to the latest MiniMyth containing the same MythTV version (e.g. MiniMyth 0.21.0-72) + and test for any problems, and + </li> + <li> + upgrade to the latest MiniMyth containing the new MythTV version (e.g. MiniMyth 0.22.0-72) and + test for any problems. + </li> + </ol> + </li> + </ol> </div> <div class="section"> <div class="heading">Overview</div> ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_FLASH.pm Fri Oct 9 13:44:36 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_FLASH.pm Tue Nov 10 21:37:09 2009 @@ -15,7 +15,7 @@ $var_list{'MM_FLASH_URL'} = { - prerequisite => ['MM_PLUGIN_BROWSER_ENABLED'], + prerequisite => ['MM_HULU_URL', 'MM_PLUGIN_BROWSER_ENABLED'], value_default => 'auto', value_valid => 'auto|none|((cifs|confro|confrw|dist|file|http|hunt| nfs| tftp):(//(([^:@]*)?(:([...@]*))?\@)?([^/]+))?[^?#]*(\?([^#]*))?(\#(.*))?)', value_auto => sub @@ -25,15 +25,13 @@ my $value_auto = 'none'; - if ($minimyth->var_get('MM_PLUGIN_BROWSER_ENABLED') eq 'yes') + if (($minimyth->var_get('MM_HULU_URL') ne '') || + ($minimyth->var_get('MM_PLUGIN_BROWSER_ENABLED') eq 'yes')) { if (-e '/lib/ld-linux.so.2') { $value_auto = 'confrw:libflashplayer.32.so'; } - } - if ($minimyth->var_get('MM_PLUGIN_BROWSER_ENABLED') eq 'yes') - { if (-e '/lib/ld-linux-x86-64.so.2') { $value_auto = 'confrw:libflashplayer.64.so'; ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HULU.pm Sat Oct 17 20:12:08 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HULU.pm Tue Nov 10 21:37:09 2009 @@ -15,7 +15,6 @@ $var_list{'MM_HULU_URL'} = { - prerequisite => ['MM_FLASH_URL'], value_default => 'auto', value_valid => 'auto|none|((cifs|confro|confrw|dist|file|http|hunt| nfs| tftp):(//(([^:@]*)?(:([...@]*))?\@)?([^/]+))?[^?#]*(\?([^#]*))?(\#(.*))?)', value_auto => sub @@ -25,16 +24,13 @@ my $value_auto = 'none'; - if ($minimyth->var_get('MM_FLASH_URL') ne 'none') - { - if (-e '/lib/ld-linux.so.2') - { - $value_auto = 'confrw:huludesktop.32'; - } - if (-e '/lib/ld-linux-x86-64.so.2') - { - $value_auto = 'confrw:huludesktop.64'; - } + if (-e '/lib/ld-linux.so.2') + { + $value_auto = 'confrw:huludesktop.32'; + } + if (-e '/lib/ld-linux-x86-64.so.2') + { + $value_auto = 'confrw:huludesktop.64'; } return $value_auto; ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/flash.pm Fri Oct 9 13:44:36 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/flash.pm Tue Nov 10 21:37:09 2009 @@ -17,22 +17,22 @@ { $minimyth->message_output('info', "installing binary Adobe Flash Player ..."); $minimyth->url_get($minimyth->var_get('MM_FLASH_URL'), '/usr/lib/browser/plugins/libflashplayer.so'); - if (-f '/usr/lib/browser/plugins/libflashplayer.so') - { - chmod(0666, '/usr/lib/browser/plugins/libflashplayer.so'); - if (-e '/lib/ld-linux.so.2') - { - if (system(qq(/lib/ld-linux.so.2 --list /usr/lib/browser/plugins/libflashplayer.so > /dev/null 2>&1)) != 0) - { - $minimyth->message_output('err', 'Adobe Flash Player will fail because libraries are missing.') - } - } - if (-e '/lib/ld-linux-x86-64.so.2') - { - if (system(qq(/lib/ld-linux-x86-64.so.2 --list /usr/lib/browser/plugins/libflashplayer.so > /dev/null 2>&1)) != 0) - { - $minimyth->message_output('err', 'Adobe Flash Player will fail because libraries are missing.') - } + } + if (-f '/usr/lib/browser/plugins/libflashplayer.so') + { + chmod(0666, '/usr/lib/browser/plugins/libflashplayer.so'); + if (-e '/lib/ld-linux.so.2') + { + if (system(qq(/lib/ld-linux.so.2 --list /usr/lib/browser/plugins/libflashplayer.so > /dev/null 2>&1)) != 0) + { + $minimyth->message_output('err', 'Adobe Flash Player will fail because libraries are missing.') + } + } + if (-e '/lib/ld-linux-x86-64.so.2') + { + if (system(qq(/lib/ld-linux-x86-64.so.2 --list /usr/lib/browser/plugins/libflashplayer.so > /dev/null 2>&1)) != 0) + { + $minimyth->message_output('err', 'Adobe Flash Player will fail because libraries are missing.') } } } ======================================= --- /trunk/gar-minimyth/script/minimyth.conf.mk Tue Nov 10 21:00:46 2009 +++ /trunk/gar-minimyth/script/minimyth.conf.mk Tue Nov 10 21:37:09 2009 @@ -19,7 +19,7 @@ ) # Configuration file (minimyth.conf) version. -mm_CONF_VERSION ?= 49 +mm_CONF_VERSION ?= 50 #------------------------------------------------------------------------------- # Variables that you are likely to be override based on your environment. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
