--- a/open-src/common/delibtoolize.pl Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/common/delibtoolize.pl Thu Dec 16 17:09:59 2010 -0800
@@ -187,7 +187,7 @@
# handle line continuation
next if ($n =~ m/\\$/);
- if ($l =~ m/^\s*CC\s*=(?:.*\s+)?(\S+)/) {
+ if ($l =~ m/^\s*CC\s*=(?:.*\s+)?(\S*cc)/) {
$compiler = $1;
}
--- a/open-src/driver/xf86-input-keyboard/6886424.patch Tue Dec 14 00:55:39 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-diff -urp -x '*~' -x '*.orig' src/kbd.c src/kbd.c
---- src/kbd.c 2009-01-08 00:51:05.000000000 +0800
-+++ src/kbd.c 2009-10-19 16:46:59.481878000 +0800
-@@ -598,6 +598,18 @@ KbdProc(DeviceIntPtr device, int what)
- break;
-
- case DEVICE_CLOSE:
-+
-+ if (pInfo->fd != -1)
-+ RemoveEnabledDevice(pInfo->fd);
-+ pKbd->KbdOff(pInfo, what);
-+ device->public.on = FALSE;
-+
-+ if (pInfo->fd != -1) {
-+ close(pInfo->fd);
-+ pInfo->fd = -1;
-+ }
-+ break;
-+
- case DEVICE_OFF:
-
- /*
--- a/open-src/driver/xf86-input-keyboard/6897086.patch Tue Dec 14 00:55:39 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
---- src/sun_kbdMap.c.orig Mon Nov 16 15:42:20 2009
-+++ src/sun_kbdMap.c Mon Nov 16 15:38:59 2009
-@@ -40,6 +40,17 @@
- #define KEY_Kanji 0x82
- #define KEY_Execute 0x83
-
-+/*
-+ * Additional Korean 106 Keyboard Keys not defined in atKeynames.h
-+ * These are exactly same USB usage id with Kana(0x90) and Eisu(0x91) keys
-+ * in Mac Japanese keyboard. From /usr/X11/lib/X11/xkb/keycodes/xfree86, these
-+ * are 209 and 210. So these should be 0xc9(209-8=201) and 0xca(210-8=202).
-+ * <EISU> = 210; // Alphanumeric mode on macintosh
-+ * <KANA> = 209; // Kana mode on macintosh
-+ */
-+#define KEY_Hangul 0xC9 /* Also Kana in Mac Japanaese kbd */
-+#define KEY_Hangul_Hanja 0xCA /* Also Eisu in Mac Japanaese kbd */
-+
- /* Override atKeynames.h values with unique keycodes, so we can distinguish
- KEY_F15 from KEY_HKTG & KEY_KP_DEC from KEY_BSlash2 */
- #undef KEY_HKTG
-@@ -475,8 +486,8 @@
- /* 141 */ KEY_NOTUSED,
- /* 142 */ KEY_NOTUSED,
- /* 143 */ KEY_NOTUSED,
-- /* 144 */ KEY_NOTUSED,
-- /* 145 */ KEY_NOTUSED,
-+ /* 144 */ KEY_Hangul, /* Korean 106 Kbd: Hangul */
-+ /* 145 */ KEY_Hangul_Hanja, /* Korean 106 Kbd: Hanja */
- /* 146 */ KEY_NOTUSED,
- /* 147 */ KEY_NOTUSED,
- /* 148 */ KEY_NOTUSED,
--- a/open-src/driver/xf86-input-keyboard/7005752.patch Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-input-keyboard/7005752.patch Thu Dec 16 17:09:59 2010 -0800
@@ -19,9 +19,10 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
---- src/sun_kbdMap.c.orig Thu Aug 26 03:28:10 2010
-+++ src/sun_kbdMap.c Fri Dec 10 02:32:43 2010
-@@ -36,10 +36,6 @@
+diff -urp -x '*~' -x '*.orig' src/sun_kbdMap.c src/sun_kbdMap.c
+--- src/sun_kbdMap.c 2010-08-14 00:59:20.000000000 -0700
++++ src/sun_kbdMap.c 2010-12-14 18:27:31.709516099 -0800
+@@ -37,10 +37,6 @@
/* Map the Solaris keycodes to the "XFree86" keycodes. */
@@ -29,10 +30,10 @@
-#define KEY_Kanji 0x82
-#define KEY_Execute 0x83
-
- /*
+ /*
* Additional Korean 106 Keyboard Keys not defined in atKeynames.h
- * These are exactly same USB usage id with Kana(0x90) and Eisu(0x91) keys
-@@ -478,10 +474,10 @@
+ * These are exactly same USB usage id with Kana(0x90) and Eisu(0x91) keys
+@@ -479,10 +475,10 @@ static unsigned char usbmap[256] = {
/* 133 */ KEY_NOTUSED,
/* 134 */ KEY_NOTUSED,
/* 135 */ KEY_BSlash2, /* Sun Japanese Kbd: Backslash / Underscore */
@@ -46,7 +47,7 @@
/* 140 */ KEY_NOTUSED,
/* 141 */ KEY_NOTUSED,
/* 142 */ KEY_NOTUSED,
-@@ -603,8 +599,6 @@
+@@ -604,8 +600,6 @@ KbdGetMapping (InputInfoPtr pInfo, KeySy
* Add Sun keyboard keysyms to default map
*/
#define map_for_key(k,c) map[(k * GLYPHS_PER_KEY) + c]
--- a/open-src/driver/xf86-input-keyboard/Makefile Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-input-keyboard/Makefile Thu Dec 16 17:09:59 2010 -0800
@@ -29,16 +29,14 @@
MODULE_NAME=xf86-input-keyboard
# Version number (used in path names)
-MODULE_VERSION=1.4.0
+MODULE_VERSION=1.5.0
# Checksums for upstream tarball
-TARBALL_MD5 = fd17158ffeacecc8cc670604460cb98b
-TARBALL_SHA1 = 5061fdaff8b7ddcbcca82f065c4abbfff255a1da
+TARBALL_MD5 = b74d7162db5ce7899c17927c6cfa9522
+TARBALL_SHA1 = 206e0c8b9ac68d6aa44521f8437b6626a75fe963
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- 6886424.patch \
- 6897086.patch \
7005752.patch
# Man pages to apply Sun footer to & attributes to list
--- a/open-src/driver/xf86-input-mouse/6892799.patch Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-input-mouse/6892799.patch Thu Dec 16 17:09:59 2010 -0800
@@ -19,10 +19,10 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-diff -urp -x '*~' -x '*.orig' src/mouse.c src/mouse.c
---- src/mouse.c 2009-10-21 15:54:31.146864000 +0800
-+++ src/mouse.c 2009-10-21 15:54:31.343475000 +0800
-@@ -1744,13 +1744,14 @@ MouseProc(DeviceIntPtr device, int what)
+diff -Nurp -x '*~' -x '*.orig' src/mouse.c src/mouse.c
+--- src/mouse.c 2010-08-14 01:04:54.000000000 -0700
++++ src/mouse.c 2010-09-09 11:31:51.072960718 -0700
+@@ -1637,13 +1637,14 @@ MouseProc(DeviceIntPtr device, int what)
ErrorF("assigning %p atom=%d name=%s\n", device, pInfo->atom,
pInfo->name);
#endif
@@ -41,26 +41,23 @@
if (pMse->xisbscale)
pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4);
else
-@@ -1800,6 +1801,22 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1699,8 +1700,6 @@ MouseProc(DeviceIntPtr device, int what)
+ XisbFree(pMse->buffer);
+ pMse->buffer = NULL;
+ }
+- xf86CloseSerial(pInfo->fd);
+- pInfo->fd = -1;
+ if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft)
+ {
+ RemoveBlockAndWakeupHandlers (MouseBlockHandler,
+@@ -1711,6 +1710,10 @@ MouseProc(DeviceIntPtr device, int what)
+ device->public.on = FALSE;
break;
-
- case DEVICE_OFF:
-+ if (pInfo->fd != -1) {
-+ xf86RemoveEnabledDevice(pInfo);
-+ if (pMse->buffer) {
-+ XisbFree(pMse->buffer);
-+ pMse->buffer = NULL;
-+ }
-+ if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft)
-+ {
-+ RemoveBlockAndWakeupHandlers (MouseBlockHandler,
-+ MouseWakeupHandler,
-+ (pointer) pInfo);
-+ }
+ case DEVICE_CLOSE:
++ if (pInfo->fd != -1) {
++ xf86CloseSerial(pInfo->fd);
++ pInfo->fd = -1;
+ }
-+ device->public.on = FALSE;
-+ break;
-+
- case DEVICE_CLOSE:
- if (pInfo->fd != -1) {
- xf86RemoveEnabledDevice(pInfo);
+ xfree(pMse->mousePriv);
+ pMse->mousePriv = NULL;
+ break;
--- a/open-src/driver/xf86-input-mouse/6920647.patch Tue Dec 14 00:55:39 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -ur old/src/sun_mouse.c new/src/sun_mouse.c
---- src/sun_mouse.c Thu Feb 11 17:09:23 2010
-+++ src/sun_mouse.c Thu Feb 11 17:10:24 2010
-@@ -438,6 +438,9 @@
- ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
- int result;
-
-+ if (!pScr->currentMode)
-+ return;
-+
- if ((pVuidMse->absres.width != pScr->currentMode->HDisplay) ||
- (pVuidMse->absres.height != pScr->currentMode->VDisplay))
- {
--- a/open-src/driver/xf86-input-mouse/6950572.patch Tue Dec 14 00:55:39 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-From cb11e9ca60e8ca2590c77f844bfd19e5278f518f Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 11 Aug 2010 21:30:40 -0700
-Subject: [PATCH:xf86-input-mouse] MouseCtrl doesn't need to save values we never use
-
-Makes it into a no-op, like evdev's PtrCtrl function, now that
-mouse acceleration is completely handled in dix.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
-Reviewed-by: Peter Hutterer <[email protected]>
-Reviewed-by: Patrick E. Kane <pekane52 at gmail.com>
-Reviewed-by: Simon Thum <[email protected]>
----
- src/mouse.c | 18 +++---------------
- src/xf86OSmouse.h | 3 ---
- 2 files changed, 3 insertions(+), 18 deletions(-)
-
-diff --git a/src/mouse.c b/src/mouse.c
-index 99d1f2b..a296021 100644
---- a/src/mouse.c
-+++ b/src/mouse.c
-@@ -1546,26 +1546,14 @@ post_event:
-
- /*
- * MouseCtrl --
-- * Alter the control parameters for the mouse. Note that all special
-- * protocol values are handled by dix.
-+ * Alter the control parameters for the mouse. Note that all
-+ * settings are now handled by dix.
- */
-
- static void
- MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl)
- {
-- InputInfoPtr pInfo;
-- MouseDevPtr pMse;
--
-- pInfo = device->public.devicePrivate;
-- pMse = pInfo->private;
--
--#ifdef EXTMOUSEDEBUG
-- ErrorF("MouseCtrl pMse=%p\n", pMse);
--#endif
--
-- pMse->num = ctrl->num;
-- pMse->den = ctrl->den;
-- pMse->threshold = ctrl->threshold;
-+ /* This function intentionally left blank */
- }
-
- /*
-diff --git a/src/xf86OSmouse.h b/src/xf86OSmouse.h
-index 09b8525..33b2232 100644
---- a/src/xf86OSmouse.h
-+++ b/src/xf86OSmouse.h
-@@ -214,9 +214,6 @@ typedef struct _MouseDevRec {
- int oldBaudRate;
- int sampleRate;
- int lastButtons;
-- int threshold; /* acceleration */
-- int num;
-- int den;
- int buttons; /* # of buttons */
- int emulateState; /* automata state for 2 button mode */
- Bool emulate3Buttons;
---
-1.5.6.5
-
--- a/open-src/driver/xf86-input-mouse/Makefile Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-input-mouse/Makefile Thu Dec 16 17:09:59 2010 -0800
@@ -29,18 +29,15 @@
MODULE_NAME=xf86-input-mouse
# Version number (used in path names)
-MODULE_VERSION=1.5.0
+MODULE_VERSION=1.6.0
# Checksums for upstream tarball
-TARBALL_MD5 = c58629fddf0782dad5c02da6aeb35521
-TARBALL_SHA1 = b9213bf745b793a3da2c946ea4d8ee5768e560f4
+TARBALL_MD5 = cef849b1a2743d2e84de98422f372974
+TARBALL_SHA1 = df3f2fe711db195fc58dbffef5f2cd8964d9b9df
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- enodev.patch \
- 6892799.patch \
- 6920647.patch \
- 6950572.patch,-p1
+ 6892799.patch
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-input-mouse/enodev.patch Tue Dec 14 00:55:39 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-#
-
-6844148 Xorg support for errno ENODEV from mouse devices
-
-Based on xf86-input-keyboard fix for 6835394
-
-diff -Nurp -x '*~' -x '*.orig' src/sun_mouse.c src/sun_mouse.c
---- src/sun_mouse.c 2009-09-20 19:02:57.000000000 -0700
-+++ src/sun_mouse.c 2010-01-20 15:17:08.303078733 -0800
-@@ -23,7 +23,7 @@
- * dealings in this Software without prior written authorization from the
- * XFree86 Project.
- */
--/* Copyright 2004-2005, 2008-2009 Sun Microsystems, Inc. All rights reserved.
-+/* Copyright 2004-2005, 2008-2010, Oracle and/or its affiliates. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
-@@ -107,6 +107,7 @@ typedef struct _VuidMseRec {
- #ifdef HAVE_ABSOLUTE_MOUSE_SCALING
- Ms_screen_resolution absres;
- #endif
-+ OsTimerPtr remove_timer; /* Callback for removal on ENODEV */
- } VuidMseRec, *VuidMsePtr;
-
- static VuidMsePtr vuidMouseList = NULL;
-@@ -138,6 +139,18 @@ VuidMsePtr getVuidMsePriv(InputInfoPtr p
- return m;
- }
-
-+/* Called from OsTimer callback, since removing a device from the device
-+ list or changing pInfo->fd while xf86Wakeup is looping through the list
-+ causes server crashes */
-+static CARD32
-+vuidRemoveMouse(OsTimerPtr timer, CARD32 time, pointer arg)
-+{
-+ InputInfoPtr pInfo = (InputInfoPtr) arg;
-+
-+ xf86DisableDevice(pInfo->dev, TRUE);
-+
-+ return 0; /* All done, don't set to run again */
-+}
-
- /*
- * Initialize and enable the mouse wheel, if present.
-@@ -334,19 +347,40 @@ vuidReadInput(InputInfoPtr pInfo)
- pMse = pInfo->private;
- pVuidMse = getVuidMsePriv(pInfo);
- buttons = pMse->lastButtons;
-- XisbBlockDuration(pMse->buffer, -1);
- pBuf = pVuidMse->buffer;
- n = 0;
-
- do {
-- while (n < sizeof(Firm_event) && (c = XisbRead(pMse->buffer)) >= 0) {
-- pBuf[n++] = (unsigned char)c;
-- }
--
-- if (n == 0)
-- return;
-+ n = read(pInfo->fd, pBuf, sizeof(Firm_event));
-
-- if (n != sizeof(Firm_event)) {
-+ if (n == 0) {
-+ break;
-+ } else if (n == -1) {
-+ switch (errno) {
-+ case EAGAIN: /* Nothing to read now */
-+ n = 0; /* End loop, go on to flush events & return */
-+ continue;
-+ case EINTR: /* Interrupted, try again */
-+ continue;
-+ case ENODEV: /* May happen when USB mouse is unplugged */
-+ /* We use X_NONE here because it doesn't alloc since we
-+ may be called from SIGIO handler */
-+ xf86MsgVerb(X_NONE, 0,
-+ "%s: Device no longer present - removing.\n",
-+ pInfo->name);
-+ xf86RemoveEnabledDevice(pInfo);
-+ pVuidMse->remove_timer =
-+ TimerSet(pVuidMse->remove_timer, 0, 1,
-+ vuidRemoveMouse, pInfo);
-+ return;
-+ default: /* All other errors */
-+ /* We use X_NONE here because it doesn't alloc since we
-+ may be called from SIGIO handler */
-+ xf86MsgVerb(X_NONE, 0, "%s: Read error: %s\n", pInfo->name,
-+ strerror(errno));
-+ return;
-+ }
-+ } else if (n != sizeof(Firm_event)) {
- xf86Msg(X_WARNING, "%s: incomplete packet, size %d\n",
- pInfo->name, n);
- }
-@@ -416,11 +450,6 @@ vuidReadInput(InputInfoPtr pInfo)
- }
- #endif
-
-- n = 0;
-- if ((c = XisbRead(pMse->buffer)) >= 0) {
-- /* Another packet. Handle it right away. */
-- pBuf[n++] = c;
-- }
- } while (n != 0);
-
- if (absXset || absYset) {
-@@ -563,6 +592,13 @@ vuidMouseProc(DeviceIntPtr pPointer, int
- vuidMouseSendScreenSize(screenInfo.screens[0], pVuidMse);
- #endif
- xf86FlushInput(pInfo->fd);
-+
-+ /* Allocate here so we don't alloc in ReadInput which may be called
-+ from SIGIO handler. */
-+ if (pVuidMse->remove_timer == NULL) {
-+ pVuidMse->remove_timer = TimerSet(pVuidMse->remove_timer,
-+ 0, 0, NULL, NULL);
-+ }
- }
- break;
-
-@@ -578,6 +614,10 @@ vuidMouseProc(DeviceIntPtr pPointer, int
- }
- }
- }
-+ if (pVuidMse->remove_timer) {
-+ TimerFree(pVuidMse->remove_timer);
-+ pVuidMse->remove_timer = NULL;
-+ }
- ret = pVuidMse->wrapped_device_control(pPointer, what);
- break;
-
--- a/open-src/driver/xf86-input-synaptics/Makefile Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-input-synaptics/Makefile Thu Dec 16 17:09:59 2010 -0800
@@ -29,38 +29,26 @@
MODULE_NAME=xf86-input-synaptics
# Version number (used in path names)
-MODULE_VERSION=1.2.1
+MODULE_VERSION=1.3.0
# Checksums for upstream tarball
-TARBALL_MD5 = 29a6f9da5123149e4abc8ff83880ed5c
-TARBALL_SHA1 = ffdad38384f3dcbf650d1db7e3d75ed46935a2c6
+TARBALL_MD5 = b4e58eba1bdca13f0929a4b03b262135
+TARBALL_SHA1 = 132fff19a3a1768e7ab403f44ebc28e0480a4120
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
MODULE_STABILITY=Volatile
# Extra flags to pass to configure script
-# - need to set install locations for HAL config file & probe util/script
MODULE_CONFIG_OPTS= \
- --with-hal-bin-dir=/usr/sbin \
- --with-hal-callouts-dir=/usr/lib/hal \
- --with-hal-fdi-dir=/etc/hal/fdi/policy/10osvendor \
--bindir=$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
# Libraries/modules to link with
MODULE_LD_OPTIONS= -lm
-# Extra install rules
-MODULE_ADD_INSTALL_TARGETS = install_fdi
-
-# Fix path for installing headers in proto area
-MODULE_INSTALL_MAKEFLAGS = sdkdir='$(XORG_SDK_INCLUDES_DIR)'
+# Fix path for installing headers & HAL fdi file in proto area
+MODULE_INSTALL_MAKEFLAGS = sdkdir='$(XORG_SDK_INCLUDES_DIR)' \
+ fdidir=/etc/hal/fdi/policy/10osvendor
include ../Makefile.inc
-FDI_DIR=$(PROTODIR)/etc/hal/fdi/policy/10osvendor
-
-install_fdi: $(SOURCE_TARGETS)
- mkdir -p $(FDI_DIR)
- $(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/fdi/11-x11-synaptics.fdi \
- $(FDI_DIR)/
--- a/open-src/driver/xf86-input-void/Makefile Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-input-void/Makefile Thu Dec 16 17:09:59 2010 -0800
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-input-void
# Version number (used in path names)
-MODULE_VERSION=1.3.0
+MODULE_VERSION=1.3.1
# Checksums for upstream tarball
-TARBALL_MD5 = 53bdac9ca56418f4675810ed8a78b3e8
-TARBALL_SHA1 = 2b2d284c4cc356f2ff6fc8e448e61bbea2e4ff30
+TARBALL_MD5 = 3056bc7c57db8c5d56039648c0530c45
+TARBALL_SHA1 = f0009bd77d205c5e5a9791d8f498780b44e931ae
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-ati/COPYING Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-video-ati/COPYING Thu Dec 16 17:09:59 2010 -0800
@@ -25,16 +25,27 @@
------------------------------------------------------------------------
-Copyright 2004, 2005 Eric Anholt
+Copyright 2007 Advanced Micro Devices, Inc.
+Copyright (C) 2008-2009 Advanced Micro Devices, Inc.
+Copyright 2004 Eric Anholt
+Copyright 2005 Eric Anholt
+Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
+Copyright 2004 ATI Technologies Inc., Markham, Ontario
+Copyright (C) 2008-2009 Alexander Deucher
+Copyright 2008 J�r�me Glisse
Copyright 2005 Benjamin Herrenschmidt
+Copyright 2008 Kristian H�gsberg
+Copyright (C) 2008-2009 Matthias Hopf
+Copyright (c) 2006 Itronix Inc.
+Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+Copyright � 2007 Red Hat, Inc.
+Copyright � 2009 Red Hat, Inc.
+Copyright 2007 George Sapountzis
+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
Copyright 2006 Tungsten Graphics, Inc.
-All Rights Reserved.
+Copyright 2000 VA Linux Systems, Inc., Fremont, California.
Copyright � 2006 Intel Corporation
Copyright 2006 Luc Verhaegen.
-Copyright 2007 George Sapountzis
-Copyright 2007, 2008 Red Hat, Inc.
-Copyright 2007, 2008 Advanced Micro Devices, Inc.
-Copyright 2008 Alex Deucher
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -57,12 +68,12 @@
------------------------------------------------------------------------
-Copyright 2005-2007 Luc Verhaegen.
-Copyright 2006-2007 Advanced Micro Devices, Inc.
+Copyright 2006-2007 Advanced Micro Devices, Inc.
Copyright 2007 Egbert Eich <[email protected]>
Copyright 2007 Matthias Hopf <[email protected]>
-Copyright (C) 2008-2009 Advanced Micro Devices, Inc.
-Copyright (C) 2008-2009 Matthias Hopf
+Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+Copyright 2007 Luc Verhaegen <[email protected]>
+Copyright 2005-2007 Luc Verhaegen.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
--- a/open-src/driver/xf86-video-ati/Makefile Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-video-ati/Makefile Thu Dec 16 17:09:59 2010 -0800
@@ -29,15 +29,14 @@
MODULE_NAME=xf86-video-ati
# Version number (used in path names)
-MODULE_VERSION=6.13.1
+MODULE_VERSION=6.13.2
# Checksums for upstream tarball
-TARBALL_MD5 = d65ae11cc66146c7006dbf5acebde413
-TARBALL_SHA1 = 74a8e647e3149af0b1eb1baf58ef1b69b44f0228
+TARBALL_MD5 = a8f92fe3c458e511f4e2ead7f92c02b0
+TARBALL_SHA1 = f9d379a884a833829ab1942de4ad4f4766cdcd46
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- fix-build-on-non-kms.patch,-p1 \
mapfiles.patch \
solaris-dri-drv-port.patch
--- a/open-src/driver/xf86-video-ati/fix-build-on-non-kms.patch Tue Dec 14 00:55:39 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-From 06691376b1ee963c711420edaf5a03eab6f5658f Mon Sep 17 00:00:00 2001
-From: Dave Airlie <[email protected]>
-Date: Wed, 7 Jul 2010 13:15:03 +1000
-Subject: [PATCH] fix build on non-kms
-
----
- src/r6xx_accel.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
-index 0edfe8b..73f9462 100644
---- a/src/r6xx_accel.c
-+++ b/src/r6xx_accel.c
-@@ -1262,9 +1262,9 @@ void r600_finish_op(ScrnInfoPtr pScrn, int vtx_size)
-
- void r600_vb_no_space(ScrnInfoPtr pScrn, int vert_size)
- {
--#ifdef XF86DRM_MODE
- RADEONInfoPtr info = RADEONPTR(pScrn);
- struct radeon_accel_state *accel_state = info->accel_state;
-+#ifdef XF86DRM_MODE
-
- if (info->cs) {
- if (accel_state->vb_bo) {
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-vmware/6370961.patch Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-video-vmware/6370961.patch Thu Dec 16 17:09:59 2010 -0800
@@ -20,10 +20,10 @@
# DEALINGS IN THE SOFTWARE.
6370961 - needs sane vert, horiz ranges
-diff -urp -x '*~' -x '*.orig' src/vmware.c src/vmware.c
---- src/vmware.c 2009-05-12 16:47:50.000000000 -0700
-+++ src/vmware.c 2009-05-12 21:01:29.909838000 -0700
-@@ -927,6 +927,20 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
+diff -Nurp -x '*~' -x '*.orig' src/vmware.c src/vmware.c
+--- src/vmware.c 2010-10-29 00:25:37.000000000 -0700
++++ src/vmware.c 2010-11-09 07:46:56.703211613 -0800
+@@ -955,6 +955,20 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
*/
vmwareGetSupportedModelines(&pScrn->monitor->Modes);
--- a/open-src/driver/xf86-video-vmware/COPYING Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-video-vmware/COPYING Thu Dec 16 17:09:59 2010 -0800
@@ -23,3 +23,25 @@
and author(s) shall not be used in advertising or otherwise to promote
the sale, use or other dealings in this Software without prior written
authorization from the copyright holder(s) and author(s).
+
+Copyright 2010 VMware, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/open-src/driver/xf86-video-vmware/Makefile Tue Dec 14 00:55:39 2010 -0800
+++ b/open-src/driver/xf86-video-vmware/Makefile Thu Dec 16 17:09:59 2010 -0800
@@ -29,14 +29,14 @@
MODULE_NAME=xf86-video-vmware
# Version number (used in path names)
-MODULE_VERSION=10.16.9
+MODULE_VERSION=11.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 3b3d38abfa1f8be4b1e26dcd236bc94f
-TARBALL_SHA1 = 4e0e5d193f3e83dce46a7d39d52257629e51f4d3
+TARBALL_MD5 = 579bee487309b1bdc8329bf627d43413
+TARBALL_SHA1 = 8aa23618a3dfa91f88094a4d1dc45c878f386f69
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6370961.patch xf86LoaderReqSymLists.patch
+SOURCE_PATCHES = 6370961.patch
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
@@ -52,6 +52,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lshadowfb -lXfont -lvgahw -lpciaccess
+ -lfb -lpixman-1 -lshadowfb -lXfont -lvgahw -lpciaccess
include ../Makefile.inc
--- a/open-src/driver/xf86-video-vmware/xf86LoaderReqSymLists.patch Tue Dec 14 00:55:39 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
---- src/vmware.c Mon Nov 9 12:26:22 2009
-+++ src/vmware.c Mon Nov 9 12:26:48 2009
-@@ -640,8 +640,6 @@
- return FALSE;
- }
-
-- xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
- if (!vgaHWGetHWRec(pScrn)) {
- return FALSE;
- }
-@@ -973,7 +971,6 @@
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
-
- /* Need ramdac for hwcursor */
- if (pVMWARE->hwCursor) {
-@@ -981,7 +978,6 @@
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(ramdacSymbols, NULL);
- }
-
- return TRUE;
-@@ -2065,9 +2061,6 @@
- setupDone = TRUE;
- xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
-
-- LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
-- shadowfbSymbols, NULL);
--
- return (pointer)1;
- }
- if (errmaj) {
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-vmware.mf Tue Dec 14 00:55:39 2010 -0800
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-vmware.mf Thu Dec 16 17:09:59 2010 -0800
@@ -35,5 +35,7 @@
dir path=usr/share/man
dir path=usr/share/man/man7
file path=usr/lib/xorg/modules/drivers/$(ARCH64)/vmware_drv.so
+file path=usr/lib/xorg/modules/drivers/$(ARCH64)/vmwlegacy_drv.so
file path=usr/lib/xorg/modules/drivers/vmware_drv.so
+file path=usr/lib/xorg/modules/drivers/vmwlegacy_drv.so
file path=usr/share/man/man7/vmware.7