Author: pebender
Date: Sat Oct 18 08:50:09 2008
New Revision: 3848
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/video.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/x.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/video
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/x
Log:
- Fixed a bug that would cause the video output to no be configured
correctly for Intel DVI output when perl init scripts were used.
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 Oct 18
08:50:09 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 58 (2008-10-17):
+Changes since 58 (2008-10-18):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -98,6 +98,8 @@
line.
- Fixed a bug in MiniMyth::url_file_put that caused MythTV themecache
and
codecs saving to local boot device to fail.
+ - Fixed a bug that would cause the video output to no be configured
+ correctly for Intel DVI output when perl init scripts were used.
Modified build system
- Added mm_GRAPHICS for controlling which graphics drivers are
included.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/video.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/video.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/video.pm
Sat Oct 18 08:50:09 2008
@@ -43,6 +43,12 @@
(-e '/usr/lib/nvidia/libXvMCNVIDIA_dynamic.so.1') &&
($xvmc_lib = '/usr/lib/nvidia/libXvMCNVIDIA_dynamic.so.1');
(-e '/usr/lib/nvidia/libXvMCNVIDIA.so.1') &&
($xvmc_lib = '/usr/lib/nvidia/libXvMCNVIDIA.so.1');
}
+ when (/^openchrome$/)
+ {
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
+ ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'xvmc-vld');
+ (-e '/usr/lib/libchromeXvMC.so.1') && ($xvmc_lib
= '/usr/lib/libchromeXvMC.so.1');
+ }
when (/^radeon$/)
{
($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
@@ -62,12 +68,6 @@
{
($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'ffmpeg');
- }
- when (/^openchrome$/)
- {
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'xvmc-vld');
- (-e '/usr/lib/libchromeXvMC.so.1') && ($xvmc_lib
= '/usr/lib/libchromeXvMC.so.1');
}
when (/^vmware$/)
{
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/x.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/x.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/x.pm
Sat Oct 18 08:50:09 2008
@@ -102,11 +102,16 @@
when (/^auto$/) { $device_intel = 'VGA'; }
when (/^([0-9]+)$/) { $device_intel = 'VGA-' . $1; }
}
- given ($minimyth->var_get('MM_X_OUTPUT_VGA'))
+ given ($minimyth->var_get('MM_X_OUTPUT_DVI'))
{
when (/^auto$/) { $device_intel = 'TMDS'; }
when (/^([0-9]+)$/) { $device_intel = 'TMDS-' . $1; }
}
+ if ($device_intel eq '')
+ {
+ $minimyth->message_output('err', "error: no X video output
enabled.");
+ return 0;
+ }
}
when (/^nvidia$/)
{
@@ -154,6 +159,18 @@
return 0;
}
}
+ when (/^(radeon)$/)
+ {
+ }
+ when (/^(radeonhd)$/)
+ {
+ }
+ when (/^(savage)$/)
+ {
+ }
+ when (/^(sis)$/)
+ {
+ }
when (/^vmware$/)
{
}
@@ -234,6 +251,9 @@
# Rebuild library cache.
system(qq(/sbin/ldconfig));
}
+ when (/^(openchrome)$/)
+ {
+ }
when (/^(radeon)$/)
{
}
@@ -244,9 +264,6 @@
{
}
when (/^(sis)$/)
- {
- }
- when (/^(openchrome)$/)
{
}
when (/^(vmware)$/)
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/video
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/video
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/video
Sat Oct 18 08:50:09 2008
@@ -52,6 +52,13 @@
/usr/bin/test -e ${XVMC_LIB} && \
/bin/sed -i "[EMAIL PROTECTED]@%${XVMC_LIB}%"
/etc/X11/XvMCConfig
;;
+ openchrome)
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
+ /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='xvmc-vld'
+ XVMC_LIB='/usr/lib/libchromeXvMC.so.1' && \
+ /usr/bin/test -e ${XVMC_LIB} && \
+ /bin/sed -i "[EMAIL PROTECTED]@%${XVMC_LIB}%"
/etc/X11/XvMCConfig
+ ;;
radeon)
/usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
/usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
@@ -67,13 +74,6 @@
sis)
/usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
/usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
- ;;
- openchrome)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='xvmc-vld'
- XVMC_LIB='/usr/lib/libchromeXvMC.so.1' && \
- /usr/bin/test -e ${XVMC_LIB} && \
- /bin/sed -i "[EMAIL PROTECTED]@%${XVMC_LIB}%"
/etc/X11/XvMCConfig
;;
vmware)
/usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/x
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/x
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/x
Sat Oct 18 08:50:09 2008
@@ -105,11 +105,25 @@
MM_X_DEVICE_VIA="LCD${MM_X_DEVICE_VIA}"
fi
;;
+ radeon)
+ ;;
+ radeonhd)
+ ;;
+ savage)
+ ;;
+ sis)
+ ;;
vmware)
;;
esac
case "${MM_X_DRIVER}" in
+ intel_810|intel_915)
+ if /usr/bin/test ! -n "${MM_X_DEVICE_INTEL}" ; then
+ mm_message_output err "error: no X video output enabled."
+ exit 1
+ fi
+ ;;
nvidia)
if /usr/bin/test ! -n "${MM_X_DEVICE_NVIDIA}" ; then
mm_message_output err "error: no X video output enabled."
@@ -122,6 +136,16 @@
exit 1
fi
;;
+ radeon)
+ ;;
+ radeonhd)
+ ;;
+ savage)
+ ;;
+ sis)
+ ;;
+ vmware)
+ ;;
esac
# Hacks to deal with the fact that the names for proprietary drivers
and
@@ -155,6 +179,8 @@
# Rebuild library cache.
/sbin/ldconfig
;;
+ openchrome)
+ ;;
radeon)
;;
radeonhd)
@@ -162,8 +188,6 @@
savage)
;;
sis)
- ;;
- openchrome)
;;
vmware)
;;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
