Re: [PULL] fixes and clean ups for alpha

2009-10-13 Thread Peter Hutterer
On Tue, Oct 13, 2009 at 10:22:09PM -0700, Jeremy Huddleston wrote: > > On Oct 13, 2009, at 20:22, Keith Packard wrote: > >> Excerpts from Matt Turner's message of Tue Oct 13 18:48:10 -0700 2009: >> >>> Actually before I sent the pull request I did `git pull origin >>> master` >>> to verify that t

Re: [PULL] fixes and clean ups for alpha

2009-10-13 Thread Jeremy Huddleston
On Oct 13, 2009, at 20:22, Keith Packard wrote: Excerpts from Matt Turner's message of Tue Oct 13 18:48:10 -0700 2009: Actually before I sent the pull request I did `git pull origin master` to verify that there were no conflicts, and when there weren't I did a `git reset --hard HEAD^`.

Re: git practices

2009-10-13 Thread Jeremy Huddleston
On Oct 13, 2009, at 19:11, Peter Hutterer wrote: Note that while I'm writing this email there's a discussion on IRC about this anyway, so I don't know what the final verdict will be on that. Well, I'll need to read through my IRC logs when I get into the office tomorrow then. yes, but n

Re: [PULL] fixes and clean ups for alpha

2009-10-13 Thread Keith Packard
Excerpts from Matt Turner's message of Tue Oct 13 18:48:10 -0700 2009: > Actually before I sent the pull request I did `git pull origin master` > to verify that there were no conflicts, and when there weren't I did a > `git reset --hard HEAD^`. Ok, cool. > Is this OK? I'm not quite sure that a b

Re: git practices

2009-10-13 Thread Peter Hutterer
Note that while I'm writing this email there's a discussion on IRC about this anyway, so I don't know what the final verdict will be on that. On Tue, Oct 13, 2009 at 05:56:37PM -0700, Jeremy Huddleston wrote: > Thanks. That answers some questions, but I'm still left with others. > > The following

Re: [PULL] fixes and clean ups for alpha

2009-10-13 Thread Eamon Walsh
On 10/13/2009 09:45 PM, Daniel Stone wrote: > Hi, > > On Tue, Oct 13, 2009 at 09:24:49PM -0400, Matt Turner wrote: > >> Please pull these changes into master. I've gotten confirmation from >> multiple users that they fix the xserver on alpha. >> > Would these be useful for 1.6 as well? It

Re: [PULL] fixes and clean ups for alpha

2009-10-13 Thread Matt Turner
On Tue, Oct 13, 2009 at 9:45 PM, Daniel Stone wrote: > Hi, > > On Tue, Oct 13, 2009 at 09:24:49PM -0400, Matt Turner wrote: >> Please pull these changes into master. I've gotten confirmation from >> multiple users that they fix the xserver on alpha. > > Would these be useful for 1.6 as well? It lo

Re: [PULL] fixes and clean ups for alpha

2009-10-13 Thread Matt Turner
Thanks. On Tue, Oct 13, 2009 at 9:42 PM, Keith Packard wrote: > Excerpts from Matt Turner's message of Tue Oct 13 18:24:49 -0700 2009: >> Hi Keith, >> Please pull these changes into master. I've gotten confirmation from >> multiple users that they fix the xserver on alpha. > > Looks like it worke

Re: [PULL] fixes and clean ups for alpha

2009-10-13 Thread Daniel Stone
Hi, On Tue, Oct 13, 2009 at 09:24:49PM -0400, Matt Turner wrote: > Please pull these changes into master. I've gotten confirmation from > multiple users that they fix the xserver on alpha. Would these be useful for 1.6 as well? It looks like there might well be some use in 1.6.6, if we can fix XA

Re: [PULL] fixes and clean ups for alpha

2009-10-13 Thread Keith Packard
Excerpts from Matt Turner's message of Tue Oct 13 18:24:49 -0700 2009: > Hi Keith, > Please pull these changes into master. I've gotten confirmation from > multiple users that they fix the xserver on alpha. Looks like it worked, but for future reference, it's probably best to rebase your changes t

Re: [PATCH:libfontenc] Use fontutil macros to determine default font path

