xorg-server: Changes to 'debian-unstable'
Rebased ref, commits from common ancestor:
commit 6747edeaa9337c8ceb38d8cf0c57249edd144332
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 28 12:53:12 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 30d9de9..ac07882 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.11.0-1) UNRELEASED; urgency=low
+xorg-server (2:1.11.0-1) unstable; urgency=low
[ Julien Cristau ]
* Make xvfb, xnest, xserver-xephyr and xserver-xfbdev provide the xserver
@@ -10,7 +10,7 @@ xorg-server (2:1.11.0-1) UNRELEASED; urgency=low
Thanks, Mohammed Sameer!
- Fix memcpy abuse in the fb layer (Closes: #626682).
- -- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:18:39 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sun, 28 Aug 2011 12:53:06 +0200
xorg-server (2:1.10.99.901+git20110731-1) experimental; urgency=low
commit 4d85945b81f250fb13783c9cee1d138cfd32f1f4
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Aug 27 13:31:38 2011 +0200
Close bugs.
diff --git a/debian/changelog b/debian/changelog
index 36f8d88..30d9de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ xorg-server (2:1.11.0-1) UNRELEASED; urgency=low
virtual package again.
[ Cyril Brulebois ]
- * New upstream release.
+ * New upstream release:
+ - Fix assertion failure when calling dixSetPrivate (Closes: #632549).
+ Thanks, Mohammed Sameer!
+ - Fix memcpy abuse in the fb layer (Closes: #626682).
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:18:39 +0200
commit d6e934be8c3363ff6e4f5243ee675493205fa5da
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Aug 27 13:26:16 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index b157de8..11653bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,164 @@
+commit 0caeef6146bee5fb1827ab25db191685dde9d4b4
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Aug 26 16:46:13 2011 -0700
+
+ Version bumped to 1.11
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e32cc0b4c85c78cd8743a6e1680dcc79054b57ce
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Apr 21 16:37:11 2011 -0400
+
+ fb: Fix memcpy abuse
+
+ The memcpy fast path implicitly assumes that the copy walks
+ left-to-right. That's not something memcpy guarantees, and newer glibc
+ on some processors will indeed break that assumption. Since we walk a
+ line at a time, check the source and destination against the width of
+ the blit to determine whether we can be sloppy enough to allow memcpy.
+ (Having done this, we can remove the check for !reverse as well.)
+
+ On an Intel Core i7-2630QM with an NVIDIA GeForce GTX 460M running in
+ NoAccel, the broken code and various fixes for -copywinwin{10,100,500}
+ gives (edited to fit in 80 columns):
+
+ 1: Disable the fastpath entirely
+ 2: Replace memcpy with memmove
+ 3: This fix
+ 4: The code before this fix
+
+ 1 2 3 4 Operation
+ ------ --------------- --------------- --------------- ------------
+ 258000 269000 ( 1.04) 544000 ( 2.11) 552000 ( 2.14) Copy 10x10
+ 21300 23000 ( 1.08) 43700 ( 2.05) 47100 ( 2.21) Copy 100x100
+ 960 962 ( 1.00) 1990 ( 2.09) 1990 ( 2.07) Copy 500x500
+
+ So it's a modest performance hit, but correctness demands it, and it's
+ probably worth keeping the 2x speedup from having the fast path in the
+ first place.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ac2c307f4716ebd3e955c004ceec9f4c029401a0
+Author: Pelle Johansson <pelle@morth.org>
+Date: Sun Aug 14 17:44:40 2011 -0700
+
+ XQuartz: Initialize darwin pointer valuators
+
+ This fixes a regression introduced by: 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde
+
+ http://xquartz.macosforge.org/trac/ticket/498
+
+ Signed-off-by: Pelle Johansson <pelle@morth.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4020cab88f5cf3164fc83cf912f94f288aa5a45d
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Aug 10 11:36:16 2011 +0200
+
+ EXA/mixed: Update sys_pitch in MPH even when there's no system memory copy.
+
+ Otherwise sys_pitch will be stale when a system memory copy is allocated.
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38322 and a crash when
+ unlocking the screen with xscreensaver, reported by Janne Huttunen.
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Tested-by: Janne Huttunen <jahuttun@gmail.com>
+ Tested-by: Jan Kriho <Erbureth@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a1dec7cd6adabaf8770dc3b21b0df30ce2f0bc8d
+Author: Julien Cristau <jcristau@debian.org>
+Date: Thu Jul 7 19:18:03 2011 +0200
+
+ Xephyr/dri: register screen and window privates on init
+
+ Fixes assertion failure when calling dixSetPrivate
+ Debian bug#632549 <http://bugs.debian.org/632549>
+
+ Reported-and-tested-by: Mohammed Sameer <msameer@foolab.org>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 39bc81b60ddc9e495ff3b9bb3c3a6c39e547b43a
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Aug 3 20:57:03 2011 -0700
+
+ Version bumped to 1.10.99.902 (1.11 RC2)
+
+ At the close of the 1.11 non-critical fixes window.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9504caf1c3243e3ab2eb7126bc2bb876a8f89918
+Author: Ville Syrjälä <ville.syrjala@nokia.com>
+Date: Fri May 6 18:19:34 2011 +0300
+
+ composite: Inhibit window background paint with manual subwindow redirection
+
+ The composite extension spec says that window background painting
+ should be inhibited when the subwindow redirection mode is set to
+ manual.
+
+ This eliminates the ugly flashing effect when compiz unredirects a
+ fullscreen window.
+
+ Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
+ Reviewed-by: Owen Taylor <otaylor@fishsoup.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f1d75f3b742231c4c09f13d7a22ed920014cb5ef
+Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+Date: Thu Jul 28 15:17:59 2011 -0700
+
+ Revert "composite: Don't backfill non-MapWindow allocations"
+
+ This reverts commit db8840600e8e21356241eb87395031388d9b54d2.
+
+ It was an optimization for the resize case, but 193ecc8b453b22 made
+ it so that no backfilling takes place on resize if left in.
+
+ Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+ Conflicts:
+
+ composite/compalloc.c
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e87adcc9e024982fdad974de2876b00cf974dab8
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Jul 31 21:14:59 2011 +0200
+
+ Xquartz: include new localization files in the tarball
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit a1bb5062c72667b2f10b56925c61888acc89e3e4
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Jul 21 10:33:58 2011 -0700
+
+ XQuartz: xpr: Don't FatalError if xp_unlock_window fails
+
+ We added the FatalError in 5d1d9d9ae39fab2ee2ac085f9776f82768828dc8 but
+ it caused a regression http://xquartz.macosforge.org/trac/ticket/482
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit c319f7b5b3ee651636cdfd165588f0dc972a22a4
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Jul 20 00:16:42 2011 -0700
+
+ XQuartz: Use CFSTR to avoid implicit cast warning of NSString * to CFStringRef
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
commit 08dfff92e8d0c2b1726634392c147f6634d1706d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 29 16:12:06 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index 11fc300..36f8d88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xorg-server (2:1.10.99.901+git20110731-2) UNRELEASED; urgency=low
+xorg-server (2:1.11.0-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Make xvfb, xnest, xserver-xephyr and xserver-xfbdev provide the xserver
virtual package again.
+ [ Cyril Brulebois ]
+ * New upstream release.
+
-- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:18:39 +0200
xorg-server (2:1.10.99.901+git20110731-1) experimental; urgency=low
commit 0caeef6146bee5fb1827ab25db191685dde9d4b4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 26 16:46:13 2011 -0700
Version bumped to 1.11
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/configure.ac b/configure.ac
index 4f4bcf2..2ac1f2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.10.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-08-03"
+AC_INIT([xorg-server], 1.11.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-08-26"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit e32cc0b4c85c78cd8743a6e1680dcc79054b57ce
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 21 16:37:11 2011 -0400
fb: Fix memcpy abuse
The memcpy fast path implicitly assumes that the copy walks
left-to-right. That's not something memcpy guarantees, and newer glibc
on some processors will indeed break that assumption. Since we walk a
line at a time, check the source and destination against the width of
the blit to determine whether we can be sloppy enough to allow memcpy.
(Having done this, we can remove the check for !reverse as well.)
On an Intel Core i7-2630QM with an NVIDIA GeForce GTX 460M running in
NoAccel, the broken code and various fixes for -copywinwin{10,100,500}
gives (edited to fit in 80 columns):
1: Disable the fastpath entirely
2: Replace memcpy with memmove
3: This fix
4: The code before this fix
1 2 3 4 Operation
------ --------------- --------------- --------------- ------------
258000 269000 ( 1.04) 544000 ( 2.11) 552000 ( 2.14) Copy 10x10
21300 23000 ( 1.08) 43700 ( 2.05) 47100 ( 2.21) Copy 100x100
960 962 ( 1.00) 1990 ( 2.09) 1990 ( 2.07) Copy 500x500
So it's a modest performance hit, but correctness demands it, and it's
probably worth keeping the 2x speedup from having the fast path in the
first place.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/fb/fbblt.c b/fb/fbblt.c
index a040298..6809404 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -65,6 +65,7 @@ fbBlt (FbBits *srcLine,
int n, nmiddle;
Bool destInvarient;
int startbyte, endbyte;
+ int careful;
FbDeclareMergeRop ();
if (bpp == 24 && !FbCheck24Pix (pm))
@@ -74,12 +75,16 @@ fbBlt (FbBits *srcLine,
return;
}
- if (alu == GXcopy && pm == FB_ALLONES && !reverse &&
+ careful = !((srcLine < dstLine && srcLine + width * (bpp>>3) > dstLine) ||
+ (dstLine < srcLine && dstLine + width * (bpp>>3) > srcLine)) ||
+ (bpp & 7);
+
+ if (alu == GXcopy && pm == FB_ALLONES && !careful &&
!(srcX & 7) && !(dstX & 7) && !(width & 7)) {
int i;
CARD8 *src = (CARD8 *) srcLine;
CARD8 *dst = (CARD8 *) dstLine;
-
+
srcStride *= sizeof(FbBits);
dstStride *= sizeof(FbBits);
width >>= 3;
commit ac2c307f4716ebd3e955c004ceec9f4c029401a0
Author: Pelle Johansson <pelle@morth.org>
Date: Sun Aug 14 17:44:40 2011 -0700
XQuartz: Initialize darwin pointer valuators
This fixes a regression introduced by: 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde
http://xquartz.macosforge.org/trac/ticket/498
Signed-off-by: Pelle Johansson <pelle@morth.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index f19d7bf..b483000 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -322,8 +322,8 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
(PtrCtrlProcPtr)NoopDDA,
GetMotionHistorySize(), NAXES,
axes_labels);
-// InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
-// InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+ InitValuatorAxisStruct(pPointer, 0, axes_labels[0], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);
+ InitValuatorAxisStruct(pPointer, 1, axes_labels[1], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);
break;
case DEVICE_ON:
pPointer->public.on = TRUE;
commit 4020cab88f5cf3164fc83cf912f94f288aa5a45d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Aug 10 11:36:16 2011 +0200
EXA/mixed: Update sys_pitch in MPH even when there's no system memory copy.
Otherwise sys_pitch will be stale when a system memory copy is allocated.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38322 and a crash when
unlocking the screen with xscreensaver, reported by Janne Huttunen.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Janne Huttunen <jahuttun@gmail.com>
Tested-by: Jan Kriho <Erbureth@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index 58645ae..0b1a4a4 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -186,17 +186,20 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
}
/* Need to re-create system copy if there's also a GPU copy */
- if (has_gpu_copy && pExaPixmap->sys_ptr) {
- free(pExaPixmap->sys_ptr);
- pExaPixmap->sys_ptr = NULL;
- pExaPixmap->sys_pitch = PixmapBytePad(width, depth);
- DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
- DamageDestroy(pExaPixmap->pDamage);
- pExaPixmap->pDamage = NULL;
- RegionEmpty(&pExaPixmap->validSys);
+ if (has_gpu_copy) {
+ if (pExaPixmap->sys_ptr) {
+ free(pExaPixmap->sys_ptr);
+ pExaPixmap->sys_ptr = NULL;
+ DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
+ DamageDestroy(pExaPixmap->pDamage);
+ pExaPixmap->pDamage = NULL;
+ RegionEmpty(&pExaPixmap->validSys);
- if (pExaScr->deferred_mixed_pixmap == pPixmap)
- pExaScr->deferred_mixed_pixmap = NULL;
+ if (pExaScr->deferred_mixed_pixmap == pPixmap)
+ pExaScr->deferred_mixed_pixmap = NULL;
+ }
+
+ pExaPixmap->sys_pitch = PixmapBytePad(width, depth);
}
}
commit a1dec7cd6adabaf8770dc3b21b0df30ce2f0bc8d
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 7 19:18:03 2011 +0200
Xephyr/dri: register screen and window privates on init
Fixes assertion failure when calling dixSetPrivate
Debian bug#632549 <http://bugs.debian.org/632549>
Reported-and-tested-by: Mohammed Sameer <msameer@foolab.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
index 6945f5b..0bd51b2 100644
--- a/hw/kdrive/ephyr/ephyrdriext.c
+++ b/hw/kdrive/ephyr/ephyrdriext.c
@@ -1394,6 +1394,10 @@ ephyrDRIExtensionInit (ScreenPtr a_screen)
EPHYR_LOG_ERROR ("failed to register DRI extension\n") ;
goto out ;
}
+ if (!dixRegisterPrivateKey(&ephyrDRIScreenKeyRec, PRIVATE_SCREEN, 0))
+ goto out ;
+ if (!dixRegisterPrivateKey(&ephyrDRIWindowKeyRec, PRIVATE_WINDOW, 0))
+ goto out ;
screen_priv = calloc(1, sizeof (EphyrDRIScreenPrivRec)) ;
if (!screen_priv) {
EPHYR_LOG_ERROR ("failed to allocate screen_priv\n") ;
commit 39bc81b60ddc9e495ff3b9bb3c3a6c39e547b43a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 3 20:57:03 2011 -0700
Version bumped to 1.10.99.902 (1.11 RC2)
At the close of the 1.11 non-critical fixes window.
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/configure.ac b/configure.ac
index 2438825..4f4bcf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.10.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-06-01"
+AC_INIT([xorg-server], 1.10.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-08-03"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 9504caf1c3243e3ab2eb7126bc2bb876a8f89918
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri May 6 18:19:34 2011 +0300
composite: Inhibit window background paint with manual subwindow redirection
The composite extension spec says that window background painting
should be inhibited when the subwindow redirection mode is set to
manual.
This eliminates the ugly flashing effect when compiz unredirects a
fullscreen window.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Owen Taylor <otaylor@fishsoup.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/composite/compalloc.c b/composite/compalloc.c
index 841b2dc..f00bf4e 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -434,6 +434,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
* critical output
*/
DamageExtSetCritical (pClient, TRUE);
+ pWin->inhibitBGPaint = TRUE;
}
return Success;
}
@@ -466,6 +467,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
*/
DamageExtSetCritical (pClient, FALSE);
csw->update = CompositeRedirectAutomatic;
+ pWin->inhibitBGPaint = FALSE;
if (pWin->mapped)
(*pWin->drawable.pScreen->ClearToBackground)(pWin, 0, 0, 0, 0, TRUE);
}
diff --git a/include/windowstr.h b/include/windowstr.h
index 4a7a0f4..222de31 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -169,6 +169,7 @@ typedef struct _Window {
#endif
#ifdef COMPOSITE
unsigned damagedDescendants:1; /* some descendants are damaged */
+ unsigned inhibitBGPaint:1; /* paint the background? */
#endif
} WindowRec;
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 94258b8..0f1ebe5 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -575,6 +575,10 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
tile_x_off = pWin->drawable.x - draw_x_off;
tile_y_off = pWin->drawable.y - draw_y_off;
fill = pWin->background;
+#ifdef COMPOSITE
+ if (pWin->inhibitBGPaint)
+ return;
+#endif
switch (pWin->backgroundState) {
case None:
return;
commit f1d75f3b742231c4c09f13d7a22ed920014cb5ef
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Thu Jul 28 15:17:59 2011 -0700
Revert "composite: Don't backfill non-MapWindow allocations"
This reverts commit db8840600e8e21356241eb87395031388d9b54d2.
It was an optimization for the resize case, but 193ecc8b453b22 made
it so that no backfilling takes place on resize if left in.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Conflicts:
composite/compalloc.c
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/composite/compalloc.c b/composite/compalloc.c
index 5c27631..841b2dc 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -557,7 +557,7 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin)
}
static PixmapPtr
-compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
+compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
WindowPtr pParent = pWin->parent;
@@ -572,10 +572,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
pPixmap->screen_x = x;
pPixmap->screen_y = y;
- /* resize allocations will update later in compCopyWindow, not here */
- if (!map)
- return pPixmap;
-
if (pParent->drawable.depth == pWin->drawable.depth)
{
GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen);
@@ -641,7 +637,7 @@ compAllocPixmap (WindowPtr pWin)
int y = pWin->drawable.y - bw;
int w = pWin->drawable.width + (bw << 1);
int h = pWin->drawable.height + (bw << 1);
- PixmapPtr pPixmap = compNewPixmap (pWin, x, y, w, h, TRUE);
+ PixmapPtr pPixmap = compNewPixmap (pWin, x, y, w, h);
CompWindowPtr cw = GetCompWindow (pWin);
if (!pPixmap)
@@ -713,7 +709,7 @@ compReallocPixmap (WindowPtr pWin, int draw_x, int draw_y,
pix_h = h + (bw << 1);
if (pix_w != pOld->drawable.width || pix_h != pOld->drawable.height)
{
- pNew = compNewPixmap (pWin, pix_x, pix_y, pix_w, pix_h, FALSE);
+ pNew = compNewPixmap (pWin, pix_x, pix_y, pix_w, pix_h);
if (!pNew)
return FALSE;
cw->pOldPixmap = pOld;
commit e87adcc9e024982fdad974de2876b00cf974dab8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 31 21:14:59 2011 +0200
Xquartz: include new localization files in the tarball
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 6deecae..6e83a42 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -40,6 +40,9 @@ EXTRA_DIST = \
Resources/Dutch.lproj/InfoPlist.strings \
Resources/Dutch.lproj/Localizable.strings \
Resources/Dutch.lproj/main.nib/keyedobjects.nib \
+ Resources/el.lproj/InfoPlist.strings \
+ Resources/el.lproj/Localizable.strings \
+ Resources/el.lproj/main.nib/keyedobjects.nib \
Resources/English.lproj/InfoPlist.strings \
Resources/English.lproj/Localizable.strings \
Resources/English.lproj/main.nib/designable.nib \
@@ -53,6 +56,9 @@ EXTRA_DIST = \
Resources/German.lproj/InfoPlist.strings \
Resources/German.lproj/Localizable.strings \
Resources/German.lproj/main.nib/keyedobjects.nib \
+ Resources/he.lproj/InfoPlist.strings \
+ Resources/he.lproj/Localizable.strings \
+ Resources/he.lproj/main.nib/keyedobjects.nib \
Resources/Italian.lproj/InfoPlist.strings \
Resources/Italian.lproj/Localizable.strings \
Resources/Italian.lproj/main.nib/keyedobjects.nib \
@@ -77,6 +83,9 @@ EXTRA_DIST = \
Resources/ru.lproj/InfoPlist.strings \
Resources/ru.lproj/Localizable.strings \
Resources/ru.lproj/main.nib/keyedobjects.nib \
+ Resources/sk.lproj/InfoPlist.strings \
+ Resources/sk.lproj/Localizable.strings \
+ Resources/sk.lproj/main.nib/keyedobjects.nib \
Resources/Spanish.lproj/InfoPlist.strings \
Resources/Spanish.lproj/Localizable.strings \
Resources/Spanish.lproj/main.nib/keyedobjects.nib \
commit a1bb5062c72667b2f10b56925c61888acc89e3e4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jul 21 10:33:58 2011 -0700
XQuartz: xpr: Don't FatalError if xp_unlock_window fails
We added the FatalError in 5d1d9d9ae39fab2ee2ac085f9776f82768828dc8 but
it caused a regression http://xquartz.macosforge.org/trac/ticket/482
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
index 4818653..98f1cc3 100644
--- a/hw/xquartz/xpr/xprFrame.c
+++ b/hw/xquartz/xpr/xprFrame.c
@@ -223,7 +223,7 @@ xprDestroyFrame(RootlessFrameID wid)
err = xp_destroy_window(x_cvt_vptr_to_uint(wid));
if (err != Success)
- FatalError("Could not destroy window %i.", (int)x_cvt_vptr_to_uint(wid));
+ FatalError("Could not destroy window %d (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
}
@@ -364,7 +364,7 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
err = xp_lock_window(x_cvt_vptr_to_uint(wid), NULL, NULL, data, rowbytes, NULL);
if (err != Success)
- FatalError("Could not lock window %i for drawing.", (int)x_cvt_vptr_to_uint(wid));
+ FatalError("Could not lock window %d for drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
*pixelData = data[0];
*bytesPerRow = rowbytes[0];
@@ -380,8 +380,11 @@ xprStopDrawing(RootlessFrameID wid, Bool flush)
xp_error err;
err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);
+ /* This should be a FatalError, but we started tripping over it. Make it a
+ * FatalError after http://xquartz.macosforge.org/trac/ticket/482 is fixed.
+ */
if(err != Success)
- FatalError("Could not unlock window %i after drawing.", (int)x_cvt_vptr_to_uint(wid));
+ ErrorF("Could not unlock window %d after drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);
}
commit c319f7b5b3ee651636cdfd165588f0dc972a22a4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 20 00:16:42 2011 -0700
XQuartz: Use CFSTR to avoid implicit cast warning of NSString * to CFStringRef
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 8a03fbe..7fd7dab 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1014,7 +1014,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
if (app_prefs_domain_cfstr == NULL) {
ErrorF("X11ApplicationMain: Unable to determine bundle identifier. Your installation of XQuartz may be broken.\n");
- app_prefs_domain_cfstr = @BUNDLE_ID_PREFIX".X11";
+ app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX".X11");
}
[NSApp read_defaults];
commit 5929db44124705d60ed9ef7f1d53de79103a7de8
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 1 01:19:42 2011 +0200
Restore the xserver virtual package
Make xvfb, xnest, xserver-xephyr and xserver-xfbdev provide the xserver
virtual package again.
diff --git a/debian/changelog b/debian/changelog
index 17bc6df..11fc300 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.10.99.901+git20110731-2) UNRELEASED; urgency=low
+
+ * Make xvfb, xnest, xserver-xephyr and xserver-xfbdev provide the xserver
+ virtual package again.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 01 Aug 2011 01:18:39 +0200
+
xorg-server (2:1.10.99.901+git20110731-1) experimental; urgency=low
[ Cyril Brulebois ]
diff --git a/debian/control b/debian/control
index 540f232..ea69deb 100644
--- a/debian/control
+++ b/debian/control
@@ -229,6 +229,7 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Recommends: libgl1-mesa-dri (>= 7.1~rc1)
+Provides: xserver
Description: Nested X server
Xnest is a nested X server that simply relays all its requests to another
X server, where it runs as a client. This means that it appears as another
@@ -249,6 +250,7 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Recommends: xauth
+Provides: xserver
Description: Virtual Framebuffer 'fake' X server
Xvfb provides an X server that can run on machines with no display hardware
and no physical input devices. It emulates a dumb framebuffer using virtual
@@ -277,6 +279,7 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Recommends: libgl1-mesa-dri (>= 7.1~rc1)
+Provides: xserver
Description: nested X server
Xephyr is an X server that can be run inside another X server,
much like Xnest. It is based on the kdrive X server, and as a
@@ -294,6 +297,7 @@ Depends:
xserver-common (>= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
+Provides: xserver
Description: Linux framebuffer device tiny X server
xserver-xfbdev is a Linux framebuffer device tiny X server based on the
kdrive X server.
commit 25e87a8e237642f0c0e1827434aa102d1186b614
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 31 22:15:43 2011 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 00e30a5..17bc6df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.99.901+git20110731-1) experimental; urgency=low
[ Cyril Brulebois ]
* New upstream release candidate.
@@ -30,7 +30,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low
* Drop obsolete 20-workaround-36986.diff.
* Fix patch stamp dependency.
- -- Cyril Brulebois <kibi@debian.org> Tue, 31 May 2011 13:52:04 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 31 Jul 2011 22:15:07 +0200
xorg-server (2:1.10.2-1) unstable; urgency=low
commit 1254005030c6de9f1476aced4e4f4d629046574c
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 31 21:19:18 2011 +0200
Refresh patches
diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
index 475bf77..bb0c338 100644
--- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
+++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
@@ -8,9 +8,11 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
[jcristau: forward-ported from 1.7 to 1.8]
Signed-off-by: Julien Cristau <jcristau@debian.org>
---
---- a/configure.ac
-+++ b/configure.ac
-@@ -1356,7 +1356,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
+Index: xorg-server/configure.ac
+===================================================================
+--- xorg-server.orig/configure.ac
++++ xorg-server/configure.ac
+@@ -1315,7 +1315,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
# SHA1 hashing
AC_ARG_WITH([sha1],
@@ -19,7 +21,7 @@ Signed-off-by: Julien Cristau <jcristau@debian.org>
[choose SHA1 implementation])])
AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
-@@ -1439,6 +1439,16 @@ if test "x$with_sha1" = xlibcrypto; then
+@@ -1398,6 +1398,16 @@ if test "x$with_sha1" = xlibcrypto; then
SHA1_CFLAGS="$OPENSSL_CFLAGS"
fi
fi
@@ -36,8 +38,10 @@ Signed-off-by: Julien Cristau <jcristau@debian.org>
AC_MSG_CHECKING([for SHA1 implementation])
if test "x$with_sha1" = x; then
AC_MSG_ERROR([No suitable SHA1 implementation found])
---- a/include/dix-config.h.in
-+++ b/include/dix-config.h.in
+Index: xorg-server/include/dix-config.h.in
+===================================================================
+--- xorg-server.orig/include/dix-config.h.in
++++ xorg-server/include/dix-config.h.in
@@ -175,6 +175,9 @@
/* Define to use libsha1 for SHA1 */
#undef HAVE_SHA1_IN_LIBSHA1
@@ -48,8 +52,10 @@ Signed-off-by: Julien Cristau <jcristau@debian.org>
/* Define to 1 if you have the `shmctl64' function. */
#undef HAVE_SHMCTL64
---- a/os/xsha1.c
-+++ b/os/xsha1.c
+Index: xorg-server/os/xsha1.c
+===================================================================
+--- xorg-server.orig/os/xsha1.c
++++ xorg-server/os/xsha1.c
@@ -127,6 +127,31 @@ int x_sha1_final(void *ctx, unsigned cha
return 1;
}
diff --git a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
index 9aac31f..1bd6b70 100644
--- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
+++ b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
@@ -8,9 +8,11 @@ Subject: [PATCH] xfree86: fix build with xv disabled
hw/xfree86/modes/xf86Crtc.h | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -3094,6 +3094,7 @@ xf86_crtc_box_area(BoxPtr box)
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c
++++ xorg-server/hw/xfree86/modes/xf86Crtc.c
+@@ -3089,6 +3089,7 @@ xf86_crtc_box_area(BoxPtr box)
return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
}
@@ -18,7 +20,7 @@ Subject: [PATCH] xfree86: fix build with xv disabled
/*
* Return the crtc covering 'box'. If two crtcs cover a portion of
* 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
-@@ -3182,6 +3183,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
+@@ -3177,6 +3178,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
return ret;
}
@@ -26,8 +28,10 @@ Subject: [PATCH] xfree86: fix build with xv disabled
xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
---- a/hw/xfree86/modes/xf86Crtc.h
-+++ b/hw/xfree86/modes/xf86Crtc.h
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h
++++ xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -934,6 +934,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn);
extern _X_EXPORT void
xf86_cursors_fini (ScreenPtr screen);
commit db14bd281d0a873ee5af613f4b2db2de63872af4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 31 21:18:26 2011 +0200
Fix patch stamp dependency.
diff --git a/debian/changelog b/debian/changelog
index 7724ab2..00e30a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low
apt decide to remove them instead of removing all of X. Thanks, David
Kalnischkies!
* Drop obsolete 20-workaround-36986.diff.
+ * Fix patch stamp dependency.
-- Cyril Brulebois <kibi@debian.org> Tue, 31 May 2011 13:52:04 +0200
diff --git a/debian/rules b/debian/rules
index 7d1c012..d000ed4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,6 +182,8 @@ confflags_udeb = \
$(config_backend_udeb) \
$(void)
+$(QUILT_STAMPFN): $(STAMP_DIR)/stampdir
+
$(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir $(QUILT_STAMPFN)
dh_testdir
autoreconf -vfi
commit 1ac0345550ef004c390da7f0831e9b1f2d00c30b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 31 21:16:32 2011 +0200
Drop obsolete 20-workaround-36986.diff.
diff --git a/debian/changelog b/debian/changelog
index 8a17e51..7724ab2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low
* Adapt 15-nouveau.diff to cope with the glxdricommon-ification of
GLX probing. Nouveau users might still see an error (EE) mentioning
the fallback to software rendering.
- * Refresh 20-workaround-36986.diff.
* Bump pixman build-dep/dep to 0.21.8.
* Bump xutils-dev build-dep for new macros.
* Drop libglib2.0-dev build-dep, no longer needed for unit tests.
@@ -28,6 +27,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low
+ Add Breaks on drivers abandoned between lenny and squeeze. This helps
apt decide to remove them instead of removing all of X. Thanks, David
Kalnischkies!
+ * Drop obsolete 20-workaround-36986.diff.
-- Cyril Brulebois <kibi@debian.org> Tue, 31 May 2011 13:52:04 +0200
diff --git a/debian/patches/20-workaround-36986.diff b/debian/patches/20-workaround-36986.diff
deleted file mode 100644
index d9026cd..0000000
--- a/debian/patches/20-workaround-36986.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Workaround fdo#36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986>
---- a/test/input.c
-+++ b/test/input.c
-@@ -1223,8 +1223,10 @@ static void dix_valuator_alloc(void)
-
- assert(v);
- assert(v->numAxes == num_axes);
-+#if 0
- assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0);
- assert(((void*)v->axes - (void*)v) % sizeof(double) == 0);
-+#endif
- num_axes ++;
- }
diff --git a/debian/patches/series b/debian/patches/series
index a9c30f6..2e0f947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
07-xfree86-fix-build-with-xv-disabled.diff
#13_debian_add_xkbpath_env_variable.diff
15-nouveau.diff
-20-workaround-36986.diff
commit 7294c5919b6ca632fbf84680a2f2e23660210c39
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 31 21:13:04 2011 +0200
Xquartz: include new localization files in the tarball
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 6deecae..6e83a42 100644
--- a/hw/xquartz/bundle/Makefile.am
Reply to: