xorg-server: Changes to 'ubuntu'
ChangeLog | 843 +
GL/Makefile.am | 14
GL/apple/Makefile.am | 24
GL/apple/aglGlx.c | 1354 --
GL/apple/indirect.c | 1938 --
GL/glx/.gitignore | 13
GL/glx/Makefile.am | 83
GL/glx/extension_string.c | 165
GL/glx/extension_string.h | 63
GL/glx/g_disptab.h | 51
GL/glx/glxbyteorder.h | 61
GL/glx/glxcmds.c | 2383 ---
GL/glx/glxcmdsswap.c | 778 -
GL/glx/glxcontext.h | 150
GL/glx/glxdrawable.h | 101
GL/glx/glxdri.c | 1183 -
GL/glx/glxdri2.c | 762 -
GL/glx/glxext.c | 501
GL/glx/glxext.h | 92
GL/glx/glxglcore.c | 451
GL/glx/glxscreens.c | 601
GL/glx/glxscreens.h | 184
GL/glx/glxserver.h | 266
GL/glx/glxutil.c | 154
GL/glx/glxutil.h | 63
GL/glx/indirect_program.c | 150
GL/glx/indirect_table.h | 106
GL/glx/indirect_texture_compression.c | 120
GL/glx/indirect_util.c | 310
GL/glx/indirect_util.h | 53
GL/glx/render2.c | 264
GL/glx/render2swap.c | 375
GL/glx/renderpix.c | 75
GL/glx/renderpixswap.c | 93
GL/glx/rensize.c | 423
GL/glx/single2.c | 394
GL/glx/single2swap.c | 272
GL/glx/singlepix.c | 533
GL/glx/singlepixswap.c | 584
GL/glx/singlesize.c | 198
GL/glx/singlesize.h | 59
GL/glx/swap_interval.c | 92
GL/glx/unpack.h | 239
GL/glx/xfont.c | 201
GL/mesa/.gitignore | 32
GL/mesa/Makefile.am | 18
GL/mesa/X/Makefile.am | 27
GL/mesa/glapi/Makefile.am | 20
GL/mesa/main/Makefile.am | 86
GL/mesa/math/Makefile.am | 27
GL/mesa/shader/Makefile.am | 39
GL/mesa/shader/grammar/Makefile.am | 20
GL/mesa/shader/slang/Makefile.am | 41
GL/mesa/swrast/Makefile.am | 50
GL/mesa/swrast_setup/Makefile.am | 20
GL/mesa/tnl/Makefile.am | 37
GL/mesa/vbo/Makefile.am | 35
GL/symlink-mesa.sh | 342
GL/windows/ChangeLog | 64
GL/windows/glwindows.h | 64
GL/windows/glwrap.c | 583
GL/windows/indirect.c | 1605 --
Makefile.am | 4
XTrap/xtrapdi.c | 2
Xext/security.c | 10
Xext/shm.c | 13
Xext/xselinux.c | 2
Xi/exevents.c | 11
composite/compalloc.c | 3
config/hal.c | 275
config/x11-input.fdi | 62
configure | 196
configure.ac | 69
dbe/dbe.c | 53
debian/changelog | 69
debian/control | 6
debian/patches/001_fedora_extramodes.patch | 85
debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch | 47
debian/patches/09_debian_xserver_rtff.diff | 6
debian/patches/103_fedora_xserver-1.5.0-xaa-option-inversion.patch | 44
debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch | 4
debian/patches/series | 3
debian/rules | 54
debian/serverminver | 2
debian/xsfbs/xsfbs.mk | 22
debian/xsfbs/xsfbs.sh | 387
dix/privates.c | 65
dix/protocol.txt | 28
dix/registry.c | 44
dix/window.c | 1
exa/exa.c | 79
exa/exa.h | 2
exa/exa_accel.c | 66
exa/exa_migration.c | 2
exa/exa_offscreen.c | 49
exa/exa_priv.h | 9
exa/exa_unaccel.c | 18
fb/fb24_32.c | 10
glx/Makefile.am | 91
glx/dispatch.h | 3829 +++++
glx/extension_string.c | 165
glx/extension_string.h | 63
glx/g_disptab.h | 51
glx/glapi.c | 1064 +
glx/glapi.h | 160
glx/glapioffsets.h | 1174 +
glx/glapitable.h | 816 +
glx/glapitemp.h | 6655 ++++++++++
glx/glprocs.h | 2260 +++
glx/glthread.c | 378
glx/glthread.h | 319
glx/glxbyteorder.h | 61
glx/glxcmds.c | 2383 +++
glx/glxcmdsswap.c | 778 +
glx/glxcontext.h | 150
glx/glxdrawable.h | 101
glx/glxdri.c | 1160 +
glx/glxdri2.c | 584
glx/glxdricommon.c | 209
glx/glxdricommon.h | 40
glx/glxdriswrast.c | 544
glx/glxext.c | 501
glx/glxext.h | 92
glx/glxscreens.c | 604
glx/glxscreens.h | 184
glx/glxserver.h | 266
glx/glxutil.c | 148
glx/glxutil.h | 63
glx/indirect_dispatch.c | 5889 ++++++++
glx/indirect_dispatch.h | 1047 +
glx/indirect_dispatch_swap.c | 6051 +++++++++
glx/indirect_program.c | 150
glx/indirect_reqsize.c | 832 +
glx/indirect_reqsize.h | 121
glx/indirect_size.h | 88
glx/indirect_size_get.c | 1210 +
glx/indirect_size_get.h | 102
glx/indirect_table.c | 1596 ++
glx/indirect_table.h | 106
glx/indirect_texture_compression.c | 120
glx/indirect_util.c | 310
glx/indirect_util.h | 53
glx/render2.c | 264
glx/render2swap.c | 375
glx/renderpix.c | 75
glx/renderpixswap.c | 93
glx/rensize.c | 423
glx/single2.c | 394
glx/single2swap.c | 272
glx/singlepix.c | 533
glx/singlepixswap.c | 584
glx/singlesize.c | 198
glx/singlesize.h | 59
glx/swap_interval.c | 92
glx/unpack.h | 239
glx/xfont.c | 201
hw/dmx/glxProxy/glxcmds.c | 15
hw/dmx/glxProxy/glxext.c | 2
hw/kdrive/ati/Makefile.am | 4
hw/kdrive/chips/Makefile.am | 4
hw/kdrive/ephyr/ephyrglxext.c | 8
hw/kdrive/epson/Makefile.am | 4
hw/kdrive/i810/Makefile.am | 4
hw/kdrive/mach64/Makefile.am | 4
hw/kdrive/mga/Makefile.am | 4
hw/kdrive/neomagic/Makefile.am | 4
hw/kdrive/nvidia/Makefile.am | 4
hw/kdrive/pm2/Makefile.am | 4
hw/kdrive/r128/Makefile.am | 4
hw/kdrive/sis300/Makefile.am | 4
hw/kdrive/smi/Makefile.am | 4
hw/kdrive/via/Makefile.am | 4
hw/xfree86/common/extramodes | 6
hw/xfree86/common/xf86Module.h | 10
hw/xfree86/common/xf86VidMode.c | 10
hw/xfree86/dixmods/GLcoremodule.c | 63
hw/xfree86/dixmods/Makefile.am | 12
hw/xfree86/dixmods/glxmodule.c | 37
hw/xfree86/dri/Makefile.am | 3
hw/xfree86/dri2/Makefile.am | 2
hw/xfree86/int10/xf86int10.c | 12
hw/xfree86/loader/dixsym.c | 3
hw/xfree86/modes/xf86Crtc.c | 2
hw/xfree86/os-support/bsd/bsd_init.c | 2
hw/xfree86/os-support/bus/Makefile.am | 4
hw/xfree86/os-support/bus/Makefile.in | 19
hw/xfree86/os-support/bus/Pci.h | 71
hw/xfree86/os-support/bus/axpPci.c | 415
hw/xfree86/os-support/linux/int10/linux.c | 4
hw/xfree86/os-support/shared/sigio.c | 3
hw/xfree86/x86emu/ops2.c | 63
hw/xfree86/xaa/Makefile.am | 2
hw/xfree86/xaa/Makefile.in | 5
hw/xfree86/xaa/xaaInitAccel.c | 9
hw/xgl/Makefile.am | 2
hw/xgl/glx/Makefile.am | 2
hw/xgl/glxext/Makefile.am | 2
hw/xgl/glxext/module/Makefile.am | 2
hw/xnest/Makefile.am | 1
hw/xprint/ddxInit.c | 6
hw/xquartz/GL/Makefile.am | 13
hw/xquartz/GL/indirect.c | 1938 ++
hw/xquartz/Makefile.am | 4
hw/xwin/glx/ChangeLog | 64
hw/xwin/glx/glwindows.h | 64
hw/xwin/glx/glwrap.c | 583
hw/xwin/glx/indirect.c | 1605 ++
include/Makefile.am | 4
include/Makefile.in | 7
include/dix-config.h.in | 3
include/do-not-use-config.h.in | 9
include/privates.h | 61
include/xorg-config.h.in | 3
mi/miinitext.c | 4
miext/damage/damage.c | 53
miext/damage/damagestr.h | 1
record/record.c | 16
render/picture.c | 21
render/render.c | 29
xkb/ddxLoad.c | 2
220 files changed, 53004 insertions(+), 20430 deletions(-)
New commits:
commit 8c779e212a07851edd3b27aafa8e645c6b8ca6a9
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Tue Jul 1 20:34:37 2008 +0300
"Clarify" the removal of 168_closedir.patch
diff --git a/debian/changelog b/debian/changelog
index b7ea99e..548e81d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ xorg-server (2:1.4.99.905-1ubuntu1) UNRELEASED; urgency=low
163_fix_untrusted_access.diff, 164_fix_context_sharing.diff,
165_fedora_xserver-1.5.0-xaa-option-inversion.patch,
166_fix_lpl_monitors.diff, 167_xf86AutoConfig_geode_addition.diff,
+ 168_closedir.patch,
170_xorg-xserver-1.4-cve-2008-1377.diff,
171_xorg-xserver-1.4-cve-2008-1379.diff,
172_xorg-xserver-1.4-cve-2008-2360.diff,
@@ -57,8 +58,6 @@ xorg-server (2:1.4.99.905-1ubuntu1) UNRELEASED; urgency=low
169_xf86AutoConfig_choose_default_driver_if_no_pci.patch
- unnecessary:
106_ubuntu_fpic_libxf86config.patch (the lib is not shipped)
- - applied to master, waiting for upstream to cherry-pick the equivalent:
- 168_closedir.patch
-- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 18 Jun 2008 13:24:40 +0300
commit 0c8652bf1916945fb38aa4f9cf7d9b39b46ed0e3
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Tue Jul 1 20:31:03 2008 +0300
XAANoOffscreenPixmaps is now the default, remove the patch.
diff --git a/debian/changelog b/debian/changelog
index f81089e..b7ea99e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,6 @@ xorg-server (2:1.4.99.905-1ubuntu1) UNRELEASED; urgency=low
Fixes document fontpaths shown in the man page.
- 102_ubuntu_sharevts_load_cpu.patch
Close console fd only when using --sharevts.
- - 103_fedora_xserver-1.5.0-xaa-option-inversion.patch
- Turn XAA Offscreen Pixmaps off by default, and use XaaOffscreenPixmaps
- "true" to turn them on.
- 104_psb_auto.patch
Add automatic detection of Poulsbo hardware when running without a
Device definition.
@@ -46,6 +43,7 @@ xorg-server (2:1.4.99.905-1ubuntu1) UNRELEASED; urgency=low
159_xkb_default_to_null.diff, 160_default_to_intel.diff,
161_fix_big_endian_cursor.diff, 162_cve-2007-6429.diff,
163_fix_untrusted_access.diff, 164_fix_context_sharing.diff,
+ 165_fedora_xserver-1.5.0-xaa-option-inversion.patch,
166_fix_lpl_monitors.diff, 167_xf86AutoConfig_geode_addition.diff,
170_xorg-xserver-1.4-cve-2008-1377.diff,
171_xorg-xserver-1.4-cve-2008-1379.diff,
diff --git a/debian/patches/103_fedora_xserver-1.5.0-xaa-option-inversion.patch b/debian/patches/103_fedora_xserver-1.5.0-xaa-option-inversion.patch
deleted file mode 100644
index 68f2732..0000000
--- a/debian/patches/103_fedora_xserver-1.5.0-xaa-option-inversion.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a01ca030c7a1f38e411281d888f0acf2c3fb40f3 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 13 Mar 2008 13:38:02 -0400
-Subject: [PATCH] Disable XAA offscreen pixmaps by default.
-
-Say Option "XaaOffscreenPixmaps" to turn them back on.
----
- hw/xfree86/xaa/xaaInitAccel.c | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
-index 1b7c154..f3c8f56 100644
---- a/hw/xfree86/xaa/xaaInitAccel.c
-+++ b/hw/xfree86/xaa/xaaInitAccel.c
-@@ -43,7 +43,8 @@ typedef enum {
- XAAOPT_WRITE_BITMAP,
- XAAOPT_WRITE_PIXMAP,
- XAAOPT_PIXMAP_CACHE,
-- XAAOPT_OFFSCREEN_PIXMAPS
-+ XAAOPT_OFFSCREEN_PIXMAPS,
-+ XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE
- } XAAOpts;
-
- static const OptionInfoRec XAAOptions[] = {
-@@ -89,6 +90,8 @@ static const OptionInfoRec XAAOptions[] = {
- OPTV_BOOLEAN, {0}, FALSE },
- {XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps",
- OPTV_BOOLEAN, {0}, FALSE },
-+ {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps",
-+ OPTV_BOOLEAN, {0}, FALSE },
- { -1, NULL,
- OPTV_NONE, {0}, FALSE }
- };
-@@ -532,8 +532,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
- #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
-
- if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
-- !xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS,
-- FALSE)) {
-+ xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
-+ {
- XAAMSG("\tOffscreen Pixmaps\n");
- } else {
- infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
diff --git a/debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch b/debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch
index 9e4af11..e26cf74 100644
--- a/debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch
+++ b/debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch
@@ -14,8 +14,8 @@ is bound.
Index: xorg-server/GL/glx/glxdri.c
===================================================================
---- xorg-server.orig/GL/glx/glxdri.c 2008-06-18 12:43:50.000000000 +0300
-+++ xorg-server/GL/glx/glxdri.c 2008-06-18 12:43:53.000000000 +0300
+--- xorg-server.orig/glx/glxdri.c 2008-06-18 12:43:50.000000000 +0300
++++ xorg-server/glx/glxdri.c 2008-06-18 12:43:53.000000000 +0300
@@ -410,6 +410,22 @@
pixmap = (PixmapPtr) glxPixmap->pDraw;
diff --git a/debian/patches/series b/debian/patches/series
index 1faec2d..73dfebd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@
100_xserver_exa_force_greedy.patch
101_fedora_xserver-1.3.0-document-fontpath-correctly.patch
102_ubuntu_sharevts_load_cpu.patch
-103_fedora_xserver-1.5.0-xaa-option-inversion.patch
104_psb_auto.patch
107_fedora_dont_backfill_bg_none.patch
110_fedora_no_move_damage.patch
commit a66fc3ef316b6ea3079a07b6a53e19d5576a5656
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Tue Jul 1 19:35:05 2008 +0300
Re-enable dri & glx.
diff --git a/debian/changelog b/debian/changelog
index ec6888e..ac8c604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg-server (2:1.4.99.905-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* New upstream release candidate
- fixes FTBFS on alpha (closes: #472205); won't work, though, because
of #485528
@@ -15,7 +16,10 @@ xorg-server (2:1.4.99.905-1) UNRELEASED; urgency=low
* Stop build-depending on mesa-swx11-source (mesa 7.1 will build the
software driver itself), and don't pass --with-mesa-source to configure.
- -- Julien Cristau <jcristau@debian.org> Thu, 26 Jun 2008 15:32:28 +0200
+ [ Timo Aaltonen ]
+ * Re-enable dri & glx.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 19:34:39 +0300
xorg-server (2:1.4.99.902-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 013926c..2d5ef53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,6 @@ confflags += --disable-static \
--with-os-name="$(shell uname)" \
--with-os-vendor="$(VENDOR) ($(SOURCE_NAME) $(SOURCE_VERSION))" \
--with-int10=x86emu \
- --disable-glx \
- --disable-dri \
--disable-dri2
build: prepare patch build-stamp
commit 6f7c0fa3b414986a1039789110fa2a618aad48cf
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 1 17:25:07 2008 +0200
we don't need the mesa source anymore
Stop build-depending on mesa-swx11-source (mesa 7.1 will build the software
driver itself), and don't pass --with-mesa-source to configure.
diff --git a/debian/changelog b/debian/changelog
index a211e21..ec6888e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xorg-server (2:1.4.99.905-1) UNRELEASED; urgency=low
think dates back to the days of the custom module loader.
* debian/rules: drop some remaining xprintisms.
* bump serverminver to 2:1.4.99.905.
+ * Stop build-depending on mesa-swx11-source (mesa 7.1 will build the
+ software driver itself), and don't pass --with-mesa-source to configure.
-- Julien Cristau <jcristau@debian.org> Thu, 26 Jun 2008 15:32:28 +0200
diff --git a/debian/control b/debian/control
index 2e1ee31..cfec819 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex,
libpciaccess-dev, libssl-dev,
x11proto-xf86dri-dev, libdrm-dev (>= 2.3.0) [!hurd-i386],
x11proto-print-dev, libfreetype6-dev, xfonts-utils,
- mesa-swx11-source (>> 7.0.1~rc2-1),
x11proto-gl-dev (>= 1.4.9), libgl1-mesa-dev (>= 6.5.1),
libxmuu-dev (>= 1:0.99.1), libxext-dev (>= 1:0.99.1),
libx11-dev (>= 1:0.99.2), libxrender-dev (>= 1:0.9.0),
diff --git a/debian/rules b/debian/rules
index 7a1e18f..013926c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,6 @@ VENDOR = $(shell lsb_release -i -s)
# kill the .las.
confflags += --disable-static \
--enable-xorg \
- --with-mesa-source=/usr/share/mesa-source \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \
--with-serverconfig-path=/etc/X11/xserver \
--enable-xtrap \
commit 1274c79375ad6685b63c9bc9d508da713aefa7ee
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 1 17:20:46 2008 +0200
update changelogs and bump serverminver
diff --git a/ChangeLog b/ChangeLog
index d0d7620..6d97a5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,250 @@
+commit 0617653277d2e2802c6223fc2a221adfa6b93fc4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 30 16:11:32 2008 -0400
+
+ xserver 1.5RC5
+
+commit bee463bd8a991ef7ba619241237cd06d2fc92558
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 30 16:10:37 2008 -0400
+
+ XInput ABI is 2.1, not 3.1.
+ (cherry picked from commit 76576c87b0de106e006d1cfa59d42d3a483e966c)
+
+commit 795d293d769aa93dddd457e8e200d62044a3921a
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 4 12:11:14 2008 -0700
+
+ Wrap AddTraps in exa and damage.
+
+ This fine (and unused) function wasn't ever wrapped which made it not work
+ under exa.
+ (cherry picked from commit 06e7e1d0486e8c516a9b3219a2c86026f88825fc)
+
+commit 32cd2c510939498e94ae2aaec40fe48b2850a321
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 30 11:18:27 2008 -0400
+
+ xserver 1.5RC4.
+
+ Remember kids, distcheck before you tag.
+
+commit 6ec12077ef0fd712ef97682deab751aac5c39d6d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 30 10:47:34 2008 -0400
+
+ Distcheck fixes.
+
+commit 6a2ee7e0bb416e82004510edd97bebe94596a858
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 30 10:40:50 2008 -0400
+
+ xserver 1.5RC3.
+
+commit 6e8ed1398dd68426d45c20c05a10640c22f7d104
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 30 10:29:17 2008 -0400
+
+ Bump ABI minor numbers for the devPrivate ABI functions.
+ (cherry picked from commit 211e2bdcc677122145998829a7f26610c7c567e6)
+
+commit 39cc11b005b2f462bca9004c8e0fa290377687ce
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Thu Jun 26 21:23:31 2008 -0400
+
+ Fix a leak of window devPrivates in window.c/CrushTree().
+ (cherry picked from commit 7ddfb2f1587da3ec1cd27ae270e42700adf4f560)
+
+commit 8017c999013b79fd30cb74eaf8ca0970e9b1bd4a
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Wed May 21 16:14:55 2008 -0700
+
+ Actually enable building GLX without Mesa source
+ (cherry picked from commit e837244947fbb18192e9056c070ce439ef24d1a3)
+
+commit 90f2a82ba5aa6480d2299f99816a2ba351e24bee
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Fri May 23 22:39:09 2008 +0300
+
+ glx: fix forgotten swrast -> SWRast
+ (cherry picked from commit 21a8052fdca2115668dfc747b0b58db437b4eb6d)
+
+commit 6e278e3944cc32d165829f6ef64cbafbf9b513b7
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Fri May 23 22:38:36 2008 +0300
+
+ glx: missing swrast is fatal
+ (cherry picked from commit 877e6c35ff1f0f110627590ac0f12fddf47de506)
+
+commit 0845476521f5b9e9b477197d96d7ffe64be7ae3a
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Fri May 23 22:38:11 2008 +0300
+
+ glx: drop stray glcore.h include
+ (cherry picked from commit 1345c93ad4be875951256dae87bc4fd9a1b5e08a)
+
+commit 6f18c5d7039be3c03185aee61fb74ac4cf593532
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Fri May 23 22:40:03 2008 +0300
+
+ kdrive: need not export symbols for glx anymore
+ (cherry picked from commit ae0504d34d245f15b2f098a63ad1a9e1c4daef35)
+
+commit a194718e9d83b488f21226332b8b5b250f48e274
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 21 13:33:36 2008 -0400
+
+ Move GL/glx on level up now that it's the only thing left under GL.
+ (cherry picked from commit c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55)
+
+commit cb402b4112dc9e4cb21c9fc9327da301a70b6a8d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 21 12:34:07 2008 -0400
+
+ Move the windows GL files to the xwin DDX.
+ (cherry picked from commit a8a9b40e554dd0c184866978889a39519afc466a)
+
+commit 0234d3d48f462fcac9c526919812d829375f0a0c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 21 11:44:12 2008 -0400
+
+ Get out of the mesa symlinking business.
+
+ This copies over the files generated from mesa/src/mesa/glapi. There's
+ a corresponding mesa commit that makes it easy to generate the glapi files
+ straight into the xserver tree when the XML definitions change.
+
+ The only few files that are copied from mesa but aren't generated are
+ glapi.[ch] and glthread.[ch]. Everything in there is technically DRI
+ driver API and the whole setup is still a bit fragile, but it's not a new
+ problem.
+
+ The --with-mesa-source configure option is still around since other
+ parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
+ but for common case of building with GLX and AIGLX support, that
+ option is no longer needed.
+ (cherry picked from commit e5aad4bc087036489e2af576628aa9b612054a6e)
+
+commit d3a2e060bfc322fbf7c55dd7d07472a0eeec18ef
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Wed May 21 10:51:15 2008 -0700
+
+ Fix up paths for GL/glx -> glx renaming
+ (cherry picked from commit c76fddeea28b4f88db97a2a3487d7a57cd9d578c)
+
+commit d325a207c83884ba1306af38a4d1c60b9bad18bb
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 21 10:18:16 2008 -0400
+
+ Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
+ (cherry picked from commit f558c7d4d1d87affe1ce4aec2e62ff64545f2bc8)
+
+commit bd81faff8c4d9cae5f6a4b424230a11706a508c5
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 21 10:17:53 2008 -0400
+
+ Drop glcore GLX provider.
+
+ Obsoleted by the DRI swrast driver.
+ (cherry picked from commit 77ff8fd5072fa57158463bfd84656389eeb7b503)
+
+commit d88da6638eb133f93833933924711d9874c480a6
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Apr 23 10:22:34 2008 -0700
+
+ Moved Apple GL bits into our DDX subtree
+ (cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
+ (cherry picked from commit d09c520b322ba5c5f4d6b630a7c0c62e56732f82)
+
+commit 500463f728927a3ca8d8167bc7c1b266142c93fe
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue May 20 16:56:27 2008 -0400
+
+ Stop symlinking glcontextmodes.[ch] from mesa.
+ (cherry picked from commit 61eaef22359ae2abcee7dcd73ee8610a83776fc7)
+
+commit a569beba4cdad4af6e52c5a966475b4041365eda
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Thu Apr 24 18:21:42 2008 -0700
+
+ XQuartz: Compile in missing glx source that we still need
+ (cherry picked from commit c611335dee267e41dcd1733a6bb5206b102f804e)
+ (cherry picked from commit 63853e4ad211945ed25541223207a78f83766ced)
+
+commit 46e0bb6211cf711ef4dacf134404d79a530b5549
+Author: Ben Byer <bbyer@apple.com>
+Date: Tue Apr 22 23:53:23 2008 -0700
+
+ xquartz: remove vestigial aglGlx.c
+ (cherry picked from commit 40bd041e4255f26fcbdf0831e68619ae0f46ab39)
+ (cherry picked from commit 3685b171da51f853bfdb312d36622dfa03ee75be)
+
+commit e8a1eda65d36af022ac8c245640a0d5f2ac1989a
+Author: Ben Byer <bbyer@apple.com>
+Date: Mon Apr 21 22:06:38 2008 -0700
+
+ add missing DARWIN_GLX_LIBS in configure.ac
+ (cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44)
+ (cherry picked from commit 744d0cfda74f8283801cc2d6c5eda48402455bc3)
+
+commit 17ac93b23bcb3e2a1117c76b63b23c7439a96ef5
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Wed May 21 18:13:47 2008 +0300
+
+ glx: drop drm.h, sareaHandle from swrast loader
+ (cherry picked from commit 88f43e5d06fb5543bc40ca060b2c5d8e2673afad)
+
+commit 988b1b8df319903d308d8ee232e991dab42e1c0b
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Tue May 20 16:36:22 2008 -0400
+
+ Add loader for the swrast dri driver.
+ (cherry picked from commit 6ff6465931c397f72db27a4fd0ca0dcac0609537)
+
+commit 1efc0329b147eb6e25671ad3bcb5f12095d9f844
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Fri Apr 18 17:47:16 2008 +0300
+
+ glcore: drop GLcore (files)
+ (cherry picked from commit a88c6b66465c039bf92a54a496516fee4d900784)
+
+commit 9b4d5b6521a8d6e02ab9cb534fbff3faa9f3a388
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Fri Apr 18 17:47:01 2008 +0300
+
+ glcore: drop GLcore (build system)
+ (cherry picked from commit dd7a53f8f21e41e1ab43f7e684ba586abc97ef7e)
+
+commit 1ea2e69cfcdf66f6b7834e503526d9d89fd69c09
+Author: George Sapountzis <gsap7@yahoo.gr>
+Date: Fri Apr 18 17:46:18 2008 +0300
+
+ glcore: build from mesa, dlopen from xorg
+
+ * The GLcore interface is disposable
+ * GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
+ GLX_PROVIDER_INSTALL_DIR
+ (cherry picked from commit 567d389d47dee233a973b101e04ce41c47a68f34)
+
+commit f2c30a57e3c6169fbecdbb60ac24ad2a5e9aa8a4
+Author: Donnie Berkholz <dberkholz@gentoo.org>
+Date: Mon Jun 9 16:01:53 2008 -0700
+
+ glcore: prepare for dynamic loading
+
+ glcore gets linked with -ldl, -lpthread for s3tc and glapi
+ xserver needs
+ DLOPEN_LIBS - to dlopen the glcore dso
+ LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use
+
+ the ld flag is added to kdrive only when GLX is enabled, the net overhead for
+ Xephyr is ~155KB, could be reduced with --dynamic-list.
+ (cherry picked from commit efb723e166e5fa89e90c7b400fb4c7979b1f50c0)
+
+ Conflicts:
+
+ configure.ac
+
commit 9029748f894e603bd7a963c4b868349dc1a73f5f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 25 15:06:49 2008 -0700
diff --git a/debian/changelog b/debian/changelog
index d6ebba2..a211e21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xorg-server (2:1.4.99.902-2) UNRELEASED; urgency=low
+xorg-server (2:1.4.99.905-1) UNRELEASED; urgency=low
- * Update from upstream server-1.5-branch
+ * New upstream release candidate
- fixes FTBFS on alpha (closes: #472205); won't work, though, because
of #485528
- fixes FTBFS on GNU/kFreeBSD (closes: #482550)
@@ -11,6 +11,7 @@ xorg-server (2:1.4.99.902-2) UNRELEASED; urgency=low
* debian/rules: drop our special handling for stripping modules, which I
think dates back to the days of the custom module loader.
* debian/rules: drop some remaining xprintisms.
+ * bump serverminver to 2:1.4.99.905.
-- Julien Cristau <jcristau@debian.org> Thu, 26 Jun 2008 15:32:28 +0200
diff --git a/debian/serverminver b/debian/serverminver
index 06db17c..90a72d1 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1 @@
-2:1.4.99.901
+2:1.4.99.905
commit 0617653277d2e2802c6223fc2a221adfa6b93fc4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 16:11:32 2008 -0400
xserver 1.5RC5
diff --git a/configure.ac b/configure.ac
index 4ef00b4..83892df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit bee463bd8a991ef7ba619241237cd06d2fc92558
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 16:10:37 2008 -0400
XInput ABI is 2.1, not 3.1.
(cherry picked from commit 76576c87b0de106e006d1cfa59d42d3a483e966c)
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index fdcd567..5ce6e8a 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(4, 1)
-#define ABI_XINPUT_VERSION SET_ABI_VERSION(3, 1)
+#define ABI_XINPUT_VERSION SET_ABI_VERSION(2, 1)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(1, 1)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
commit 795d293d769aa93dddd457e8e200d62044a3921a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 4 12:11:14 2008 -0700
Wrap AddTraps in exa and damage.
This fine (and unused) function wasn't ever wrapped which made it not work
under exa.
(cherry picked from commit 06e7e1d0486e8c516a9b3219a2c86026f88825fc)
diff --git a/exa/exa.c b/exa/exa.c
index 3a6ad98..a35b174 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -753,6 +753,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
if (ps) {
ps->Composite = pExaScr->SavedComposite;
ps->Trapezoids = pExaScr->SavedTrapezoids;
+ ps->AddTraps = pExaScr->SavedAddTraps;
}
#endif
@@ -919,6 +920,9 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->SavedTrapezoids = ps->Trapezoids;
ps->Trapezoids = exaTrapezoids;
+
+ pExaScr->SavedAddTraps = ps->AddTraps;
+ ps->AddTraps = ExaCheckAddTraps;
}
#endif
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index 0138e4a..21e6f0b 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -114,6 +114,7 @@ typedef struct {
TrianglesProcPtr SavedTriangles;
GlyphsProcPtr SavedGlyphs;
TrapezoidsProcPtr SavedTrapezoids;
+ AddTrapsProcPtr SavedAddTraps;
#endif
Bool swappedOut;
@@ -293,6 +294,13 @@ ExaCheckGetSpans (DrawablePtr pDrawable,
int nspans,
char *pdstStart);
+void
+ExaCheckAddTraps (PicturePtr pPicture,
+ INT16 x_off,
+ INT16 y_off,
+ int ntrap,
+ xTrap *traps);
+
/* exa_accel.c */
static _X_INLINE Bool
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 8e19886..d7bd06c 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -350,6 +350,20 @@ ExaCheckComposite (CARD8 op,
REGION_UNINIT(pScreen, ®ion);
}
+void
+ExaCheckAddTraps (PicturePtr pPicture,
+ INT16 x_off,
+ INT16 y_off,
+ int ntrap,
+ xTrap *traps)
+{
+ EXA_FALLBACK(("to pict %p (%c)\n",
+ exaDrawableLocation(pPicture->pDrawable)));
+ exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+ fbAddTraps (pPicture, x_off, y_off, ntrap, traps);
+ exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+}
+
/**
* Gets the 0,0 pixel of a pixmap. Used for doing solid fills of tiled pixmaps
* that happen to be 1x1. Pixmap must be at least 8bpp.
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 56864c5..b9a15ee 100755
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -655,6 +655,58 @@ damageGlyphs (CARD8 op,
damageReportPostOp (pDst->pDrawable);
wrap (pScrPriv, ps, Glyphs, damageGlyphs);
}
+
+static void
+damageAddTraps (PicturePtr pPicture,
+ INT16 x_off,
+ INT16 y_off,
+ int ntrap,
+ xTrap *traps)
+{
+ ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+ PictureScreenPtr ps = GetPictureScreen(pScreen);
+ damageScrPriv(pScreen);
+
+ if (checkPictureDamage (pPicture))
+ {
+ BoxRec box;
+ int i;
+ int x, y;
+ xTrap *t = traps;
+
+ box.x1 = 32767;
+ box.y1 = 32767;
+ box.x2 = -32767;
+ box.y2 = -32767;
+ x = pPicture->pDrawable->x + x_off;
+ y = pPicture->pDrawable->y + y_off;
+ for (i = 0; i < ntrap; i++)
+ {
+ pixman_fixed_t l = min (t->top.l, t->bot.l);
+ pixman_fixed_t r = max (t->top.r, t->bot.r);
+ int x1 = x + pixman_fixed_to_int (l);
+ int x2 = x + pixman_fixed_to_int (pixman_fixed_ceil (r));
+ int y1 = y + pixman_fixed_to_int (t->top.y);
+ int y2 = y + pixman_fixed_to_int (pixman_fixed_ceil (t->bot.y));
+
+ if (x1 < box.x1)
+ box.x1 = x1;
+ if (x2 > box.x2)
+ box.x2 = x2;
+ if (y1 < box.y1)
+ box.y1 = y1;
+ if (y2 > box.y2)
+ box.y2 = y2;
+ }
+ TRIM_PICTURE_BOX (box, pPicture);
+ if (BOX_NOT_EMPTY(box))
+ damageDamageBox (pPicture->pDrawable, &box, pPicture->subWindowMode);
+ }
+ unwrap (pScrPriv, ps, AddTraps);
+ (*ps->AddTraps) (pPicture, x_off, y_off, ntrap, traps);
+ damageReportPostOp (pPicture->pDrawable);
+ wrap (pScrPriv, ps, AddTraps, damageAddTraps);
+}
#endif
/**********************************************************/
@@ -1767,6 +1819,7 @@ DamageSetup (ScreenPtr pScreen)
if (ps) {
wrap (pScrPriv, ps, Glyphs, damageGlyphs);
wrap (pScrPriv, ps, Composite, damageComposite);
+ wrap (pScrPriv, ps, AddTraps, damageAddTraps);
}
#endif
diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h
index 2f6d538..7ee40ce 100755
--- a/miext/damage/damagestr.h
+++ b/miext/damage/damagestr.h
@@ -70,6 +70,7 @@ typedef struct _damageScrPriv {
#ifdef RENDER
CompositeProcPtr Composite;
GlyphsProcPtr Glyphs;
+ AddTrapsProcPtr AddTraps;
#endif
} DamageScrPrivRec, *DamageScrPrivPtr;
commit 32cd2c510939498e94ae2aaec40fe48b2850a321
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 11:18:27 2008 -0400
xserver 1.5RC4.
Remember kids, distcheck before you tag.
diff --git a/configure.ac b/configure.ac
index 64aab85..4ef00b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 6ec12077ef0fd712ef97682deab751aac5c39d6d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 10:47:34 2008 -0400
Distcheck fixes.
diff --git a/glx/Makefile.am b/glx/Makefile.am
index f62d2ed..39b96d7 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -40,12 +40,15 @@ glapi_sources = \
glapitemp.h \
glapi.c \
glapi.h \
+ glapioffsets.h \
glthread.c \
- glthread.h
+ glthread.h \
+ glprocs.h
libglxdri_la_SOURCES = \
glxdri.c \
glxdri2.c \
+ glxdricommon.h \
extension_string.c \
extension_string.h
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index a885289..5ffba12 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -167,14 +167,7 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
Reply to: