Author: pebender
Date: Mon Dec 8 09:10:42 2008
New Revision: 4059
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-kbd.rules.disabled
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-mouse.rules.disabled
trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/ (props changed)
trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/Makefile
trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/checksums
trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/files/
trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/files/xf86-input-evdev-2.0.8-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/ (props changed)
trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/Makefile
trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/checksums
trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/files/
trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/files/xf86-input-evdev-2.0.8-pkg_config.patch
Removed:
trunk/gar-minimyth/script/xorg-7.3/xf86-input-keyboard/
trunk/gar-minimyth/script/xorg-7.3/xf86-input-mouse/
trunk/gar-minimyth/script/xorg-7.4/xf86-input-keyboard/
trunk/gar-minimyth/script/xorg-7.4/xf86-input-mouse/
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.sh/init.d/conf.d/MM_LIRC
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_X
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/x
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/x.pm
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
trunk/gar-minimyth/script/xorg-7.3/xorg/Makefile
trunk/gar-minimyth/script/xorg-7.4/xorg/Makefile
Log:
- Replaced the kbd and mouse drivers with the evdev driver.
- Added auto-detection of the kbd and mouse device.
- Now, when a device is used by LIRC, it is not used by Xorg.
- Added packages
xorg-7.3/xf86-input-evdev
xorg-7.4/xf86-input-evdev
- Removed packages
xorg-7.3/xf86-input-keyboard
xorg-7.3/xf86-input-mouse
xorg-7.4/xf86-input-keyboard
xorg-7.4/xf86-input-mouse
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 Dec 8
09:10:42 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 61 (2008-12-06):
+Changes since 61 (2008-12-08):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -12,6 +12,11 @@
MythTV 0.21: version 0.21.0, release-0-21-fixes branch
svn 19237
MythTV trunk: version trunk.19241 trunk svn 19241
+Modified Xorg
+ - Replaced the kbd and mouse drivers with the evdev driver.
+ - Added auto-detection of the kbd and mouse device.
+ - Now, when a device is used by LIRC, it is not used by Xorg.
+
Modified LCDproc
- Reorganized lcdproc devices names.
- Converted persistent names from device names to device symbolic
links.
@@ -64,9 +69,15 @@
Removed packages
Added nvidia/nvidia-180.08.
+ Updated xorg-7.3/xf86-input-keyboard.
+ Updated xorg-7.3/xf86-input-mouse.
+ Updated xorg-7.4/xf86-input-keyboard.
+ Updated xorg-7.4/xf86-input-mouse.
Added packages
Added nvidia/nvidia-180.11.
+ Updated xorg-7.3/xf86-input-evdev.
+ Updated xorg-7.4/xf86-input-evdev.
Updated packages
Updated lib/bluez.
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
Mon Dec 8 09:10:42 2008
@@ -156,6 +156,5 @@
xorg/modules/extensions/libglx.so
xorg/modules/extensions/librecord.so
xorg/modules/fonts/libfreetype.so
-xorg/modules/input/kbd_drv.so
-xorg/modules/input/mouse_drv.so
+xorg/modules/input/evdev_drv.so
xorg/modules/input/void_drv.so
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 Dec 8 09:10:42 2008
@@ -21,29 +21,24 @@
Section "Module"
Load "dbe"
@DRI_TRUE@ Load "dri"
- Load "extmod"
+ Load "extmod"
Load "freetype"
- Load "glx"
+ Load "glx"
Load "int10"
Load "record"
EndSection
-Section "InputDevice"
- Identifier "Keyboard1"
- Driver "kbd"
- Option "AutoRepeat" "500 30"
- Option "XkbRules" "base"
- Option "XkbModel" "pc105"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse1"
- Driver "mouse"
- Option "Protocol" "PS/2"
- Option "Device" "/dev/input/mice"
- Option "ZAxisMapping" "4 5"
-EndSection
[EMAIL PROTECTED]@Section "InputDevice"
[EMAIL PROTECTED]@ Identifier "Keyboard1"
[EMAIL PROTECTED]@ Driver "evdev"
[EMAIL PROTECTED]@ Option "Device" "@MM_X_KBD_DEVICE@"
[EMAIL PROTECTED]@EndSection
+
[EMAIL PROTECTED]@Section "InputDevice"
[EMAIL PROTECTED]@ Identifier "Mouse1"
[EMAIL PROTECTED]@ Driver "evdev"
[EMAIL PROTECTED]@ Option "Device" "@MM_X_MOUSE_DEVICE@"
[EMAIL PROTECTED]@EndSection
Section "Monitor"
Identifier "Monitor1"
@@ -79,8 +74,8 @@
Option "NoLogo" "true"
Option "ConnectedMonitor" "@MM_X_DEVICE_NVIDIA@"
Option "TVStandard" "@MM_X_TV_TYPE@"
- Option "TVOutFormat" "@MM_X_TV_OUTPUT@"
- Option "TVOverScan" "@MM_X_TV_OVERSCAN@"
+ Option "TVOutFormat" "@MM_X_TV_OUTPUT@"
+ Option "TVOverScan" "@MM_X_TV_OVERSCAN@"
Option "UseEdidFreqs" "false"
Option "UseEDIDDpi" "false"
Option "DynamicTwinView" "false"
@@ -94,8 +89,8 @@
Driver "openchrome"
Option "EnableAGPDMA" "true"
Option "ActiveDevice" "@MM_X_DEVICE_VIA@"
- Option "TVType" "@MM_X_TV_TYPE@"
- Option "TVOutput" "@MM_X_TV_OUTPUT@"
+ Option "TVType" "@MM_X_TV_TYPE@"
+ Option "TVOutput" "@MM_X_TV_OUTPUT@"
Option "TVDeflicker" "2"
EndSection
@@ -141,8 +136,8 @@
Section "ServerLayout"
Identifier "Layout1"
Screen "Screen1"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
[EMAIL PROTECTED]@ InputDevice "Mouse1" "CorePointer"
[EMAIL PROTECTED]@ InputDevice "Keyboard1" "CoreKeyboard"
EndSection
Section "DRI"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
Mon Dec 8 09:10:42 2008
@@ -42,6 +42,10 @@
local device_list
local driver
+ if /usr/bin/test -e '/tmp/init.conf.lirc/conf_default_MM_LIRC' ; then
+ return 0
+ fi
+
if /usr/bin/test -z "${MM_LIRC_DRIVER}" ; then
MM_LIRC_DRIVER='none'
fi
@@ -179,6 +183,9 @@
MM_LIRC_DEVICE_LIST="${device_list}"
fi
+ /bin/mkdir -p '/tmp/init.conf.lirc'
+ /bin/touch '/tmp/init.conf.lirc/conf_default_MM_LIRC'
+
return 0
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_X
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_X
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_X
Mon Dec 8 09:10:42 2008
@@ -186,6 +186,9 @@
}
conf_default_MM_X() {
+ local device
+ local device_item
+ local device_list
local X_RESOLUTION_X
local X_RESOLUTION_Y
local X_VIRTUAL_X
@@ -197,9 +200,89 @@
return 0
fi
+ # The routine relies on MM_LIRC_* variables.
+ conf_default_MM_LIRC
+
# The routine relies on MM_VIDEO_* variables.
conf_default_MM_VIDEO
+ # X device variables
+ if /usr/bin/test -z "${MM_X_KBD_DEVICE}" ; then
+ MM_X_KBD_DEVICE='auto'
+ fi
+ if /usr/bin/test "${MM_X_KBD_DEVICE}" = 'auto' ; then
+ MM_X_KBD_DEVICE="`mm_detect_state_get 'kbd' | mm_uniq`"
+ device_list=
+ for device in ${MM_X_KBD_DEVICE} ; do
+ if /usr/bin/test -e "${device}" ; then
+ device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
+ fi
+ device_list="${device_list} ${device}"
+ done
+ MM_X_KBD_DEVICE="${device_list}"
+
+ if /usr/bin/test -n "${MM_LIRC_DEVICE_LIST}" ; then
+ device_blacklist=
+ for device_item in ${MM_LIRC_DEVICE_LIST} ; do
+ device=`/bin/echo "${device_item}" | /usr/bin/cut -d ','
-f 1`
+ if /usr/bin/test -e "${device}" ; then
+ device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
+ fi
+ device_blacklist="${device_blacklist} ${device}"
+ done
+ device_list=
+ for device in ${MM_X_KBD_DEVICE} ; do
+ if ! /bin/echo " ${device_blacklist} " | /bin/grep -q "
${device} " ; then
+ device_list="${device_list} ${device}"
+ fi
+ done
+ MM_X_KBD_DEVICE="${device_list}"
+ fi
+ MM_X_KBD_DEVICE=`/bin/echo "${MM_X_KBD_DEVICE}" | /bin/sed -e 's%
*% %g' -e 's%^ %%' -e 's% $%%'`
+ MM_X_KBD_DEVICE=`/bin/echo "${MM_X_KBD_DEVICE}" | /usr/bin/cut
-d ' ' -f 1`
+ fi
+ if /usr/bin/test "${MM_X_KBD_DEVICE}" = 'none' ; then
+ MM_X_KBD_DEVICE=''
+ fi
+
+ if /usr/bin/test -z "${MM_X_MOUSE_DEVICE}" ; then
+ MM_X_MOUSE_DEVICE='auto'
+ fi
+ if /usr/bin/test "${MM_X_MOUSE_DEVICE}" = 'auto' ; then
+ MM_X_MOUSE_DEVICE="`mm_detect_state_get 'mouse' | mm_uniq`"
+ device_list=
+ for device in ${MM_X_MOUSE_DEVICE} ; do
+ if /usr/bin/test -e "${device}" ; then
+ device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
+ fi
+ device_list="${device_list} ${device}"
+ done
+ MM_X_MOUSE_DEVICE="${device_list}"
+
+ if /usr/bin/test -n "${MM_LIRC_DEVICE_LIST}" ; then
+ device_blacklist=
+ for device_item in ${MM_LIRC_DEVICE_LIST} ; do
+ device=`/bin/echo "${device_item}" | /usr/bin/cut -d ','
-f 1`
+ if /usr/bin/test -e "${device}" ; then
+ device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
+ fi
+ device_blacklist="${device_blacklist} ${device}"
+ done
+ device_list=
+ for device in ${MM_X_MOUSE_DEVICE} ; do
+ if ! /bin/echo " ${device_blacklist} " | /bin/grep -q "
${device} " ; then
+ device_list="${device_list} ${device}"
+ fi
+ done
+ MM_X_MOUSE_DEVICE="${device_list}"
+ fi
+ MM_X_MOUSE_DEVICE=`/bin/echo "${MM_X_MOUSE_DEVICE}" | /bin/sed
-e 's% *% %g' -e 's%^ %%' -e 's% $%%'`
+ MM_X_MOUSE_DEVICE=`/bin/echo "${MM_X_MOUSE_DEVICE}" | /usr/bin/cut
-d ' ' -f 1`
+ fi
+ if /usr/bin/test "${MM_X_MOUSE_DEVICE}" = 'none' ; then
+ MM_X_MOUSE_DEVICE=''
+ fi
+
# X driver variables.
if /usr/bin/test -z "${MM_X_DRIVER}" ; then
MM_X_DRIVER=`mm_detect_state_get 'x' | /usr/bin/cut -d ' ' -f 1 |
/usr/bin/cut -d ',' -f 1`
@@ -748,6 +831,9 @@
conf_write_MM_X() {
local conf_file=$1
+
+ conf_variable_write "${conf_file}"
MM_X_KBD_DEVICE "${MM_X_KBD_DEVICE}"
+ conf_variable_write "${conf_file}"
MM_X_MOUSE_DEVICE "${MM_X_MOUSE_DEVICE}"
conf_variable_write "${conf_file}"
MM_X_DRIVER "${MM_X_DRIVER}"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/x
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/x
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/x
Mon Dec 8 09:10:42 2008
@@ -16,6 +16,8 @@
local LIB
local LIBS
local NVIDIA_TRUE
+ local KBD_TRUE
+ local MOUSE_TRUE
mm_message_output info "configuring X ..."
@@ -202,7 +204,20 @@
/usr/bin/test -n "${MM_X_MODE_0}" && MM_X_MODE_0="\"${MM_X_MODE_0}\""
/usr/bin/test -n "${MM_X_MODE_1}" && MM_X_MODE_1="\"${MM_X_MODE_1}\""
/usr/bin/test -n "${MM_X_MODE_2}" && MM_X_MODE_2="\"${MM_X_MODE_2}\""
+
+ KBD_TRUE='#'
+ if /usr/bin/test -n "${MM_X_KBD_DEVICE}" ; then
+ KBD_TRUE=''
+ fi
+ MOUSE_TRUE='#'
+ if /usr/bin/test -n "${MM_X_MOUSE_DEVICE}" ; then
+ MOUSE_TRUE=''
+ fi
+ /bin/sed -i "[EMAIL PROTECTED]@%${KBD_TRUE}%"
/etc/X11/xorg.conf
+ /bin/sed -i "[EMAIL PROTECTED]@%${MM_X_KBD_DEVICE}%"
/etc/X11/xorg.conf
+ /bin/sed -i "[EMAIL PROTECTED]@%${MOUSE_TRUE}%"
/etc/X11/xorg.conf
+ /bin/sed -i "[EMAIL PROTECTED]@%${MM_X_MOUSE_DEVICE}%"
/etc/X11/xorg.conf
/bin/sed -i "[EMAIL PROTECTED]@%${MM_X_DRIVER}%"
/etc/X11/xorg.conf
/bin/sed -i "[EMAIL PROTECTED]@%${MM_X_DEVICE_INTEL}%"
/etc/X11/xorg.conf
/bin/sed -i "[EMAIL PROTECTED]@%${MM_X_DEVICE_NVIDIA}%"
/etc/X11/xorg.conf
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm
Mon Dec 8 09:10:42 2008
@@ -18,6 +18,139 @@
#===============================================================================
#
#===============================================================================
+$var_list{'MM_X_KBD_DEVICE'} =
+{
+ prerequisite => ['MM_LIRC_DEVICE_LIST'],
+ value_default => 'auto',
+ value_valid => 'auto|none|.+',
+ value_auto => sub
+ {
+ my $minimyth = shift;
+ my $name = shift;
+
+ my $device_canonicalize = sub
+ {
+ my $device = shift;
+
+ if (($device) && (-e $device) && (open(FILE, '-|',
qq(/sbin/udevadm info --query name --root --name='$device'))))
+ {
+ while (<FILE>)
+ {
+ chomp;
+ $device = $_;
+ last;
+ }
+ close(FILE);
+ }
+
+ return $device;
+ };
+
+ my @device_list;
+
+ foreach my $item (@{$minimyth->detect_state_get('kbd')})
+ {
+ my $device = &{$device_canonicalize}($item->{'device'});
+ if ($device)
+ {
+ push(@device_list, "$device");
+ }
+ }
+ # Remove any dumplicates.
+ {
+ my $prev = '';
+ @device_list = grep($_ ne $prev && (($prev) = $_),
sort(@device_list));
+ }
+
+ if ($minimyth->var_get('MM_LIRC_DEVICE_LIST'))
+ {
+ my @blacklist = ();
+ foreach my $item (split(/ +/,
$minimyth->var_get('MM_LIRC_DEVICE_LIST')))
+ {
+ if ($item)
+ {
+ my @item = split(/,/, $item);
+ my $device = &{$device_canonicalize}($item[0]);
+ push(@blacklist, $device);
+ }
+ }
+ my $blacklist_filter = join('|', @blacklist);
+ @device_list = grep(! /^($blacklist_filter),.+$/,
@device_list);
+ }
+
+ return $device_list[0];
+ },
+ value_none => ''
+};
+
+$var_list{'MM_X_MOUSE_DEVICE'} =
+{
+ prerequisite => ['MM_LIRC_DEVICE_LIST'],
+ value_default => 'auto',
+ value_valid => 'auto|none|.+',
+ value_auto => sub
+ {
+ my $minimyth = shift;
+ my $name = shift;
+
+ my $device_canonicalize = sub
+ {
+ my $device = shift;
+
+ if (($device) && (-e $device) && (open(FILE, '-|',
qq(/sbin/udevadm info --query name --root --name='$device'))))
+ {
+ while (<FILE>)
+ {
+ chomp;
+ $device = $_;
+ last;
+ }
+ close(FILE);
+ }
+
+ return $device;
+ };
+
+ my @device_list;
+
+ foreach my $item (@{$minimyth->detect_state_get('mouse')})
+ {
+ my $device = &{$device_canonicalize}($item->{'device'});
+ if ($device)
+ {
+ push(@device_list, "$device");
+ }
+ }
+ # Remove any dumplicates.
+ {
+ my $prev = '';
+ @device_list = grep($_ ne $prev && (($prev) = $_),
sort(@device_list));
+ }
+
+ if ($minimyth->var_get('MM_LIRC_DEVICE_LIST'))
+ {
+ my @blacklist = ();
+ foreach my $item (split(/ +/,
$minimyth->var_get('MM_LIRC_DEVICE_LIST')))
+ {
+ if ($item)
+ {
+ my @item = split(/,/, $item);
+ my $device = &{$device_canonicalize}($item[0]);
+ push(@blacklist, $device);
+ }
+ }
+ my $blacklist_filter = join('|', @blacklist);
+ @device_list = grep(! /^($blacklist_filter),.+$/,
@device_list);
+ }
+
+ return $device_list[0];
+ },
+ value_none => ''
+};
+
+#===============================================================================
+#
+#===============================================================================
$var_list{'MM_X_DRIVER'} =
{
value_default => sub
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 Dec 8 09:10:42 2008
@@ -287,31 +287,38 @@
$mode_1 = '"' . $mode_1 . '"' if ($mode_1 ne '');
$mode_2 = '"' . $mode_2 . '"' if ($mode_2 ne '');
+ my $kbd_true = $minimyth->var_get('MM_X_KBD_DEVICE') ? '' : '#';
+ my $mouse_true = $minimyth->var_get('MM_X_MOUSE_DEVICE') ? '' : '#';
+
$minimyth->file_replace_variable(
'/etc/X11/xorg.conf',
- { '@MM_X_DRIVER@' => $minimyth->var_get('MM_X_DRIVER') ,
- '@MM_X_DEVICE_INTEL@' => $device_intel ,
- '@MM_X_DEVICE_NVIDIA@' => $device_nvidia ,
- '@MM_X_DEVICE_VIA@' => $device_via ,
- '@MM_X_TV_TYPE@' => $minimyth->var_get('MM_X_TV_TYPE') ,
- '@MM_X_TV_OUTPUT@' => $minimyth->var_get('MM_X_TV_OUTPUT') ,
- '@MM_X_TV_OVERSCAN@' => $minimyth->var_get('MM_X_TV_OVERSCAN'),
- '@MM_X_SYNC@' => $minimyth->var_get('MM_X_SYNC') ,
- '@MM_X_REFRESH@' => $minimyth->var_get('MM_X_REFRESH') ,
- '@MM_X_MODELINE@' => $minimyth->var_get('MM_X_MODELINE') ,
- '@MM_X_MODELINE_0@' => $minimyth->var_get('MM_X_MODELINE_0') ,
- '@MM_X_MODELINE_1@' => $minimyth->var_get('MM_X_MODELINE_1') ,
- '@MM_X_MODELINE_2@' => $minimyth->var_get('MM_X_MODELINE_2') ,
- '@MM_X_MODE@' => $mode ,
- '@MM_X_MODE_0@' => $mode_0 ,
- '@MM_X_MODE_1@' => $mode_1 ,
- '@MM_X_MODE_2@' => $mode_2 ,
- '@X_DISPLAYSIZE_X@' => $displaysize_x ,
- '@X_DISPLAYSIZE_Y@' => $displaysize_y ,
- '@X_VIRTUAL_X@' => $virtual_x ,
- '@X_VIRTUAL_Y@' => $virtual_y ,
- '@DRI_TRUE@' => $dri_true ,
- '@NVIDIA_TRUE@' => $nvidia_true
});
+ { '@KBD_TRUE@' =>
$kbd_true ,
+ '@MM_X_KBD_DEVICE@' =>
$minimyth->var_get('MM_X_KBD_DEVICE') ,
+ '@MOUSE_TRUE@' =>
$mouse_true ,
+ '@MM_X_MOUSE_DEVICE@' =>
$minimyth->var_get('MM_X_MOUSE_DEVICE'),
+ '@MM_X_DRIVER@' =>
$minimyth->var_get('MM_X_DRIVER') ,
+ '@MM_X_DEVICE_INTEL@' =>
$device_intel ,
+ '@MM_X_DEVICE_NVIDIA@' =>
$device_nvidia ,
+ '@MM_X_DEVICE_VIA@' =>
$device_via ,
+ '@MM_X_TV_TYPE@' =>
$minimyth->var_get('MM_X_TV_TYPE') ,
+ '@MM_X_TV_OUTPUT@' =>
$minimyth->var_get('MM_X_TV_OUTPUT') ,
+ '@MM_X_TV_OVERSCAN@' =>
$minimyth->var_get('MM_X_TV_OVERSCAN') ,
+ '@MM_X_SYNC@' =>
$minimyth->var_get('MM_X_SYNC') ,
+ '@MM_X_REFRESH@' =>
$minimyth->var_get('MM_X_REFRESH') ,
+ '@MM_X_MODELINE@' =>
$minimyth->var_get('MM_X_MODELINE') ,
+ '@MM_X_MODELINE_0@' =>
$minimyth->var_get('MM_X_MODELINE_0') ,
+ '@MM_X_MODELINE_1@' =>
$minimyth->var_get('MM_X_MODELINE_1') ,
+ '@MM_X_MODELINE_2@' =>
$minimyth->var_get('MM_X_MODELINE_2') ,
+ '@MM_X_MODE@' =>
$mode ,
+ '@MM_X_MODE_0@' =>
$mode_0 ,
+ '@MM_X_MODE_1@' =>
$mode_1 ,
+ '@MM_X_MODE_2@' =>
$mode_2 ,
+ '@X_DISPLAYSIZE_X@' =>
$displaysize_x ,
+ '@X_DISPLAYSIZE_Y@' =>
$displaysize_y ,
+ '@X_VIRTUAL_X@' =>
$virtual_x ,
+ '@X_VIRTUAL_Y@' =>
$virtual_y ,
+ '@DRI_TRUE@' =>
$dri_true ,
+ '@NVIDIA_TRUE@' =>
$nvidia_true });
# Make sure that the file ownership is correct.
{
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-kbd.rules.disabled
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-kbd.rules.disabled
Mon Dec 8 09:10:42 2008
@@ -0,0 +1,25 @@
+#-------------------------------------------------------------------------------
+# Detect kbd devices.
+#
+# An kbd device is assumed to have the name event[0-9]*, be an input device
+# and either be a USB keyboard or use the atkbd driver.
+#
+# The state requires the kbd device name. However, since it is not yet
+# known, it cannot be added be included in mm_detect_state_kbd. Therefore,
+# the mm_detect script will prepend the kbd device name to the state.
+#-------------------------------------------------------------------------------
+ACTION!="add|change|remove", GOTO="end"
+KERNEL=="event[0-9]*", SUBSYSTEM=="input", GOTO="begin"
+GOTO="end"
+LABEL="begin"
+
+ENV{mm_detect_state_kbd}=""
+
+SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03",
ATTRS{bInterfaceProtocol}=="01", ENV{mm_detect_state_kbd}="yes"
+
+DRIVERS=="atkbd", ENV{mm_detect_state_kbd}="yes"
+
+# The state has been set, so save it.
+ENV{mm_detect_state_kbd}=="?*", RUN+="/lib/udev/mm_detect kbd %k
state_prepend_devname"
+
+LABEL="end"
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-mouse.rules.disabled
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-mouse.rules.disabled
Mon Dec 8 09:10:42 2008
@@ -0,0 +1,25 @@
+#-------------------------------------------------------------------------------
+# Detect mouse devices.
+#
+# An mouse device is assumed to have the name event[0-9]*, be an input
device
+# and either be a USB mouse or use the psmouse driver.
+#
+# The state requires the mouse device name. However, since it is not yet
+# known, it cannot be added be included in mm_detect_state_mouse.
Therefore,
+# the mm_detect script will prepend the mouse device name to the state.
+#-------------------------------------------------------------------------------
+ACTION!="add|change|remove", GOTO="end"
+KERNEL=="event[0-9]*", SUBSYSTEM=="input", GOTO="begin"
+GOTO="end"
+LABEL="begin"
+
+ENV{mm_detect_state_mouse}=""
+
+SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03",
ATTRS{bInterfaceProtocol}=="02", ENV{mm_detect_state_mouse}="yes"
+
+DRIVERS=="psmouse", ENV{mm_detect_state_mouse}="yes"
+
+# The state has been set, so save it.
+ENV{mm_detect_state_mouse}=="?*", RUN+="/lib/udev/mm_detect mouse %k
state_prepend_devname"
+
+LABEL="end"
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Mon Dec 8
09:10:42 2008
@@ -1 +1 @@
-2410fb27e98ff18d505d2bb77c8cbcf4 download/MiniMyth.pm
+67eeec6f74b1b5ab8a9246b311d41655 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Mon Dec
8 09:10:42 2008
@@ -405,8 +405,10 @@
my %map;
$map{'audio'} = [ 'card_number' , 'device_number' ];
$map{'backend'} = [ 'enabled'];
+ $map{'kbd'} = [ 'device' ];
$map{'lcdproc'} = [ 'device' , 'driver'];
$map{'lirc'} = [ 'device' , 'driver', 'lircd_conf' ];
+ $map{'mouse'} = [ 'device' ];
$map{'x'} = [ 'driver' ];
my @state;
Added: trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/Makefile
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/Makefile Mon Dec
8
09:10:42 2008
@@ -0,0 +1,44 @@
+GARNAME = xf86-input-evdev
+GARVERSION = 2.0.8
+CATEGORIES = $(CATEGORY)
+MASTER_SITES = $(XORG_MASTER_SITES)
+DISTFILES = $(DISTNAME).tar.bz2
+PATCHFILES = $(DISTNAME)-pkg_config.patch
+LICENSE = $(GARNAME)
+$(GARNAME)_LICENSE_TEXT = $(WORKSRC)/COPYING
+
+DESCRIPTION =
+define BLURB
+endef
+
+DEPENDS = lang/c \
+ $(CATEGORY)/inputproto \
+ $(CATEGORY)/randrproto \
+ $(CATEGORY)/xorg-server \
+ $(CATEGORY)/xproto
+BUILDDEPS = \
+ $(CATEGORY)/util-macros \
+ $(CATEGORY)/xorg-server \
+ $(CATEGORY)/xorg-sgml-doctools
+
+CATEGORY := $(shell basename $(shell dirname $(shell pwd)))
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
+CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
+ --with-gnu-ld
+
+GAR_EXTRA_CONF += $(CATEGORY)/xorg/package-api.mk
+include ../../gar.mk
+
+pre-configure:
+ @rm -f $(WORKSRC)/acinclude.m4
+ @cd $(WORKSRC) ; autoreconf --verbose --install --force
+ @$(call FIX_LIBTOOL,$(WORKSRC)/configure)
+ @$(MAKECOOKIE)
+
+post-install:
+ @rm -f $(DESTDIR)$(libdir)/xorg/modules/input/evdev_drv.la
+ @$(MAKECOOKIE)
Added: trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/checksums
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/checksums Mon Dec
8 09:10:42 2008
@@ -0,0 +1,2 @@
+7f9ace5bcca1427b0da40827a74cbc33 download/xf86-input-evdev-2.0.8.tar.bz2
+25ffe2b2cbd8da2accfd4d4014b3098a
download/xf86-input-evdev-2.0.8-pkg_config.patch
Added:
trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/files/xf86-input-evdev-2.0.8-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/xf86-input-evdev/files/xf86-input-evdev-2.0.8-pkg_config.patch
Mon Dec 8 09:10:42 2008
@@ -0,0 +1,13 @@
+diff -Naur xf86-input-evdev-2.0.8-old/configure.ac
xf86-input-evdev-2.0.8-new/configure.ac
+--- xf86-input-evdev-2.0.8-old/configure.ac 2008-11-18 16:28:49.000000000
-0800
++++ xf86-input-evdev-2.0.8-new/configure.ac 2008-12-07 21:31:17.000000000
-0800
+@@ -76,7 +76,8 @@
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++sdkdir="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=sdkdir
xorg-server)"
+
+ CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+ AC_SUBST([CFLAGS])
Modified: trunk/gar-minimyth/script/xorg-7.3/xorg/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/xorg/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.3/xorg/Makefile Mon Dec 8 09:10:42
2008
@@ -32,8 +32,7 @@
$(CATEGORY)/mkfontscale \
$(CATEGORY)/rgb \
$(CATEGORY)/xdpyinfo \
- $(CATEGORY)/xf86-input-keyboard \
- $(CATEGORY)/xf86-input-mouse \
+ $(CATEGORY)/xf86-input-evdev \
$(CATEGORY)/xf86-input-void \
$(CATEGORY)/xf86-video-ati \
$(CATEGORY)/xf86-video-radeonhd \
Added: trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/Makefile
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/Makefile Mon Dec
8
09:10:42 2008
@@ -0,0 +1,44 @@
+GARNAME = xf86-input-evdev
+GARVERSION = 2.0.8
+CATEGORIES = $(CATEGORY)
+MASTER_SITES = $(XORG_MASTER_SITES)
+DISTFILES = $(DISTNAME).tar.bz2
+PATCHFILES = $(DISTNAME)-pkg_config.patch
+LICENSE = $(GARNAME)
+$(GARNAME)_LICENSE_TEXT = $(WORKSRC)/COPYING
+
+DESCRIPTION =
+define BLURB
+endef
+
+DEPENDS = lang/c \
+ $(CATEGORY)/inputproto \
+ $(CATEGORY)/randrproto \
+ $(CATEGORY)/xorg-server \
+ $(CATEGORY)/xproto
+BUILDDEPS = \
+ $(CATEGORY)/util-macros \
+ $(CATEGORY)/xorg-server \
+ $(CATEGORY)/xorg-sgml-doctools
+
+CATEGORY := $(shell basename $(shell dirname $(shell pwd)))
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
+CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
+ --with-gnu-ld
+
+GAR_EXTRA_CONF += $(CATEGORY)/xorg/package-api.mk
+include ../../gar.mk
+
+pre-configure:
+ @rm -f $(WORKSRC)/acinclude.m4
+ @cd $(WORKSRC) ; autoreconf --verbose --install --force
+ @$(call FIX_LIBTOOL,$(WORKSRC)/configure)
+ @$(MAKECOOKIE)
+
+post-install:
+ @rm -f $(DESTDIR)$(libdir)/xorg/modules/input/evdev_drv.la
+ @$(MAKECOOKIE)
Added: trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/checksums
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/checksums Mon Dec
8 09:10:42 2008
@@ -0,0 +1,2 @@
+7f9ace5bcca1427b0da40827a74cbc33 download/xf86-input-evdev-2.0.8.tar.bz2
+25ffe2b2cbd8da2accfd4d4014b3098a
download/xf86-input-evdev-2.0.8-pkg_config.patch
Added:
trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/files/xf86-input-evdev-2.0.8-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xf86-input-evdev/files/xf86-input-evdev-2.0.8-pkg_config.patch
Mon Dec 8 09:10:42 2008
@@ -0,0 +1,13 @@
+diff -Naur xf86-input-evdev-2.0.8-old/configure.ac
xf86-input-evdev-2.0.8-new/configure.ac
+--- xf86-input-evdev-2.0.8-old/configure.ac 2008-11-18 16:28:49.000000000
-0800
++++ xf86-input-evdev-2.0.8-new/configure.ac 2008-12-07 21:31:17.000000000
-0800
+@@ -76,7 +76,8 @@
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++sdkdir="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=sdkdir
xorg-server)"
+
+ CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+ AC_SUBST([CFLAGS])
Modified: trunk/gar-minimyth/script/xorg-7.4/xorg/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xorg/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xorg/Makefile Mon Dec 8 09:10:42
2008
@@ -32,8 +32,7 @@
$(CATEGORY)/mkfontscale \
$(CATEGORY)/rgb \
$(CATEGORY)/xdpyinfo \
- $(CATEGORY)/xf86-input-keyboard \
- $(CATEGORY)/xf86-input-mouse \
+ $(CATEGORY)/xf86-input-evdev \
$(CATEGORY)/xf86-input-void \
$(CATEGORY)/xf86-video-ati \
$(CATEGORY)/xf86-video-radeonhd \
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
