Author: pebender
Date: Wed Nov 26 11:18:40 2008
New Revision: 4013
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/index.html
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/software/minimyth-bin-list.mplayer-svn
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/video
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
trunk/gar-minimyth/script/minimyth.conf.mk
Log:
- Modified init so that it links mplayer to the appropriate version,
depending on whether or not XvMC-VLD is used for MPEG2 decoding.
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 Wed Nov 26
11:18:40 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 60 (2008-11-25):
+Changes since 60 (2008-11-26):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -28,14 +28,15 @@
certain capabilities.
- Made sure that all are using the shared libdca rather than their
internal versions of libdca/libdts.
- - Made mplayer-svn the default mplayer version.
- - mpplayer is linked to mplayer-svn.
- Renamed mplayer-stable to mplayer-vld in order to reflect that the
only
reason it continues to be included is because it supports XvMC-VLD.
Modified init
- Modified init so that it redirects the output
of '/usr/sbin/powernowd'
to /dev/null.
+ - Modified init so that it links mplayer appropriate version
(mplayer-svn or
+ mplayer-vld), which depends on whether or not the MiniMyth is using
+ XvMC-VLD for MPEG2 decoding.
Fixed bugs
- Worked around problem in Sys::Hostname::hostname that caused the
perl init
Modified: trunk/gar-minimyth/html/minimyth/index.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/index.html (original)
+++ trunk/gar-minimyth/html/minimyth/index.html Wed Nov 26 11:18:40 2008
@@ -58,6 +58,10 @@
</li>
<li><a
href="http://home.kabelfoon.nl/~moongies/streamtuned.html";>MythStream</a>
<strong>0.18_1</strong></li>
<li>
+ <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN
27979</strong> and
+ <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15908</strong>
+ </li>
+ <li>
<a href="http://www.mplayerhq.hu/";>MPlayer</a>
<strong>1.0rc2</strong> with patches to add
<ul>
<li><a
href="http://wiki.openchrome.org/tikiwiki/tiki-index.php?page=XvMC#Mplayer";>XvMC-VLD
hardware acceleration</a></li>
@@ -65,11 +69,6 @@
</ul>
</li>
<li>
- <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN
27979</strong> and
- <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15908</strong>
- (experimental)
- </li>
- <li>
<a href="http://www.videolan.org/";>VLC</a>
<strong>0.9.6</strong> and
<a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15908</strong>
(experimental)
@@ -194,7 +193,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-11-22
+ Last Updated on 2008-11-26
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile Wed Nov 26
11:18:40 2008
@@ -297,6 +297,4 @@
post-install:
@rm -f $(DESTDIR)$(bindir)/mplayer-svn
@mv -f $(DESTDIR)$(bindir)/mplayer $(DESTDIR)$(bindir)/mplayer-svn
- @rm -f $(DESTDIR)$(bindir)/mplayer
- @ln -fs mplayer-svn $(DESTDIR)$(bindir)/mplayer
@$(MAKECOOKIE)
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/software/minimyth-bin-list.mplayer-svn
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/software/minimyth-bin-list.mplayer-svn
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/software/minimyth-bin-list.mplayer-svn
Wed Nov 26 11:18:40 2008
@@ -1,3 +1,2 @@
-mplayer
mplayer-svn
mplayer-resumer.pl
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/video
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/video
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/video
Wed Nov 26 11:18:40 2008
@@ -198,21 +198,25 @@
case "${MM_VIDEO_MPEG2_DECODER}" in
ffmpeg)
+ /usr/bin/test ! -e /usr/bin/mplayer && /usr/bin/test -e
/usr/bin/mplayer-svn && /bin/ln -s mplayer-svn /usr/bin/mplayer
/bin/sed -i "[EMAIL PROTECTED]@%xv%"
/home/minimyth/.xine/config
/bin/sed -i "[EMAIL PROTECTED]@%\#%"
/home/minimyth/.mplayer/config
/bin/sed -i "[EMAIL PROTECTED]@%%"
/home/minimyth/.mplayer/config
;;
libmpeg2)
+ /usr/bin/test ! -e /usr/bin/mplayer && /usr/bin/test -e
/usr/bin/mplayer-svn && /bin/ln -s mplayer-svn /usr/bin/mplayer
/bin/sed -i "[EMAIL PROTECTED]@%xv%"
/home/minimyth/.xine/config
/bin/sed -i "[EMAIL PROTECTED]@%\#%"
/home/minimyth/.mplayer/config
/bin/sed -i "[EMAIL PROTECTED]@%%"
/home/minimyth/.mplayer/config
;;
xvmc)
+ /usr/bin/test ! -e /usr/bin/mplayer && /usr/bin/test -e
/usr/bin/mplayer-svn && /bin/ln -s mplayer-svn /usr/bin/mplayer
/bin/sed -i "[EMAIL PROTECTED]@%xvmc%"
/home/minimyth/.xine/config
/bin/sed -i "[EMAIL PROTECTED]@%%"
/home/minimyth/.mplayer/config
/bin/sed -i "[EMAIL PROTECTED]@%\#%"
/home/minimyth/.mplayer/config
;;
xvmc-vld)
+ /usr/bin/test ! -e /usr/bin/mplayer && /usr/bin/test -e
/usr/bin/mplayer-vld && /bin/ln -s mplayer-vld /usr/bin/mplayer
/bin/sed -i "[EMAIL PROTECTED]@%xxmc%"
/home/minimyth/.xine/config
/bin/sed -i "[EMAIL PROTECTED]@%%"
/home/minimyth/.mplayer/config
/bin/sed -i "[EMAIL PROTECTED]@%\#%"
/home/minimyth/.mplayer/config
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
Wed Nov 26 11:18:40 2008
@@ -178,6 +178,7 @@
}
}
+ my $mplayer;
my $video_driver;
my $xvmc_true;
my $xvmc_false;
@@ -185,24 +186,28 @@
{
when (/^ffmpeg$/)
{
+ $mplayer = 'mplayer-svn';
$video_driver = 'xv';
$xvmc_true = '#';
$xvmc_false = '';
}
when (/^libmpeg2$/)
{
+ $mplayer = 'mplayer-svn';
$video_driver = 'xv';
$xvmc_true = '#';
$xvmc_false = '';
}
when (/^xvmc$/)
{
+ $mplayer = 'mplayer-svn';
$video_driver = 'xvmc';
$xvmc_true = '';
$xvmc_false = '#';
}
when (/^xvmc-vld$/)
{
+ $mplayer = 'mplayer-vld';
$video_driver = 'xxmc';
$xvmc_true = '';
$xvmc_false = '#';
@@ -239,6 +244,11 @@
}
}
my $monitoraspect = $minimyth->var_get('MM_VIDEO_ASPECT_RATIO');
+
+ if ( (! -e '/usr/bin/mplayer') && (qq(/usr/bin/$mplayer)) )
+ {
+ symlink($mplayer, '/usr/bin/mplayer');
+ }
$minimyth->file_replace_variable(
'/home/minimyth/.xine/config',
Modified: trunk/gar-minimyth/script/minimyth.conf.mk
==============================================================================
--- trunk/gar-minimyth/script/minimyth.conf.mk (original)
+++ trunk/gar-minimyth/script/minimyth.conf.mk Wed Nov 26 11:18:40 2008
@@ -37,11 +37,10 @@
# Lists the software to be supported.
# Valid values for MM_SOFTWARE are zero or more
of 'mythbrowser', 'mythgallery',
# 'mythgame', 'mythmusic', 'mythnews', 'mythphone', 'mythstream', 'mythvideo',
-# 'mythweather', 'mythzoneminder', 'flash', 'gnash',
-# 'mplayer-svn' (experimental and may be removed in the future without
warning),
-# 'mplayer-vld',
-# 'vlc' (experimental and may be removed in the future without warning),
-# 'xine', 'perl', 'transcode', 'mame', 'wiimote', 'backend' and 'debug'.
+# 'mythweather', 'mythzoneminder', 'flash', 'gnash', 'mplayer-svn',
+# 'mplayer-vld', 'vlc' (experimental and may be removed in the future
without
+# warning), 'xine', 'perl', 'transcode', 'mame', 'wiimote', 'backend' and
+# 'debug'.
mm_SOFTWARE ?= mythbrowser \
$(if $(filter $(mm_MYTH_VERSION),0.20
0.20-softpad),mythdvd) \
mythgallery \
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