2009-10-13 Thread Alan Coopersmith
I've had essentially the same thing sitting in my libfontenc tree, as part of my development & testing of the font-util macros, but hadn't commited/pushed it yet - I'll do that now. Thanks for the reminder. -alan- Yaakov (Cygwin/X) wrote: > From: Yaakov Selkowitz > > With font-util 1.

Re: [PATCH:xserver] Use fontutil macros to determine default font path

2009-10-13 Thread Alan Coopersmith
Thanks - I was planning to do this once the fontutil macros had gotten out there and distributed. I'd also like to see a check like the one in app/xfs for /etc/X11/fontpath.d and using that as a catalogue: entry if it exists, but that can be done as a separate patch. Also I've been using m4_fata

[PULL] fixes and clean ups for alpha

2009-10-13 Thread Matt Turner
Hi Keith, Please pull these changes into master. I've gotten confirmation from multiple users that they fix the xserver on alpha. Thanks, Matt The following changes since commit 6676f49e34f8db7ef5767a6dbf6c2a4d2087f79c: Julien Cristau (1): configure: quote argument to m4_pattern_forbid

[PATCH:xserver] Use fontutil macros to determine default font path

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz With font-util 1.1, the default font path has changed, and macros are provided to determine the configured path. xserver should use these macros as well to provide a default which is more likely to be correct. This adds a build-time (or at least an autoconf/autogen time)

[PATCH:xserver] dolt: add Cygwin to supported platforms

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz Signed-off-by: Yaakov Selkowitz --- m4/dolt.m4 |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/m4/dolt.m4 b/m4/dolt.m4 index 1109bdb..7c62b6c 100644 --- a/m4/dolt.m4 +++ b/m4/dolt.m4 @@ -26,6 +26,9 @@ i?86-*-linux*|x86_64-*-linux*|powerpc-*-linu

