Author: pebender
Date: Mon Jul 6 18:24:33 2009
New Revision: 5127
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xorg.conf
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
Log:
- Removed Xorg 7.3 support from init scripts.
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 Mon Jul 6
18:24:33 2009
@@ -20,6 +20,7 @@
in the init process.
- Moved autogeneration of /etc/lircd.conf and /etc/lircrc to earlier in
the init process.
+ - Removed Xorg 7.3 support.
Modified suspend/resume script (mm_sleep)
- Added hack to 'clear' NVidia HDMI output upon resume so that it does
not
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xorg.conf
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xorg.conf
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xorg.conf
Mon Jul 6 18:24:33 2009
@@ -20,9 +20,11 @@
Section "Module"
Load "dbe"
+...@dri_false@ Disable "dri"
+...@dri_false@ Disable "dri2"
@DRI_TRUE@ Load "dri"
+...@dri_true@ Load "dri2"
Load "extmod"
-...@freetype_true@ Load "freetype"
Load "glx"
Load "int10"
Load "record"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
Mon Jul 6 18:24:33 2009
@@ -210,6 +210,7 @@
# open source drivers conflict.
# the proprietary NVIDIA GL libraries conflict with the Open Source
Mesa GL libraries.
my $dri_true = '';
+ my $dri_false = '#';
my $nvidia_true = '#';
given ($minimyth->var_get('MM_X_DRIVER'))
{
@@ -222,6 +223,7 @@
when (/^(nvidia)$/)
{
$dri_true = '#';
+ $dri_false = '';
$nvidia_true = '';
# Include path to proprietary libraries.
{
@@ -306,26 +308,6 @@
}
}
- # xorg-server versions 1.6.0 and greater have freetype support
built-in,
- # whereas older versions require the freetype module.
- my $freetype_true = '#';
- if ((-e '/usr/version/xorg-server') &&
(open(FILE, '<', '/usr/version/xorg-server')))
- {
- while (<FILE>)
- {
- chomp;
- if (/(\d+)\.(\d+)(\..*)?$/)
- {
- if (($1) && ($2) && (($1 < 1) || (($1 <= 1) && ($2 < 6))))
- {
- $freetype_true = '';
- last;
- }
- }
- }
- close(FILE);
- }
-
my $mode = $minimyth->var_get('MM_X_MODE');
my $mode_0 = $minimyth->var_get('MM_X_MODE_0');
my $mode_1 = $minimyth->var_get('MM_X_MODE_1');
@@ -389,8 +371,8 @@
'@X_DISPLAYSIZE_Y@' =>
$displaysize_y ,
'@X_VIRTUAL_X@' =>
$virtual_x ,
'@X_VIRTUAL_Y@' =>
$virtual_y ,
- '@FREETYPE_TRUE@' =>
$freetype_true ,
'@DRI_TRUE@' =>
$dri_true ,
+ '@DRI_FALSE@' =>
$dri_false ,
'@NVIDIA_TRUE@' =>
$nvidia_true });
$minimyth->message_output('info', "starting X ...");
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
