--- a/open-src/common/Makefile.init Thu Aug 30 13:44:13 2012 -0700
+++ b/open-src/common/Makefile.init Thu Aug 30 15:02:35 2012 -0700
@@ -389,7 +389,7 @@
# referenced in multiple places, so it's kept here for easy sharing.
#
# Current Xorg server source tarball to use sources from:
-XORGSERVER_VERS=1.12.2
+XORGSERVER_VERS=1.12.4
# Minimum Xorg server version that we expect to be ABI compatible with.
# Usually .99 of the previous minor release series, as that's the convention
# for the development snapshots of the next release series.
--- a/open-src/driver/xf86-input-keyboard/Makefile Thu Aug 30 13:44:13 2012 -0700
+++ b/open-src/driver/xf86-input-keyboard/Makefile Thu Aug 30 15:02:35 2012 -0700
@@ -29,15 +29,15 @@
MODULE_NAME=xf86-input-keyboard
# Version number (used in path names)
-MODULE_VERSION=1.6.1
+MODULE_VERSION=1.6.2
# Checksums for upstream tarball
-TARBALL_MD5 = 09744e8dc9a1fe5e61927c1073cd3428
-TARBALL_SHA1 = ef30fecb9e846a5268ae339846401489a785e413
-TARBALL_SHA256= aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
+TARBALL_MD5 = ec2ea4c3faf5af15f2b3192d84252703
+TARBALL_SHA1 = 8a4f75076231b941011b7c129bd66afe8f261b9a
+TARBALL_SHA256= 76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = leds.patch,-p1
+SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-input-keyboard/leds.patch Thu Aug 30 13:44:13 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-From ed35abe0da1a9134ee126df88608b33892ae4313 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 18 Jan 2012 18:13:08 -0800
-Subject: [PATCH:xf86-input-keyboard] Solaris: Use uchar_t, not int, for led masks in KIOCSLED/KIOCGLED ioctls
-
-Avoids checking/setting the wrong bits on big endian machines like SPARC.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- src/sun_kbd.c | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/sun_kbd.c b/src/sun_kbd.c
-index a240087..5f7b5c6 100644
---- a/src/sun_kbd.c
-+++ b/src/sun_kbd.c
-@@ -70,8 +70,9 @@ static void
- sunKbdSetLeds(InputInfoPtr pInfo, int leds)
- {
- int i;
-+ uchar_t setleds = (uchar_t) (leds & 0xFF);
-
-- SYSCALL(i = ioctl(pInfo->fd, KIOCSLED, &leds));
-+ SYSCALL(i = ioctl(pInfo->fd, KIOCSLED, &setleds));
- if (i < 0) {
- xf86Msg(X_ERROR, "%s: Failed to set keyboard LED's: %s\n",
- pInfo->name, strerror(errno));
-@@ -82,14 +83,15 @@ sunKbdSetLeds(InputInfoPtr pInfo, int leds)
- static int
- sunKbdGetLeds(InputInfoPtr pInfo)
- {
-- int i, leds = 0;
-+ int i;
-+ uchar_t leds = 0;
-
- SYSCALL(i = ioctl(pInfo->fd, KIOCGLED, &leds));
- if (i < 0) {
- xf86Msg(X_ERROR, "%s: Failed to get keyboard LED's: %s\n",
- pInfo->name, strerror(errno));
- }
-- return leds;
-+ return (int) leds;
- }
-
-
---
-1.7.3.2
-
--- a/open-src/lib/pixman/COPYING Thu Aug 30 13:44:13 2012 -0700
+++ b/open-src/lib/pixman/COPYING Thu Aug 30 15:02:35 2012 -0700
@@ -724,3 +724,39 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------
+
+pixman/pixman-mips-dspr2-asm.S, pixman/pixman-mips-dspr2-asm.h,
+pixman/pixman-mips-dspr2.c, pixman/pixman-mips-dspr2.h,
+pixman/pixman-mips-memcpy-asm.S
+
+ Copyright (c) 2012
+ MIPS Technologies, Inc., California.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the MIPS Technologies, Inc., nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE MIPS TECHNOLOGIES, INC. ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE MIPS TECHNOLOGIES, INC. BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ Author: Nemanja Lukic ([email protected])
+
+
--- a/open-src/lib/pixman/Makefile Thu Aug 30 13:44:13 2012 -0700
+++ b/open-src/lib/pixman/Makefile Thu Aug 30 15:02:35 2012 -0700
@@ -28,11 +28,11 @@
MODULE_NAME=pixman
# Version number (used in path names)
-MODULE_VERSION=0.24.4
+MODULE_VERSION=0.26.2
# Checksums for upstream tarball
-TARBALL_MD5 = 89eb7db8853681bbcea626b161de0488
-TARBALL_SHA1 = 683450f917015366ac7918fc517c76801aeff374
+TARBALL_MD5 = 6b3e4c5300adb893a2baa9631c23efb2
+TARBALL_SHA1 = 1daf014714cc29147726abada12359345d156705
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/proto/glproto/Makefile Thu Aug 30 13:44:13 2012 -0700
+++ b/open-src/proto/glproto/Makefile Thu Aug 30 15:02:35 2012 -0700
@@ -27,12 +27,12 @@
MODULE_NAME=glproto
# Version number (used in path names)
-MODULE_VERSION=1.4.15
+MODULE_VERSION=1.4.16
# Checksums for upstream tarball
-TARBALL_MD5 = d1ff0c1acc605689919c1ee2fc9b5582
-TARBALL_SHA1 = 4cee35232f1926312b29d59a94da1c526b01e5c3
-TARBALL_SHA256= 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
+TARBALL_MD5 = 3847963c1b88fd04a030b932b0aece07
+TARBALL_SHA1 = 6f1a971c6c6da3daf860ff2888fa0eae347479b0
+TARBALL_SHA256= 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/xserver/xorg/Makefile Thu Aug 30 13:44:13 2012 -0700
+++ b/open-src/xserver/xorg/Makefile Thu Aug 30 15:02:35 2012 -0700
@@ -32,9 +32,9 @@
MODULE_VERSION=$(XORGSERVER_VERS)
# Checksums for upstream tarball
-TARBALL_MD5 = 791f0323b886abb7954de7f042bb7dc6
-TARBALL_SHA1 = 2edb151d39571dc0fcdedc299ea0a77fe6bfc076
-TARBALL_SHA256= ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
+TARBALL_MD5 = f87d830aa69885275e26dd6327d76a44
+TARBALL_SHA1 = 6d616874f9c7677bda08dc073c03f83e78fbc585
+TARBALL_SHA256= 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
# Patches to apply to source after unpacking, in order
# *** Moved to patch-list file so they can be shared between Xorg & Xvnc builds
--- a/open-src/xserver/xorg/patch-list Thu Aug 30 13:44:13 2012 -0700
+++ b/open-src/xserver/xorg/patch-list Thu Aug 30 15:02:35 2012 -0700
@@ -1,4 +1,3 @@
-sbusPaletteKey.patch,-p1
SProcDRI2Connect.patch,-p1
studio-asm.patch,-p1
osaudit.patch,-p1
--- a/open-src/xserver/xorg/sbusPaletteKey.patch Thu Aug 30 13:44:13 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-From 12e1e1599213c413ccdfed5f0c7a8884974b7210 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Thu, 26 Jan 2012 15:44:40 -0800
-Subject: [PATCH] Convert sbusPaletteKey to latest DevPrivate API
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- hw/xfree86/common/xf86sbusBus.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
-index c993b60..9716146 100644
---- a/hw/xfree86/common/xf86sbusBus.c
-+++ b/hw/xfree86/common/xf86sbusBus.c
-@@ -619,8 +619,9 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp)
- pScrn->virtualY = psdp->height;
- }
-
--static sbusPaletteKeyIndex;
--static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex;
-+static DevPrivateKeyRec sbusPaletteKeyRec;
-+#define sbusPaletteKey (&sbusPaletteKeyRec)
-+
- typedef struct _sbusCmap {
- sbusDevicePtr psdp;
- CloseScreenProcPtr CloseScreen;
-@@ -692,6 +693,9 @@ xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
- struct fbcmap fbcmap;
- unsigned char data[2];
-
-+ if (!dixRegisterPrivateKey(sbusPaletteKey, PRIVATE_SCREEN, 0))
-+ FatalError("Cannot register sbus private key");
-+
- cmap = xnfcalloc(1, sizeof(sbusCmapRec));
- dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap);
- cmap->psdp = psdp;
---
-1.7.9.2
-