--- a/open-src/app/sessreg/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/app/sessreg/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.5
+MODULE_VERSION=1.0.6
# Checksums for upstream tarball
-TARBALL_MD5 = 00e834c3cbfd990e9d7d5ddc834242df
-TARBALL_SHA1 = d1dac6a398b23ed44bb67286ec083e9071bd00e7
+TARBALL_MD5 = 8c8fcda19f4cffe573d43ec9b8255f8e
+TARBALL_SHA1 = 6f260f1ddc366da070a6d60301b9fb64a99c119a
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xditview/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/app/xditview/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -33,11 +33,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = e9a7192ef29453b8c810ddd556a463c0
-TARBALL_SHA1 = 1f369042a725bab1c2d3774184b99f09e7933920
+TARBALL_MD5 = dbf480019b75377154b6976726809bba
+TARBALL_SHA1 = 18f603e76a82fd2a62017dbd0c51258769539b0a
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xinput/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/app/xinput/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xinput
# Version number (used in path names)
-MODULE_VERSION=1.5.1
+MODULE_VERSION=1.5.2
# Checksums for upstream tarball
-TARBALL_MD5 = 82400f0ba63217df9b00d825532cea7d
-TARBALL_SHA1 = f8f45486de7d44b3d7274dfd24f988035fe05910
+TARBALL_MD5 = 8cec6023f90180cb8e4be31d98c43fda
+TARBALL_SHA1 = 4b352ad59e67dc6e63361a9050d3fbe5a6aec3de
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/x11-server-utilities
--- a/open-src/app/xlsfonts/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/app/xlsfonts/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xlsfonts
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION=1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 28958248590ff60ecd70e8f590d977b7
-TARBALL_SHA1 = 556c8b94002e834cf61e08ea4f5551a039e2d5c9
+TARBALL_MD5 = bf6f3e7074479839d5182ffed735d2be
+TARBALL_SHA1 = 9d4e0adbcb83362dd9234e90507c0528f60e309b
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/app/xrandr/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/app/xrandr/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xrandr
# Version number (used in path names)
-MODULE_VERSION=1.3.2
+MODULE_VERSION=1.3.3
# Checksums for upstream tarball
-TARBALL_MD5 = 2cb19bb1c19ccf77c40032b03dbe06f0
-TARBALL_SHA1 = 0e49b0a0889ae8a590452c6cd0d60a2253a8d940
+TARBALL_MD5 = 5b2dcfb0d9b736afaf78f6ce7651259c
+TARBALL_SHA1 = dada3eb30fead3334d954dc4dad9f0ffd7a8ff95
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/x11-server-utilities
--- a/open-src/app/xset/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/app/xset/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xset
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.2.0
# Checksums for upstream tarball
-TARBALL_MD5 = eeb0d02f69c76bd40470dede99b4bd49
-TARBALL_SHA1 = ff4295442821826092b17248c1ad65e16cd860ef
+TARBALL_MD5 = 88ff2d390695366fa53e5d746fe86ad5
+TARBALL_SHA1 = 0aa0fa0b7620a7bee846e5cd7847c20095a7d654
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = xsetfbpm.patch xsetman.patch
--- a/open-src/app/xterm/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/app/xterm/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -42,11 +42,11 @@
UPSTREAM_SET = yes
# Version number (used in path names)
-MODULE_VERSION=258
+MODULE_VERSION=261
# Checksums for upstream tarball
-TARBALL_MD5 = bcf4f0ba51f5f58fd5bef76b3d05e40e
-TARBALL_SHA1 = d3357fc88917e23210eea2db32b185799bb2d22e
+TARBALL_MD5 = 10d211f6986c4b279cfa9530b2361457
+TARBALL_SHA1 = c19b73bea2f43c676699e914c8a059d8b69fc89b
# Source tarball
SOURCE_URL=ftp://invisible-island.net/xterm/$(SOURCE_TARBALL_NAME:.tar.gz=.tgz)
--- a/open-src/common/Makefile.inc Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/common/Makefile.inc Mon Aug 16 15:35:21 2010 -0700
@@ -451,6 +451,7 @@
# Command line options to GNU autoconf configure script
DEFAULT_CONFIG_OPTS = --prefix=$(MODULE_PREFIX) \
+ --without-xmlto --without-asciidoc \
--mandir='$${prefix}/share/man' --localstatedir=/var
CONFIG_OPTS = $(DEFAULT_CONFIG_OPTS) \
--- a/open-src/doc/xorg-sgml-doctools/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/doc/xorg-sgml-doctools/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -31,11 +31,11 @@
MODULE_PKGTAIL_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.4
+MODULE_VERSION=1.5
# Checksums for upstream tarball
-TARBALL_MD5 = 20484c9d97800530616742cb14989ac2
-TARBALL_SHA1 = 629687695b367946575ee935727d26e621f25674
+TARBALL_MD5 = 1cd2d8213ee71ebdbefce45c9da54762
+TARBALL_SHA1 = 16c70d7fb704309b7c9f2c05c226ea131b6e9088
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/driver/xf86-input-vmmouse/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-input-vmmouse/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,19 +29,30 @@
MODULE_NAME=xf86-input-vmmouse
# Version number (used in path names)
-MODULE_VERSION=12.6.5
+MODULE_VERSION=12.6.10
# Checksums for upstream tarball
-TARBALL_MD5 = ce78e0135b5e34338a1ea98afb933120
-TARBALL_SHA1 = bf2f1031ccc0096f388272ce93b75572d24548be
+TARBALL_MD5 = 49c6e77851e9f7bc5cb7d85f061992f8
+TARBALL_SHA1 = 4c510d3f3ceaeb3bf826d440a406fe53fd85902c
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = xf86LoaderReqSymLists.patch,-p1
+SOURCE_PATCHES =
# vmmouse_client code won't build with Sun compiler
MODULE_COMPILER=gcc
MODULE_COMPILER_SET=yes
+# Need to use GNU Make to build due to Sun make bug 6474905
+MODULE_MAKE=$(GNUMAKE)
+MODULE_MAKE_SET=yes
+
+# Special handling for 64-bit installs, since GNU make doesn't
+# pass through the *_drv_ladir override correctly from MODTYPE_MAKEFLAGS
+INSTALL_TARGETS_64 = install-driver
+INSTALL_TARGETS_SET_64 = yes
+INSTALL_TARGETS = $(INSTALL_TARGETS_$(BUILD_TYPE))
+INSTALL_TARGETS_SET = $(INSTALL_TARGETS_SET_$(BUILD_TYPE))
+
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
MODULE_STABILITY=Volatile
@@ -67,3 +78,7 @@
(cd $(SOURCE_DIR)/fdi ; \
$(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS) \
uninstall)
+
+install-driver: $(INSTALL_DEPS)
+ mkdir -p $(PROTODIR)$(DRIVER_DIR)
+ cp -pf $(SOURCE_DIR)/src/vmmouse_drv.so $(PROTODIR)$(DRIVER_DIR)/
--- a/open-src/driver/xf86-input-vmmouse/xf86LoaderReqSymLists.patch Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-From 43e123c2f4fadfdf6e7cf5aa864102d82e40fe4b Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Tue, 8 Sep 2009 22:35:55 -0700
-Subject: [PATCH] Symbol was removed from the server.
-
-Signed-off-by: Peter Hutterer <[email protected]>
----
- src/vmmouse.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/vmmouse.c b/src/vmmouse.c
-index d4f0ca6..1f4774a 100644
---- a/src/vmmouse.c
-+++ b/src/vmmouse.c
-@@ -146,6 +146,7 @@ typedef struct {
- Bool absoluteRequested;
- } VMMousePrivRec, *VMMousePrivPtr;
-
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
- static const char *reqSymbols[] = {
- "InitPointerDeviceStruct",
- "LoaderSymbol",
-@@ -192,6 +193,7 @@ static const char *reqSymbols[] = {
- "Xstrdup",
- NULL
- };
-+#endif
-
- InputDriverRec VMMOUSE = {
- 1,
-@@ -1175,7 +1177,9 @@ VMMousePlug(pointer module,
- {
- static Bool Initialised = FALSE;
-
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
- xf86LoaderReqSymLists(reqSymbols, NULL);
-+#endif
-
- if (!Initialised)
- Initialised = TRUE;
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-apm/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-apm/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-apm
# Version number (used in path names)
-MODULE_VERSION=1.2.2
+MODULE_VERSION=1.2.3
# Checksums for upstream tarball
-TARBALL_MD5 = 48441a19aaf015570b267f2a8e67d8ab
-TARBALL_SHA1 = d319ccb26754419541bde73636d747d581a7ab84
+TARBALL_MD5 = a3743a971b3acb7de3d2eefc8b1a4834
+TARBALL_SHA1 = 1fa7180cf985a74132f8d5b39a0bf9df08713fac
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
@@ -52,7 +52,8 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa
+ -lfb -lpixman-1 -lint10 -lpciaccess -lshadowfb -lXfont -lvbe \
+ -lvgahw -lxaa
# Additional install rules beyond what upstream installs
MODULE_ADD_INSTALL_TARGETS=install_docs
--- a/open-src/driver/xf86-video-ark/COPYING Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-Copyright 2000 Ani Joshi <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation and
-that the name of Ani Joshi not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission. Ani Joshi makes no representations
-about the suitability of this software for any purpose. It is provided
-"as-is" without express or implied warranty.
-
-ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
--- a/open-src/driver/xf86-video-ark/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-ark/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-ark
# Version number (used in path names)
-MODULE_VERSION=0.7.2
+MODULE_VERSION=0.7.3
# Checksums for upstream tarball
-TARBALL_MD5 = 4745f5c722b030962cc56eb2443894a0
-TARBALL_SHA1 = fc934b68e06b8fa4f54ccda028134ab88065c6ea
+TARBALL_MD5 = ff0cb9cb0a7f36cc6f556deed7327798
+TARBALL_SHA1 = 56901ec6097a83433689f208268281f9c98c238b
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-ast/6924667.patch Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-ast/6924667.patch Mon Aug 16 15:35:21 2010 -0700
@@ -1,6 +1,7 @@
---- src/ast_driver.c Mon Feb 15 14:36:59 2010
-+++ src/ast_driver.c Mon Feb 15 14:46:07 2010
-@@ -404,28 +404,32 @@
+diff -urp -x '*~' -x '*.orig' src/ast_driver.c src/ast_driver.c
+--- src/ast_driver.c 2010-08-16 13:19:22.622286472 -0700
++++ src/ast_driver.c 2010-08-16 13:19:22.900612901 -0700
+@@ -321,28 +321,32 @@ ASTProbe(DriverPtr drv, int flags)
xfree(usedChips);
#else
--- a/open-src/driver/xf86-video-ast/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-ast/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,18 +29,16 @@
MODULE_NAME=xf86-video-ast
# Version number (used in path names)
-MODULE_VERSION=0.89.0
+MODULE_VERSION=0.91.10
# Checksums for upstream tarball
-TARBALL_MD5 = 9d98ac74ea7feb9f1f4783b59eccdb2b
-TARBALL_SHA1 = dca605c1d7202209bc0f3ecec10ae979cbf71e14
+TARBALL_MD5 = 65da53af3ebd1685149b6145976fdb2d
+TARBALL_SHA1 = a90624e63f33fdcb50ccefcdeebb34052f341ef3
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- xf86UDelay.patch,-p1 \
sparc-ast.patch \
- sparc-ast-6860461.patch \
- 6924667.patch port.patch
+ 6924667.patch
# Link in additional source files from sun-src directory
ADDITIONAL_SOURCE_DIR=sun-src
--- a/open-src/driver/xf86-video-ast/port.patch Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
---- src/ast_accel.c Tue Nov 10 12:51:02 2009
-+++ src/ast_accel.c Tue Nov 10 12:51:10 2009
-@@ -25,8 +25,6 @@
- #endif
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
---- src/ast_cursor.c Tue Nov 10 12:51:25 2009
-+++ src/ast_cursor.c Tue Nov 10 12:51:33 2009
-@@ -25,8 +25,6 @@
- #endif
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
---- src/ast_driver.c Tue Nov 10 12:51:52 2009
-+++ src/ast_driver.c Tue Nov 10 12:55:34 2009
-@@ -25,8 +25,10 @@
- #endif
- #include "xf86.h"
- #include "xf86_OSproc.h"
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
- #include "xf86RAC.h"
-+#endif
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
-@@ -288,19 +290,6 @@
- xf86AddDriver(&AST, module, 0);
-
- /*
-- * Tell the loader about symbols from other modules that this module
-- * might refer to.
-- */
--#if !(defined(__sparc__))
-- LoaderRefSymLists(vgahwSymbols,
-- fbSymbols, xaaSymbols, ramdacSymbols,
-- vbeSymbols, vbeOptionalSymbols,
-- ddcSymbols, int10Symbols, NULL);
--#else
-- LoaderRefSymLists(fbSymbols, xaaSymbols, ramdacSymbols, ddcSymbols, NULL);
--#endif
--
-- /*
- * The return value must be non-NULL on success even though there
- * is no TearDownProc.
- */
-@@ -485,20 +474,20 @@
- if (pEnt->location.type != BUS_PCI)
- return FALSE;
-
-+#ifndef XSERVER_LIBPCIACCESS
- if (xf86RegisterResources(pEnt->index, 0, ResExclusive))
- return FALSE;
-+#endif
-
- #if !(defined(__sparc__))
- /* The vgahw module should be loaded here when needed */
- if (!xf86LoadSubModule(pScrn, "vgahw"))
- return FALSE;
-- xf86LoaderReqSymLists(vgahwSymbols, NULL);
- #endif
-
- /* The fb module should be loaded here when needed */
- if (!xf86LoadSubModule(pScrn, "fb"))
- return FALSE;
-- xf86LoaderReqSymLists(fbSymbols, NULL);
-
- #if !(defined(__sparc__))
- /* Allocate a vgaHWRec */
-@@ -542,8 +531,10 @@
- pScrn->progClock = TRUE;
- pScrn->rgbBits = 6;
- pScrn->monitor = pScrn->confScreen->monitor; /* should be initialized before set gamma */
-+#ifndef XSERVER_LIBPCIACCESS
- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
- pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-+#endif
-
- /*
- * If the driver can do gamma correction, it should call xf86SetGamma()
-@@ -691,7 +682,6 @@
- #else
- if (xf86LoadSubModule(pScrn, "int10")) {
- xf86Int10InfoPtr pInt10;
-- xf86LoaderReqSymLists(int10Symbols, NULL);
- xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
- pInt10 = xf86InitInt10(pAST->pEnt->index);
- xf86FreeInt10(pInt10);
-@@ -797,7 +787,6 @@
- ASTFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(xaaSymbols, NULL);
-
- pAST->noAccel = FALSE;
-
-@@ -831,7 +820,6 @@
- ASTFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
- pAST->noHWC = FALSE;
- pAST->HWCInfo.HWC_NUM = DEFAULT_HWC_NUM;
-@@ -843,8 +831,10 @@
- #endif
-
- /* We won't be using the VGA access after the probe */
-+#ifndef XSERVER_LIBPCIACCESS
- xf86SetOperatingState(resVgaIo, pAST->pEnt->index, ResUnusedOpr);
- xf86SetOperatingState(resVgaMem, pAST->pEnt->index, ResDisableOpr);
-+#endif
-
- return TRUE;
- }
-@@ -1333,7 +1323,6 @@
- #if defined(__sparc__)
- if ((xf86LoadSubModule(pScrn, "ddc")) && (GetVGAEDID(pScrn, DDC_data) == TRUE))
- {
-- xf86LoaderReqSymLists(ddcSymbols, NULL);
- ConfiguredMonitor = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
- }
- else
-@@ -1376,7 +1365,6 @@
- }
-
- if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
-- xf86LoaderReqSymLists(vbeSymbols, NULL);
- MonInfo1 = vbeDoEDID(pVbe, NULL);
- MonInfo = MonInfo1;
-
-@@ -1541,7 +1529,6 @@
-
- if ((xf86LoadSubModule(pScrn, "ddc")) && (GetVGAEDID(pScrn, DDC_data) == TRUE))
- {
-- xf86LoaderReqSymLists(ddcSymbols, NULL);
- MonInfo = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
-
- xf86PrintEDID(MonInfo);
---- src/ast_mode.c Tue Nov 10 12:55:44 2009
-+++ src/ast_mode.c Tue Nov 10 12:55:50 2009
-@@ -25,8 +25,6 @@
- #endif
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
---- src/ast_tool.c Tue Nov 10 12:55:58 2009
-+++ src/ast_tool.c Tue Nov 10 12:56:06 2009
-@@ -25,8 +25,6 @@
- #endif
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
---- src/ast_vgatool.c Tue Nov 10 12:56:13 2009
-+++ src/ast_vgatool.c Tue Nov 10 12:56:20 2009
-@@ -25,8 +25,6 @@
- #endif
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
---- src/ast_2dtool.c Tue Nov 10 13:02:52 2009
-+++ src/ast_2dtool.c Tue Nov 10 12:56:53 2009
-@@ -25,8 +25,6 @@
- #endif
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
--- a/open-src/driver/xf86-video-ast/sparc-ast-6860461.patch Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -ur orig/ast_driver.c src/ast_driver.c
---- orig/ast_driver.c Mon Jul 13 18:56:25 2009
-+++ src/ast_driver.c Mon Jul 13 18:56:47 2009
-@@ -1311,11 +1311,6 @@
- else
- vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
- vgaHWProtect(pScrn, FALSE);
--#else
--
-- astReg = &pAST->SavedReg;
-- ASTRestoreHW(pScrn);
--#endif
-
- /* Ext. restore */
- vASTOpenKey(pScrn);
-@@ -1326,6 +1321,7 @@
- for (i=0xBC; i<=0xC1; i++)
- SetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
- SetIndexReg(CRTC_PORT, (UCHAR) (0xBB), astReg->ExtCRTC[icount]);
-+#endif
-
- }
-
--- a/open-src/driver/xf86-video-ast/sparc-ast.patch Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-ast/sparc-ast.patch Mon Aug 16 15:35:21 2010 -0700
@@ -1,6 +1,6 @@
diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am 2009-04-13 18:32:28.000000000 -0700
-+++ src/Makefile.am 2009-04-24 02:03:07.532962000 -0700
+--- src/Makefile.am 2008-08-15 10:54:35.000000000 -0700
++++ src/Makefile.am 2010-08-16 13:45:07.710404820 -0700
@@ -42,4 +42,5 @@ ast_drv_la_SOURCES = \
ast_pcirename.h \
ast_tool.c \
@@ -9,8 +9,8 @@
+ ast_vgatool.h \
+ ast_sparc_driver.c
diff -urp -x '*~' -x '*.orig' src/ast.h src/ast.h
---- src/ast.h 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast.h 2009-04-24 02:03:07.534004000 -0700
+--- src/ast.h 2010-08-10 07:38:29.000000000 -0700
++++ src/ast.h 2010-08-16 13:45:07.710712331 -0700
@@ -20,8 +20,17 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
@@ -29,7 +29,7 @@
#include "ast_pcirename.h"
-@@ -83,6 +92,15 @@ typedef CARD32 ULONG;
+@@ -84,6 +93,15 @@ typedef CARD32 ULONG;
typedef struct _ASTRegRec {
UCHAR ExtCRTC[0x50];
@@ -45,9 +45,9 @@
} ASTRegRec, *ASTRegPtr;
typedef struct _VIDEOMODE {
-@@ -187,12 +205,108 @@ typedef struct _ASTRec {
- ULONG ulCMDReg;
- Bool EnableClip;
+@@ -194,12 +212,108 @@ typedef struct _ASTRec {
+ int clip_right;
+ int clip_bottom;
+#if defined(__sparc__)
+ char *deviceName;
@@ -155,17 +155,17 @@
+
+#endif /* AST_H */
diff -urp -x '*~' -x '*.orig' src/ast_2dtool.c src/ast_2dtool.c
---- src/ast_2dtool.c 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_2dtool.c 2009-04-24 02:03:07.534955000 -0700
-@@ -190,6 +190,7 @@ Bool
- bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST)
+--- src/ast_2dtool.c 2010-08-10 07:38:29.000000000 -0700
++++ src/ast_2dtool.c 2010-08-16 13:45:07.711030285 -0700
+@@ -256,6 +256,7 @@ bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr p
{
ULONG ulData;
+ PFN_bENABLE_CMDQ pfnEnableCMDQ = bEnableCMDQ;
+ ASTDECL_FD
-
- switch (pAST->jChipType)
- {
-@@ -225,6 +226,7 @@ bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr p
+
+ if (pAST->jChipType == AST2300)
+ pfnEnableCMDQ = bEnableCMDQ2300;
+@@ -295,6 +296,7 @@ bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr p
void
vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST)
{
@@ -173,7 +173,7 @@
vWaitEngIdle(pScrn, pAST);
vWaitEngIdle(pScrn, pAST);
-@@ -240,6 +242,7 @@ vWaitEngIdle(ScrnInfoPtr pScrn, ASTRecPt
+@@ -310,6 +312,7 @@ vWaitEngIdle(ScrnInfoPtr pScrn, ASTRecPt
ULONG ulEngState, ulEngState2;
UCHAR jReg;
ULONG ulEngCheckSetting;
@@ -182,8 +182,8 @@
if (pAST->MMIO2D)
ulEngCheckSetting = 0x10000000;
diff -urp -x '*~' -x '*.orig' src/ast_2dtool.h src/ast_2dtool.h
---- src/ast_2dtool.h 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_2dtool.h 2009-04-24 02:03:07.535695000 -0700
+--- src/ast_2dtool.h 2010-08-10 07:38:29.000000000 -0700
++++ src/ast_2dtool.h 2010-08-16 13:45:07.711347075 -0700
@@ -20,6 +20,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
@@ -194,16 +194,16 @@
/* Eng Capability Definition */
#define ENG_CAP_Sync 0x0001
#define ENG_CAP_ScreenToScreenCopy 0x0002
-@@ -482,3 +485,5 @@ typedef struct {
- addr->PKT_SC_dwHeader = (ULONG) (PKT_NULL_CMD); \
- addr->PKT_SC_dwData[0] = (ULONG) 0; \
+@@ -533,3 +536,5 @@ typedef struct {
+ addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_NUMBER); \
+ addr->PKT_SC_dwData[0] = (ULONG)(no); \
}
+
+#endif /* AST2DTOOL_H */
diff -urp -x '*~' -x '*.orig' src/ast_accel.c src/ast_accel.c
---- src/ast_accel.c 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_accel.c 2009-04-24 02:03:07.537053000 -0700
-@@ -184,7 +184,12 @@ ASTAccelInit(ScreenPtr pScreen)
+--- src/ast_accel.c 2010-08-10 07:38:29.000000000 -0700
++++ src/ast_accel.c 2010-08-16 13:45:07.711848515 -0700
+@@ -189,7 +189,12 @@ ASTAccelInit(ScreenPtr pScreen)
{
infoPtr->SetupForSolidFill = ASTSetupForSolidFill;
infoPtr->SubsequentSolidFillRect = ASTSubsequentSolidFillRect;
@@ -217,9 +217,9 @@
/* Solid Lines */
diff -urp -x '*~' -x '*.orig' src/ast_cursor.c src/ast_cursor.c
---- src/ast_cursor.c 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_cursor.c 2009-04-24 02:03:07.538408000 -0700
-@@ -84,9 +84,14 @@ ASTCursorInit(ScreenPtr pScreen)
+--- src/ast_cursor.c 2009-10-29 13:33:38.000000000 -0700
++++ src/ast_cursor.c 2010-08-16 13:45:07.712204039 -0700
+@@ -82,9 +82,14 @@ ASTCursorInit(ScreenPtr pScreen)
pAST->HWCInfoPtr = infoPtr;
@@ -234,7 +234,7 @@
infoPtr->MaxWidth = MAX_HWC_WIDTH;
infoPtr->MaxHeight = MAX_HWC_HEIGHT;
-@@ -137,6 +142,7 @@ ASTShowCursor(ScrnInfoPtr pScrn)
+@@ -135,6 +140,7 @@ ASTShowCursor(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
UCHAR jReg;
@@ -242,7 +242,7 @@
jReg= 0x02;
if (pAST->HWCInfo.cursortype ==HWC_COLOR)
-@@ -150,6 +156,7 @@ void
+@@ -148,6 +154,7 @@ void
ASTHideCursor(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -250,7 +250,7 @@
SetIndexRegMask(CRTC_PORT, 0xCB, 0xFC, 0x00); /* disable HWC */
-@@ -162,6 +169,7 @@ ASTSetCursorPosition(ScrnInfoPtr pScrn,
+@@ -160,6 +167,7 @@ ASTSetCursorPosition(ScrnInfoPtr pScrn,
DisplayModePtr mode = pAST->ModePtr;
int x_offset, y_offset;
UCHAR *pjSignature;
@@ -258,7 +258,7 @@
/* Set cursor info to Offscreen */
pjSignature = (UCHAR *) pAST->HWCInfo.pjHWCVirtualAddr + (HWC_SIZE+HWC_SIGNATURE_SIZE)*pAST->HWCInfo.HWC_NUM_Next + HWC_SIZE;
-@@ -219,6 +227,7 @@ ASTLoadCursorImage(ScrnInfoPtr pScrn, UC
+@@ -223,6 +231,7 @@ ASTLoadCursorImage(ScrnInfoPtr pScrn, UC
UCHAR jTempSrcAnd32, jTempSrcXor32;
ULONG ulCheckSum = 0;
ULONG ulPatternAddr;
@@ -266,7 +266,7 @@
/* init cursor info. */
pAST->HWCInfo.cursortype = HWC_MONO;
-@@ -317,6 +326,7 @@ ASTLoadCursorARGB(ScrnInfoPtr pScrn, Cur
+@@ -320,6 +329,7 @@ ASTLoadCursorARGB(ScrnInfoPtr pScrn, Cur
} usData16;
ULONG ulCheckSum = 0;
ULONG ulPatternAddr;
@@ -274,7 +274,7 @@
/* init cursor info. */
pAST->HWCInfo.cursortype = HWC_COLOR;
-@@ -404,6 +414,7 @@ static void
+@@ -407,6 +417,7 @@ static void
ASTFireCursor(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -283,8 +283,8 @@
SetIndexRegMask(CRTC_PORT, 0xCB, 0xFF, 0x00); /* dummp write to fire HWC */
diff -urp -x '*~' -x '*.orig' src/ast_cursor.h src/ast_cursor.h
---- src/ast_cursor.h 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_cursor.h 2009-04-24 02:03:07.538932000 -0700
+--- src/ast_cursor.h 2008-03-17 10:20:40.000000000 -0700
++++ src/ast_cursor.h 2010-08-16 13:45:07.712406043 -0700
@@ -20,6 +20,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
@@ -302,11 +302,11 @@
+
+#endif /* ASTCURSOR_H */
diff -urp -x '*~' -x '*.orig' src/ast_driver.c src/ast_driver.c
---- src/ast_driver.c 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_driver.c 2009-04-24 02:03:07.541179000 -0700
-@@ -74,6 +74,14 @@ extern Bool ASTSetMode(ScrnInfoPtr pScrn
- extern Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer);
- extern void vInitDRAMReg(ScrnInfoPtr pScrn);
+--- src/ast_driver.c 2010-08-10 07:38:29.000000000 -0700
++++ src/ast_driver.c 2010-08-16 13:45:07.713360394 -0700
+@@ -80,6 +80,14 @@ extern Bool bIsVGAEnabled(ScrnInfoPtr pS
+ extern void ASTBlankScreen(ScrnInfoPtr pScreen, Bool unblack);
+ extern Bool InitVGA(ScrnInfoPtr pScrn);
+#if defined(__sparc__)
+extern Bool InitVGA(ScrnInfoPtr pScrn);
@@ -319,7 +319,7 @@
extern Bool bInitCMDQInfo(ScrnInfoPtr pScrn, ASTRecPtr pAST);
extern Bool bEnableCMDQ(ScrnInfoPtr pScrn, ASTRecPtr pAST);
extern void vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST);
-@@ -97,7 +105,7 @@ static void ASTFreeScreen(int scrnIndex,
+@@ -103,7 +111,7 @@ static void ASTFreeScreen(int scrnIndex,
static ModeStatus ASTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags);
/* Internally used functions */
@@ -328,22 +328,7 @@
static void ASTFreeRec(ScrnInfoPtr pScrn);
static Bool ASTSaveScreen(ScreenPtr pScreen, Bool unblack);
static Bool ASTCloseScreen(int scrnIndex, ScreenPtr pScreen);
-@@ -283,10 +291,14 @@ astSetup(pointer module, pointer opts, i
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
-+#if !(defined(__sparc__))
- LoaderRefSymLists(vgahwSymbols,
- fbSymbols, xaaSymbols, ramdacSymbols,
- vbeSymbols, vbeOptionalSymbols,
- ddcSymbols, int10Symbols, NULL);
-+#else
-+ LoaderRefSymLists(fbSymbols, xaaSymbols, ramdacSymbols, ddcSymbols, NULL);
-+#endif
-
- /*
- * The return value must be non-NULL on success even though there
-@@ -347,7 +359,7 @@ ASTProbe(DriverPtr drv, int flags)
+@@ -257,7 +265,7 @@ ASTProbe(DriverPtr drv, int flags)
return FALSE;
}
@@ -352,7 +337,7 @@
/*
* This probing is just checking the PCI data the server already
* collected.
-@@ -357,6 +369,7 @@ ASTProbe(DriverPtr drv, int flags)
+@@ -267,6 +275,7 @@ ASTProbe(DriverPtr drv, int flags)
}
#endif
@@ -360,7 +345,7 @@
numUsed = xf86MatchPciInstances(AST_NAME, PCI_VENDOR_AST,
ASTChipsets, ASTPciChipsets,
devSections, numDevSections,
-@@ -400,6 +413,33 @@ ASTProbe(DriverPtr drv, int flags)
+@@ -310,6 +319,33 @@ ASTProbe(DriverPtr drv, int flags)
} /* end of if flags */
xfree(usedChips);
@@ -394,7 +379,7 @@
return foundScreen;
}
-@@ -415,7 +455,9 @@ static Bool
+@@ -325,7 +361,9 @@ static Bool
ASTPreInit(ScrnInfoPtr pScrn, int flags)
{
EntityInfoPtr pEnt;
@@ -404,7 +389,7 @@
int flags24;
rgb defaultWeight = { 0, 0, 0 };
-@@ -431,6 +473,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -341,6 +379,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
@@ -415,21 +400,19 @@
if (flags & PROBE_DETECT) {
ASTProbeDDC(pScrn, pEnt->index);
return TRUE;
-@@ -442,20 +488,24 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
- if (xf86RegisterResources(pEnt->index, 0, ResExclusive))
+@@ -354,18 +396,22 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
+ #endif
+#if !(defined(__sparc__))
/* The vgahw module should be loaded here when needed */
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
+#endif
/* The fb module should be loaded here when needed */
if (!xf86LoadSubModule(pScrn, "fb"))
return FALSE;
- xf86LoaderReqSymLists(fbSymbols, NULL);
+#if !(defined(__sparc__))
/* Allocate a vgaHWRec */
@@ -440,7 +423,7 @@
/* Color Depth Check */
flags24 = Support32bppFb;
-@@ -526,7 +576,12 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -438,7 +484,12 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
/* Fill AST Info */
pAST = ASTPTR(pScrn);
pAST->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
@@ -453,7 +436,7 @@
#ifndef XSERVER_LIBPCIACCESS
pAST->PciTag = pciTag(pAST->PciInfo->bus, pAST->PciInfo->device,
pAST->PciInfo->func);
-@@ -573,10 +628,13 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -485,10 +536,13 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
/* Resource Allocation */
pAST->IODBase = pScrn->domainIOBase;
@@ -467,7 +450,7 @@
pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
-@@ -602,7 +660,11 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -514,7 +568,11 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
from = X_CONFIG;
} else {
if (PCI_REGION_BASE(pAST->PciInfo, 1, REGION_MEM)) {
@@ -480,25 +463,7 @@
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-@@ -624,6 +686,9 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
- /* Init VGA Adapter */
- if (!xf86IsPrimaryPci(pAST->PciInfo))
- {
-+#if defined (__sparc__)
-+ InitVGA(pScrn);
-+#else
- if (xf86LoadSubModule(pScrn, "int10")) {
- xf86Int10InfoPtr pInt10;
- xf86LoaderReqSymLists(int10Symbols, NULL);
-@@ -631,6 +696,7 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
- pInt10 = xf86InitInt10(pAST->pEnt->index);
- xf86FreeInt10(pInt10);
- }
-+#endif
- }
-
- vASTOpenKey(pScrn);
-@@ -789,7 +855,6 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
+@@ -695,7 +753,6 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
{
ScrnInfoPtr pScrn;
ASTRecPtr pAST;
@@ -506,7 +471,7 @@
VisualPtr visual;
/* for FB Manager */
-@@ -798,7 +863,6 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
+@@ -704,7 +761,6 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
pScrn = xf86Screens[pScreen->myNum];
pAST = ASTPTR(pScrn);
@@ -514,7 +479,7 @@
if (!ASTMapMem(pScrn)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Map FB Memory Failed \n");
-@@ -822,7 +886,14 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
+@@ -728,7 +784,14 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
}
@@ -530,7 +495,7 @@
vFillASTModeInfo (pScrn);
-@@ -863,6 +934,10 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
+@@ -769,6 +832,10 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
}
@@ -541,7 +506,7 @@
if (pScrn->bitsPerPixel > 8) {
/* Fixup RGB ordering */
visual = pScreen->visuals + pScreen->numVisuals;
-@@ -991,8 +1066,10 @@ ASTLeaveVT(int scrnIndex, int flags)
+@@ -905,8 +972,10 @@ ASTLeaveVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@@ -553,7 +518,7 @@
#ifdef HWC
if (pAST->pHWCPtr) {
-@@ -1011,7 +1088,10 @@ ASTLeaveVT(int scrnIndex, int flags)
+@@ -925,7 +994,10 @@ ASTLeaveVT(int scrnIndex, int flags)
#endif
ASTRestore(pScrn);
@@ -564,7 +529,7 @@
}
-@@ -1019,8 +1099,11 @@ static void
+@@ -933,8 +1005,11 @@ static void
ASTFreeScreen(int scrnIndex, int flags)
{
ASTFreeRec(xf86Screens[scrnIndex]);
@@ -576,7 +541,7 @@
}
-@@ -1081,7 +1164,6 @@ ASTValidMode(int scrnIndex, DisplayModeP
+@@ -1009,7 +1084,6 @@ ASTValidMode(int scrnIndex, DisplayModeP
}
@@ -584,7 +549,7 @@
/*
* ASTGetRec and ASTFreeRec --
*
-@@ -1089,7 +1171,7 @@ ASTValidMode(int scrnIndex, DisplayModeP
+@@ -1017,7 +1091,7 @@ ASTValidMode(int scrnIndex, DisplayModeP
* These two functions create and destroy that private data.
*
*/
@@ -593,7 +558,7 @@
ASTGetRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate)
-@@ -1099,6 +1181,8 @@ ASTGetRec(ScrnInfoPtr pScrn)
+@@ -1027,6 +1101,8 @@ ASTGetRec(ScrnInfoPtr pScrn)
return TRUE;
}
@@ -602,30 +567,17 @@
static void
ASTFreeRec(ScrnInfoPtr pScrn)
{
-@@ -1113,16 +1197,21 @@ ASTFreeRec(ScrnInfoPtr pScrn)
- static Bool
- ASTSaveScreen(ScreenPtr pScreen, Bool unblack)
- {
-+#if (!defined(__sparc__))
- return vgaHWSaveScreen(pScreen, unblack);
-+#endif
- }
-
- static Bool
+@@ -1058,7 +1134,9 @@ static Bool
ASTCloseScreen(int scrnIndex, ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-- vgaHWPtr hwp = VGAHWPTR(pScrn);
++#if (!defined(__sparc__))
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
++#endif
ASTRecPtr pAST = ASTPTR(pScrn);
-+#if (!defined(__sparc__))
-+ vgaHWPtr hwp = VGAHWPTR(pScrn);
-+#endif
-+
if (pScrn->vtSema == TRUE)
- {
- #ifdef HWC
-@@ -1142,11 +1231,15 @@ ASTCloseScreen(int scrnIndex, ScreenPtr
+@@ -1080,11 +1158,15 @@ ASTCloseScreen(int scrnIndex, ScreenPtr
#endif
ASTRestore(pScrn);
@@ -641,7 +593,7 @@
if(pAST->AccelInfoPtr) {
XAADestroyInfoRec(pAST->AccelInfoPtr);
-@@ -1166,12 +1259,12 @@ ASTCloseScreen(int scrnIndex, ScreenPtr
+@@ -1104,12 +1186,12 @@ ASTCloseScreen(int scrnIndex, ScreenPtr
static void
ASTSave(ScrnInfoPtr pScrn)
{
@@ -657,7 +609,7 @@
vgaReg = &VGAHWPTR(pScrn)->SavedReg;
astReg = &pAST->SavedReg;
-@@ -1182,6 +1275,10 @@ ASTSave(ScrnInfoPtr pScrn)
+@@ -1120,6 +1202,10 @@ ASTSave(ScrnInfoPtr pScrn)
else {
vgaHWSave(pScrn, vgaReg, VGA_SR_MODE);
}
@@ -668,7 +620,7 @@
/* Ext. Save */
vASTOpenKey(pScrn);
-@@ -1198,12 +1295,12 @@ ASTSave(ScrnInfoPtr pScrn)
+@@ -1136,12 +1222,12 @@ ASTSave(ScrnInfoPtr pScrn)
static void
ASTRestore(ScrnInfoPtr pScrn)
{
@@ -684,19 +636,14 @@
vgaReg = &VGAHWPTR(pScrn)->SavedReg;
astReg = &pAST->SavedReg;
-@@ -1214,6 +1311,11 @@ ASTRestore(ScrnInfoPtr pScrn)
- else
- vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
- vgaHWProtect(pScrn, FALSE);
-+#else
-+
-+ astReg = &pAST->SavedReg;
-+ ASTRestoreHW(pScrn);
+@@ -1162,12 +1248,25 @@ ASTRestore(ScrnInfoPtr pScrn)
+ for (i=0xBC; i<=0xC1; i++)
+ SetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+ SetIndexReg(CRTC_PORT, (UCHAR) (0xBB), astReg->ExtCRTC[icount]);
+#endif
-
- /* Ext. restore */
- vASTOpenKey(pScrn);
-@@ -1230,6 +1332,19 @@ ASTRestore(ScrnInfoPtr pScrn)
+
+ }
+
static void
ASTProbeDDC(ScrnInfoPtr pScrn, int index)
{
@@ -705,7 +652,6 @@
+#if defined(__sparc__)
+ if ((xf86LoadSubModule(pScrn, "ddc")) && (GetVGAEDID(pScrn, DDC_data) == TRUE))
+ {
-+ xf86LoaderReqSymLists(ddcSymbols, NULL);
+ ConfiguredMonitor = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
+ }
+ else
@@ -716,7 +662,7 @@
vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) {
-@@ -1237,6 +1352,7 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index
+@@ -1175,6 +1274,7 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
}
@@ -724,7 +670,7 @@
}
#define SkipDT 0x00
-@@ -1246,15 +1362,18 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index
+@@ -1184,15 +1284,18 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index
static xf86MonPtr
ASTDoDDC(ScrnInfoPtr pScrn, int index)
{
@@ -746,7 +692,7 @@
/* Honour Option "noDDC" */
if (xf86ReturnOptValBool(pAST->Options, OPTION_NO_DDC, FALSE)) {
return MonInfo;
-@@ -1266,7 +1385,7 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
+@@ -1203,7 +1306,7 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
MonInfo = MonInfo1;
/* For VGA2 CLONE Support, ycchen@012508 */
@@ -755,7 +701,7 @@
if (GetVGA2EDID(pScrn, DDC_data) == TRUE) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Get VGA2 EDID Correctly!! \n");
MonInfo2 = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
-@@ -1413,6 +1532,31 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
+@@ -1350,6 +1453,30 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"this driver cannot do DDC without VBE\n");
}
@@ -772,7 +718,6 @@
+
+ if ((xf86LoadSubModule(pScrn, "ddc")) && (GetVGAEDID(pScrn, DDC_data) == TRUE))
+ {
-+ xf86LoaderReqSymLists(ddcSymbols, NULL);
+ MonInfo = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
+
+ xf86PrintEDID(MonInfo);
@@ -787,7 +732,7 @@
return MonInfo;
}
-@@ -1438,9 +1582,14 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayMo
+@@ -1375,9 +1502,14 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayMo
vgaHWPtr hwp;
ASTRecPtr pAST;
@@ -803,7 +748,7 @@
vgaHWUnlock(hwp);
if (!vgaHWInit(pScrn, mode))
-@@ -1453,6 +1602,10 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayMo
+@@ -1390,6 +1522,10 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayMo
return FALSE;
vgaHWProtect(pScrn, FALSE);
@@ -815,9 +760,9 @@
return TRUE;
}
diff -urp -x '*~' -x '*.orig' src/ast_mode.c src/ast_mode.c
---- src/ast_mode.c 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_mode.c 2009-04-24 02:03:07.543155000 -0700
-@@ -392,11 +392,9 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayMod
+--- src/ast_mode.c 2010-08-10 07:38:29.000000000 -0700
++++ src/ast_mode.c 2010-08-16 13:45:07.713865832 -0700
+@@ -425,11 +425,9 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayMod
Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -830,7 +775,7 @@
switch (pScrn->bitsPerPixel)
{
-@@ -490,13 +488,12 @@ Bool bGetAST1000VGAModeInfo(ScrnInfoPtr
+@@ -536,13 +534,12 @@ Bool bGetAST1000VGAModeInfo(ScrnInfoPtr
void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -845,7 +790,7 @@
/* Set Misc */
jReg = pStdModePtr->MISC;
-@@ -520,7 +517,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
+@@ -566,7 +563,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
}
/* Set AR */
@@ -854,7 +799,7 @@
for (i=0; i<20; i++)
{
jReg = pStdModePtr->AR[i];
-@@ -530,7 +527,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
+@@ -576,7 +573,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
SetReg(AR_PORT_WRITE, 0x14);
SetReg(AR_PORT_WRITE, 0x00);
@@ -863,7 +808,7 @@
SetReg (AR_PORT_WRITE, 0x20); /* set POS */
/* Set GR */
-@@ -547,11 +544,10 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
+@@ -593,11 +590,10 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
void
vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -876,7 +821,7 @@
jReg05 = jReg07 = jReg09 = jRegAC = jRegAD = jRegAE = 0;
/* unlock CRTC */
-@@ -621,11 +617,9 @@ vSetCRTCReg(ScrnInfoPtr pScrn, DisplayMo
+@@ -667,11 +663,9 @@ vSetCRTCReg(ScrnInfoPtr pScrn, DisplayMo
void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -889,7 +834,7 @@
usOffset = pAST->VideoModeInfo.ScreenPitch >> 3; /* Unit: char */
SetIndexReg(CRTC_PORT,0x13, (UCHAR) (usOffset & 0xFF));
-@@ -635,11 +629,9 @@ void vSetOffsetReg(ScrnInfoPtr pScrn, Di
+@@ -681,11 +675,9 @@ void vSetOffsetReg(ScrnInfoPtr pScrn, Di
void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -902,7 +847,7 @@
pEnhModePtr = pVGAModeInfo->pEnhTableEntry;
pDCLKPtr = &DCLKTable[pEnhModePtr->DCLKIndex];
-@@ -654,11 +646,10 @@ void vSetDCLKReg(ScrnInfoPtr pScrn, Disp
+@@ -700,11 +692,10 @@ void vSetDCLKReg(ScrnInfoPtr pScrn, Disp
void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -916,7 +861,7 @@
jRegA0=jRegA3=jRegA8=0;
/* Mode Type Setting */
switch (pScrn->bitsPerPixel) {
-@@ -683,6 +674,14 @@ void vSetExtReg(ScrnInfoPtr pScrn, Displ
+@@ -729,6 +720,14 @@ void vSetExtReg(ScrnInfoPtr pScrn, Displ
SetIndexRegMask(CRTC_PORT,0xA3, 0xF0, (UCHAR) jRegA3);
SetIndexRegMask(CRTC_PORT,0xA8, 0xFD, (UCHAR) jRegA8);
@@ -929,9 +874,9 @@
+#endif
+
/* Set Threshold */
- if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST1100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2150) )
+ if (pAST->jChipType == AST2300)
{
-@@ -699,14 +698,13 @@ void vSetExtReg(ScrnInfoPtr pScrn, Displ
+@@ -750,14 +749,13 @@ void vSetExtReg(ScrnInfoPtr pScrn, Displ
void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -948,7 +893,7 @@
jReg |= (UCHAR) (pEnhModePtr->Flags & SyncNN);
SetReg(MISC_PORT_WRITE,jReg);
-@@ -714,13 +712,11 @@ void vSetSyncReg(ScrnInfoPtr pScrn, Disp
+@@ -765,13 +763,11 @@ void vSetSyncReg(ScrnInfoPtr pScrn, Disp
Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -964,8 +909,8 @@
{
case 8:
diff -urp -x '*~' -x '*.orig' src/ast_mode.h src/ast_mode.h
---- src/ast_mode.h 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_mode.h 2009-04-24 02:03:07.544063000 -0700
+--- src/ast_mode.h 2010-08-10 07:38:29.000000000 -0700
++++ src/ast_mode.h 2010-08-16 13:45:07.714072591 -0700
@@ -20,6 +20,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
@@ -976,16 +921,16 @@
/* Mode Limitation */
#define MAX_HResolution 1920
#define MAX_VResolution 1200
-@@ -115,3 +118,5 @@ typedef struct {
+@@ -119,3 +122,5 @@ typedef struct {
PVBIOS_ENHTABLE_STRUCT pEnhTableEntry;
} VBIOS_MODE_INFO, *PVBIOS_MODE_INFO;
+
+#endif /* ASTMODE_H */
diff -urp -x '*~' -x '*.orig' src/ast_tool.c src/ast_tool.c
---- src/ast_tool.c 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_tool.c 2009-04-24 02:03:07.544930000 -0700
-@@ -62,16 +62,29 @@ Bool ASTUnmapMem(ScrnInfoPtr pScrn);
+--- src/ast_tool.c 2009-10-29 13:33:38.000000000 -0700
++++ src/ast_tool.c 2010-08-16 13:45:07.714339101 -0700
+@@ -60,16 +60,29 @@ Bool ASTUnmapMem(ScrnInfoPtr pScrn);
Bool ASTMapMMIO(ScrnInfoPtr pScrn);
void ASTUnmapMMIO(ScrnInfoPtr pScrn);
@@ -1016,7 +961,7 @@
{
void** result = (void**)&pAST->FBVirtualAddr;
int err = pci_device_map_range(pAST->PciInfo,
-@@ -97,10 +110,14 @@ ASTUnmapMem(ScrnInfoPtr pScrn)
+@@ -95,10 +108,14 @@ ASTUnmapMem(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -1032,7 +977,7 @@
pci_device_unmap_range(pAST->PciInfo, pAST->FBVirtualAddr, pAST->FbMapSize);
#endif
-@@ -113,7 +130,7 @@ Bool
+@@ -111,7 +128,7 @@ Bool
ASTMapMMIO(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -1041,7 +986,7 @@
int mmioFlags;
#if !defined(__alpha__)
-@@ -123,9 +140,15 @@ ASTMapMMIO(ScrnInfoPtr pScrn)
+@@ -121,9 +138,15 @@ ASTMapMMIO(ScrnInfoPtr pScrn)
#endif
@@ -1057,7 +1002,7 @@
#else
{
-@@ -152,10 +175,14 @@ ASTUnmapMMIO(ScrnInfoPtr pScrn)
+@@ -150,10 +173,14 @@ ASTUnmapMMIO(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -1074,14 +1019,13 @@
#endif
pAST->MMIOVirtualAddr = 0;
diff -urp -x '*~' -x '*.orig' src/ast_vgatool.c src/ast_vgatool.c
---- src/ast_vgatool.c 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_vgatool.c 2009-04-24 02:03:07.548007000 -0700
-@@ -69,11 +69,15 @@ void vASTLoadPalette(ScrnInfoPtr pScrn,
- void ASTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
- Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer);
+--- src/ast_vgatool.c 2010-08-10 07:38:29.000000000 -0700
++++ src/ast_vgatool.c 2010-08-16 13:45:15.622974545 -0700
+@@ -71,11 +71,14 @@ Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsi
void vInitDRAMReg(ScrnInfoPtr pScrn);
-+#if defined(__sparc__)
-+Bool InitVGA(ScrnInfoPtr pScrn);
+ Bool bIsVGAEnabled(ScrnInfoPtr pScrn);
+ Bool InitVGA(ScrnInfoPtr pScrn);
++#if defined(__sparc__)
+Bool GetVGAEDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer);
+#endif
@@ -1093,7 +1037,7 @@
SetIndexReg(CRTC_PORT,0x80, 0xA8);
-@@ -82,11 +86,31 @@ vASTOpenKey(ScrnInfoPtr pScrn)
+@@ -84,11 +87,31 @@ vASTOpenKey(ScrnInfoPtr pScrn)
Bool
bASTRegInit(ScrnInfoPtr pScrn)
{
@@ -1126,7 +1070,16 @@
return (TRUE);
}
-@@ -94,7 +118,7 @@ bASTRegInit(ScrnInfoPtr pScrn)
+@@ -96,7 +119,7 @@ bASTRegInit(ScrnInfoPtr pScrn)
+ void
+ GetDRAMInfo(ScrnInfoPtr pScrn)
+ {
+- ASTRecPtr pAST = ASTPTR(pScrn);
++ ASTDECL
+ ULONG ulData;
+
+ if ( (pAST->jChipType != AST2000) )
+@@ -136,7 +159,7 @@ GetDRAMInfo(ScrnInfoPtr pScrn)
ULONG
GetVRAMInfo(ScrnInfoPtr pScrn)
{
@@ -1135,7 +1088,7 @@
UCHAR jReg;
vASTOpenKey(pScrn);
-@@ -120,7 +144,7 @@ GetVRAMInfo(ScrnInfoPtr pScrn)
+@@ -162,7 +185,7 @@ GetVRAMInfo(ScrnInfoPtr pScrn)
ULONG
GetMaxDCLK(ScrnInfoPtr pScrn)
{
@@ -1144,7 +1097,7 @@
UCHAR jReg;
ULONG ulData, ulData2;
ULONG ulRefPLL, ulDeNumerator, ulNumerator, ulDivider;
-@@ -209,7 +233,7 @@ GetMaxDCLK(ScrnInfoPtr pScrn)
+@@ -251,7 +274,7 @@ GetMaxDCLK(ScrnInfoPtr pScrn)
void
GetChipType(ScrnInfoPtr pScrn)
{
@@ -1153,7 +1106,7 @@
ULONG ulData;
UCHAR jReg;
-@@ -253,6 +277,8 @@ GetChipType(ScrnInfoPtr pScrn)
+@@ -295,6 +318,8 @@ GetChipType(ScrnInfoPtr pScrn)
void
vSetStartAddressCRT1(ASTRecPtr pAST, ULONG base)
{
@@ -1162,7 +1115,7 @@
SetIndexReg(CRTC_PORT,0x0D, (UCHAR) (base & 0xFF));
SetIndexReg(CRTC_PORT,0x0C, (UCHAR) ((base >> 8) & 0xFF));
SetIndexReg(CRTC_PORT,0xAF, (UCHAR) ((base >> 16) & 0xFF));
-@@ -262,6 +288,8 @@ vSetStartAddressCRT1(ASTRecPtr pAST, ULO
+@@ -304,6 +329,8 @@ vSetStartAddressCRT1(ASTRecPtr pAST, ULO
void
vAST1000DisplayOff(ASTRecPtr pAST)
{
@@ -1171,7 +1124,7 @@
SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x20);
}
-@@ -270,6 +298,7 @@ vAST1000DisplayOff(ASTRecPtr pAST)
+@@ -312,6 +339,7 @@ vAST1000DisplayOff(ASTRecPtr pAST)
void
vAST1000DisplayOn(ASTRecPtr pAST)
{
@@ -1179,7 +1132,16 @@
SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x00);
-@@ -280,8 +309,7 @@ void
+@@ -319,7 +347,7 @@ vAST1000DisplayOn(ASTRecPtr pAST)
+
+ void ASTBlankScreen(ScrnInfoPtr pScrn, Bool unblack)
+ {
+- ASTRecPtr pAST;
++ ASTDECL
+
+ pAST = ASTPTR(pScrn);
+
+@@ -333,8 +361,7 @@ void
vASTLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
VisualPtr pVisual)
{
@@ -1189,7 +1151,7 @@
int i, j, index;
UCHAR DACIndex, DACR, DACG, DACB;
-@@ -344,10 +372,10 @@ vASTLoadPalette(ScrnInfoPtr pScrn, int n
+@@ -397,10 +424,10 @@ vASTLoadPalette(ScrnInfoPtr pScrn, int n
void
ASTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
{
@@ -1202,7 +1164,7 @@
SEQ01=CRB6=0;
vASTOpenKey(pScrn);
-@@ -377,6 +405,7 @@ ASTDisplayPowerManagementSet(ScrnInfoPtr
+@@ -430,6 +457,7 @@ ASTDisplayPowerManagementSet(ScrnInfoPtr
SetIndexRegMask(SEQ_PORT,0x01, 0xDF, SEQ01);
SetIndexRegMask(CRTC_PORT,0xB6, 0xFC, CRB6);
@@ -1210,7 +1172,51 @@
}
-@@ -557,7 +586,7 @@ AST_DRAMStruct AST1100DRAMTableData[] =
+@@ -441,7 +469,7 @@ ASTDisplayPowerManagementSet(ScrnInfoPtr
+ Bool
+ GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer)
+ {
+- ASTRecPtr pAST = ASTPTR(pScrn);
++ ASTDECL
+ UCHAR *ulI2CBase = pAST->MMIOVirtualAddr + 0x10000 + I2C_OFFSET;
+ ULONG i, ulData;
+ UCHAR *pjEDID;
+@@ -530,12 +558,12 @@ GetVGA2EDID(ScrnInfoPtr pScrn, unsigned
+ /* Init VGA */
+ Bool bIsVGAEnabled(ScrnInfoPtr pScrn)
+ {
+- ASTRecPtr pAST;
++ ASTDECL
+ UCHAR ch;
+
+ pAST = ASTPTR(pScrn);
+
+- ch = GetReg(pAST->RelocateIO+0x43);
++ GetReg(pAST->RelocateIO+0x43, ch);
+
+ if (ch)
+ {
+@@ -552,9 +580,7 @@ Bool bIsVGAEnabled(ScrnInfoPtr pScrn)
+
+ void vEnableVGA(ScrnInfoPtr pScrn)
+ {
+- ASTRecPtr pAST;
+-
+- pAST = ASTPTR(pScrn);
++ ASTDECL
+
+ SetReg(pAST->RelocateIO+0x43, 0x01);
+ SetReg(pAST->RelocateIO+0x42, 0x01);
+@@ -577,7 +603,7 @@ UCHAR ExtRegInfo_AST2300[] = {
+
+ void vSetDefExtReg(ScrnInfoPtr pScrn)
+ {
+- ASTRecPtr pAST;
++ ASTDECL
+ UCHAR i, jIndex, *pjExtRegInfo;
+
+ pAST = ASTPTR(pScrn);
+@@ -698,7 +724,7 @@ AST_DRAMStruct AST1100DRAMTableData[] =
{ 0x0030, 0x00000040 },
{ 0x0028, 0x00000003 },
{ 0x000C, 0x00005a21 },
@@ -1219,7 +1225,7 @@
{ 0x0120, 0x00004c41 },
{ 0xffff, 0xffffffff },
};
-@@ -610,15 +639,15 @@ AST_DRAMStruct AST2100DRAMTableData[] =
+@@ -751,15 +777,15 @@ AST_DRAMStruct AST2100DRAMTableData[] =
{ 0x0030, 0x00000040 },
{ 0x0028, 0x00000003 },
{ 0x000C, 0x00005a21 },
@@ -1234,84 +1240,35 @@
+ ASTDECL
AST_DRAMStruct *pjDRAMRegInfo;
- ASTRecPtr pAST = ASTPTR(pScrn);
- ULONG i, ulTemp;
+ ULONG i, ulTemp, ulData;
UCHAR jReg;
-@@ -708,3 +737,334 @@ void vInitDRAMReg(ScrnInfoPtr pScrn)
- } while ((jReg & 0x40) == 0);
-
- } /* vInitDRAMReg */
+@@ -858,16 +884,16 @@ void vInitDRAMReg(ScrnInfoPtr pScrn)
+
+ Bool InitVGA(ScrnInfoPtr pScrn)
+ {
+- ASTRecPtr pAST;
++ ASTDECL
+ ULONG ulData;
+
+- pAST = ASTPTR(pScrn);
+-
+ {
+ /* Enable PCI */
++#if !defined(__sparc__)
+ PCI_READ_LONG(pAST->PciInfo, &ulData, 0x04);
+ ulData |= 0x03;
+ PCI_WRITE_LONG(pAST->PciInfo, ulData, 0x04);
++#endif
+
+ /* Enable VGA */
+ vEnableVGA(pScrn);
+@@ -881,3 +907,265 @@ Bool InitVGA(ScrnInfoPtr pScrn)
+
+ return (TRUE);
+ } /* Init VGA */
+
+#if defined(__sparc__)
-+/* Init VGA */
-+void vEnableVGA(ScrnInfoPtr pScrn)
-+{
-+ ASTDECL
-+
-+ SetReg(pAST->RelocateIO+0x43, 0x01);
-+ SetReg(pAST->RelocateIO+0x42, 0x01);
-+}
-+
-+UCHAR ExtRegInfo[] = {
-+ 0x0F,
-+ 0x07,
-+ 0x1C,
-+ 0xFF
-+};
-+
-+void vSetDefExtReg(ScrnInfoPtr pScrn)
-+{
-+ ASTDECL
-+ UCHAR i, jIndex, *pjExtRegInfo;
-+
-+ /* Reset Scratch */
-+ for (i=0x81; i<=0x8F; i++)
-+ {
-+ SetIndexReg(CRTC_PORT, i, 0x00);
-+ }
-+
-+ /* Set Ext. Reg */
-+ pjExtRegInfo = ExtRegInfo;
-+ jIndex = 0xA0;
-+ while (*(UCHAR *) (pjExtRegInfo) != 0xFF)
-+ {
-+ SetIndexRegMask(CRTC_PORT,jIndex, 0x00, *(UCHAR *) (pjExtRegInfo));
-+ jIndex++;
-+ pjExtRegInfo++;
-+ }
-+
-+ /* Set Ext. Default */
-+ SetIndexRegMask(CRTC_PORT,0x8C, 0x00, 0x01);
-+ SetIndexRegMask(CRTC_PORT,0xB7, 0x00, 0x00);
-+
-+ /* Enable RAMDAC for A1, ycchen@113005 */
-+ SetIndexRegMask(CRTC_PORT,0xB6, 0xFF, 0x04);
-+
-+}
-+
-+Bool InitVGA(ScrnInfoPtr pScrn)
-+{
-+ ASTDECL
-+ ULONG ulData;
-+
-+ {
-+ /* Enable PCI */
-+#if !defined(__sparc__)
-+ PCI_READ_LONG(pAST->PciInfo, &ulData, 0x04);
-+ ulData |= 0x03;
-+ PCI_WRITE_LONG(pAST->PciInfo, ulData, 0x04);
-+#endif
-+
-+ /* Enable VGA */
-+ vEnableVGA(pScrn);
-+
-+ vASTOpenKey(pScrn);
-+ vSetDefExtReg(pScrn);
-+ }
-+
-+ return (TRUE);
-+} /* Init VGA */
-+
+/* Get EDID */
+void
+I2CWriteClock(ASTRecPtr pAST, UCHAR data)
@@ -1573,8 +1530,8 @@
+} /* GetVGAEDID */
+#endif /* __sparc__ */
diff -urp -x '*~' -x '*.orig' src/ast_vgatool.h src/ast_vgatool.h
---- src/ast_vgatool.h 2009-04-13 18:32:28.000000000 -0700
-+++ src/ast_vgatool.h 2009-04-24 02:03:07.549164000 -0700
+--- src/ast_vgatool.h 2009-10-29 13:33:38.000000000 -0700
++++ src/ast_vgatool.h 2010-08-16 13:45:07.715261578 -0700
@@ -20,6 +20,12 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
@@ -1588,9 +1545,9 @@
/* VRAM Size Definition */
#define VIDEOMEM_SIZE_08M 0x00800000
#define VIDEOMEM_SIZE_16M 0x01000000
-@@ -27,6 +33,85 @@
- #define VIDEOMEM_SIZE_64M 0x04000000
- #define VIDEOMEM_SIZE_128M 0x08000000
+@@ -32,6 +38,85 @@
+ #define DRAMTYPE_512Mx32 2
+ #define DRAMTYPE_1Gx32 3
+#if defined(__sparc__)
+
@@ -1674,7 +1631,7 @@
#define AR_PORT_WRITE (pAST->RelocateIO + 0x40)
#define MISC_PORT_WRITE (pAST->RelocateIO + 0x42)
#define SEQ_PORT (pAST->RelocateIO + 0x44)
-@@ -37,7 +122,7 @@
+@@ -42,7 +127,7 @@
#define INPUT_STATUS1_READ (pAST->RelocateIO + 0x5A)
#define MISC_PORT_READ (pAST->RelocateIO + 0x4C)
@@ -1683,7 +1640,7 @@
#define SetReg(base,val) outb(base,val)
#define GetIndexReg(base,index,val) do { \
outb(base,index); \
-@@ -58,15 +143,32 @@
+@@ -62,15 +147,32 @@
SetIndexReg(base,index,__Temp); \
} while (0)
--- a/open-src/driver/xf86-video-ast/xf86UDelay.patch Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-From 882da603e0179a5f21879a3d3478b52e11daf438 Mon Sep 17 00:00:00 2001
-From: Matt Turner <[email protected]>
-Date: Sat, 7 Nov 2009 00:27:26 -0500
-Subject: [PATCH] Use usleep instead of xf86UDelay
-
-Signed-off-by: Matt Turner <[email protected]>
----
- src/ast_vgatool.c | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
-index c4975f4..5629b85 100644
---- a/src/ast_vgatool.c
-+++ b/src/ast_vgatool.c
-@@ -451,18 +451,18 @@ GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer)
- /* SCU settings */
- *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000;
- *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1;
-- xf86UDelay(10000);
-+ usleep(10000);
-
- *(ULONG *) (pAST->MMIOVirtualAddr + 0x12000) = 0x1688A8A8;
- ulData = *(ULONG *) (pAST->MMIOVirtualAddr + 0x12004);
- ulData &= 0xfffffffb;
- *(ULONG *) (pAST->MMIOVirtualAddr + 0x12004) = ulData;
-- xf86UDelay(10000);
-+ usleep(10000);
-
- /* I2C settings */
- *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = I2C_BASE;
- *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1;
-- xf86UDelay(10000);
-+ usleep(10000);
-
- /* I2C Start */
- *(ULONG *) (ulI2CBase + 0x00) = 0x0;
-@@ -782,7 +782,7 @@ void vInitDRAMReg(ScrnInfoPtr pScrn)
- if (pjDRAMRegInfo->Index == 0xFF00) /* Delay function */
- {
- for (i=0; i<15; i++)
-- xf86UDelay(pjDRAMRegInfo->Data);
-+ usleep(pjDRAMRegInfo->Data);
- }
- else if ( (pjDRAMRegInfo->Index == 0x0004) && (pAST->jChipType != AST2000) )
- {
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-ati/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-ati/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,14 +29,15 @@
MODULE_NAME=xf86-video-ati
# Version number (used in path names)
-MODULE_VERSION=6.12.4
+MODULE_VERSION=6.13.1
# Checksums for upstream tarball
-TARBALL_MD5 = e662348f6f957fcedf52818d668ab9f5
-TARBALL_SHA1 = efd9b9392787251756bbce6afc9715c417dae68f
+TARBALL_MD5 = d65ae11cc66146c7006dbf5acebde413
+TARBALL_SHA1 = 74a8e647e3149af0b1eb1baf58ef1b69b44f0228
# 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-ati/fix-build-on-non-kms.patch Mon Aug 16 15:35:21 2010 -0700
@@ -0,0 +1,27 @@
+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-ati/mapfiles.patch Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-ati/mapfiles.patch Mon Aug 16 15:35:21 2010 -0700
@@ -1,10 +1,10 @@
---- src/Makefile.am Tue Nov 10 11:09:55 2009
-+++ src/Makefile.am Tue Nov 10 11:29:10 2009
-@@ -165,3 +165,40 @@
- pcidb/ati_pciids.csv \
- pcidb/parse_pci_ids.pl \
- radeon_atombios.h
-+
+diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
+--- src/Makefile.am 2010-01-04 16:32:29.000000000 -0800
++++ src/Makefile.am 2010-04-26 20:36:36.232188492 -0700
+@@ -184,3 +184,39 @@ EXTRA_DIST = \
+ radeon_atombios.h \
+ radeon_dri2.h \
+ drmmode_display.h
+
+# Generate linker mapfiles for symbols found in other modules and use them
+# and library flag additions to make sure all symbols are resolvable
@@ -20,7 +20,7 @@
+
+radeon_drv_la_LDFLAGS += $(radeon_MAPFILES:%=-Wl,-M,%) \
+ -lexa -lfb -lint10 -lvbe -lvgahw -lxaa -lshadow \
-+ -ldrm -ldri -lglx -lm
++ -lpixman-1 -ldrm -ldri -lglx -lm
+
+radeon_drv_la_DEPENDENCIES = $(radeon_MAPFILES)
+
--- a/open-src/driver/xf86-video-ati/solaris-dri-drv-port.patch Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-ati/solaris-dri-drv-port.patch Mon Aug 16 15:35:21 2010 -0700
@@ -1,7 +1,7 @@
diff -urp -x '*~' -x '*.orig' src/radeon_dri.h src/radeon_dri.h
--- src/radeon_dri.h 2008-08-17 10:54:00.000000000 -0700
+++ src/radeon_dri.h 2009-01-10 19:09:08.415906000 -0800
-@@ -75,20 +75,25 @@ typedef struct {
+@@ -75,14 +75,17 @@ typedef struct {
/* MMIO register data */
drm_handle_t registerHandle;
drmSize registerSize;
@@ -19,11 +19,5 @@
int log2GARTTexGran;
int gartTexOffset;
unsigned int sarea_priv_offset;
+
- #ifdef PER_CONTEXT_SAREA
- drmSize perctx_sarea_size;
-+#else
-+ int padding3;
- #endif
- } RADEONDRIRec, *RADEONDRIPtr;
-
--- a/open-src/driver/xf86-video-chips/COPYING Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
- * Copyright 1996, 1997, 1998 by David Bateman <[email protected]>
- * Modified 1997, 1998 by Nozomi Ytow
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the authors not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. The authors makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the
- * source file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation" name
- * nor any trademark or logo of Digital Equipment Corporation may be used
- * to endorse or promote products derived from this software without the
- * prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed. In
- * no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for lost profits, loss
- * of revenue or loss of use, whether such damages arise in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even if
- * advised of the possibility of such damage.
-
- * Copyright 1994 The XFree86 Project
- *
- * 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
- * DAVID WEXELBLAT 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.
- *
- * Hardware Cursor for Trident utilizing XAA Cursor code.
- * Written by Alan Hourihane <[email protected]>
- * Modified for Chips and Technologies by David Bateman <[email protected]>
-
- * Copyright 1993 by Jon Block <[email protected]>
- * Modified by Mike Hollick <[email protected]>
- * Modified 1994 by Régis Cridlig <[email protected]>
- *
- * Major Contributors to XFree86 3.2
- * Modified 1995/6 by Nozomi Ytow
- * Modified 1996 by Egbert Eich <[email protected]>
- * Modified 1996 by David Bateman <[email protected]>
- * Modified 1996 by Xavier Ducoin <[email protected]>
- *
- * Contributors to XFree86 3.2
- * Modified 1995/6 by Ken Raeburn <[email protected]>
- * Modified 1996 by Shigehiro Nomura <[email protected]>
- * Modified 1996 by Marc de Courville <[email protected]>
- * Modified 1996 by Adam Sulmicki <[email protected]>
- * Modified 1996 by Jens Maurer <[email protected]>
- *
- * Large parts rewritten for XFree86 4.0
- * Modified 1998 by David Bateman <[email protected]>
- * Modified 1998 by Egbert Eich <[email protected]>
- * Modified 1998 by Nozomi Ytow
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the authors not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. The authors makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the
- * source file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation" name
- * nor any trademark or logo of Digital Equipment Corporation may be used
- * to endorse or promote products derived from this software without the
- * prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed. In
- * no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for lost profits, loss
- * of revenue or loss of use, whether such damages arise in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even if
- * advised of the possibility of such damage.
-
- * Modified 1996 by Egbert Eich <[email protected]>
- * Modified 1996 by David Bateman <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the authors not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. The authors makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
- * Created 1998 by David Bateman <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the authors not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. The authors makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
--- a/open-src/driver/xf86-video-chips/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-chips/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,14 +29,14 @@
MODULE_NAME=xf86-video-chips
# Version number (used in path names)
-MODULE_VERSION=1.2.2
+MODULE_VERSION=1.2.3
# Checksums for upstream tarball
-TARBALL_MD5 = a3969c28c3b36ab2caa852a9324e9b70
-TARBALL_SHA1 = 3990bc1cf4e8963164b3a38b15f92bc87da9278c
+TARBALL_MD5 = e3e8b8661b3ba2159f83f64e2aa6e29f
+TARBALL_SHA1 = 79d1592dacbdd5ff0419dcb2fef2a2ca541dd329
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = xf86UDelay.patch,-p1
+SOURCE_PATCHES =
# Only build 32-bit since hardware is too old to be found in 64-bit systems
BUILD_TYPES=32
@@ -52,7 +52,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa \
+ -lfb -lpixman-1 -lpciaccess -lshadowfb -lXfont -lvbe -lvgahw -lxaa \
-lxf8_16bpp
# Additional install rules beyond what upstream installs
--- a/open-src/driver/xf86-video-chips/xf86UDelay.patch Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-From ccbc6669cd1b00b4f50fdf9d63e5b38f6dacfa7a Mon Sep 17 00:00:00 2001
-From: Matt Turner <[email protected]>
-Date: Sat, 7 Nov 2009 00:29:33 -0500
-Subject: [PATCH] Use usleep instead of xf86UDelay
-
-Signed-off-by: Matt Turner <[email protected]>
----
- src/ct_BltHiQV.h | 2 +-
- src/ct_driver.c | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/ct_BltHiQV.h b/src/ct_BltHiQV.h
-index 8099d65..ada946e 100644
---- a/src/ct_BltHiQV.h
-+++ b/src/ct_BltHiQV.h
-@@ -82,7 +82,7 @@
- ErrorF("timeout\n"); \
- tmp = cPtr->readXR(cPtr, 0x20); \
- cPtr->writeXR(cPtr, 0x20, ((tmp & 0xFD) | 0x2)); \
-- xf86UDelay(10000); \
-+ usleep(10000); \
- cPtr->writeXR(cPtr, 0x20, (tmp & 0xFD)); \
- break; \
- } \
-diff --git a/src/ct_driver.c b/src/ct_driver.c
-index eda2f63..65fa03e 100644
---- a/src/ct_driver.c
-+++ b/src/ct_driver.c
-@@ -3725,12 +3725,12 @@ CHIPSEnterVT(int scrnIndex, int flags)
- && (cPtr->Flags & ChipsLinearSupport))
- CHIPSResetVideo(pScrn);
-
-- /*xf86UDelay(50000);*/
-+ /*usleep(50000);*/
- chipsHWCursorOn(cPtr, pScrn);
- /* cursor settle delay */
-- xf86UDelay(50000);
-+ usleep(50000);
- CHIPSAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-- xf86UDelay(50000);
-+ usleep(50000);
- return TRUE;
- }
-
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-dummy/COPYING Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- * Copyright 2002, SuSE Linux AG, Author: Egbert Eich
--- a/open-src/driver/xf86-video-dummy/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-dummy/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-dummy
# Version number (used in path names)
-MODULE_VERSION=0.3.3
+MODULE_VERSION=0.3.4
# Checksums for upstream tarball
-TARBALL_MD5 = 3ffe3a28f4452e66bf56180e7da9cbc5
-TARBALL_SHA1 = 3ea81b819c29938feab58b644b7066250e88da79
+TARBALL_MD5 = 1cf99415c998994f2e88575f942b364c
+TARBALL_SHA1 = 876ed7165ea2821bbddd73232a1ce0b79c1f14ff
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-i128/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-i128/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-i128
# Version number (used in path names)
-MODULE_VERSION=1.3.3
+MODULE_VERSION=1.3.4
# Checksums for upstream tarball
-TARBALL_MD5 = a597e8efeec6ab8bc6ba6d87fceb2dba
-TARBALL_SHA1 = 75838161e8ddc2e68d53250ad3ea6b54c9cca7a3
+TARBALL_MD5 = 103316abb2dc466219c027afc5a71691
+TARBALL_SHA1 = d5f755dc964eaa067b4efcafafd00814a60df775
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-mga/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-mga/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-mga
# Version number (used in path names)
-MODULE_VERSION=1.4.11
+MODULE_VERSION=1.4.13
# Checksums for upstream tarball
-TARBALL_MD5 = 9d1ca965cedb0856296b47442f3c739d
-TARBALL_SHA1 = 1add2aa03fb8387bab5d3b36ca09035aaf4e0b4c
+TARBALL_MD5 = f967fb3e655f6f68aa3f495eaadcaac2
+TARBALL_SHA1 = 55aa185cf381def4b5905c8b93694b8dfbd5c378
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = no-hal.patch
--- a/open-src/driver/xf86-video-neomagic/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-neomagic/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,14 +29,14 @@
MODULE_NAME=xf86-video-neomagic
# Version number (used in path names)
-MODULE_VERSION=1.2.4
+MODULE_VERSION=1.2.5
# Checksums for upstream tarball
-TARBALL_MD5 = 2d722ee9b9fe8da49109f280689c9c25
-TARBALL_SHA1 = 9a6991d2ca64d544a41ff653a5f4c7d5d4b9760f
+TARBALL_MD5 = 423b82b776444f88adbf207fb6a82c1a
+TARBALL_SHA1 = 02c994e2eae191b50a8cd556e5b52d82725073b3
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = xf86UDelay.patch,-p1
+SOURCE_PATCHES =
# Only build 32-bit since hardware is too old to be found in 64-bit systems
BUILD_TYPES=32
@@ -50,7 +50,7 @@
MODULE_LD_OPTIONS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
- -lfb -lpciaccess -lshadow -lvbe -lvgahw -lxaa
+ -lfb -lpixman-1 -lpciaccess -lshadow -lvbe -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-neomagic/xf86UDelay.patch Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-Date: Mon, 26 Oct 2009 15:43:50 -0400
-Subject: [PATCH] s/xf86UDelay/usleep/g
-
-cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800
-
-Signed-off-by: Adam Jackson <[email protected]>
----
- src/neo_driver.c | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index ddb6812..e4c60f2 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -114,6 +114,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <X11/extensions/xf86dgastr.h>
- #endif
-
-+#include <unistd.h>
-+
- /* Mandatory functions */
- static const OptionInfoRec * NEOAvailableOptions(int chipid, int busid);
- static void NEOIdentify(int flags);
-@@ -2489,7 +2491,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
- * In some rare cases a lockup might occur if we don't delay
- * here. (Reported by Miles Lane)
- */
-- xf86UDelay(200000);
-+ usleep(200000);
- /*
- * Disable horizontal and vertical graphics and text expansions so
- * that vgaHWRestore works properly.
-@@ -2502,7 +2504,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
- * Sleep for 200ms to make sure that the two operations above have
- * had time to take effect.
- */
-- xf86UDelay(200000);
-+ usleep(200000);
- /*
- * This function handles restoring the generic VGA registers. */
- vgaHWRestore(pScrn, VgaReg,
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-nv/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-nv/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-nv
# Version number (used in path names)
-MODULE_VERSION=2.1.16
+MODULE_VERSION=2.1.18
# Checksums for upstream tarball
-TARBALL_MD5 = fb02d5506e35054348d1c2b2c924530d
-TARBALL_SHA1 = fce8c42268f1b60c8aece2adb35d780f02300fe8
+TARBALL_MD5 = b12f0b2114849d1a542d8084732573d3
+TARBALL_SHA1 = d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-rendition/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-rendition/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,14 +29,14 @@
MODULE_NAME=xf86-video-rendition
# Version number (used in path names)
-MODULE_VERSION=4.2.3
+MODULE_VERSION=4.2.4
# Checksums for upstream tarball
-TARBALL_MD5 = 9a0a916fe1e7b5c81cd4c80a08e646cc
-TARBALL_SHA1 = 11972f4223de2381c66855c57652b9e2333099d8
+TARBALL_MD5 = 75cc28125077acb7344955294545553b
+TARBALL_SHA1 = 16148c25183f7829c22bc9dfdb588c1a16bf4565
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = xf86UDelay.patch,-p1
+SOURCE_PATCHES =
# Only build 32-bit since hardware is too old to be found in 64-bit systems
BUILD_TYPES=32
--- a/open-src/driver/xf86-video-rendition/xf86UDelay.patch Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-From f480933cfcc683aba19b679a6d532828eeb2eaa9 Mon Sep 17 00:00:00 2001
-From: Matt Turner <[email protected]>
-Date: Sat, 7 Nov 2009 00:34:00 -0500
-Subject: [PATCH] Use usleep instead of xf86UDelay
-
-Signed-off-by: Matt Turner <[email protected]>
----
- src/vmodes.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/vmodes.c b/src/vmodes.c
-index 5faf257..c0bd0df 100644
---- a/src/vmodes.c
-+++ b/src/vmodes.c
-@@ -395,14 +395,14 @@ verite_restore(ScrnInfoPtr pScreenInfo, RenditionRegPtr reg)
- if (pRendition->board.chip == V1000_DEVICE) {
- /* fixme */
- set_PLL(iob, reg->pclkpll);
-- xf86UDelay(10000);
-+ usleep(10000);
- } else {
- verite_out32(iob+PCLKPLL,reg->pclkpll);
- /*
- * Need to wait 200uS for PLL to stabilize --
- * let's play it safe with 500
- */
-- xf86UDelay(10000);
-+ usleep(10000);
- /* wait until VBLANK */
- while ((verite_in32(iob+CRTCSTATUS)&CRTCSTATUS_VERT_MASK) !=
- CRTCSTATUS_VERT_ACTIVE);
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-siliconmotion/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-siliconmotion/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-siliconmotion
# Version number (used in path names)
-MODULE_VERSION=1.7.3
+MODULE_VERSION=1.7.4
# Checksums for upstream tarball
-TARBALL_MD5 = 29fb322cd3adab52cc7f1ac86f9315bb
-TARBALL_SHA1 = f3edf5853a17c3725c11ea983edcf4b6bd54d10a
+TARBALL_MD5 = 3059e87586e16c34da89437cc6215b49
+TARBALL_SHA1 = 3c0fd42fbd301e66104e4b9190796d102a034787
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
@@ -52,6 +52,6 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lXfont -lvbe -lvgahw -lxaa -lexa
+ -lfb -lpixman-1 -lint10 -lpciaccess -lXfont -lvbe -lvgahw -lxaa -lexa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-sis/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-sis/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-sis
# Version number (used in path names)
-MODULE_VERSION=0.10.2
+MODULE_VERSION=0.10.3
# Checksums for upstream tarball
-TARBALL_MD5 = f04baa307e49e9f0e5a5c3d2e89a5576
-TARBALL_SHA1 = c7369196d504671b6fdc9e17c90c0f07aa8e0c24
+TARBALL_MD5 = dd930928b5ed7fcf34e3be4d43202ec7
+TARBALL_SHA1 = 158673747e240b0c33499685a32d46bdaead7cd5
# Only build 32-bit since hardware is too old to be found in 64-bit systems
BUILD_TYPES=32
@@ -55,7 +55,8 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lexa -lfb -lint10 -lpciaccess -lshadowfb -lXfont -lvbe -lxaa -lm
+ -lexa -lfb -lint10 -lpciaccess -lpixman-1 -lshadowfb -lXfont -lvbe \
+ -lxaa -lm
# Additional install rules beyond what upstream installs
MODULE_ADD_INSTALL_TARGETS=install_docs
--- a/open-src/driver/xf86-video-trident/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-trident/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-trident
# Version number (used in path names)
-MODULE_VERSION=1.3.3
+MODULE_VERSION=1.3.4
# Checksums for upstream tarball
-TARBALL_MD5 = 47f3c5da1942017218355f178f02ef84
-TARBALL_SHA1 = ac795465d47d807969970ae1433336439afad9b8
+TARBALL_MD5 = 7a646ba7033dd4eb10d38dca8682b391
+TARBALL_SHA1 = 7c40f5c02bddf399862782b708941e79302318af
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = 6452329.patch
@@ -52,7 +52,8 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lexa -lfb -lint10 -lpciaccess -lshadow -lvbe -lvgahw -lxaa -lm
+ -lexa -lfb -lint10 -lpciaccess -lpixman-1 -lshadow -lvbe -lvgahw \
+ -lxaa -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-tseng/COPYING Mon Aug 16 15:18:35 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-Copyright 2000 by Rainer Keller, <[email protected]>.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Alan Hourihane makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Authors: Adapted from: Alan Hourihane, <[email protected]>
- by: Rainer Keller, <[email protected]>
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Thomas Roell not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Thomas Roell makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Author: Thomas Roell, [email protected]
- ET6000 and ET4000W32 16/24/32 bpp and acceleration support by Koen Gadeyne
-
-Large parts rewritten for XFree86 4.0 by Koen Gadeyne.
-
-Copyright 2005-2006 Luc Verhaegen.
-Copyright 1993-1997 The XFree86 Project, Inc.
-Copyright 1990-1991 Thomas Roell.
-
-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, sub license,
-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 NON-INFRINGEMENT. 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-tseng/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-tseng/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-tseng
# Version number (used in path names)
-MODULE_VERSION=1.2.3
+MODULE_VERSION=1.2.4
# Checksums for upstream tarball
-TARBALL_MD5 = 79f63999c88477801ae54dc486272ad6
-TARBALL_SHA1 = 6cfc03bec98d56b3294ca45c604cf620b4b477c8
+TARBALL_MD5 = fa441774f8bf516a5c6331d64231a39d
+TARBALL_SHA1 = 1b45f55657b2c92f30abb0769cae57fca98d93b7
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-vesa/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/driver/xf86-video-vesa/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=xf86-video-vesa
# Version number (used in path names)
-MODULE_VERSION=2.2.1
+MODULE_VERSION=2.3.0
# Checksums for upstream tarball
-TARBALL_MD5 = 61a1dc9a22991bd04d0ff98f800775c1
-TARBALL_SHA1 = 086adbf06e9043ed2c18d887fb32ce605324876e
+TARBALL_MD5 = 07fa32958aff9b463dd3af5481ef6626
+TARBALL_SHA1 = 4689b7c295d7a8d7326302dafecb812739617134
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = vesa_xorg72.patch
--- a/open-src/font/deja-vu/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/font/deja-vu/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -37,11 +37,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=2.30
+MODULE_VERSION=2.31
# Checksums for upstream tarball
-TARBALL_MD5 = 545b3bfc69893075a90a7c6e6f4a7e67
-TARBALL_SHA1 = 3a09830033f74be6e370155410091f76193f5528
+TARBALL_MD5 = a794a75d8c43c83f0226207cd3aaf666
+TARBALL_SHA1 = 33ed20fc45566bfac776a713b3bb4f1214ccb0f7
# Download site for source
SOURCE_URL=$(SF_DOWNLOADS_URL)/dejavu/$(SOURCE_TARBALL_NAME)
--- a/open-src/lib/libX11/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/lib/libX11/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=libX11
# Version number (used in path names)
-MODULE_VERSION=1.3.4
+MODULE_VERSION=1.3.5
# Checksums for upstream tarball
-TARBALL_MD5 = f65c9c7ecbfb64c19dbd7927160d63fd
-TARBALL_SHA1 = 5aab6dc8ed5ec0e86419626715efc3edd34d1db4
+TARBALL_MD5 = a1175b6667fcb249c6f1d725965944e3
+TARBALL_SHA1 = c5dda2b6279f3e3267646576138fcd091a7f3c54
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
--- a/open-src/lib/libX11/compose-en_US.UTF-8.patch Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/lib/libX11/compose-en_US.UTF-8.patch Mon Aug 16 15:35:21 2010 -0700
@@ -21,9 +21,8 @@
# DEALINGS IN THE SOFTWARE.
#
-diff -urp -x '*~' -x '*.orig' nls/en_US.UTF-8/Compose.pre nls/en_US.UTF-8/Compose.pre
---- nls/en_US.UTF-8/Compose.pre 2010-04-26 22:00:12.000000000 -0700
-+++ nls/en_US.UTF-8/Compose.pre 2010-06-07 15:49:36.457980695 -0700
+--- nls/en_US.UTF-8/Compose.pre 2010-08-10 17:42:18.000000000 -0700
++++ nls/en_US.UTF-8/Compose.pre 2010-08-05 20:42:35.085554525 -0700
@@ -1,8 +1,69 @@
-XCOMM UTF-8 (Unicode) compose sequence
+XCOMM
@@ -168,7 +167,7 @@
XCOMM Musical alterations
<Multi_key> <numbersign> <b> : "♭" U266d # MUSIC FLAT SIGN
-@@ -221,5154 +282,2592 @@ XCOMM Other symbols
+@@ -221,5161 +282,2594 @@ XCOMM Other symbols
<Multi_key> <colon> <parenright> : "☺" U263A # WHITE SMILING FACE
<Multi_key> <colon> <parenleft> : "☹" U2639 # WHITE FROWNING FACE
@@ -1537,8 +1536,10 @@
-<Multi_key> <b> <a> : "ă" U0103 # LATIN SMALL LETTER A WITH BREVE
-<dead_ogonek> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
-<Multi_key> <semicolon> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
+-<Multi_key> <comma> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
-<dead_ogonek> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
-<Multi_key> <semicolon> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
+-<Multi_key> <comma> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
-<dead_acute> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
-<Multi_key> <acute> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
-<Multi_key> <apostrophe> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
@@ -1585,8 +1586,10 @@
-<Multi_key> <period> <e> : "ė" U0117 # LATIN SMALL LETTER E WITH DOT ABOVE
-<dead_ogonek> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
-<Multi_key> <semicolon> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
+-<Multi_key> <comma> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
-<dead_ogonek> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
-<Multi_key> <semicolon> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
+-<Multi_key> <comma> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
-<dead_caron> <E> : "Ě" U011A # LATIN CAPITAL LETTER E WITH CARON
-<Multi_key> <c> <E> : "Ě" U011A # LATIN CAPITAL LETTER E WITH CARON
-<dead_caron> <e> : "ě" U011B # LATIN SMALL LETTER E WITH CARON
@@ -1639,8 +1642,10 @@
-<Multi_key> <b> <i> : "ĭ" U012D # LATIN SMALL LETTER I WITH BREVE
-<dead_ogonek> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
-<Multi_key> <semicolon> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
+-<Multi_key> <comma> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
-<dead_ogonek> <i> : "į" U012F # LATIN SMALL LETTER I WITH OGONEK
-<Multi_key> <semicolon> <i> : "į" U012F # LATIN SMALL LETTER I WITH OGONEK
+-<Multi_key> <comma> <i> : "į" U012F # LATIN SMALL LETTER I WITH OGONEK
-<dead_abovedot> <I> : "İ" U0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE
-<Multi_key> <period> <I> : "İ" U0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE
-<dead_abovedot> <i> : "ı" U0131 # LATIN SMALL LETTER DOTLESS I
@@ -1791,8 +1796,10 @@
-<Multi_key> <equal> <u> : "ű" U0171 # LATIN SMALL LETTER U WITH DOUBLE ACUTE
-<dead_ogonek> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
-<Multi_key> <semicolon> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
+-<Multi_key> <comma> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
-<dead_ogonek> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
-<Multi_key> <semicolon> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
+-<Multi_key> <comma> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
-<dead_circumflex> <W> : "Ŵ" U0174 # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <W> : "Ŵ" U0174 # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-<dead_circumflex> <w> : "ŵ" U0175 # LATIN SMALL LETTER W WITH CIRCUMFLEX
@@ -2084,10 +2091,8 @@
-<dead_abovedot> <a> : "ȧ" U0227 # LATIN SMALL LETTER A WITH DOT ABOVE
-<Multi_key> <period> <a> : "ȧ" U0227 # LATIN SMALL LETTER A WITH DOT ABOVE
-<dead_cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
--<Multi_key> <comma> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
-<Multi_key> <cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
-<dead_cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
--<Multi_key> <comma> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
-<Multi_key> <cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
-<dead_macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-<Multi_key> <macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
@@ -7897,3 +7902,5 @@
+Ctrl<space> : SWITCH_STATE_TO "[ English/European ]"
+LANGUAGE : in_IN
+END_STATE
++
+ <Multi_key> <backslash> <o> <slash> : "🙌" # PERSON RAISING BOTH HANDS IN CELEBRATION
--- a/open-src/lib/libXau/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/lib/libXau/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=libXau
# Version number (used in path names)
-MODULE_VERSION=1.0.5
+MODULE_VERSION=1.0.6
# Checksums for upstream tarball
-TARBALL_MD5 = 993b3185c629e4b89401fca072dcb663
-TARBALL_SHA1 = b1c68843edf7e80ce952f7ee0541448f41bac202
+TARBALL_MD5 = 4a2cbd83727682f9ee1c1e719bac6adb
+TARBALL_SHA1 = 0e1ab449f98026e4599f6e0d7491810d36c8fe4d
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/lib/libXi/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/lib/libXi/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,20 +29,16 @@
MODULE_NAME=libXi
# Version number (used in path names)
-MODULE_VERSION=1.3
+MODULE_VERSION=1.3.2
# Checksums for upstream tarball
-TARBALL_MD5 = 8df4ece9bd1efb02c28acb2b6f485e09
-TARBALL_SHA1 = 7685f2881ce40b13028d9409eedbb9cf1ed0d8ef
+TARBALL_MD5 = 26f93781356b1fdde08f7ee9cd5884d6
+TARBALL_SHA1 = 50fdac374d45feb4fe39938d3530bd4f314f3a85
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- man.patch,-p1 \
solaris-abi.patch
-# Need to autoreconf after patching man/Makefile.am in man.patch
-AUTORECONF = yes
-
# Library name (used for specfiles/mapfiles)
LIBNAME=Xi
--- a/open-src/lib/libXvMC/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/lib/libXvMC/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -29,11 +29,11 @@
MODULE_NAME=libXvMC
# Version number (used in path names)
-MODULE_VERSION=1.0.5
+MODULE_VERSION=1.0.6
# Checksums for upstream tarball
-TARBALL_MD5 = 16c3a11add14979beb7510e44623cac6
-TARBALL_SHA1 = 153b85884f22b882cecb9fc462fe24c669a80dbd
+TARBALL_MD5 = bfc7524646f890dfc30dea1d676004a3
+TARBALL_SHA1 = 4ace7e7ce6b646b5715b2efa561affc89bc87f91
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/lib/pixman/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/lib/pixman/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -28,11 +28,11 @@
MODULE_NAME=pixman
# Version number (used in path names)
-MODULE_VERSION=0.18.2
+MODULE_VERSION=0.18.4
# Checksums for upstream tarball
-TARBALL_MD5 = 8f0c47bbb12a0d9c0d14242596bf6bf9
-TARBALL_SHA1 = d66ab37ebc111e8031dd6d0ff1edf19b7adab5be
+TARBALL_MD5 = c1d69aaddba8c1e046d26ac125da95bf
+TARBALL_SHA1 = 011b00fb33d6e5021a680bcc74f600f44d709d8d
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/proto/kbproto/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/proto/kbproto/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -27,11 +27,11 @@
MODULE_NAME=kbproto
# Version number (used in path names)
-MODULE_VERSION=1.0.4
+MODULE_VERSION=1.0.5
# Checksums for upstream tarball
-TARBALL_MD5 = 7f439166a9b2bf81471a33951883019f
-TARBALL_SHA1 = d300745389d3a80d90c9a3c989651f228db486e5
+TARBALL_MD5 = e7edb59a3f54af15f749e8f3e314ee62
+TARBALL_SHA1 = d95fada09399568c434729b436e1a09503e15b7a
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= 5077065.patch
--- a/open-src/proto/renderproto/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/proto/renderproto/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -27,11 +27,11 @@
MODULE_NAME=renderproto
# Version number (used in path names)
-MODULE_VERSION=0.11
+MODULE_VERSION=0.11.1
# Checksums for upstream tarball
-TARBALL_MD5 = b160a9733fe91b666e74fca284333148
-TARBALL_SHA1 = d30cf508b1a1b5f0deb1c6db41ba2f4e57680637
+TARBALL_MD5 = a914ccc1de66ddeb4b611c6b0686e274
+TARBALL_SHA1 = 7ae9868a358859fe539482b02414aa15c2d8b1e4
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/proto/videoproto/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/proto/videoproto/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -27,11 +27,11 @@
MODULE_NAME=videoproto
# Version number (used in path names)
-MODULE_VERSION=2.3.0
+MODULE_VERSION=2.3.1
# Checksums for upstream tarball
-TARBALL_MD5 = fb762146a18207a1e8bc9f299dfc7ac0
-TARBALL_SHA1 = 4aef2b438d45b3ab75e640996ce1267d3468f48c
+TARBALL_MD5 = c3b348c6e2031b72b11ae63fc7f805c2
+TARBALL_SHA1 = bb8b366687a7f345e3a8697bac516cb436cbf4b2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/proto/x11proto/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/proto/x11proto/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -27,11 +27,11 @@
MODULE_NAME=xproto
# Version number (used in path names)
-MODULE_VERSION=7.0.16
+MODULE_VERSION=7.0.18
# Checksums for upstream tarball
-TARBALL_MD5 = 75c9edff1f3823e5ab6bb9e66821a901
-TARBALL_SHA1 = 0eda5588d42f2c810d8491da44fe84a4093e12bc
+TARBALL_MD5 = 6b8a34b274c6fceaffe57c579db826b9
+TARBALL_SHA1 = 252596e7264f3174d535bf67fd1b704b1ba8f699
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= \
--- a/open-src/proto/xextproto/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/proto/xextproto/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -27,11 +27,11 @@
MODULE_NAME=xextproto
# Version number (used in path names)
-MODULE_VERSION=7.1.1
+MODULE_VERSION=7.1.2
# Checksums for upstream tarball
-TARBALL_MD5 = fb6ccaae76db7a35e49b12aea60ca6ff
-TARBALL_SHA1 = 1bb4bd12d65a17b3168dc9b4e028b33a2f7b2cad
+TARBALL_MD5 = 263ae968b223c23b2986603d84e5c30e
+TARBALL_SHA1 = be6303a9449277af58f38e1be57e442d98f400fe
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/util/lndir/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/util/lndir/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -39,11 +39,11 @@
MODULE_ARC_CASES = PSARC/2010/219
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.2
# Checksums for upstream tarball
-TARBALL_MD5 = e274ea9f55dfd62afa0a7b1e1ab4ba96
-TARBALL_SHA1 = c7eed31c4cb2b016e4a06b629a57333c8df14421
+TARBALL_MD5 = 619acbb2ed766d7762f02328513b1f72
+TARBALL_SHA1 = bad5a03b82cd817e4a2a7d2e83b820326fb2a7b7
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/util/util-macros/Makefile Mon Aug 16 15:18:35 2010 -0700
+++ b/open-src/util/util-macros/Makefile Mon Aug 16 15:35:21 2010 -0700
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.8.0
+MODULE_VERSION=1.10.0
# Checksums for upstream tarball
-TARBALL_MD5 = 0c9334201b0ed5ec187faab0bb713329
-TARBALL_SHA1 = cbe9920712789ecd25386956649db0d666642f0f
+TARBALL_MD5 = 533b86bfdafadbde12c654e2f0144679
+TARBALL_SHA1 = 01bd26de7f76907ad502b430a5d18f64a896dc81
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/pkg/manifests/x11-documentation-xorg-docs.mf Mon Aug 16 15:18:35 2010 -0700
+++ b/pkg/manifests/x11-documentation-xorg-docs.mf Mon Aug 16 15:35:21 2010 -0700
@@ -69,3 +69,5 @@
file path=usr/share/man/man5/Xsecurity.5
file path=usr/share/pkgconfig/xorg-sgml-doctools.pc
file path=usr/share/sgml/X11/defs.ent
+file path=usr/share/sgml/X11/xorg.css
+file path=usr/share/sgml/X11/xorg.xsl
--- a/pkg/manifests/x11-header-x11-protocols.mf Mon Aug 16 15:18:35 2010 -0700
+++ b/pkg/manifests/x11-header-x11-protocols.mf Mon Aug 16 15:35:21 2010 -0700
@@ -41,6 +41,8 @@
dir path=usr/share/doc/fixesproto
dir path=usr/share/doc/randrproto
dir path=usr/share/doc/renderproto
+dir path=usr/share/doc/videoproto
+dir path=usr/share/doc/xextproto
dir path=usr/share/doc/xproxymanagementprotocol
dir path=usr/share/pkgconfig
file path=usr/include/GL/glxint.h
@@ -145,11 +147,14 @@
file path=usr/include/X11/extensions/securproto.h
file path=usr/include/X11/extensions/shapeconst.h
file path=usr/include/X11/extensions/shapeproto.h
+file path=usr/include/X11/extensions/shapestr.h
file path=usr/include/X11/extensions/shm.h
file path=usr/include/X11/extensions/shmproto.h
+file path=usr/include/X11/extensions/shmstr.h
file path=usr/include/X11/extensions/sme.h
file path=usr/include/X11/extensions/syncconst.h
file path=usr/include/X11/extensions/syncproto.h
+file path=usr/include/X11/extensions/syncstr.h
file path=usr/include/X11/extensions/transovl.h
file path=usr/include/X11/extensions/transovlstr.h
file path=usr/include/X11/extensions/vldXvMC.h
@@ -189,6 +194,19 @@
file path=usr/share/doc/fixesproto/fixesproto.txt
file path=usr/share/doc/randrproto/randrproto.txt
file path=usr/share/doc/renderproto/renderproto.txt
+file path=usr/share/doc/videoproto/xv-protocol-v2.txt
+file path=usr/share/doc/xextproto/appgroup.xml
+file path=usr/share/doc/xextproto/dbe.xml
+file path=usr/share/doc/xextproto/dpms.xml
+file path=usr/share/doc/xextproto/evi.xml
+file path=usr/share/doc/xextproto/geproto.xml
+file path=usr/share/doc/xextproto/multibuf.xml
+file path=usr/share/doc/xextproto/security.xml
+file path=usr/share/doc/xextproto/shape.xml
+file path=usr/share/doc/xextproto/shm.xml
+file path=usr/share/doc/xextproto/sync.xml
+file path=usr/share/doc/xextproto/tog-cup.xml
+file path=usr/share/doc/xextproto/xtest.xml
file path=usr/share/doc/xproxymanagementprotocol/PM_spec
file path=usr/share/pkgconfig/bigreqsproto.pc
file path=usr/share/pkgconfig/compositeproto.pc
--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-vmmouse.mf Mon Aug 16 15:18:35 2010 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-vmmouse.mf Mon Aug 16 15:35:21 2010 -0700
@@ -31,11 +31,9 @@
dir path=etc/hal/fdi
dir path=etc/hal/fdi/policy
dir path=etc/hal/fdi/policy/10osvendor
-dir path=etc/hal/fdi/policy/10osvendor/$(ARCH64)
dir path=usr
dir path=usr/lib
dir path=usr/lib/hal
-dir path=usr/lib/hal/$(ARCH64)
dir path=usr/lib/xorg
dir path=usr/lib/xorg/$(ARCH64)
dir path=usr/lib/xorg/modules