Author: pebender
Date: Sat Jul 18 05:58:00 2009
New Revision: 5184
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_PLUGIN.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/mythtv.pm
Log:
- Modified init
- For plugins that differ between MythTV versions, changed plugin
initialization to be MythTV version specific.
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 Sat Jul 18
05:58:00 2009
@@ -11,6 +11,10 @@
patch glvdpau20744.
MythTV trunk: version trunk.20842 trunk svn 20842.
+Modified init
+ - For plugins that differ between MythTV versions, changed plugin
+ initialization to be MythTV version specific.
+
Modified LIRC
- Moved /etc/lircd.conf, /etc/lircmd.conf and /etc/lircrc to
/etc/lirc/lircd.conf, /etc/lirc/lircmd.conf and /etc/lirc/lircrc
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_PLUGIN.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_PLUGIN.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_PLUGIN.pm
Sat Jul 18 05:58:00 2009
@@ -5,6 +5,7 @@
use strict;
use warnings;
+use feature "switch";
my %var_list;
@@ -25,36 +26,65 @@
};
$var_list{'MM_PLUGIN_BROWSER_ENABLED'} =
{
+ prerequisite => ['MM_VERSION_MYTH_BINARY_MINOR'],
value_default => sub
{
my $minimyth = shift;
my $name = shift;
- if (-e '/usr/lib/mythtv/plugins/libmythbookmarkmanager.so')
+ given ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR'))
{
- return 'yes'
- }
- else
- {
- return 'no'
+ when (/^20|21$/)
+ {
+ if (-e '/usr/lib/mythtv/plugins/libmythbookmarkmanager.so')
+ {
+ return 'yes';
+ }
+ else
+ {
+ return 'no';
+ }
+ }
+ default
+ {
+ if (-e '/usr/lib/mythtv/plugins/libmythbrowser.so')
+ {
+ return 'yes';
+ }
+ else
+ {
+ return 'no';
+ }
+ }
}
},
value_valid => 'no|yes'
};
$var_list{'MM_PLUGIN_DVD_ENABLED'} =
{
+ prerequisite => ['MM_VERSION_MYTH_BINARY_MINOR'],
value_default => sub
{
my $minimyth = shift;
my $name = shift;
- if (-e '/usr/lib/mythtv/plugins/libmythdvd.so')
- {
- return 'yes'
- }
- else
+ given ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR'))
{
- return 'no'
+ when (/^20$/)
+ {
+ if (-e '/usr/lib/mythtv/plugins/libmythdvd.so')
+ {
+ return 'yes';
+ }
+ else
+ {
+ return 'no';
+ }
+ }
+ default
+ {
+ return 'no';
+ }
}
},
value_valid => 'no|yes'
@@ -68,11 +98,11 @@
if (-e '/usr/lib/mythtv/plugins/libmythgallery.so')
{
- return 'yes'
+ return 'yes';
}
else
{
- return 'no'
+ return 'no';
}
},
value_valid => 'no|yes'
@@ -86,11 +116,11 @@
if (-e '/usr/lib/mythtv/plugins/libmythgame.so')
{
- return 'yes'
+ return 'yes';
}
else
{
- return 'no'
+ return 'no';
}
},
value_valid => 'no|yes'
@@ -104,11 +134,11 @@
if (-e '/usr/lib/mythtv/plugins/libmythmusic.so')
{
- return 'yes'
+ return 'yes';
}
else
{
- return 'no'
+ return 'no';
}
},
value_valid => 'no|yes'
@@ -122,29 +152,40 @@
if (-e '/usr/lib/mythtv/plugins/libmythnews.so')
{
- return 'yes'
+ return 'yes';
}
else
{
- return 'no'
+ return 'no';
}
},
value_valid => 'no|yes'
};
$var_list{'MM_PLUGIN_PHONE_ENABLED'} =
{
+ prerequisite => ['MM_VERSION_MYTH_BINARY_MINOR'],
value_default => sub
{
my $minimyth = shift;
my $name = shift;
- if (-e '/usr/lib/mythtv/plugins/libmythphone.so')
+ given ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR'))
{
- return 'yes'
- }
- else
- {
- return 'no'
+ when (/^20|21$/)
+ {
+ if (-e '/usr/lib/mythtv/plugins/libmythphone.so')
+ {
+ return 'yes';
+ }
+ else
+ {
+ return 'no';
+ }
+ }
+ default
+ {
+ return 'no';
+ }
}
},
value_valid => 'no|yes'
@@ -158,11 +199,11 @@
if (-e '/usr/lib/mythtv/plugins/libmythstream.so')
{
- return 'yes'
+ return 'yes';
}
else
{
- return 'no'
+ return 'no';
}
},
value_valid => 'no|yes'
@@ -176,11 +217,11 @@
if (-e '/usr/lib/mythtv/plugins/libmythvideo.so')
{
- return 'yes'
+ return 'yes';
}
else
{
- return 'no'
+ return 'no';
}
},
value_valid => 'no|yes'
@@ -194,29 +235,40 @@
if (-e '/usr/lib/mythtv/plugins/libmythweather.so')
{
- return 'yes'
+ return 'yes';
}
else
{
- return 'no'
+ return 'no';
}
},
value_valid => 'no|yes'
};
$var_list{'MM_PLUGIN_ZONEMINDER_ENABLED'} =
{
+ prerequisite => ['MM_VERSION_MYTH_BINARY_MINOR'],
value_default => sub
{
my $minimyth = shift;
my $name = shift;
- if (-e '/usr/lib/mythtv/plugins/libmythzoneminder.so')
- {
- return 'yes'
- }
- else
+ given ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR'))
{
- return 'no'
+ when (/^20$/)
+ {
+ return 'no';
+ }
+ default
+ {
+ if (-e '/usr/lib/mythtv/plugins/libmythzoneminder.so')
+ {
+ return 'yes';
+ }
+ else
+ {
+ return 'no';
+ }
+ }
}
},
value_valid => 'no|yes'
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/mythtv.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/mythtv.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/mythtv.pm
Sat Jul 18 05:58:00 2009
@@ -203,16 +203,48 @@
{ '<depends>mythmusic mythvideo mytharchive
mythburn</depends>' => '<depends>disabled</depends>' });
}
my %plugin_remove = ();
- $plugin_remove{'MM_PLUGIN_BROWSER_ENABLED'} =
- [ '/usr/lib/mythtv/plugins/libmythbookmarkmanager.so',
- '/usr/share/mythtv/bookmark*',
- '/usr/share/mythtv/mythbookmarkmanager*',
- '/usr/share/mythtv/browser*',
- '/usr/share/mythtv/mythbrowser*' ];
- $plugin_remove{'MM_PLUGIN_DVD_ENABLED'} =
- [ '/usr/lib/mythtv/plugins/libmythdvd.so',
- '/usr/share/mythtv/dvd*',
- '/usr/share/mythtv/mythdvd*' ];
+ given ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR'))
+ {
+ when (/^20$/)
+ {
+ $plugin_remove{'MM_PLUGIN_BROWSER_ENABLED'} =
+ [ '/usr/lib/mythtv/plugins/libmythbookmarkmanager.so',
+ '/usr/share/mythtv/bookmark*',
+ '/usr/share/mythtv/mythbookmarkmanager*',
+ '/usr/share/mythtv/browser*',
+ '/usr/share/mythtv/mythbrowser*' ];
+ }
+ when (/^21$/)
+ {
+ $plugin_remove{'MM_PLUGIN_BROWSER_ENABLED'} =
+ [ '/usr/lib/mythtv/plugins/libmythbookmarkmanager.so',
+ '/usr/share/mythtv/bookmark*',
+ '/usr/share/mythtv/mythbookmarkmanager*',
+ '/usr/share/mythtv/browser*',
+ '/usr/share/mythtv/mythbrowser*' ];
+ }
+ default
+ {
+ $plugin_remove{'MM_PLUGIN_BROWSER_ENABLED'} =
+ [ '/usr/lib/mythtv/plugins/libmythbrowser.so',
+ '/usr/share/mythtv/browser*',
+ '/usr/share/mythtv/mythbrowser*' ];
+ }
+ }
+ given ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR'))
+ {
+ when (/^20$/)
+ {
+ $plugin_remove{'MM_PLUGIN_DVD_ENABLED'} =
+ [ '/usr/lib/mythtv/plugins/libmythdvd.so',
+ '/usr/share/mythtv/dvd*',
+ '/usr/share/mythtv/mythdvd*' ];
+ }
+ default
+ {
+ $plugin_remove{'MM_PLUGIN_DVD_ENABLED'} = [];
+ }
+ }
$plugin_remove{'MM_PLUGIN_GALLERY_ENABLED'} =
[ '/usr/lib/mythtv/plugins/libmythgallery.so',
'/usr/share/mythtv/gallery*',
@@ -229,10 +261,27 @@
[ '/usr/lib/mythtv/plugins/libmythnews.so',
'/usr/share/mythtv/news*',
'/usr/share/mythtv/mythnews*' ];
- $plugin_remove{'MM_PLUGIN_PHONE_ENABLED'} =
- [ '/usr/lib/mythtv/plugins/libmythphone.so',
- '/usr/share/mythtv/phone*',
- '/usr/share/mythtv/mythphone*' ];
+ given ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR'))
+ {
+ when (/^20$/)
+ {
+ $plugin_remove{'MM_PLUGIN_PHONE_ENABLED'} =
+ [ '/usr/lib/mythtv/plugins/libmythphone.so',
+ '/usr/share/mythtv/phone*',
+ '/usr/share/mythtv/mythphone*' ];
+ }
+ when (/^21$/)
+ {
+ $plugin_remove{'MM_PLUGIN_PHONE_ENABLED'} =
+ [ '/usr/lib/mythtv/plugins/libmythphone.so',
+ '/usr/share/mythtv/phone*',
+ '/usr/share/mythtv/mythphone*' ];
+ }
+ default
+ {
+ $plugin_remove{'MM_PLUGIN_PHONE_ENABLED'} = [];
+ }
+ }
$plugin_remove{'MM_PLUGIN_STREAM_ENABLED'} =
[ '/usr/lib/mythtv/plugins/libmythstream.so',
'/usr/share/mythtv/stream*',
@@ -245,10 +294,20 @@
[ '/usr/lib/mythtv/plugins/libmythweather.so',
'/usr/share/mythtv/weather*',
'/usr/share/mythtv/mythweather*' ];
- $plugin_remove{'MM_PLUGIN_ZONEMINDER_ENABLED'} =
- [ '/usr/lib/mythtv/plugins/libmythzoneminder.so',
- '/usr/share/mythtv/zoneminder*',
- '/usr/share/mythtv/mythzoneminder*' ];
+ given ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR'))
+ {
+ when (/^20$/)
+ {
+ $plugin_remove{'MM_PLUGIN_ZONEMINDER_ENABLED'} = [];
+ }
+ default
+ {
+ $plugin_remove{'MM_PLUGIN_ZONEMINDER_ENABLED'} =
+ [ '/usr/lib/mythtv/plugins/libmythzoneminder.so',
+ '/usr/share/mythtv/zoneminder*',
+ '/usr/share/mythtv/mythzoneminder*' ];
+ }
+ }
foreach my $plugin (keys %plugin_remove)
{
if ($minimyth->var_get($plugin) eq 'no')
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
