Author: pebender
Date: Sun Oct 26 17:36:06 2008
New Revision: 3872
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/conf/MM_FLASH.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/flash.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_FLASH
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/flash
(contents, props changed)
Modified:
trunk/gar-minimyth/html/minimyth/conf/minimyth.conf
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/script/meta/minimyth/files/configure.mk
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_PLUGIN
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Added MM_FLASH_URL for installing Adobe Flash Player.
- Adobe Flash Player only works with MythBrowser versions after 0.20.
- Adobe Flash Player only works when the MiniMyth image contains the
required GTK2 and NSS3 libraries.
- Adobe Flash Player only works on 32-bit builds.
Modified: trunk/gar-minimyth/html/minimyth/conf/minimyth.conf
==============================================================================
--- trunk/gar-minimyth/html/minimyth/conf/minimyth.conf (original)
+++ trunk/gar-minimyth/html/minimyth/conf/minimyth.conf Sun Oct 26 17:36:06
2008
@@ -178,6 +178,12 @@
################################################################################
################################################################################
+# Adobe Flash Player configuration variables.
+#
+# MM_FLASH_URL
+################################################################################
+
+################################################################################
# Theme configuration variables.
#
# MM_THEME_NAME
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Oct 26
17:36:06 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 58 (2008-10-24):
+Changes since 58 (2008-10-26):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -60,6 +60,11 @@
- Patched the radeonhd driver with the HDMI-including-audio patch.
Modified MiniMyth configuration
+ - Added MM_FLASH_URL for installing Adobe Flash Player.
+ - Adobe Flash Player only works with MythBrowser versions after
0.20.
+ - Adobe Flash Player only works when the MiniMyth image contains
the
+ required GTK2 and NSS3 libraries.
+ - Adobe Flash Player only works on 32-bit builds.
- Added MM_PLUGIN_INFORMATION_CENTER_ENABLED for disabling (i.e.
removing)
the 'Information Center' menu.
- Added MM_THEME_FILE_MENU_ADD for overriding/extending MythTV theme
menus.
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Sun Oct
26
17:36:06 2008
@@ -42,6 +42,7 @@
<li><a href="#MM_PLUGIN">Configuration variables for: Myth
plugins</a></li>
<li><a href="#MM_EXTRAS">Configuration variables for: extras
directory</a></li>
<li><a href="#MM_CODECS">Configuration variables for: CODECs
directory</a></li>
+ <li><a href="#MM_FLASH">Configuration variables for: Adobe
Flash Player</a></li>
<li><a href="#MM_THEME">Configuration variables for:
themes</a></li>
<li><a href="#MM_MEDIA">Configuration variables for: remote
media directories</a></li>
<li><a href="#MM_GAME">Configuration variables for:
games</a></li>
@@ -1560,7 +1561,7 @@
<dd>
<p>
Set the location of the extras directory that will be
mounted as '/usr/local'.
- Valid values are a URL, 'none' and 'auto'.
+ Valid values are a URL, 'none' and 'auto', with 'auto'
being the default.
</p>
<p>
If the value is 'none',
@@ -1603,7 +1604,7 @@
<dd>
<p>
Set the location of the CODECs directory that will be
mounted as '/usr/lib/codecs'.
- Valid values are a URL, 'none' and 'auto'.
+ Valid values are a URL, 'none' and 'auto', with 'auto'
being the default.
</p>
<p>
If the value is 'none',
@@ -1645,6 +1646,83 @@
Alternatively, you can mount the CODECs directory by adding
the appropriate commands to the 'minimyth.pm' package.
</p>
</div>
+ <div id="MM_FLASH" class="section">
+ <div class="heading">Configuration variables for: Adobe Flash
Player</div>
+ <ul>
+ <li><a href="#MM_FLASH-overview">Overview</a></li>
+ </ul>
+ <ul>
+ <li><a href="#MM_FLASH_URL">MM_FLASH_URL</a></li>
+ </ul>
+ <dl>
+ <dt id="MM_FLASH-overview"><strong>Overview</strong></dt>
+ <dd>
+ <p>
+ You can extend MiniMyth by adding
+ <a href="http://www.adobe.com/products/flashplayer/";>Adobe
Flash Player</a>
+ for use in MythBrowser.
+ </p>
+ <p>
+ The URLs in this section must have the form described in
the
+ <a href="#MM_EXTRAS">Extras directory ...</a>
+ section.
+ </p>
+ <dt id="MM_FLASH_URL"><strong>MM_FLASH_URL</strong></dt>
+ <dd>
+ <p>
+ Set the location of the Adobe Flash Player shared library
that will be installed at
+ '/usr/lib/browser/plugins/libflashplayer.so'.
+ Valid values are a URL, 'none' and 'auto', with 'auto'
being the default.
+ </p>
+ <p>
+ If the value is 'none',
+ then nothing will be installed at
+ '/usr/lib/browser/plugins/libflashplayer.so'.
+ </p>
+ <p>
+ 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.so'.
+ That is, MiniMyth will assume
MM_FLASH_URL='confrw:libflashplayer.so'.
+ </p>
+ <p>
+ The MythTV frontend menus contain
the 'MiniMyth Tools' menu
+ (under the 'Utilities / Setup' menu in a regular
theme and under the main menu in a classic theme).
+ The 'MiniMyth Tools' menu contains the menu
item 'Fetch and Save Adobe Flash Player'
+ to help with creating a Adobe Flash Player shared library.
+ The 'Fetch and Save Adobe Flash Player'
menu item does the following:
+ </p>
+ <ol>
+ <li>fetches
+ <a
href="http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz";>Adobe
Flash Player</a>
+ from the Internet,</li>
+ <li>creates a temporary browser plugins directory,</li>
+ <li>installs the downloaded Adobe Flash Player in the
temporary browser plugins directory, and</li>
+ <li>saves the Adobe Flash Player shared library in the
+ <a href="document-configure.html#location">MiniMyth
read-write configuration directory</a>.</li>
+ </ol>
+ <p>
+ During the time that it takes MiniMyth to fetch and save
the Adobe Flash Player shared library,
+ MiniMyth will display a terminal window with status
information.
+ </p>
+ <p>
+ For the newly downloaded Adobe Flash Player to take
effect, you must reboot your MiniMyth frontend.
+ </p>
+ <p>
+ The MythBrowser did not support NPAPI plugins until after
release 0.20.x.
+ Therefore, this setting does not apply to MythTV until
after release 0.20.x.
+ </p>
+ <p>
+ The Adobe Flash Player shared library only supports 32-bit.
+ Therefore, this setting does not apply to non-32-bit
builds.
+ </p>
+ </dd>
+ </dl>
+ <p>
+ Alternatively, copy the Adobe Flash Player shared library to
the browser plugin directory by adding the appropriate commands to
the 'minimyth.pm' package.
+ </p>
+ </div>
+ <div id="MM_FLASH" class="section">
<div id="MM_THEME" class="section">
<div class="heading">Configuration variables for: themes</div>
<ul>
@@ -2811,7 +2889,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-10-25
+ Last Updated on 2008-10-26
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified: trunk/gar-minimyth/script/meta/minimyth/files/configure.mk
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/files/configure.mk (original)
+++ trunk/gar-minimyth/script/meta/minimyth/files/configure.mk Sun Oct 26
17:36:06 2008
@@ -17,6 +17,7 @@
game \
master \
codecs \
+ flash \
extras \
sensors \
acpi \
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/conf/MM_FLASH.pm
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/conf/MM_FLASH.pm
Sun Oct 26 17:36:06 2008
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+################################################################################
+# MM_FLASH configuration variable handlers.
+################################################################################
+package init::conf::MM_FLASH;
+
+use strict;
+use warnings;
+
+my %var_list;
+
+sub var_list
+{
+ return \%var_list;
+}
+
+$var_list{'MM_FLASH_URL'} =
+{
+ prerequisite =>
['MM_PLUGIN_BROWSER_ENABLED','MM_VERSION_MYTH_BINARY_MAJOR','MM_VERSION_MYTH_BINARY_MINOR'],
+ value_default => 'auto',
+ value_valid => 'auto|none|((cifs|confro|confrw|dist|file|http|hunt|
nfs|
tftp):(//(([^:@]*)?(:([EMAIL
PROTECTED]))?\@)?([^/]+))?[^?#]*(\?([^#]*))?(\#(.*))?)',
+ value_auto => sub
+ {
+ my $minimyth = shift;
+ my $name = shift;
+
+ my $value_default = 'none';
+
+ if ( ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MAJOR') > 0) ||
+ ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR') >= 21) )
+ {
+ if ($minimyth->var_get('MM_PLUGIN_BROWSER_ENABLED') eq 'yes')
+ {
+ if (-e '/lib/ld-linux.so.2')
+ {
+ $value_default = 'confrw:libflashplayer.so';
+ }
+ }
+ }
+
+ return $value_default;
+ }
+};
+
+1;
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/flash.pm
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/flash.pm
Sun Oct 26 17:36:06 2008
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+################################################################################
+# version
+#
+# This script installs binary Adobe Flash Player.
+################################################################################
+package init::flash;
+
+use strict;
+use warnings;
+
+require MiniMyth;
+
+sub start
+{
+ my $self = shift;
+ my $minimyth = shift;
+
+ if ($minimyth->var_get('MM_FLASH_URL'))
+ {
+ $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('error', 'Adobe Flash Player
will fail because libraries are missing.')
+ }
+ }
+ if (-e '/lib/ld-linux-x86-64.so.2')
+ {
+ $minimyth->message_output('error', 'Adobe Flash Player
will fail because it is a 32-bit library.');
+ }
+ }
+ }
+
+ return 1;
+}
+
+sub stop
+{
+ my $self = shift;
+ my $minimyth = shift;
+
+ return 1;
+}
+
+1;
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_FLASH
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_FLASH
Sun Oct 26 17:36:06 2008
@@ -0,0 +1,55 @@
+################################################################################
+# MM_FLASH configuration variables and files.
+################################################################################
+conf_clean_MM_FLASH() {
+ /bin/rm -rf /tmp/init.conf.flash
+
+ return 0
+}
+
+conf_check_MM_FLASH() {
+ return 0
+}
+
+conf_default_MM_FLASH() {
+ # The routine relies on MM_PLUBIN_* variables.
+ conf_default_MM_PLUGIN
+
+ # The routine relies on MM_VERSION_* variables.
+ conf_default_MM_VERSION
+
+ if /usr/bin/test -z "${MM_FLASH_URL}" ; then
+ MM_FLASH_URL='auto'
+ fi
+
+ if /usr/bin/test "${MM_FLASH_URL}" = "auto" ; then
+ MM_FLASH_URL='none'
+ if /usr/bin/test ${MM_VERSION_MYTH_BINARY_MAJOR} -gt 0 ||
+ /usr/bin/test ${MM_VERSION_MYTH_BINARY_MINOR} -ge 21 ; then
+ if /usr/bin/test "${MM_PLUGIN_BROWSER_ENABLED}" = "yes" ; then
+ if /usr/bin/test -e "/lib/ld-linux.so.2" ; then
+ MM_FLASH_URL='confrw:libflashplayer.so'
+ fi
+ fi
+ fi
+ fi
+
+ # Convert 'none' to empty.
+ if /usr/bin/test "${MM_COCECS_URL}" = "none" ; then
+ MM_FLASH_URL=
+ fi
+
+ return 0
+}
+
+conf_write_MM_FLASH() {
+ local conf_file=$1
+
+ conf_variable_write "${conf_file}" MM_FLASH_URL "${MM_FLASH_URL}"
+
+ return 0
+}
+
+conf_fetch_MM_FLASH() {
+ return 0
+}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_PLUGIN
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_PLUGIN
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_PLUGIN
Sun Oct 26 17:36:06 2008
@@ -78,6 +78,10 @@
}
conf_default_MM_PLUGIN() {
+ if /usr/bin/test -e /tmp/init.conf.plugin/conf_default_MM_PLUGIN ; then
+ return 0
+ fi
+
if /usr/bin/test -z "${MM_PLUGIN_INFORMATION_CENTER_ENABLED}" ; then
MM_PLUGIN_INFORMATION_CENTER_ENABLED='yes'
fi
@@ -161,6 +165,9 @@
MM_PLUGIN_ZONEMINDER_ENABLED='no'
fi
fi
+
+ /bin/mkdir -p /tmp/init.conf.plugin
+ /bin/touch /tmp/init.conf.plugin/conf_default_MM_PLUGIN
return 0
}
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/flash
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/flash
Sun Oct 26 17:36:06 2008
@@ -0,0 +1,39 @@
+#!/bin/sh
+################################################################################
+# flash
+#
+# This script installs Adobe Flash Player for MythBrowser.
+################################################################################
+. /etc/rc.d/functions
+
+start() {
+ mm_message_output info "installing Adobe Flaash Player ..."
+
+ if /usr/bin/test -n "${MM_FLASH_URL}" ; then
+
mm_url_get "${MM_FLASH_URL}" "/usr/lib/browser/plugins/libflashplayer.so"
+ if /usr/bin/test -e "/usr/lib/browser/plugins/libflashplayer.so" ;
then
+ chmod 0666 "/usr/lib/browser/plugins/libflashplayer.so"
+ if /usr/bin/test -e "/lib/ld-linux.so.2" ; then
+ if ! /lib/ld-linux.so.2
--list "/usr/lib/browser/plugins/libflashplayer.so" > /dev/null 2>&1 ; then
+ mm_message_output 'error' 'Adobe Flash Player will
fail because libraries are missing.'
+ fi
+ fi
+ if /usr/bin/test -e "/lib/ld-linux-x86_64.so.2" ; then
+ mm_message_output 'error' 'Adobe Flash Player will fail
because it is a 32-bit library.'
+ fi
+ fi
+ fi
+
+ return 0
+}
+
+stop() {
+ return 0
+}
+
+case $1 in
+ start) start ;;
+ stop) stop ;;
+esac
+
+exit 0
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Sun Oct 26
17:36:06 2008
@@ -1 +1 @@
-4c341509d925e8d5bfca9128ea312627 download/MiniMyth.pm
+80e1d60c75e7203a7c45c030cf49a432 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Sun Oct
26 17:36:06 2008
@@ -1971,7 +1971,7 @@
unlink(qq($local_dir/$flash_file));
if (! $self->url_get($flash_url, qq($local_dir/$flash_file)))
{
- $self->message_log('error', qq(failed to create the flash player
plugin file.));
+ $self->message_log('error', qq(failed to create the Adobe Flash
Player file.));
File::Path::rmtree(qq($local_dir/$flash_base));
unlink(qq($local_dir/$flash_file));
return 0;
@@ -1982,7 +1982,7 @@
if (! -e qq($local_dir/$flash_base/$file))
{
File::Path::rmtree(qq($local_dir/$flash_base));
- $self->message_log('error', qq(failed to save the flash player
plugin file.));
+ $self->message_log('error', qq(failed to save the Adobe Flash
Player file.));
return 0;
}
@@ -1992,7 +1992,7 @@
{
File::Path::rmtree(qq($local_dir/$flash_base));
unlink(qq($local_file));
- $self->message_log('error', qq(failed to save the flash player
plugin file.));
+ $self->message_log('error', qq(failed to save the Adobe Flash
Player file.));
return 0;
}
@@ -2001,7 +2001,7 @@
if (! $self->confrw_put(qq($remote_file), qq($local_file)))
{
unlink(qq($local_file));
- $self->message_log('error', qq(failed to save the flash player
plugin file.));
+ $self->message_log('error', qq(failed to save the Adobe Flash
Player file.));
return 0;
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
