xserver: Branch 'master' - 3 commits

[Keith Packard]

 config/99-evdev.conf                  |    8 ++++++++
 config/Makefile.am                    |    5 ++++-
 hw/xquartz/bundle/Info.plist.cpp      |    4 ++--
 hw/xquartz/mach-startup/bundle-main.c |    2 +-
 os/log.c                              |    2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit 1a267a8c652fa1ba1a1bed0136127a5a360c3086
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Apr 1 23:44:24 2010 -0700

    Install 99-evdev.conf in $(prefix)/etc/X11/xorg.conf.d under udev
    
    udev needs some xorg.conf file to tell it to load a suitable input
    driver, 99-evdev.conf is as simple as they come, mapping all evdev
    devices to the evdev driver.

diff --git a/config/99-evdev.conf b/config/99-evdev.conf
new file mode 100644
index 0000000..7406f4e
--- /dev/null
+++ b/config/99-evdev.conf
@@ -0,0 +1,8 @@
+#
+# Catch-all evdev loader for udev-based systems
+#
+Section "InputClass"
+        Identifier "evdev-catchall"
+        Driver "evdev"
+        MatchDevicePath "/dev/input/event*"
+EndSection
diff --git a/config/Makefile.am b/config/Makefile.am
index 27f251b..d1ed74e 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -9,6 +9,9 @@ AM_CFLAGS += $(UDEV_CFLAGS)
 libconfig_la_SOURCES += udev.c
 libconfig_la_LIBADD = $(UDEV_LIBS)
 
+xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR)
+xorgconfd_DATA = 99-evdev.conf
+
 else
 
 if CONFIG_NEED_DBUS
@@ -33,4 +36,4 @@ endif # CONFIG_NEED_DBUS
 
 endif # !CONFIG_UDEV
 
-EXTRA_DIST = xorg-server.conf x11-input.fdi
+EXTRA_DIST = xorg-server.conf x11-input.fdi 99-evdev.conf
commit 02328f190f893cb4ad0f3af7a2ecd39ed77ae5ad
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Thu Apr 1 18:21:51 2010 -0700

    Bump bundle version to 2.5.1
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index e89d985..91c8c03 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.5.0</string>
+		<string>2.5.1</string>
 	<key>CFBundleVersion</key>
-		<string>2.5.0</string>
+		<string>2.5.1</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>
commit 0e342add7768df55a1917e27f9b85feddd444e82
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Thu Apr 1 15:30:46 2010 -0700

    darwin: Correct inline assembly for  ___crashreporter_info__
    
    It was missing an underscore.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 625b8b4..42aa757 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -75,7 +75,7 @@ extern int noPanoramiXExtension;
 
 static char __crashreporter_info_buff__[4096] = {0};
 static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];
-asm (".desc __crashreporter_info__, 0x10");
+asm (".desc ___crashreporter_info__, 0x10");
 
 static const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
 
diff --git a/os/log.c b/os/log.c
index c1301d7..3773315 100644
--- a/os/log.c
+++ b/os/log.c
@@ -120,7 +120,7 @@ static Bool needBuffer = TRUE;
 #ifdef __APPLE__
 static char __crashreporter_info_buff__[4096] = {0};
 static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];
-asm (".desc __crashreporter_info__, 0x10");
+asm (".desc ___crashreporter_info__, 0x10");
 #endif
 
 /* Prefix strings for log messages. */