Author: pebender
Date: Sat May 23 12:48:05 2009
New Revision: 4817
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
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:
- Changed the x init script so that it only loads Xorg freetype module
when the xorg-server version is less than 1.6 as 1.6.x has built in
freetype support.
- Added the library xserver/protocol.txt used by xorg-server 1.6.x.
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 May 23
12:48:05 2009
@@ -125,10 +125,14 @@
- Fixed a bug that caused MythBrowser to fail due to dcopserver not
starting, which was caused by the x init script not correctly setting
the permissions on /tmp/.ICE-unix.
+ - Changed the x init script so that it only loads Xorg freetype module
+ when the xorg-server version is less than 1.6 as 1.6.x has built in
+ freetype support.
Fixed build system
- Fixed devel/binutils so that it builds static libraries as well.
- Patched kde/kdelibs so that parallel build is more reliable.
+ - Added the library xserver/protocol.txt used by xorg-server 1.6.x.
Removed packages
Removed nvidia/nvidia-180.44.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
Sat May 23 12:48:05 2009
@@ -170,3 +170,4 @@
xorg/modules/fonts/libfreetype.so
xorg/modules/input/evdev_drv.so
xorg/modules/input/void_drv.so
+xserver/protocol.txt
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
Sat May 23 12:48:05 2009
@@ -22,7 +22,7 @@
Load "dbe"
@DRI_TRUE@ Load "dri"
Load "extmod"
- Load "freetype"
+...@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
Sat May 23 12:48:05 2009
@@ -287,6 +287,26 @@
}
}
+ # 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');
@@ -350,6 +370,7 @@
'@X_DISPLAYSIZE_Y@' =>
$displaysize_y ,
'@X_VIRTUAL_X@' =>
$virtual_x ,
'@X_VIRTUAL_Y@' =>
$virtual_y ,
+ '@FREETYPE_TRUE@' =>
$freetype_true ,
'@DRI_TRUE@' =>
$dri_true ,
'@NVIDIA_TRUE@' =>
$nvidia_true });
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