[PATCH:libfontenc] Use fontutil macros to determine default font path

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz With font-util 1.1, the default font path has changed, and macros are provided to determine the configured path. libfontenc should use these macros as well to provide a default which is more likely to be correct. This adds a build-time (or at least an autoconf/autogen tim

[PATCH] Cygwin GCC does not use visibility attributes

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz Cygwin's gcc4 accepts visibility attributes but does actually use them, generating tons of warnings that they are not supported. Signed-off-by: Yaakov Selkowitz --- configure.ac |2 +- pixman/pixman-compiler.h |2 +- 2 files changed, 2 insertions(+),

Re: git practices

2009-10-13 Thread Jeremy Huddleston
Thanks. That answers some questions, but I'm still left with others. The following commands give me puzzlement. Please correct my misunderstandings. This is assuming the first case of push (my personal tree has been merged into origin/master) Assuming: origin/master has the following com

[PATCH 3/3] Provide _Xsetlocale compat wrappers on Cygwin

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz Previous versions of Cygwin did not have proper locale support, so Cygwin/X defined X_LOCALE, using _Xsetlocale instead. Cygwin 1.7 has added locale support, but we can't remove the _Xsetlocale entry point without breaking ABI. Signed-off-by: Yaakov Selkowitz --- src/Se

[PATCH 2/3] Fix Cygwin compile of xcb_io.c

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz Per POSIX, struct timeval is defined in . Compilation on Cygwin explicitely requires this #include. Signed-off-by: Yaakov Selkowitz --- src/xcb_io.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/xcb_io.c b/src/xcb_io.c index 4f0159c..7292b

[PATCH 1/3] dolt: add Cygwin to supported platforms

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz Signed-off-by: Yaakov Selkowitz --- acinclude.m4 |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1485a8c..922145f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -76,6 +76,9 @@ i?86-*-linux*|x86_64-*-linux*|powe

[PATCH 0/3] Xlib Cygwin patches

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz These three patches are required to fix libX11-1.3 on Cygwin. Yaakov Selkowitz (3): dolt: add Cygwin to supported platforms Fix Cygwin compile of xcb_io.c Provide _Xsetlocale compat wrappers on Cygwin acinclude.m4|3 +++ src/SetLocale.c |4 ++-- src/xcb

Re: [PATCH] DRI2: Report the correct extension minor version

2009-10-13 Thread Peter Hutterer
On Tue, Oct 13, 2009 at 04:26:26PM -0700, Aaron Plattner wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Signed-off-by: Aaron Plattner > - --- > hw/xfree86/dri2/dri2ext.c |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/x

Re: git practices

2009-10-13 Thread Peter Hutterer
On Tue, Oct 13, 2009 at 04:01:19PM -0700, Jeremy Huddleston wrote: > On Oct 13, 2009, at 14:48, Peter Hutterer wrote: > >> On Tue, Oct 13, 2009 at 12:08:53PM -0700, Jeremy Huddleston wrote: >>> I'm still holding off branching from master or creating my own >>> xserver >>> git because I want to re

[PATCH] DRI2: Report the correct extension minor version

2009-10-13 Thread Aaron Plattner
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Signed-off-by: Aaron Plattner - --- hw/xfree86/dri2/dri2ext.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c index 6c14578..dc07b47 100644 - --- a/hw/xfree86/dri2/dri2ex

Re: git practices

2009-10-13 Thread Jeremy Huddleston
On Oct 13, 2009, at 14:48, Peter Hutterer wrote: On Tue, Oct 13, 2009 at 12:08:53PM -0700, Jeremy Huddleston wrote: I'm still holding off branching from master or creating my own xserver git because I want to read your promised "best practices", so I do it correctly. Have you gotten around

[PATCH] xproto: Cygwin GCC does not support visibility attributes

2009-10-13 Thread Yaakov (Cygwin/X)
From: Yaakov Selkowitz --- Xfuncproto.h.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in index 0843491..afdd95b 100644 --- a/Xfuncproto.h.in +++ b/Xfuncproto.h.in @@ -83,7 +83,7 @@ in this Software without prior written authorization

Re: cherry-pick to master

2009-10-13 Thread Keith Packard
Excerpts from Jeremy Huddleston's message of Tue Oct 13 13:34:52 -0700 2009: > No, I actually tested these on master and am living on master... I've cherry-picked these and pushed master out; let's figure out how to avoid that in future; master should never contain cherry picked patches :-) --

Re: [PATCH] Rootless: src drawable window can now be NULL

2009-10-13 Thread Chris Wilson
Excerpts from Jeremy Huddleston's message of Tue Oct 13 17:25:33 +0100 2009: > That looks like a sane enough sanity check... but why was > pSrc->pDrawable NULL in the first place? RenderSources, i.e. gradients and solid fills, do not have an associated Drawable. -ickle -- Chris Wilson, Intel Open

Re: cherry-pick to master

2009-10-13 Thread Keith Packard
Excerpts from Jeremy Huddleston's message of Tue Oct 13 13:34:52 -0700 2009: > > but since I can't commit to master by policy (merge to master from > feature branches), and I don't have an apple feature branch tracking > master (since I'm waiting for Peter's documentation on the best > pract

Re: cherry-pick to master

2009-10-13 Thread Jeremy Huddleston
On Oct 13, 2009, at 13:16, Keith Packard wrote: Excerpts from Jeremy Huddleston's message of Tue Oct 13 12:59:19 -0700 2009: Hi Keith, Can you please pull these two commits into master: 6980f77892e0409b44bd8f33ba82e7273c6462a4 7e178ffbed7c8557faf8d471ad275aa2b0365e1d I'm still waiting on P

Re: cherry-pick to master

2009-10-13 Thread Keith Packard
Excerpts from Jeremy Huddleston's message of Tue Oct 13 12:59:19 -0700 2009: > Hi Keith, > > Can you please pull these two commits into master: > > 6980f77892e0409b44bd8f33ba82e7273c6462a4 > 7e178ffbed7c8557faf8d471ad275aa2b0365e1d > > I'm still waiting on Peter's "best git practices" documentat

cherry-pick to master

2009-10-13 Thread Jeremy Huddleston
Hi Keith, Can you please pull these two commits into master: 6980f77892e0409b44bd8f33ba82e7273c6462a4 7e178ffbed7c8557faf8d471ad275aa2b0365e1d I'm still waiting on Peter's "best git practices" documentation before making my apple feature tree. Thanks, Jeremy commit 7e178ffbed7c8557faf8d471

Re: [PATCH] Rootless: src drawable window can now be NULL

2009-10-13 Thread Jeremy Huddleston
On Oct 13, 2009, at 01:45, Colin Harrison wrote: Hi, This is one for Jeremy Huddleston and Jon Turney. Found when testing rootless modes in Xming using the new xeyes (uses Xrender to anti-alias). Patch to fix the crash and make it work... Looks like we need this in RootlessGlyphs as wel

Re: [PATCH] Add support for RENDER BGRA formats.

2009-10-13 Thread Michael
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello, On Oct 13, 2009, at 2:51 PM, Adam Jackson wrote: > On Fri, 2009-10-09 at 11:26 +0200, Mark Kettenis wrote: > >>> Hmm, right. The two hunks above were aimed towards my first >>> approach for >>> fixing radeon KMS on big endian machines, by ma

Re: [PATCH] Rootless: Abstract some of the Xplugin specific stuff which has crept into rootlessWindow.c

2009-10-13 Thread Jeremy Huddleston
On Oct 9, 2009, at 11:13, Jon TURNEY wrote: The rootless extension now directly calls some Xplugin functions, and relies on types defined in Xplugin.h, which isn't very abstracted :-) This patch is a start at abstracting some of the Xplugin specific stuff which has crept into rootlessWindo

Re: [PATCH] Add support for RENDER BGRA formats.

2009-10-13 Thread Adam Jackson
On Fri, 2009-10-09 at 11:26 +0200, Mark Kettenis wrote: > > Hmm, right. The two hunks above were aimed towards my first approach for > > fixing radeon KMS on big endian machines, by making the root window > > visual BGRA. I've since abandoned that approach for a different one, so > > those hun

bitmaps stipple

2009-10-13 Thread Jeremy Huddleston
the stipple bitmaps from the 'app/bitmap' and 'data/bitmaps' modules collide on case-insensitive file systems: http://cgit.freedesktop.org/xorg/data/bitmaps/tree/stipple http://cgit.freedesktop.org/xorg/app/bitmap/tree/Stipple What's the best way to solve this issue? Why are there two stipple

Re: [PATCH] Rootless: src drawable window can now be NULL

2009-10-13 Thread Jeremy Huddleston
That looks like a sane enough sanity check... but why was pSrc- >pDrawable NULL in the first place? I'll check it out on XQuartz later today. On Oct 13, 2009, at 01:45, Colin Harrison wrote: Hi, This is one for Jeremy Huddleston and Jon Turney. Found when testing rootless modes in Xming usi

Re: [PATCH] glx: fixup deref of null pointer when glx screen init fails.

2009-10-13 Thread Luc Verhaegen
On Fri, Oct 02, 2009 at 04:28:54PM +0200, Luc Verhaegen wrote: > > In order to have this evaluated ASAP, i haven't set up an up to date > environment where i can build Xorg master yet, so this patch was not > even build tested. > >From 5f57d8c68e175d414a3b0b67eada61b645ae2f8c Mon Sep 17 00:00:0

[PATCH] Rootless: src drawable window can now be NULL

2009-10-13 Thread Colin Harrison
Hi, This is one for Jeremy Huddleston and Jon Turney. Found when testing rootless modes in Xming using the new xeyes (uses Xrender to anti-alias). Patch to fix the crash and make it work... --- ./xserver/miext/rootless/rootlessScreen.c 2009-08-23 10:10:35.0 +0100 +++ ./test/miext/root

Re: [PATCH v3] evdev: Support the "Calibration" string option.

2009-10-13 Thread Oliver McFadden
On Tue, 2009-10-13 at 00:40 +0200, ext Peter Hutterer wrote: > On Mon, Oct 12, 2009 at 04:32:51PM +0300, Oliver McFadden wrote: > > Originally based on a patch from Daniel Stone, this commit allows for > > the calibration factors to be set either from Xorg.conf or via HAL. > > > > Previously the o

[PATCH] xdpyinfo: Add support for --without-xf86misc

2009-10-13 Thread Jeremy Huddleston
Since it's gone, I don't want it accidently finding a copy of xf86misc lying outside $prefix diff --git a/configure.ac b/configure.ac index 5d4e904..03c2fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -78,13 +78,19 @@ else fi -PKG_CHECK_MODULES(DPY_XF86MISC, xxf86misc, - [SAVE_CPPF

[PATCH] xset: --without-{xf86misc,fontcache,xprint}

2009-10-13 Thread Jeremy Huddleston
diff --git a/configure.ac b/configure.ac index 194514c..1b774ef 100644 --- a/configure.ac +++ b/configure.ac @@ -56,25 +56,43 @@ PKG_CHECK_MODULES(SET_XKB, x11, AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include ]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(SET_X