[63710] trunk/dports/x11/xorg-server-devel
jeremyhu at macports.org
jeremyhu at macports.org
Fri Feb 12 21:51:22 PST 2010
Revision: 63710
http://trac.macports.org/changeset/63710
Author: jeremyhu at macports.org
Date: 2010-02-12 21:51:19 -0800 (Fri, 12 Feb 2010)
Log Message:
-----------
xorg-server-devel: Bump to 1.8rc1
Modified Paths:
--------------
trunk/dports/x11/xorg-server-devel/Portfile
Added Paths:
-----------
trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-a-possible-crash-in-quartzAudio-fade.patch
trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-clang-static-analysis-fixes.patch
trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Use-an-empty-xkb-keymap-by-default.patch
trunk/dports/x11/xorg-server-devel/files/0004-fb-Revert-fb-changes-that-broke-XQuartz.patch
Removed Paths:
-------------
trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch
Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile 2010-02-13 01:55:50 UTC (rev 63709)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2010-02-13 05:51:19 UTC (rev 63710)
@@ -4,8 +4,7 @@
name xorg-server-devel
set my_name xorg-server
-version 1.7.99.2
-revision 1
+version 1.7.99.901
categories x11 devel
maintainers jeremyhu openmaintainer
description The X.org / Xquartz X server.
@@ -19,9 +18,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums md5 cafc4e2d4ef6cf6e47f3e7dffeb3346a \
- sha1 fb0725abd9ad1741722a93b085f93f877bc3da58 \
- rmd160 bf4839e3ba0213e6a6341d8ae1ab6b5bed9e15be
+checksums md5 9717fea6a0b6e84fdaf4cd2bdb74bdf9 \
+ sha1 3c315defe501d4015829b3e536cdb6d196056ce8 \
+ rmd160 5183de86bedd69303dd5c718e5d78e402604851e
use_bzip2 yes
use_parallel_build yes
@@ -75,7 +74,12 @@
# GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
configure.cppflags-append -I/usr/include -I${filespath}/dri
-patchfiles 0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch
+patchfiles \
+ 0001-XQuartz-Fix-a-possible-crash-in-quartzAudio-fade.patch \
+ 0002-XQuartz-clang-static-analysis-fixes.patch \
+ 0003-XQuartz-Use-an-empty-xkb-keymap-by-default.patch \
+ 0004-fb-Revert-fb-changes-that-broke-XQuartz.patch
+
patch.args -p1
build.args V=1
Deleted: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch 2010-02-13 01:55:50 UTC (rev 63709)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch 2010-02-13 05:51:19 UTC (rev 63710)
@@ -1,27 +0,0 @@
-From 6f6a99abc12ddee82898fdabfb50c17e90e094b9 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at freedesktop.org>
-Date: Wed, 13 Jan 2010 14:39:54 -0800
-Subject: [PATCH] XQuartz: Don't FatalError in x_hook_run if the list is empty
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>
----
- hw/xquartz/xpr/x-hook.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xquartz/xpr/x-hook.c b/hw/xquartz/xpr/x-hook.c
-index 03e7f85..5b850fe 100644
---- a/hw/xquartz/xpr/x-hook.c
-+++ b/hw/xquartz/xpr/x-hook.c
-@@ -79,6 +79,9 @@ X_PFX (hook_run) (x_list *lst, void *arg)
- void **data;
- int length, i;
-
-+ if(!lst)
-+ return;
-+
- length = X_PFX (list_length) (lst);
- fun = xalloc (sizeof (x_hook_function *) * length);
- data = xalloc (sizeof (void *) * length);
---
-1.6.6.1
-
Added: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-a-possible-crash-in-quartzAudio-fade.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-a-possible-crash-in-quartzAudio-fade.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-a-possible-crash-in-quartzAudio-fade.patch 2010-02-13 05:51:19 UTC (rev 63710)
@@ -0,0 +1,26 @@
+From 1e9491f12b8a20fde07b7bd86e8e0ad87a6f0e08 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed, 10 Feb 2010 17:22:58 -0800
+Subject: [PATCH 1/4] XQuartz: Fix a possible crash in quartzAudio fade
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/quartzAudio.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xquartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
+index af63d18..2723259 100644
+--- a/hw/xquartz/quartzAudio.c
++++ b/hw/xquartz/quartzAudio.c
+@@ -141,7 +141,7 @@ static void QuartzFillBuffer(
+ data->prevFrame = 0;
+
+ // adjust for space eaten by prev fade
+- buffer += audiobuffer->mNumberChannels*frame;
++ b += audiobuffer->mNumberChannels*frame;
+ bufferFrameCount -= frame;
+ frameCount = min(bufferFrameCount, data->remainingFrames);
+ }
+--
+1.6.2
+
Added: trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-clang-static-analysis-fixes.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-clang-static-analysis-fixes.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-clang-static-analysis-fixes.patch 2010-02-13 05:51:19 UTC (rev 63710)
@@ -0,0 +1,272 @@
+From ae0fb1f426e85420cce76ac4f03a929eddc05a07 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed, 10 Feb 2010 17:56:30 -0800
+Subject: [PATCH 2/4] XQuartz: clang static analysis fixes
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/GL/indirect.c | 2 +-
+ hw/xquartz/GL/visualConfigs.c | 3 +--
+ hw/xquartz/X11Application.m | 18 ++++++++++--------
+ hw/xquartz/mach-startup/bundle-main.c | 30 +++++++++++++++++++++++-------
+ hw/xquartz/mach-startup/stub.c | 7 -------
+ hw/xquartz/pbproxy/x-selection.h | 9 ---------
+ hw/xquartz/quartzAudio.c | 1 +
+ hw/xquartz/quartzKeyboard.c | 2 +-
+ 8 files changed, 37 insertions(+), 35 deletions(-)
+
+diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
+index 1762825..44380ff 100644
+--- a/hw/xquartz/GL/indirect.c
++++ b/hw/xquartz/GL/indirect.c
+@@ -548,7 +548,7 @@ static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {
+ attr[i++] = conf->samples;
+ }
+
+- attr[i++] = 0;
++ attr[i + 1] = 0;
+
+ error = CGLChoosePixelFormat(attr, &fobj, &formats);
+ if(error) {
+diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
+index f926778..bef27f0 100644
+--- a/hw/xquartz/GL/visualConfigs.c
++++ b/hw/xquartz/GL/visualConfigs.c
+@@ -62,7 +62,7 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
+ int numConfigs = 0;
+ __GLXconfig *visualConfigs, *c;
+ struct glCapabilities caps;
+- struct glCapabilitiesConfig *conf = NULL;
++ struct glCapabilitiesConfig *conf;
+ int stereo, depth, aux, buffers, stencil, accum, color, msample;
+
+ if(getGlCapabilities(&caps)) {
+@@ -94,7 +94,6 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
+ */
+
+ assert(NULL != caps.configurations);
+- conf = caps.configurations;
+
+ numConfigs = 0;
+
+diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
+index f3c8a30..3faa1cb 100644
+--- a/hw/xquartz/X11Application.m
++++ b/hw/xquartz/X11Application.m
+@@ -482,7 +482,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+ return out;
+ }
+
+-- (CFPropertyListRef) prefs_get:(NSString *)key {
++- (CFPropertyListRef) prefs_get_copy:(NSString *)key {
+ CFPropertyListRef value;
+
+ value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);
+@@ -543,7 +543,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+ CFPropertyListRef value;
+ int ret;
+
+- value = [self prefs_get:key];
++ value = [self prefs_get_copy:key];
+
+ if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
+ CFNumberGetValue (value, kCFNumberIntType, &ret);
+@@ -561,7 +561,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+ CFPropertyListRef value;
+ const char *ret = NULL;
+
+- value = [self prefs_get:key];
++ value = [self prefs_get_copy:key];
+
+ if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
+ NSString *s = (NSString *) value;
+@@ -578,12 +578,13 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+ CFPropertyListRef value;
+ NSURL *ret = NULL;
+
+- value = [self prefs_get:key];
++ value = [self prefs_get_copy:key];
+
+ if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
+ NSString *s = (NSString *) value;
+
+ ret = [NSURL URLWithString:s];
++ [ret retain];
+ }
+
+ if (value != NULL) CFRelease (value);
+@@ -595,7 +596,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+ CFPropertyListRef value;
+ float ret = def;
+
+- value = [self prefs_get:key];
++ value = [self prefs_get_copy:key];
+
+ if (value != NULL
+ && CFGetTypeID (value) == CFNumberGetTypeID ()
+@@ -613,7 +614,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+ CFPropertyListRef value;
+ int ret = def;
+
+- value = [self prefs_get:key];
++ value = [self prefs_get_copy:key];
+
+ if (value != NULL) {
+ if (CFGetTypeID (value) == CFNumberGetTypeID ())
+@@ -637,7 +638,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+ NSArray *ret = nil;
+ CFPropertyListRef value;
+
+- value = [self prefs_get:key];
++ value = [self prefs_get_copy:key];
+
+ if (value != NULL) {
+ if (CFGetTypeID (value) == CFArrayGetTypeID ())
+@@ -757,7 +758,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+ NSURL *url = [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
+ if(url) {
+ [[SUUpdater sharedUpdater] setFeedURL:url];
+- CFRelease(url);
++ [url release];
+ }
+ #endif
+ }
+@@ -970,6 +971,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
+ // [[SUUpdater sharedUpdater] checkForUpdates:X11App];
+ #endif
+
++ [pool release];
+ [NSApp run];
+ /* not reached */
+ }
+diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
+index 0366f3b..4872ff5 100644
+--- a/hw/xquartz/mach-startup/bundle-main.c
++++ b/hw/xquartz/mach-startup/bundle-main.c
+@@ -641,30 +641,46 @@ static int execute(const char *command) {
+ static char *command_from_prefs(const char *key, const char *default_value) {
+ char *command = NULL;
+
+- CFStringRef cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
+- CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
++ CFStringRef cfKey;
++ CFPropertyListRef PlistRef;
++
++ if(!key)
++ return NULL;
++
++ cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
++
++ if(!cfKey)
++ return NULL;
++
++ PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
+
+ if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
+ CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
+ int len = strlen(default_value) + 1;
+
++ if(!cfDefaultValue)
++ goto command_from_prefs_out;
++
+ CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
+ CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
++ CFRelease(cfDefaultValue);
+
+ command = (char *)malloc(len * sizeof(char));
+ if(!command)
+- return NULL;
++ goto command_from_prefs_out;
+ strcpy(command, default_value);
+ } else {
+ int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
+ command = (char *)malloc(len * sizeof(char));
+ if(!command)
+- return NULL;
++ goto command_from_prefs_out;
+ CFStringGetCString((CFStringRef)PlistRef, command, len, kCFStringEncodingASCII);
+- }
+-
++ }
++
++command_from_prefs_out:
+ if (PlistRef)
+ CFRelease(PlistRef);
+-
++ if(cfKey)
++ CFRelease(cfKey);
+ return command;
+ }
+diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
+index 89f9e10..ccf5ab4 100644
+--- a/hw/xquartz/mach-startup/stub.c
++++ b/hw/xquartz/mach-startup/stub.c
+@@ -73,7 +73,6 @@ static void set_x11_path(void) {
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+
+ CFURLRef appURL = NULL;
+- CFBundleRef bundle = NULL;
+ OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
+
+ switch (osstatus) {
+@@ -84,12 +83,6 @@ static void set_x11_path(void) {
+ exit(1);
+ }
+
+- bundle = CFBundleCreate(NULL, appURL);
+- if(!bundle) {
+- fprintf(stderr, "Xquartz: Null value returned from CFBundleCreate().\n");
+- exit(2);
+- }
+-
+ if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
+ fprintf(stderr, "Xquartz: Error resolving URL for %s\n", kX11AppBundleId);
+ exit(3);
+diff --git a/hw/xquartz/pbproxy/x-selection.h b/hw/xquartz/pbproxy/x-selection.h
+index fc903d0..614c8b0 100644
+--- a/hw/xquartz/pbproxy/x-selection.h
++++ b/hw/xquartz/pbproxy/x-selection.h
+@@ -58,15 +58,6 @@ struct atom_list {
+ /* The unmapped window we use for fetching selections. */
+ Window _selection_window;
+
+- /* Last time we declared anything on the pasteboard. */
+- int _my_last_change;
+-
+- /* Name of the selection we're proxying onto the pasteboard. */
+- Atom _proxied_selection;
+-
+- /* When true, we're expecting a SelectionNotify event. */
+- unsigned int _pending_notify :1;
+-
+ Atom request_atom;
+
+ struct {
+diff --git a/hw/xquartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
+index 2723259..d6e9a72 100644
+--- a/hw/xquartz/quartzAudio.c
++++ b/hw/xquartz/quartzAudio.c
+@@ -204,6 +204,7 @@ QuartzAudioIOProc(
+ if (wasPlaying && !data->playing) {
+ OSStatus err;
+ err = AudioDeviceStop(inDevice, QuartzAudioIOProc);
++ fprintf(stderr, "Error stopping audio device: %ld\n", (long int)err);
+ }
+ pthread_mutex_unlock(&data->lock);
+ return 0;
+diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
+index 96b5fa5..3b4eac3 100644
+--- a/hw/xquartz/quartzKeyboard.c
++++ b/hw/xquartz/quartzKeyboard.c
+@@ -368,7 +368,7 @@ void DarwinKeyboardReloadHandler(void) {
+ KeySymsRec keySyms;
+ CFIndex initialKeyRepeatValue, keyRepeatValue;
+ BOOL ok;
+- DeviceIntPtr pDev = darwinKeyboard;
++ DeviceIntPtr pDev;
+ const char *xmodmap = PROJECTROOT "/bin/xmodmap";
+ const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";
+ const char *homedir = getenv("HOME");
+--
+1.6.2
+
Added: trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Use-an-empty-xkb-keymap-by-default.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Use-an-empty-xkb-keymap-by-default.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Use-an-empty-xkb-keymap-by-default.patch 2010-02-13 05:51:19 UTC (rev 63710)
@@ -0,0 +1,86 @@
+From 960924eae45b520a1386f4d2ec81b1a6b2e7d8c3 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed, 10 Feb 2010 15:52:14 -0800
+Subject: [PATCH 3/4] XQuartz: Use an empty xkb keymap by default
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/darwin.c | 6 ++++++
+ hw/xquartz/quartzKeyboard.c | 16 +++++-----------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
+index 3feacdc..066f5a5 100644
+--- a/hw/xquartz/darwin.c
++++ b/hw/xquartz/darwin.c
+@@ -45,6 +45,7 @@
+ #include "site.h"
+ #include "globals.h"
+ #include "dix.h"
++#include "xkbsrv.h"
+
+ #include <X11/extensions/XI.h>
+ #include <X11/extensions/XIproto.h>
+@@ -461,6 +462,11 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr)
+ */
+ void InitInput( int argc, char **argv )
+ {
++ XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
++ .variant = NULL, .options = NULL };
++ /* We need to really have rules... or something... */
++ XkbSetRulesDflts(&rmlvo);
++
+ darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
+ RegisterKeyboardDevice( darwinKeyboard );
+ darwinKeyboard->name = strdup("keyboard");
+diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
+index 3b4eac3..7e36a9a 100644
+--- a/hw/xquartz/quartzKeyboard.c
++++ b/hw/xquartz/quartzKeyboard.c
+@@ -301,9 +301,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
+ // for a kIOHIDParamConnectType connection.
+ assert(darwinParamConnect = NXOpenEventStatus());
+
+- /* We need to really have rules... or something... */
+- //XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
+-
+ InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
+
+ DarwinKeyboardReloadHandler();
+@@ -775,12 +772,9 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+ #endif
+ }
+
+- // There seems to be an issue with this in 1.5+, shift-space is not
+- // producing space, it's sending NoSymbol... ?
+- //if (k[3] == k[2]) k[3] = NoSymbol;
+- //if (k[1] == k[0]) k[1] = NoSymbol;
+- //if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
+- //if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
++ if (k[3] == k[2]) k[3] = NoSymbol;
++ if (k[1] == k[0]) k[1] = NoSymbol;
++ if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
+ }
+
+ /* Fix up some things that are normally missing.. */
+@@ -791,7 +785,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+
+ if (k[0] == NoSymbol && k[1] == NoSymbol
+ && k[2] == NoSymbol && k[3] == NoSymbol)
+- k[0] = k[1] = k[2] = k[3] = known_keys[i].keysym;
++ k[0] = known_keys[i].keysym;
+ }
+ }
+
+@@ -804,7 +798,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+ k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
+
+ if (k[0] == known_numeric_keys[i].normal)
+- k[0] = k[1] = k[2] = k[3] = known_numeric_keys[i].keypad;
++ k[0] = known_numeric_keys[i].keypad;
+ }
+ }
+
+--
+1.6.2
+
Added: trunk/dports/x11/xorg-server-devel/files/0004-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0004-fb-Revert-fb-changes-that-broke-XQuartz.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2010-02-13 05:51:19 UTC (rev 63710)
@@ -0,0 +1,231 @@
+From ed5676d7872626c98e19a044110210b8f5fdbcf4 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 12 Feb 2010 19:48:52 -0800
+Subject: [PATCH 4/4] fb: Revert fb changes that broke XQuartz
+
+http://bugs.freedesktop.org/show_bug.cgi?id=26124
+
+Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."
+Revert "fb: Adjust transform or composite coordinates for pixman operations"
+
+http://bugs.freedesktop.org/26124
+
+This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.
+This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ fb/fb.h | 7 +----
+ fb/fbpict.c | 72 ++++++++++++++++++-----------------------------------------
+ fb/fbtrap.c | 6 +---
+ 3 files changed, 26 insertions(+), 59 deletions(-)
+
+diff --git a/fb/fb.h b/fb/fb.h
+index 02d6c03..ed21f9e 100644
+--- a/fb/fb.h
++++ b/fb/fb.h
+@@ -2082,11 +2082,8 @@ fbFillRegionSolid (DrawablePtr pDrawable,
+ FbBits xor);
+
+ extern _X_EXPORT pixman_image_t *
+-image_from_pict (PicturePtr pict,
+- Bool has_clip,
+- int *xoff,
+- int *yoff);
+-
++image_from_pict (PicturePtr pict,
++ Bool has_clip);
+ extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
+
+ #endif /* _FB_H_ */
+diff --git a/fb/fbpict.c b/fb/fbpict.c
+index dddfce8..07a2286 100644
+--- a/fb/fbpict.c
++++ b/fb/fbpict.c
+@@ -158,24 +158,19 @@ fbComposite (CARD8 op,
+ CARD16 height)
+ {
+ pixman_image_t *src, *mask, *dest;
+- int src_xoff, src_yoff;
+- int msk_xoff, msk_yoff;
+- int dst_xoff, dst_yoff;
+
+ miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);
+ if (pMask)
+ miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
+
+- src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);
+- mask = image_from_pict (pMask, FALSE, &msk_xoff, &msk_yoff);
+- dest = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);
++ src = image_from_pict (pSrc, TRUE);
++ mask = image_from_pict (pMask, TRUE);
++ dest = image_from_pict (pDst, TRUE);
+
+ if (src && dest && !(pMask && !mask))
+ {
+ pixman_image_composite (op, src, mask, dest,
+- xSrc + src_xoff, ySrc + src_yoff,
+- xMask + msk_xoff, yMask + msk_yoff,
+- xDst + dst_xoff, yDst + dst_yoff,
++ xSrc, ySrc, xMask, yMask, xDst, yDst,
+ width, height);
+ }
+
+@@ -275,22 +270,22 @@ create_conical_gradient_image (PictGradient *gradient)
+
+ static pixman_image_t *
+ create_bits_picture (PicturePtr pict,
+- Bool has_clip,
+- int *xoff,
+- int *yoff)
++ Bool has_clip)
+ {
+- PixmapPtr pixmap;
+ FbBits *bits;
+ FbStride stride;
+- int bpp;
++ int bpp, xoff, yoff;
+ pixman_image_t *image;
+
+- fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);
+- fbGetPixmapBitsData(pixmap, bits, stride, bpp);
++ fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
++
++ bits = (FbBits*)((CARD8*)bits +
++ (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) +
++ (pict->pDrawable->x + xoff) * (bpp / 8));
+
+ image = pixman_image_create_bits (
+ pict->format,
+- pixmap->drawable.width, pixmap->drawable.height,
++ pict->pDrawable->width, pict->pDrawable->height,
+ (uint32_t *)bits, stride * sizeof (FbStride));
+
+
+@@ -316,52 +311,30 @@ create_bits_picture (PicturePtr pict,
+ if (pict->clientClipType != CT_NONE)
+ pixman_image_set_has_client_clip (image, TRUE);
+
+- if (*xoff || *yoff)
+- pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);
++ pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
+
+ pixman_image_set_clip_region (image, pict->pCompositeClip);
+
+- if (*xoff || *yoff)
+- pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);
++ pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
+ }
+
+ /* Indexed table */
+ if (pict->pFormat->index.devPrivate)
+ pixman_image_set_indexed (image, pict->pFormat->index.devPrivate);
+
+- /* Add in drawable origin to position within the image */
+- *xoff += pict->pDrawable->x;
+- *yoff += pict->pDrawable->y;
+-
+ return image;
+ }
+
+ static void
+-set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
++set_image_properties (pixman_image_t *image, PicturePtr pict)
+ {
+ pixman_repeat_t repeat;
+ pixman_filter_t filter;
+
+ if (pict->transform)
+ {
+- /* For source images, adjust the transform to account
+- * for the drawable offset within the pixman image,
+- * then set the offset to 0 as it will be used
+- * to compute positions within the transformed image.
+- */
+- if (!has_clip) {
+- struct pixman_transform adjusted;
+-
+- adjusted = *pict->transform;
+- pixman_transform_translate(&adjusted,
+- NULL,
+- pixman_int_to_fixed(*xoff),
+- pixman_int_to_fixed(*yoff));
+- pixman_image_set_transform (image, &adjusted);
+- *xoff = 0;
+- *yoff = 0;
+- } else
+- pixman_image_set_transform (image, pict->transform);
++ pixman_image_set_transform (
++ image, (pixman_transform_t *)pict->transform);
+ }
+
+ switch (pict->repeatType)
+@@ -388,8 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
+
+ if (pict->alphaMap)
+ {
+- int alpha_xoff, alpha_yoff;
+- pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff);
++ pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE);
+
+ pixman_image_set_alpha_map (
+ image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
+@@ -422,7 +394,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
+ }
+
+ pixman_image_t *
+-image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
++image_from_pict (PicturePtr pict,
++ Bool has_clip)
+ {
+ pixman_image_t *image = NULL;
+
+@@ -431,7 +404,7 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+
+ if (pict->pDrawable)
+ {
+- image = create_bits_picture (pict, has_clip, xoff, yoff);
++ image = create_bits_picture (pict, has_clip);
+ }
+ else if (pict->pSourcePict)
+ {
+@@ -452,11 +425,10 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+ else if (sp->type == SourcePictTypeConical)
+ image = create_conical_gradient_image (gradient);
+ }
+- *xoff = *yoff = 0;
+ }
+
+ if (image)
+- set_image_properties (image, pict, has_clip, xoff, yoff);
++ set_image_properties (image, pict);
+
+ return image;
+ }
+diff --git a/fb/fbtrap.c b/fb/fbtrap.c
+index 515e2e1..830603a 100644
+--- a/fb/fbtrap.c
++++ b/fb/fbtrap.c
+@@ -40,8 +40,7 @@ fbAddTraps (PicturePtr pPicture,
+ int ntrap,
+ xTrap *traps)
+ {
+- int image_xoff, image_yoff;
+- pixman_image_t *image = image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff);
++ pixman_image_t *image = image_from_pict (pPicture, FALSE);
+
+ if (!image)
+ return;
+@@ -57,8 +56,7 @@ fbRasterizeTrapezoid (PicturePtr pPicture,
+ int x_off,
+ int y_off)
+ {
+- int mask_xoff, mask_yoff;
+- pixman_image_t *image = image_from_pict (pPicture, FALSE, &mask_xoff, &mask_yoff);
++ pixman_image_t *image = image_from_pict (pPicture, FALSE);
+
+ if (!image)
+ return;
+--
+1.6.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100212/ff94f5a6/attachment-0001.html>
More information about the macports-changes
mailing list