sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (6f3cfa325f85cc9cafb6fb659491c1d4a90c3bed)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (6f3cfa325f85cc9cafb6fb659491c1d4a90c3bed)
Date: Tue, 29 Dec 2009 22:57:29 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
xorg-driver/xf86-video-vmware/DETAILS | 2
xorg-driver/xf86-video-vmware/HISTORY | 8 +
xorg-driver/xf86-video-vmware/PRE_BUILD | 7
xorg-driver/xf86-video-vmware/vmware.patch | 78
----------
xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.8.tar.bz2.sig | 0
xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.9.tar.bz2.sig |binary
7 files changed, 9 insertions(+), 86 deletions(-)

New commits:
commit 6f3cfa325f85cc9cafb6fb659491c1d4a90c3bed
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-vmware: Updated to 10.16.9
SOURCE matches upstream posted SHA1
Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24541 and
http://bugs.freedesktop.org/show_bug.cgi?id=14208
vmware.patch no longer needed

diff --git a/xorg-driver/xf86-video-vmware/DETAILS
b/xorg-driver/xf86-video-vmware/DETAILS
index 6c54057..0935d1c 100755
--- a/xorg-driver/xf86-video-vmware/DETAILS
+++ b/xorg-driver/xf86-video-vmware/DETAILS
@@ -1,5 +1,5 @@
SPELL=xf86-video-vmware
- VERSION=10.16.8
+ VERSION=10.16.9
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
#
SOURCE_HASH=sha512:0db8e5424abf6a17dcea495203a7c9e0753299bf4251c765860adbcfa8a9df7f28541afe246b99376a716cd5b0ceec5e707506e9b1279caebeba48a62570d222
diff --git a/xorg-driver/xf86-video-vmware/HISTORY
b/xorg-driver/xf86-video-vmware/HISTORY
index 3ed6294..1365645 100644
--- a/xorg-driver/xf86-video-vmware/HISTORY
+++ b/xorg-driver/xf86-video-vmware/HISTORY
@@ -1,3 +1,11 @@
+2009-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 10.16.9
+ SOURCE matches upstream posted SHA1
+ Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24541 and
+ http://bugs.freedesktop.org/show_bug.cgi?id=14208
+ * PRE_BUILD: vmware.patch no longer needed
+ * vmware.patch: Removed, fixed in 10.16.9
+
2009-12-27 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added to apply patch
* vmware.patch: Added fix for lockups from upstream bug:
diff --git a/xorg-driver/xf86-video-vmware/PRE_BUILD
b/xorg-driver/xf86-video-vmware/PRE_BUILD
deleted file mode 100755
index fa9a880..0000000
--- a/xorg-driver/xf86-video-vmware/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-# Upstream fix from
-# https://bugs.freedesktop.org/show_bug.cgi?id=24541
-
-patch -p0 < $SCRIPT_DIRECTORY/vmware.patch
diff --git a/xorg-driver/xf86-video-vmware/vmware.patch
b/xorg-driver/xf86-video-vmware/vmware.patch
deleted file mode 100644
index a2a22ef..0000000
--- a/xorg-driver/xf86-video-vmware/vmware.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/vmware.c b/src/vmware.c
-index 6004677..b5a5099 100644
---- src/vmware.c
-+++ src/vmware.c
-@@ -146,38 +146,6 @@ static PciChipsets VMWAREPciChipsets[] = {
- { -1, -1, RES_UNDEFINED }
- };
-
--static const char *vgahwSymbols[] = {
-- "vgaHWGetHWRec",
-- "vgaHWGetIOBase",
-- "vgaHWGetIndex",
-- "vgaHWInit",
-- "vgaHWProtect",
-- "vgaHWRestore",
-- "vgaHWSave",
-- "vgaHWSaveScreen",
-- "vgaHWUnlock",
-- NULL
--};
--
--static const char *fbSymbols[] = {
-- "fbCreateDefColormap",
-- "fbPictureInit",
-- "fbScreenInit",
-- NULL
--};
--
--static const char *ramdacSymbols[] = {
-- "xf86CreateCursorInfoRec",
-- "xf86DestroyCursorInfoRec",
-- "xf86InitCursor",
-- NULL
--};
--
--static const char *shadowfbSymbols[] = {
-- "ShadowFBInit2",
-- NULL
--};
--
- #ifdef XFree86LOADER
- static XF86ModuleVersionInfo vmwareVersRec = {
- "vmware",
-@@ -640,8 +608,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
- return FALSE;
- }
-
-- xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
- if (!vgaHWGetHWRec(pScrn)) {
- return FALSE;
- }
-@@ -959,7 +925,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
-
- /* Need ramdac for hwcursor */
- if (pVMWARE->hwCursor) {
-@@ -967,7 +932,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(ramdacSymbols, NULL);
- }
-
- return TRUE;
-@@ -2051,9 +2015,6 @@ vmwareSetup(pointer module, pointer opts, int *errmaj,
int *errmin)
- setupDone = TRUE;
- xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
-
-- LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
-- shadowfbSymbols, NULL);
--
- return (pointer)1;
- }
- if (errmaj) {
diff --git
a/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.8.tar.bz2.sig
b/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.8.tar.bz2.sig
deleted file mode 100644
index d2d1265..0000000
Binary files
a/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.8.tar.bz2.sig and
/dev/null differ
diff --git
a/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.9.tar.bz2.sig
b/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.9.tar.bz2.sig
new file mode 100644
index 0000000..53d0a53
Binary files /dev/null and
b/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.9.tar.bz2.sig differ

[SM-Commit] GIT changes to master grimoire by Eric Sandall (6f3cfa325f85cc9cafb6fb659491c1d4a90c3bed), Eric Sandall, 12/29/2009