Bug#677173: 3.2.19-1: after some time, the USB keyboard no longer works

2012-07-19 Thread Julien Cristau 
On Fri, Jul 20, 2012 at 01:40:52 +0200, Vincent Lefevre wrote:

> On 2012-07-14 21:38:05 +0200, Vincent Lefevre wrote:
> > So, it seems that when the problem occurs, the keyboard modifiers may
> > still be working with clicks (to be confirmed).
> 
> Forget that. The problem is the following: a keypress is taken into
> account only if the key is kept pressed for about half a second (key
> modifiers are generally pressed at least that time when used as a
> combination with a click, that's why they appear to be working as
> usual), a bit like the Power button needs to be pressed for some time
> to be taken into account. If a normal key is pressed long enough, it
> repeats until it is released, as usual.
> 
Sounds like you have slowkeys enabled.
http://who-t.blogspot.fr/2012/06/xkb-slowkeys.html

Cheers,
Julien


signature.asc
Description: Digital signature

Bug#677173: 3.2.19-1: after some time, the USB keyboard no longer works

2012-07-19 Thread Vincent Lefevre 
On 2012-07-14 21:38:05 +0200, Vincent Lefevre wrote:
> So, it seems that when the problem occurs, the keyboard modifiers may
> still be working with clicks (to be confirmed).

Forget that. The problem is the following: a keypress is taken into
account only if the key is kept pressed for about half a second (key
modifiers are generally pressed at least that time when used as a
combination with a click, that's why they appear to be working as
usual), a bit like the Power button needs to be pressed for some time
to be taken into account. If a normal key is pressed long enough, it
repeats until it is released, as usual.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120719234052.ga31...@xvii.vinc17.org

mesa: Changes to 'ubuntu-oneiric'

2012-07-19 Thread Bryce Harrington 
 debian/changelog |8 
 debian/patches/125_nv50_nvc0_use_screen_for_flush_notifier.patch |  221 
++
 2 files changed, 229 insertions(+)

New commits:
commit 30a4a84a8f8a8ff0c30df08add104fe6e443fcf1
Author: Bryce Harrington 
Date:   Thu Jul 19 15:01:40 2012 -0700

Add 125_nv50_nvc0_use_screen_for_flush_notifier.patch

diff --git a/debian/changelog b/debian/changelog
index ed508bb..c9361a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.11-0ubuntu3.3) oneiric-proposed; urgency=low
+
+  * Add 125_nv50_nvc0_use_screen_for_flush_notifier.patch to fix es2_info
+crash.  Backport from mesa 8.0.
+(LP: #926918)
+
+ -- Bryce Harrington   Thu, 19 Jul 2012 13:37:06 -0700
+
 mesa (7.11-0ubuntu3.2) oneiric-proposed; urgency=low
 
   * Add patch series from upstream stable release to fix various issues:
diff --git a/debian/patches/125_nv50_nvc0_use_screen_for_flush_notifier.patch 
b/debian/patches/125_nv50_nvc0_use_screen_for_flush_notifier.patch
new file mode 100644
index 000..f02e75d
--- /dev/null
+++ b/debian/patches/125_nv50_nvc0_use_screen_for_flush_notifier.patch
@@ -0,0 +1,221 @@
+commit 3069a7eaa5d83e7f41616347ba244c0dc0d944ae
+Author: Christoph Bumiller 
+Date:   Thu Jul 7 14:58:29 2011 +0200
+
+nv50,nvc0: use screen instead of context for flush notifier
+
+Context may become NULL and we still have to be able to flush
+pending fences.
+
+diff --git a/src/gallium/drivers/nv50/nv50_context.c 
b/src/gallium/drivers/nv50/nv50_context.c
+index ceb83f6..ac3e361 100644
+--- a/src/gallium/drivers/nv50/nv50_context.c
 b/src/gallium/drivers/nv50/nv50_context.c
+@@ -60,13 +60,13 @@ nv50_texture_barrier(struct pipe_context *pipe)
+ void
+ nv50_default_flush_notify(struct nouveau_channel *chan)
+ {
+-   struct nv50_context *nv50 = chan->user_private;
++   struct nv50_screen *screen = chan->user_private;
+ 
+-   if (!nv50)
++   if (!screen)
+   return;
+ 
+-   nouveau_fence_update(&nv50->screen->base, TRUE);
+-   nouveau_fence_next(&nv50->screen->base);
++   nouveau_fence_update(&screen->base, TRUE);
++   nouveau_fence_next(&screen->base);
+ }
+ 
+ static void
+@@ -100,10 +100,8 @@ nv50_destroy(struct pipe_context *pipe)
+ 
+draw_destroy(nv50->draw);
+ 
+-   if (nv50->screen->cur_ctx == nv50) {
+-  nv50->screen->base.channel->user_private = NULL;
++   if (nv50->screen->cur_ctx == nv50)
+   nv50->screen->cur_ctx = NULL;
+-   }
+ 
+FREE(nv50);
+ }
+@@ -140,7 +138,6 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
+ 
+if (!screen->cur_ctx)
+   screen->cur_ctx = nv50;
+-   screen->base.channel->user_private = nv50;
+screen->base.channel->flush_notify = nv50_default_flush_notify;
+ 
+nv50_init_query_functions(nv50);
+diff --git a/src/gallium/drivers/nv50/nv50_screen.c 
b/src/gallium/drivers/nv50/nv50_screen.c
+index cc921d0..4cda303 100644
+--- a/src/gallium/drivers/nv50/nv50_screen.c
 b/src/gallium/drivers/nv50/nv50_screen.c
+@@ -215,6 +215,7 @@ nv50_screen_destroy(struct pipe_screen *pscreen)
+   nouveau_fence_wait(screen->base.fence.current);
+   nouveau_fence_ref (NULL, &screen->base.fence.current);
+}
++   screen->base.channel->user_private = NULL;
+ 
+nouveau_bo_ref(NULL, &screen->code);
+nouveau_bo_ref(NULL, &screen->tls_bo);
+@@ -300,6 +301,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct 
nouveau_device *dev)
+   FAIL_SCREEN_INIT("nouveau_screen_init failed: %d\n", ret);
+ 
+chan = screen->base.channel;
++   chan->user_private = screen;
+ 
+pscreen->winsys = ws;
+pscreen->destroy = nv50_screen_destroy;
+diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c 
b/src/gallium/drivers/nv50/nv50_state_validate.c
+index 11561f5..d29c1e9 100644
+--- a/src/gallium/drivers/nv50/nv50_state_validate.c
 b/src/gallium/drivers/nv50/nv50_state_validate.c
+@@ -282,8 +282,7 @@ nv50_switch_pipe_context(struct nv50_context *ctx_to)
+if (!ctx_to->zsa)
+   ctx_to->dirty &= ~NV50_NEW_ZSA;
+ 
+-   ctx_to->screen->base.channel->user_private = ctx_to->screen->cur_ctx =
+-  ctx_to;
++   ctx_to->screen->cur_ctx = ctx_to;
+ }
+ 
+ static struct state_validate {
+diff --git a/src/gallium/drivers/nv50/nv50_vbo.c 
b/src/gallium/drivers/nv50/nv50_vbo.c
+index bb08941..f23008a 100644
+--- a/src/gallium/drivers/nv50/nv50_vbo.c
 b/src/gallium/drivers/nv50/nv50_vbo.c
+@@ -389,11 +389,11 @@ nv50_prim_gl(unsigned prim)
+ static void
+ nv50_draw_vbo_flush_notify(struct nouveau_channel *chan)
+ {
+-   struct nv50_context *nv50 = chan->user_private;
++   struct nv50_screen *screen = chan->user_private;
+ 
+-   nouveau_fence_update(&nv50->screen->base, TRUE);
++   nouveau_fence_update(&screen->base, TRUE);
+ 
+-   nv50_bufctx_emit_relocs(nv50);
++   nv50_bufctx_emit_relocs(screen->cur_ctx);
+ }
+ 
+ static void
+@@ -650,7 +650,6 @@ nv50_draw_vbo(struct pipe_context *pipe, const struct 
pipe_draw_info *info)
+nv50_state_valida

xkb-data: Changes to 'ubuntu'

2012-07-19 Thread Bryce Harrington 
 debian/changelog  |8 
 debian/patches/series |2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 4e0f95c31489bd8edecc6d03564ceef0138af3ea
Author: Bryce Harrington 
Date:   Thu Jul 19 14:12:05 2012 -0700

Disable patch 109 as per bug #1013881

diff --git a/debian/changelog b/debian/changelog
index 8bfd3cf..3dbddef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xkeyboard-config (2.5-1ubuntu6) quantal; urgency=low
+
+  * Disable patch 109.  The fix causes behavioral changes for right
+control.  Needs to be fixed differently; discussion ongoing upstream.
+(LP: #1013881)
+
+ -- Bryce Harrington   Thu, 19 Jul 2012 14:08:18 -0700
+
 xkeyboard-config (2.5-1ubuntu5) quantal; urgency=low
 
   * Add 113_ossmath_is_five_levels.patch: Some keymaps like fr/oss fail to
diff --git a/debian/patches/series b/debian/patches/series
index ded6420..ba3a198 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@ docs.diff
 revert-goodmap-badmap-for-apple.diff
 105_intelligent_keyboard.patch
 108_fix_intltool_make_check.diff
-109_fr_oss_space_char.patch
+#109_fr_oss_space_char.patch
 110_dead_hook_horn.patch
 111_cz_ssharp.patch
 112_dk_dvorak_tilde.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sry1h-0001o8...@vasks.debian.org

mesa: Changes to 'ubuntu-oneiric'

2012-07-19 Thread Robert Hooker 
 debian/changelog|   17 +
 debian/patches/120_fix_tfp_texture_free.patch   |   37 --
 debian/patches/121-i965-fix-border-color.patch  |   48 +++
 debian/patches/122-i965-apply-post-sync-workaround.patch|   40 +++
 debian/patches/123-i965-emit-depth-stalls-and-flushes.patch |  153 
 debian/patches/124-i965-last-render-target-select.patch |   32 ++
 debian/patches/series   |5 
 7 files changed, 294 insertions(+), 38 deletions(-)

New commits:
commit 4f0c77a6b92fd851ef1529e329f885f91096c78a
Author: Robert Hooker 
Date:   Thu Jul 19 16:50:59 2012 -0400

Import changes from already released 7.11-0ubuntu3.2

diff --git a/debian/changelog b/debian/changelog
index e3cc9f8..ed508bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+mesa (7.11-0ubuntu3.2) oneiric-proposed; urgency=low
+
+  * Add patch series from upstream stable release to fix various issues:
+- 121-i965-fix-border-color.patch: Fixes wrong colors in lightsmark
+  (LP: #966399)
+- 122-i965-apply-post-sync-workaround.patch: Fixes GPU hangs in
+  Civilization 4, PlaneShift, Minecraft, Neverwinter Nights
+  (among others) on Sandybridge and Ivybridge. (LP: #966399)
+- 123-i965-emit-depth-stalls-and-flushes.patch: Fixes GPU hangs when
+  running qgears2, lightsmark, and openarena on Ivybridge. (LP: #966399)
+- 124-i965-last-render-target-select.patch: Fixes a GPU hang when
+  running Trine, or Unigine Heaven which crashes the desktop. (LP: #966399)
+  * Drop 120_fix_tfp_texture_free.patch from previous SRU, it was the
+incorrect patch.
+
+ -- Robert Hooker   Tue, 20 Mar 2012 10:44:16 -0400
+
 mesa (7.11-0ubuntu3.1) oneiric-proposed; urgency=low
 
   * Add 120_fix_tfp_texture_free.patch: Fixes segmentation fault in
diff --git a/debian/patches/120_fix_tfp_texture_free.patch 
b/debian/patches/120_fix_tfp_texture_free.patch
deleted file mode 100644
index f9e97ae..000
--- a/debian/patches/120_fix_tfp_texture_free.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit b2f1366c2825aeee3411c88db5c8e6b426191487
-Author: Bryce Harrington 
-Date:   Thu Jan 26 15:30:24 2012 -0800
-
-Backport of the following patch to oneiric:
-
-commit d430e81c3287eba4ee84ca1639a23f92bbe22c8e
-Author: Eric Anholt 
-Date:   Wed Sep 21 15:17:36 2011 -0700
-
-intel: Fix improper freeing of texture data in TFP.
-
-If there happened to be ->Data present, we assertion failed instead
-of handling it correctly.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35234
-Acked-by: Kenneth Graunke 
-
-Most of the surrounding code has changed, so it's unclear if this change
-alone is sufficient to resolve the problem.
-
-diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c 
b/src/mesa/drivers/dri/intel/intel_tex_image.c
-index 269faef..4d0968e 100644
 a/src/mesa/drivers/dri/intel/intel_tex_image.c
-+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
-@@ -822,10 +822,7 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
-texImage = _mesa_get_tex_image(&intel->ctx, texObj, target, level);
-intelImage = intel_texture_image(texImage);
- 
--   if (intelImage->mt) {
--  intel_miptree_release(intel, &intelImage->mt);
--  assert(!texImage->Data);
--   }
-+   ctx->Driver.FreeTextureImageBuffer(ctx, image);
-if (intelObj->mt)
-   intel_miptree_release(intel, &intelObj->mt);
- 
diff --git a/debian/patches/121-i965-fix-border-color.patch 
b/debian/patches/121-i965-fix-border-color.patch
new file mode 100644
index 000..4e3e867
--- /dev/null
+++ b/debian/patches/121-i965-fix-border-color.patch
@@ -0,0 +1,48 @@
+From da33bb5fde8f752c74ca4cd15c067c3a593bac97 Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke 
+Date: Fri, 20 Jan 2012 03:33:40 -0800
+Subject: [PATCH] i965: Fix border color on Sandybridge and Ivybridge.
+
+While reading through the simulator, I found some interesting code that
+looks like it checks the sampler default color pointer against the bound
+set in STATE_BASE_ADDRESS.  On failure, it appears to program it to the
+base address itself.
+
+So I decided to try programming a legitimate bound, and lo and behold,
+border color worked.
+
++92 piglits on Sandybridge.  Also fixes Lightsmark on Ivybridge.
+
+NOTE: This is a candidate for stable release branches.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28924
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38868
+Signed-off-by: Kenneth Graunke 
+Reviewed-by: Yuanhan Liu 
+Reviewed-by: Eric Anholt 
+---
+ src/mesa/drivers/dri/i965/brw_misc_state.c |8 +++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c 
b/src/mesa/drivers/dri/i965/brw_misc_state.c
+index 033c77c..fd3ac13 100644
+--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
 b/src/mesa/driv

xorg-server: Changes to 'ubuntu'

2012-07-19 Thread Bryce Harrington 
 debian/changelog |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 16a364b0e6aab8c55ac752528be9b3e54a15f884
Author: Bryce Harrington 
Date:   Thu Jul 19 11:36:55 2012 -0700

Note a bug # this release will fix.

diff --git a/debian/changelog b/debian/changelog
index 30cc1a7..b7b924c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg-server (2:1.12.99.902-1) UNRELEASED; urgency=low
 
   * New upstream release snapshot (on the way to 1.13).
+- Fixes QT5 app segfaults (LP: #1015292)
   * Bump minimum required abi, randr, dri2 and gl protos.
   * Refreshed patches to apply on x1.13
   * Remove patches merged upstream:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srvb8-00049e...@vasks.debian.org

[bts-link] source package xorg-server

2012-07-19 Thread bts-link-upstream 
#
# bts-link upstream status pull for source package xorg-server
# see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html
#

user bts-link-upstr...@lists.alioth.debian.org

# remote status report for #681286 (http://bugs.debian.org/681286)
# Bug title: nouveau: text gets mangled in iceweasal
#  * https://bugs.freedesktop.org/show_bug.cgi?id=47266
#  * remote status changed: (?) -> REOPENED
usertags 681286 + status-REOPENED

# remote status report for #681265 (http://bugs.debian.org/681265)
# Bug title: xorg: Segfault at address 0x48 via dri2. radeon driver. r600
#  * https://bugs.freedesktop.org/show_bug.cgi?id=50019
#  * remote status changed: (?) -> RESOLVED
#  * remote resolution changed: (?) -> FIXED
#  * closed upstream
tags 681265 + fixed-upstream
usertags 681265 + status-RESOLVED resolution-FIXED

# remote status report for #681286 (http://bugs.debian.org/681286)
# Bug title: nouveau: text gets mangled in iceweasal
#  * https://bugs.freedesktop.org/show_bug.cgi?id=47266
#  * remote status changed: (?) -> REOPENED
usertags 681286 + status-REOPENED

thanks


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20120719164045.3284.47534.btsl...@busoni.debian.org

Bug#675977: Fixing this bug would enable 'standard' gnome-shell graphics for Debian guests under VMWare Fusion

2012-07-19 Thread Andrew C. Morrow 
With a clean install of Debian unstable, I was able to get gnome-shell
to work in 'standard' graphics mode (meaning not 'fallback') under
VMWare Fusion tech preview by simply recompiling this driver from
source with the suggested fix (libxatracker-dev installed). All of the
other components (mesa, etc.) are already built correctly and of the
required version in unstable. Fixing this bug would mean that Debian
guests would automatically support gnome-shell standard mode in
VMWare.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/ca+acj4f3e4zb25illqtdo0yfu2rvxpj2g-cachcsjh5xcsd...@mail.gmail.com

Bug#682106: xserver-xorg: The log files to see itself for more info

2012-07-19 Thread Braun Gábor 
Package: xserver-xorg
Version: 1:7.5+8+squeeze1
Severity: minor


The end of /var/log/Xorg.0.log
(in a non-working setup):

Fatal server error:
no screens found

Please consult the The X.Org Foundation support 
 at http://wiki.x.org
 for help. 
Please also check the log file at "/var/log/Xorg.0.log" for additional 
information.



This bug is about the last sentence:
It doesn't make sense to ask to check itself in the log file.
One is probably doing exactly that when one reads the sentence.

Best wishes,

Gábor Braun

-- Package-specific info:
X server symlink status:

lrwxrwxrwx 1 root root 13 Dec 23  2009 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1889472 Oct 29  2011 /usr/bin/Xorg

VGA-compatible devices on PCI bus:
--
02:00.0 VGA compatible controller [0300]: NVIDIA Corporation C79 [GeForce 
9400M] [10de:0863] (rev b1)

/etc/X11/xorg.conf does not exist.

Contents of /etc/X11/xorg.conf.d:
-
total 8
-rw-r--r-- 1 root root  126 Jun 12  2010 10local-display-nouveau.conf
-rw-r--r-- 1 root root 1566 Aug 27  2011 90local-touchpad.conf

/etc/modprobe.d contains no KMS configuration files.

Kernel version (/proc/version):
---
Linux version 2.6.32-5-amd64 (Debian 2.6.32-45) (da...@debian.org) (gcc version 
4.3.5 (Debian 4.3.5-4) ) #1 SMP Sun May 6 04:00:17 UTC 2012

Xorg X server log files on system:
--
-rw-r--r-- 1 root root 25113 Jul 19 13:07 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file (/var/log/Xorg.0.log):
-

X.Org X Server 1.7.7
Release Date: 2010-05-04
X Protocol Version 11, Revision 0
Build Operating System: Linux 3.0.0-1-amd64 x86_64 Debian
Current Operating System: Linux gabor 2.6.32-5-amd64 #1 SMP Sun May 6 04:00:17 
UTC 2012 x86_64
Kernel command line: BOOT_IMAGE=/boot/vmlinuz-2.6.32-5-amd64 
root=UUID=40f5d3a4-ed3c-45f8-b4f8-f691bfb6b11a ro
Build Date: 29 October 2011  06:58:14PM
xorg-server 2:1.7.7-14 (Julien Cristau ) 
Current version of pixman: 0.26.0
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/Xorg.0.log", Time: Thu Jul 19 09:37:35 2012
(==) Using config directory: "/etc/X11/xorg.conf.d"
(==) Using system config directory "/usr/share/X11/xorg.conf.d"
(==) No Layout section.  Using the first Screen section.
(==) No screen section available. Using defaults.
(**) |-->Screen "Default Screen Section" (0)
(**) |   |-->Monitor ""
(==) No device specified for screen "Default Screen Section".
Using the first device section listed.
(**) |   |-->Device "Default screen"
(==) No monitor specified for screen "Default Screen Section".
Using a default monitor configuration.
(==) Automatically adding devices
(==) Automatically enabling devices
(WW) The directory "/usr/share/fonts/X11/cyrillic" does not exist.
Entry deleted from font path.
(==) FontPath set to:
/usr/share/fonts/X11/misc,
/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,
built-ins
(==) ModulePath set to "/usr/lib/xorg/modules"
(II) The server relies on udev to provide the list of input devices.
If no devices become available, reconfigure udev or disable 
AutoAddDevices.
(II) Loader magic: 0x7c8a40
(II) Module ABI versions:
X.Org ANSI C Emulation: 0.4
X.Org Video Driver: 6.0
X.Org XInput driver : 7.0
X.Org Server Extension : 2.0
(++) using VT number 7

(--) PCI: (0:0:3:5) 10de:0aa3:10de:cb79 NVIDIA Corporation MCP79 Co-processor 
rev 177, Mem @ 0x9340/524288
(--) PCI:*(0:2:0:0) 10de:0863:106b:00b9 NVIDIA Corporation C79 [GeForce 9400M] 
rev 177, Mem @ 0x9200/16777216, 0x8000/268435456, 0x9000/33554432, 
I/O @ 0x1000/128, BIOS @ 0x/131072
(II) Open ACPI successful (/var/run/acpid.socket)
(II) LoadModule: "extmod"
(II) Loading /usr/lib/xorg/modules/extensions/libextmod.so
(II) Module extmod: vendor="X.Org Foundation"
compiled for 1.7.7, module version = 1.0.0
Module class: X.Org Server Extension
ABI class: X.Org Server Extension, version 2.0
(II) Loading extension SELinux
(II) Loading extension MIT-SCREEN-SAVER
(II) Loading extension XFree86-VidModeExtension
(II) Loading extension XFree86-DGA
(II) Loading extension DPMS
(II) Loading extension XVideo
(II) Loading extension XVideo-MotionCompensation
(II) Loading extension X-Resource
(II) LoadModule: "dbe"
(II) Loadin

xserver-xorg-video-tdfx: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
 debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 47ee2707b5ef76acad1593c1d0d643646c1a80d9
Author: Maarten Lankhorst 
Date:   Thu Jul 19 14:01:58 2012 +0200

Refresh patch to build on x1.13

diff --git a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff 
b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
index 28dd4ed..588f513 100644
--- a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
+++ b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
@@ -6,12 +6,12 @@
TDFXTRACE("TDFXValidMode start\n");
 -  if ((mode->HDisplay>2048) || (mode->VDisplay>1536)) 
 +  if (mode->HDisplay>2048) {
-+xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution 
%d"
++xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with horizontal 
resolution %d"
 +   " exceeding maximum of 2048\n", mode->HDisplay);
  return MODE_BAD;
 +  }
 +  if (mode->VDisplay>1536) {
-+xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with vertical resolution %d"
++xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with vertical 
resolution %d"
 +   " exceeding maximum of 1536\n", mode->VDisplay);
 +return MODE_BAD;
 +  }
@@ -22,7 +22,7 @@
  return MODE_OK;
  break;
default:
-+xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with unsupported"
++xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with unsupported"
 + " interlace flag\n");
  return MODE_BAD;
  break;
@@ -31,7 +31,7 @@
/* In clock doubled mode widths must be divisible by 16 instead of 8 */
 -  if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16))
 +  if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16)) {
-+xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution 
%d"
++xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with horizontal 
resolution %d"
 +   " not divisibile by 16 and clock %d greater than %d\n",
 +   mode->HDisplay, mode->Clock, TDFX2XCUTOFF);
  return MODE_BAD;


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srpqp-0002k5...@vasks.debian.org

xserver-xorg-video-trident: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
 ChangeLog  |  924 +
 configure.ac   |   59 +--
 debian/README.source   |   24 -
 debian/changelog   |   29 +
 debian/compat  |2 
 debian/control |   22 -
 debian/patches/series  |1 
 debian/rules   |  100 -
 debian/watch   |1 
 debian/xsfbs/repack.sh |   32 -
 debian/xsfbs/xsfbs.mk  |  285 ---
 debian/xsfbs/xsfbs.sh  |  622 
 man/Makefile.am|   22 -
 man/trident.man|1 
 src/Makefile.am|1 
 src/blade_accel.c  |   11 
 src/blade_accel_exa.c  |   21 -
 src/compat-api.h   |   99 +
 src/image_accel.c  |   12 
 src/trident.h  |   18 
 src/trident_accel.c|   11 
 src/trident_bank.c |   15 
 src/trident_dac.c  |5 
 src/trident_dga.c  |   27 -
 src/trident_driver.c   |  178 +
 src/trident_i2c.c  |3 
 src/trident_shadow.c   |   11 
 src/trident_video.c|   42 +-
 src/tridenthelper.c|1 
 src/tvga_dac.c |1 
 src/xp4_accel.c|   11 
 src/xp4_accel_exa.c|   13 
 src/xp_accel.c |   12 
 33 files changed, 1344 insertions(+), 1272 deletions(-)

New commits:
commit 267ae3ea7588fbea4c01c95f7c504479a2f771bd
Author: Maarten Lankhorst 
Date:   Thu Jul 19 13:22:07 2012 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index b4b9ee5..27c8bf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit 3098fe7193cbfe4a885a60b93e71796b70e4fa2a
+Author: Dave Airlie 
+Date:   Tue Jul 17 16:05:09 2012 +1000
+
+xf86-video-trident: bump to version 1.3.6
+
+Signed-off-by: Dave Airlie 
+
+commit f02709607cb353db1e89a909ff01a6941f535ab4
+Author: Dave Airlie 
+Date:   Mon Jul 16 03:17:51 2012 +0100
+
+trident: add support for building without XAA
+
+fix build for removal of XAA from server.
+
+Signed-off-by: Dave Airlie 
+
+commit 177c93486647e71c088ac42697e34c47664eb666
+Author: Dave Airlie 
+Date:   Wed Jun 6 11:49:16 2012 +0100
+
+trident: convert to new compat API.
+
+Signed-off-by: Dave Airlie 
+
+commit 2301879bc334fd9f44cc7f23be613b5b4533568a
+Author: Dave Airlie 
+Date:   Wed Jun 6 11:40:26 2012 +0100
+
+trident: drop lots of xf86PciInfo.h includes
+
+Signed-off-by: Dave Airlie 
+
+commit f481290e6dbd73b484cad3e8583031c6e2ccb555
+Author: Adam Jackson 
+Date:   Wed Apr 18 10:48:07 2012 -0400
+
+Use DamageRegion for shadow damage
+
+The 'damage' member is an ancient compatibility hack I want to destroy.
+
+Signed-off-by: Adam Jackson 
+
 commit 16816e99bacbd8dfc51a2deba541a72fb27f156a
 Author: Alan Coopersmith 
 Date:   Fri Mar 23 20:02:50 2012 -0700
diff --git a/debian/changelog b/debian/changelog
index 4f06e20..f68529a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-trident (1:1.3.6-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Thu, 19 Jul 2012 
13:21:51 +0200
+
 xserver-xorg-video-trident (1:1.3.5-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 9623194..97a15c2 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  x11proto-fonts-dev,
  x11proto-randr-dev,
  x11proto-render-dev,
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git
 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder

commit 3098fe7193cbfe4a885a60b93e71796b70e4fa2a
Author: Dave Airlie 
Date:   Tue Jul 17 16:05:09 2012 +1000

xf86-video-trident: bump to version 1.3.6

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index 31bc459..eeb895e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-trident],
-[1.3.5],
+[1.3.6],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-trident])
 AC_CONFIG_SRCDIR([Makefile.am])

commit f02709607cb353db1e89a909ff01a6941f535ab4
Author: Dave Airlie 
Date:   Mon Jul 16 03:17:51 2012 +0100

trident: add support for building without XAA

fix build for removal of XAA from server.

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index cab1fb7..31bc459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,24 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
   [#include "xorg-server.h"])
 CPPFLAGS="$SAVE_CPPFLAGS"
 
+AC_ARG_ENABLE(xaa,
+  AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA) 
[default=auto]]),
+  [XAA="$enableva

xserver-xorg-video-trident: Changes to 'upstream-experimental'

2012-07-19 Thread Maarten Lankhorst 
 configure.ac  |   59 ++--
 man/Makefile.am   |   22 +-
 man/trident.man   |1 
 src/Makefile.am   |1 
 src/blade_accel.c |   11 ++-
 src/blade_accel_exa.c |   21 +
 src/compat-api.h  |   99 +++
 src/image_accel.c |   12 ++-
 src/trident.h |   18 +++--
 src/trident_accel.c   |   11 ++-
 src/trident_bank.c|   15 +---
 src/trident_dac.c |5 -
 src/trident_dga.c |   27 ---
 src/trident_driver.c  |  178 +-
 src/trident_i2c.c |3 
 src/trident_shadow.c  |   11 +--
 src/trident_video.c   |   42 +--
 src/tridenthelper.c   |1 
 src/tvga_dac.c|1 
 src/xp4_accel.c   |   11 ++-
 src/xp4_accel_exa.c   |   13 +--
 src/xp_accel.c|   12 ++-
 22 files changed, 367 insertions(+), 207 deletions(-)

New commits:
commit 3098fe7193cbfe4a885a60b93e71796b70e4fa2a
Author: Dave Airlie 
Date:   Tue Jul 17 16:05:09 2012 +1000

xf86-video-trident: bump to version 1.3.6

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index 31bc459..eeb895e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-trident],
-[1.3.5],
+[1.3.6],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-trident])
 AC_CONFIG_SRCDIR([Makefile.am])

commit f02709607cb353db1e89a909ff01a6941f535ab4
Author: Dave Airlie 
Date:   Mon Jul 16 03:17:51 2012 +0100

trident: add support for building without XAA

fix build for removal of XAA from server.

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index cab1fb7..31bc459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,24 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
   [#include "xorg-server.h"])
 CPPFLAGS="$SAVE_CPPFLAGS"
 
+AC_ARG_ENABLE(xaa,
+  AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA) 
[default=auto]]),
+  [XAA="$enableval"],
+  [XAA=auto])
+if test "x$XAA" != xno; then
+save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+CFLAGS=$XORG_CFLAGS
+CPPFLAGS="$XORG_CFLAGS"
+AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
+
 if test "x$XSERVER_LIBPCIACCESS" = xyes; then
 PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
 XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
diff --git a/src/blade_accel.c b/src/blade_accel.c
index b8954e6..1645e1d 100644
--- a/src/blade_accel.c
+++ b/src/blade_accel.c
@@ -38,6 +38,7 @@
 #include "trident.h"
 #include "trident_regs.h"
 
+#ifdef HAVE_XAA_H
 #include "xaarop.h"
 #include "xaalocal.h"
 
@@ -145,10 +146,12 @@ BladeInitializeAccelerator(ScrnInfoPtr pScrn)
 #endif
 BLADE_OUT(0x216C, 0);
 }
+#endif
 
 Bool
 BladeXaaInit(ScreenPtr pScreen)
 {
+#ifdef HAVE_XAA_H
 XAAInfoRecPtr infoPtr;
 ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
@@ -247,8 +250,12 @@ BladeXaaInit(ScreenPtr pScreen)
 infoPtr->ImageWriteRange = 0x1;
 
 return(XAAInit(pScreen, infoPtr));
+#else
+return FALSE;
+#endif
 }
 
+#ifdef HAVE_XAA_H
 static void
 BladeSync(ScrnInfoPtr pScrn)
 {
@@ -701,3 +708,4 @@ static void BladeSubsequentImageWriteRect(
 BLADE_OUT(0x2108, y<<16 | (x&0xfff));
 BLADE_OUT(0x210C, ((y+h-1)&0xfff)<<16 | ((x+w-1)&0xfff));
 }
+#endif
diff --git a/src/image_accel.c b/src/image_accel.c
index 9a9388d..4dc13ff 100644
--- a/src/image_accel.c
+++ b/src/image_accel.c
@@ -38,6 +38,7 @@
 #include "trident.h"
 #include "trident_regs.h"
 
+#ifdef HAVE_XAA_H
 #include "xaarop.h"
 #include "xaalocal.h"
 
@@ -93,6 +94,7 @@ static void ImageSubsequentScanlineCPUToScreenColorExpandFill(
int y, int w, int h, int skipleft);
 static void ImageSubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno);
 
+
 static void
 ImageInitializeAccelerator(ScrnInfoPtr pScrn)
 {
@@ -128,10 +130,12 @@ ImageInitializeAccelerator(ScrnInfoPtr pScrn)
 pTrident->Clipping = FALSE;
 pTrident->DstEnable = FALSE;
 }
+#endif
 
 Bool
 ImageAccelInit(ScreenPtr pScreen)
 {
+#ifdef HAVE_XAA_H
 XAAInfoRecPtr infoPtr;
 ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
@@ -244,8 +248,12 @@ ImageAccelInit(ScreenPtr pScreen)
   }
 
 return(XAAInit(pScreen, infoPtr));
+#else
+return FALSE;
+#endif
 }
 
+#ifdef HAVE_XAA_H
 static void
 ImageSync(ScrnInfoPtr pScrn)
 {
@@ -636,3 +644,4 @@ ImageSubsequentImageWriteScanline(ScrnInfoPtr pScrn, int 
bufno)
 if (!pTrident->h)
ImageSync(pScrn);
 }
+#endif
diff --git a/src/trident.h b/src/trident.h
ind

xserver-xorg-video-tdfx: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
 .gitignore |   70 +
 COPYING|   27 +-
 ChangeLog  |  361 
 Makefile.am|   11 
 configure.ac   |   73 +++--
 debian/README.source   |   24 -
 debian/changelog   |   28 ++
 debian/compat  |2 
 debian/control |   22 -
 debian/rules   |  100 ---
 debian/watch   |1 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 man/.gitignore |2 
 man/Makefile.am|   59 +---
 man/tdfx.man   |1 
 src/.gitignore |6 
 src/Makefile.am|1 
 src/compat-api.h   |  105 
 src/tdfx.h |   22 +
 src/tdfx_accel.c   |   32 +-
 src/tdfx_dga.c |   24 +
 src/tdfx_dri.c |   83 +++---
 src/tdfx_driver.c  |  149 +--
 src/tdfx_hwcurs.c  |4 
 src/tdfx_priv.c|   14 -
 src/tdfx_sli.c |5 
 src/tdfx_video.c   |   38 +-
 29 files changed, 883 insertions(+), 1320 deletions(-)

New commits:
commit ec99e88950b70d156288aced2cae86fba923dffd
Author: Maarten Lankhorst 
Date:   Thu Jul 19 13:19:28 2012 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 6105da4..8da7ce7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit a1037f73cf5da0ee3fec1867a5f20305d9267e63
+Author: Dave Airlie 
+Date:   Tue Jul 17 16:05:09 2012 +1000
+
+xf86-video-tdfx: bump to version 1.4.5
+
+Signed-off-by: Dave Airlie 
+
+commit 42706433782656adcf831588cf9dde203e50402b
+Author: Dave Airlie 
+Date:   Mon Jul 16 19:01:23 2012 +1000
+
+tdfx: fix build against XAA-less server.
+
+Signed-off-by: Dave Airlie 
+
+commit abeb6ba8edac356b510ae6e8427c3cb8a0cf6e7a
+Author: Dave Airlie 
+Date:   Wed Jun 6 19:34:08 2012 +0100
+
+tdfx: port to new compat API
+
+Signed-off-by: Dave Airlie 
+
 commit 98d24dd99052322c71d1676e6d66c2c724f6066a
 Author: Alan Coopersmith 
 Date:   Fri Mar 23 19:59:33 2012 -0700
diff --git a/debian/changelog b/debian/changelog
index ead8fb0..e1d5ee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tdfx (1:1.4.5-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Thu, 19 Jul 2012 
13:18:48 +0200
+
 xserver-xorg-video-tdfx (1:1.4.4-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 49371ec..0d58405 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  libdrm-dev (>> 2.0) [!hurd-i386],
  x11proto-xf86dri-dev,
  quilt,
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tdfx
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tdfx.git
 

commit a1037f73cf5da0ee3fec1867a5f20305d9267e63
Author: Dave Airlie 
Date:   Tue Jul 17 16:05:09 2012 +1000

xf86-video-tdfx: bump to version 1.4.5

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index ff9f9ff..5df5818 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-tdfx],
-[1.4.4],
+[1.4.5],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-tdfx])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 42706433782656adcf831588cf9dde203e50402b
Author: Dave Airlie 
Date:   Mon Jul 16 19:01:23 2012 +1000

tdfx: fix build against XAA-less server.

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index 3ccb489..ff9f9ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,24 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
 fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
+AC_ARG_ENABLE(xaa,
+  AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA) 
[default=auto]]),
+  [XAA="$enableval"],
+  [XAA=auto])
+if test "x$XAA" != xno; then
+save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+CFLAGS=$XORG_CFLAGS
+CPPFLAGS="$XORG_CFLAGS"
+AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
+
 AC_SUBST([moduledir])
 
 DRIVER_NAME=tdfx
diff --git a/src/tdfx.h b/src/tdfx.h
index 64506bc..7782473 100644
--- a/src/tdfx.h
+++ b/src/tdfx.h
@@ -120,7 +120,10 @@ extern void FillPrivateDRI(TDFXPtr pTDFX, TDFXDRIPtr 
pTDFXDRI);
 #define TDFXTRACEREG if(0) ErrorF
 #endif
 
+#ifdef HAVE_XAA_H
 #include "xaa.h"
+#endif
+#include "xf86fbman.h"
 #include "xf86Cursor.h"
 #include "compat-api.h"
 
@@ -226,7 +229,9 @@ typedef struct _TDFXRec {
   BoxRec

xserver-xorg-video-tdfx: Changes to 'upstream-experimental'

2012-07-19 Thread Maarten Lankhorst 
 .gitignore|   70 -
 COPYING   |   27 +++--
 ChangeLog |   76 --
 Makefile.am   |   11 +-
 README|   20 +++
 configure.ac  |   73 --
 man/.gitignore|2 
 man/Makefile.am   |   59 ---
 man/tdfx.man  |3 
 src/.gitignore|6 -
 src/Makefile.am   |1 
 src/compat-api.h  |  105 
 src/tdfx.h|   22 +++-
 src/tdfx_accel.c  |   32 --
 src/tdfx_dga.c|   24 +++-
 src/tdfx_dri.c|   83 
 src/tdfx_driver.c |  274 +++---
 src/tdfx_hwcurs.c |4 
 src/tdfx_priv.c   |   50 +
 src/tdfx_sli.c|5 
 src/tdfx_video.c  |   38 +++
 21 files changed, 517 insertions(+), 468 deletions(-)

New commits:
commit a1037f73cf5da0ee3fec1867a5f20305d9267e63
Author: Dave Airlie 
Date:   Tue Jul 17 16:05:09 2012 +1000

xf86-video-tdfx: bump to version 1.4.5

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index ff9f9ff..5df5818 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-tdfx],
-[1.4.4],
+[1.4.5],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-tdfx])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 42706433782656adcf831588cf9dde203e50402b
Author: Dave Airlie 
Date:   Mon Jul 16 19:01:23 2012 +1000

tdfx: fix build against XAA-less server.

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index 3ccb489..ff9f9ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,24 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
 fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
+AC_ARG_ENABLE(xaa,
+  AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA) 
[default=auto]]),
+  [XAA="$enableval"],
+  [XAA=auto])
+if test "x$XAA" != xno; then
+save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+CFLAGS=$XORG_CFLAGS
+CPPFLAGS="$XORG_CFLAGS"
+AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
+
 AC_SUBST([moduledir])
 
 DRIVER_NAME=tdfx
diff --git a/src/tdfx.h b/src/tdfx.h
index 64506bc..7782473 100644
--- a/src/tdfx.h
+++ b/src/tdfx.h
@@ -120,7 +120,10 @@ extern void FillPrivateDRI(TDFXPtr pTDFX, TDFXDRIPtr 
pTDFXDRI);
 #define TDFXTRACEREG if(0) ErrorF
 #endif
 
+#ifdef HAVE_XAA_H
 #include "xaa.h"
+#endif
+#include "xf86fbman.h"
 #include "xf86Cursor.h"
 #include "compat-api.h"
 
@@ -226,7 +229,9 @@ typedef struct _TDFXRec {
   BoxRec prevBlitDest;
   TDFXRegRec SavedReg;
   TDFXRegRec ModeReg;
+#ifdef HAVE_XAA_H
   XAAInfoRecPtr AccelInfoRec;
+#endif
   xf86CursorInfoPtr CursorInfoRec;
   CloseScreenProcPtr CloseScreen;
   Bool usePIO;
diff --git a/src/tdfx_accel.c b/src/tdfx_accel.c
index 5767835..65933b4 100644
--- a/src/tdfx_accel.c
+++ b/src/tdfx_accel.c
@@ -15,14 +15,16 @@
 #include "xf86PciInfo.h"
 
 /* Drivers that use XAA need this */
-#include "xaa.h"
+#ifdef HAVE_XAA_H
 #include "xaalocal.h"
+#endif
 #include "xf86fbman.h"
 
 #include "miline.h"
 
 #include "tdfx.h"
 
+#ifdef HAVE_XAA_H
 #ifdef TDFX_DEBUG_CMDS
 static int cmdCnt=0;
 static int lastAddr=0;
@@ -77,11 +79,14 @@ static void 
TDFXSubsequentCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
  int skipleft);
 static void TDFXSubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno);
 
+#endif
 void
 TDFXNeedSync(ScrnInfoPtr pScrn) {
   TDFXPtr pTDFX = TDFXPTR(pScrn);
   pTDFX->syncDone=FALSE;
+#ifdef HAVE_XAA_H
   pTDFX->AccelInfoRec->NeedToSync = TRUE;
+#endif
 }
 
 void
@@ -203,9 +208,11 @@ TDFXSetLFBConfig(TDFXPtr pTDFX) {
   }
 }
 
+
 Bool
 TDFXAccelInit(ScreenPtr pScreen)
 {
+#ifdef HAVE_XAA_H
   XAAInfoRecPtr infoPtr;
   ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
   TDFXPtr pTDFX = TDFXPTR(pScrn);
@@ -302,6 +309,9 @@ TDFXAccelInit(ScreenPtr pScreen)
 
   /* Fill in acceleration functions */
   return XAAInit(pScreen, infoPtr);
+#else
+  return FALSE;
+#endif
 }
 
 static void TDFXMakeRoomNoProp(TDFXPtr pTDFX, int size) {
@@ -343,6 +353,9 @@ void TDFXSync(ScrnInfoPtr pScrn)
   pTDFX->PciCnt=stat&0x1F;
 }
 
+#ifdef HAVE_XAA_H
+
+
 static void
 TDFXMatchState(TDFXPtr pTDFX)
 {
@@ -933,3 +946,4 @@ static void TDFXSubsequentColorExpandScanline(ScrnInfoPtr 
pScrn, int bufno)
   }
 }
 
+#endif
diff --git a/src/tdfx_dga.c b/src/tdfx_dga.c
index 3972bdd..e83f38d 100644
--- a/src/tdfx_dga.c
+++ b/src/tdfx_dga.c
@@ -15,10 +15,12 @@ static Bool TDFX_OpenFramebuffer(ScrnInfoPtr, char **, 
unsigned char **,
 static Bool TDFX_SetMode(ScrnInfoPtr, DGAModePtr);
 static int  TDFX_GetViewport(

xserver-xorg-video-sisusb: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
 ChangeLog  |  788 +
 configure.ac   |   44 +-
 debian/README.source   |   24 -
 debian/changelog   |   28 +
 debian/compat  |2 
 debian/control |   23 -
 debian/patches/series  |1 
 debian/rules   |  103 --
 debian/watch   |1 
 debian/xsfbs/repack.sh |   32 -
 debian/xsfbs/xsfbs.mk  |  285 -
 debian/xsfbs/xsfbs.sh  |  622 --
 man/Makefile.am|   34 --
 man/sisusb.man |   20 -
 src/Makefile.am|3 
 src/compat-api.h   |   99 ++
 src/sisusb.h   |   17 -
 src/sisusb_accel.c |2 
 src/sisusb_cursor.c|6 
 src/sisusb_dac.c   |   16 
 src/sisusb_driver.c|  136 
 src/sisusb_driver.h|   16 
 src/sisusb_init.c  |6 
 src/sisusb_opt.c   |2 
 src/sisusb_osdef.h |   12 
 src/sisusb_types.h |4 
 src/sisusb_utility.c   |   48 +-
 src/sisusb_vga.c   |2 
 src/sisusb_video.c |   12 
 29 files changed, 1112 insertions(+), 1276 deletions(-)

New commits:
commit 62b81fa6209d796d7f5e8d1b360a583378d51ace
Author: Maarten Lankhorst 
Date:   Thu Jul 19 13:16:16 2012 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index ce5e334..5e1e0a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,247 @@
+commit 894814fe2e54517c3b9a728238542a409bcb783a
+Author: Dave Airlie 
+Date:   Tue Jul 17 16:05:09 2012 +1000
+
+xf86-video-sisusb: bump to version 0.9.6
+
+Signed-off-by: Dave Airlie 
+
+commit 1a278211f732a035cf08b4d2d614cb3b8919f89d
+Author: Dave Airlie 
+Date:   Sun Jul 15 20:01:57 2012 +1000
+
+sisub: don't require xaa
+
+it doesn't use xaa at all.
+
+Signed-off-by: Dave Airlie 
+
+commit a5904352bd7f378cebfe1d4d20966143f656bae3
+Author: Dave Airlie 
+Date:   Sun Jul 15 20:01:30 2012 +1000
+
+sisusb: fix build since compat-api
+
+Signed-off-by: Dave Airlie 
+
+commit 414c3ae620f48d31d264b7de0141d5cd4b5a1893
+Author: Dave Airlie 
+Date:   Mon Jul 2 13:23:21 2012 +0100
+
+sisusb: bump to 0.9.5 release
+
+Signed-off-by: Dave Airlie 
+
+commit de082dae48030b8a5c1cc2474fe3008170d62eea
+Author: Dave Airlie 
+Date:   Wed Jun 6 12:28:19 2012 +0100
+
+sisusb: add support for compat API.
+
+Signed-off-by: Dave Airlie 
+
+commit 02451944ba73887db9803f44a1826059d9105963
+Author: Jeremy Huddleston 
+Date:   Tue Nov 1 23:05:45 2011 -0700
+
+Build fix for -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
+
+Signed-off-by: Jeremy Huddleston 
+
+commit 2901c9cf5e842cef199676e76cd0ffa532a76a9b
+Author: Jeremy Huddleston 
+Date:   Tue Nov 1 22:57:33 2011 -0700
+
+Use unsigned long rather than deprecated IOADDRESS
+
+Signed-off-by: Jeremy Huddleston 
+
+commit 6272e69d8519c43293192b48ff39c8b3a84635d3
+Author: Jeremy Huddleston 
+Date:   Fri Oct 7 12:45:00 2011 -0700
+
+Fix build failures with recent server changes to swapl and swaps
+
+Signed-off-by: Jeremy Huddleston 
+
+commit dc6d77656d14853b462a8792007e73c5dc07a4b1
+Author: Jeremy Huddleston 
+Date:   Fri Oct 7 12:45:50 2011 -0700
+
+Also use calloc rather than xcalloc
+
+Signed-off-by: Jeremy Huddleston 
+
+commit 3dc05f643235e78c2b9148c052a6bc45290fb34a
+Author: Jeremy Huddleston 
+Date:   Sat Sep 24 14:02:12 2011 -0700
+
+Use malloc/free rather than xalloc/xfree
+
+Signed-off-by: Jeremy Huddleston 
+
+commit b2fe8b0fd3b9776577a76d79a9c55ff6643040e6
+Author: Jeremy Huddleston 
+Date:   Sat Sep 24 14:00:29 2011 -0700
+
+Include xf86Pci.h for IOADDRESS
+
+My previous commit incorrectly included pciaccess.h
+
+Signed-off-by: Jeremy Huddleston 
+
+commit 91720979dc7e9fe068fd904dd40900ed1d19e03d
+Author: Jeremy Huddleston 
+Date:   Thu Sep 15 14:45:25 2011 -0700
+
+Require libpciaccess
+
+Signed-off-by: Jeremy Huddleston 
+
+commit 4968496bdd96d2351ea2aec05feee41b0612140c
+Author: Jeremy Huddleston 
+Date:   Thu Sep 15 14:42:48 2011 -0700
+
+Add missing include for pciaccess.h
+
+Signed-off-by: Jeremy Huddleston 
+
+commit 241dd519e910d8a07483dc9506ebcbc1fb9c9e0f
+Author: Alan Coopersmith 
+Date:   Sat Jun 4 21:00:03 2011 -0700
+
+Convert sisusb.man from XORG_RAWCPP to using sed like other drivers
+
+Upgrade to util-macros 1.8 for additional man page support
+
+Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+The value of MAN_SUBST is the same for all X.Org packages.
+
+Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+The existing statement can now be removed from the configuration file.
+
+Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+Enables silent rule and use platform appropriate version of sed.
+
+Signed-off-by: Alan Coopersmith 
+Reviewed-by: Gaetan Nadon 
+
+commit 471636eca6e00de7daddfc7785ca90dba1eb0cb1
+Author: Thierry Vig

xserver-xorg-video-sisusb: Changes to 'upstream-experimental'

2012-07-19 Thread Maarten Lankhorst 
 configure.ac |   44 +++-
 man/Makefile.am  |   34 
 man/sisusb.man   |   20 ---
 src/Makefile.am  |3 -
 src/compat-api.h |   99 +
 src/sisusb.h |   17 +-
 src/sisusb_accel.c   |2 
 src/sisusb_cursor.c  |6 +-
 src/sisusb_dac.c |   16 +++---
 src/sisusb_driver.c  |  136 +--
 src/sisusb_driver.h  |   16 +++---
 src/sisusb_init.c|6 +-
 src/sisusb_opt.c |2 
 src/sisusb_osdef.h   |   12 ++--
 src/sisusb_types.h   |4 +
 src/sisusb_utility.c |   48 --
 src/sisusb_vga.c |2 
 src/sisusb_video.c   |   12 ++--
 18 files changed, 270 insertions(+), 209 deletions(-)

New commits:
commit 894814fe2e54517c3b9a728238542a409bcb783a
Author: Dave Airlie 
Date:   Tue Jul 17 16:05:09 2012 +1000

xf86-video-sisusb: bump to version 0.9.6

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index de75eda..a686034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-sisusb],
-[0.9.5],
+[0.9.6],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-sisusb])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 1a278211f732a035cf08b4d2d614cb3b8919f89d
Author: Dave Airlie 
Date:   Sun Jul 15 20:01:57 2012 +1000

sisub: don't require xaa

it doesn't use xaa at all.

Signed-off-by: Dave Airlie 

diff --git a/src/sisusb.h b/src/sisusb.h
index 77f804b..cdd13da 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -86,7 +86,7 @@
 #include "xf86.h"
 #include "xf86Cursor.h"
 #include "xf86cmap.h"
-#include "xaa.h"
+#include "xf86fbman.h"
 
 #define SISUSB_HaveDriverFuncs 0
 

commit a5904352bd7f378cebfe1d4d20966143f656bae3
Author: Dave Airlie 
Date:   Sun Jul 15 20:01:30 2012 +1000

sisusb: fix build since compat-api

Signed-off-by: Dave Airlie 

diff --git a/src/sisusb.h b/src/sisusb.h
index f66b701..77f804b 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -113,6 +113,8 @@
 #include 
 #endif
 
+#include "fb.h"
+
 #include "compat-api.h"
 
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 208cdbe..539b9f1 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -37,7 +37,6 @@
 
 #include "dixstruct.h"
 #include "shadowfb.h"
-#include "fb.h"
 #include "micmap.h"
 #include "mipointer.h"
 #include "mibstore.h"

commit 414c3ae620f48d31d264b7de0141d5cd4b5a1893
Author: Dave Airlie 
Date:   Mon Jul 2 13:23:21 2012 +0100

sisusb: bump to 0.9.5 release

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index 725d6cb..de75eda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-sisusb],
-[0.9.4],
+[0.9.5],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-sisusb])
 AC_CONFIG_SRCDIR([Makefile.am])

commit de082dae48030b8a5c1cc2474fe3008170d62eea
Author: Dave Airlie 
Date:   Wed Jun 6 12:28:19 2012 +0100

sisusb: add support for compat API.

Signed-off-by: Dave Airlie 

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e1735f..1f7e4a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,4 +51,5 @@ sisusb_drv_la_SOURCES = \
  sisusb_vga.c \
  sisusb_video.c \
  sisusb_video.h \
- sisusb_videostr.h
+ sisusb_videostr.h \
+ compat-api.h
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 000..6bc946f
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Dave Airlie 
+ */
+
+/* this file provides API compat between serv

xserver-xorg-video-siliconmotion: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
 ChangeLog  |  231 ++
 README |2 
 configure.ac   |   64 +++--
 debian/README.source   |   24 -
 debian/changelog   |   37 ++
 debian/compat  |2 
 debian/control |   26 --
 debian/copyright   |   55 
 debian/patches/series  |1 
 debian/rules   |  103 
 debian/watch   |1 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 man/Makefile.am|   21 -
 src/Makefile.am|1 
 src/compat-api.h   |   99 +++
 src/smi.h  |6 
 src/smi_crtc.c |6 
 src/smi_driver.c   |   73 +++--
 src/smi_exa.c  |   20 -
 src/smi_output.c   |2 
 src/smi_video.c|   80 +++---
 src/smi_xaa.c  |   12 
 src/smilynx_hw.c   |2 
 25 files changed, 602 insertions(+), 1205 deletions(-)

New commits:
commit f70148406da4863bf00494c1b39d4628e22f6620
Author: Maarten Lankhorst 
Date:   Thu Jul 19 13:13:12 2012 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index d9790da..ccdd0f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-siliconmotion (1:1.7.7-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Thu, 19 Jul 2012 
13:05:33 +0200
+
 xserver-xorg-video-siliconmotion (1:1.7.6-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index bf89342..fff5fe8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  x11proto-fonts-dev,
  quilt,
  xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: 
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-siliconmotion
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder

commit fd9f53f552e4c37efe0fca46d6a8c823fbcb2e96
Author: Maarten Lankhorst 
Date:   Thu Jul 19 13:05:27 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index 937d67a..4ecc5b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+commit 2beb25bd41508ab5e2af39c696485fcb5f0ca7d6
+Author: Dave Airlie 
+Date:   Tue Jul 17 16:05:09 2012 +1000
+
+xf86-video-siliconmotion: bump to version 1.7.7
+
+Signed-off-by: Dave Airlie 
+
+commit 4b4b8e9c047bd34c516ca8ab2b15fd1c541d05d5
+Author: Dave Airlie 
+Date:   Tue Jul 17 14:53:30 2012 +1000
+
+smi: convert to new X server screen conversion apis.
+
+Signed-off-by: Dave Airlie 
+
+commit 1aad7b44e3e141bd8d3e589b7cd410e791050bd0
+Author: Dave Airlie 
+Date:   Tue Jul 17 02:01:07 2012 +0100
+
+smi: port to compat-api for new server.
+
+Signed-off-by: Dave Airlie 
+
+commit 891ea02395079b1480faf701156185ad01405e6d
+Author: Dave Airlie 
+Date:   Tue Jul 17 01:52:45 2012 +0100
+
+smi: fix build against XAA-less server
+
 commit e4660be7c12de53cac57c0b7d4e792a071b4fcfc
 Author: Alan Coopersmith 
 Date:   Fri Mar 23 19:49:14 2012 -0700

commit 2beb25bd41508ab5e2af39c696485fcb5f0ca7d6
Author: Dave Airlie 
Date:   Tue Jul 17 16:05:09 2012 +1000

xf86-video-siliconmotion: bump to version 1.7.7

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index f5e1dfe..da5ecfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-siliconmotion],
-[1.7.6],
+[1.7.7],
 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion],
 [xf86-video-siliconmotion])
 

commit 4b4b8e9c047bd34c516ca8ab2b15fd1c541d05d5
Author: Dave Airlie 
Date:   Tue Jul 17 14:53:30 2012 +1000

smi: convert to new X server screen conversion apis.

Signed-off-by: Dave Airlie 

diff --git a/src/smi_driver.c b/src/smi_driver.c
index 604b675..4794571 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1887,7 +1887,7 @@ SMI_FreeScreen(FREE_SCREEN_ARGS_DECL)
 static Bool
 SMI_SaveScreen(ScreenPtr pScreen, int mode)
 {
-ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 
 ENTER();
 
diff --git a/src/smi_exa.c b/src/smi_exa.c
index 5103924..70298ed 100644
--- a/src/smi_exa.c
+++ b/src/smi_exa.c
@@ -91,7 +91,7 @@ SMI_DoneComposite(PixmapPtr pDst);
 Bool
 SMI_EXAInit(ScreenPtr pScreen)
 {
-ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 SMIPtr pSmi = SMIPTR(pScrn);

 ENTER();
@@ -187,7 +187,7 @@ SMI_EXAInit(ScreenPtr pScreen)
 static void
 SMI_EXASync(ScreenPtr pScreen, int marker)
 {
-ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+Sc

xserver-xorg-video-siliconmotion: Changes to 'upstream-experimental'

2012-07-19 Thread Maarten Lankhorst 
 README   |2 -
 configure.ac |   64 +--
 man/Makefile.am  |   21 ++-
 src/Makefile.am  |1 
 src/compat-api.h |   99 +++
 src/smi.h|6 +++
 src/smi_crtc.c   |6 ++-
 src/smi_driver.c |   73 ++--
 src/smi_exa.c|   20 +--
 src/smi_output.c |2 -
 src/smi_video.c  |   80 +---
 src/smi_xaa.c|   12 ++
 src/smilynx_hw.c |2 -
 13 files changed, 257 insertions(+), 131 deletions(-)

New commits:
commit 2beb25bd41508ab5e2af39c696485fcb5f0ca7d6
Author: Dave Airlie 
Date:   Tue Jul 17 16:05:09 2012 +1000

xf86-video-siliconmotion: bump to version 1.7.7

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index f5e1dfe..da5ecfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-siliconmotion],
-[1.7.6],
+[1.7.7],
 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion],
 [xf86-video-siliconmotion])
 

commit 4b4b8e9c047bd34c516ca8ab2b15fd1c541d05d5
Author: Dave Airlie 
Date:   Tue Jul 17 14:53:30 2012 +1000

smi: convert to new X server screen conversion apis.

Signed-off-by: Dave Airlie 

diff --git a/src/smi_driver.c b/src/smi_driver.c
index 604b675..4794571 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1887,7 +1887,7 @@ SMI_FreeScreen(FREE_SCREEN_ARGS_DECL)
 static Bool
 SMI_SaveScreen(ScreenPtr pScreen, int mode)
 {
-ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 
 ENTER();
 
diff --git a/src/smi_exa.c b/src/smi_exa.c
index 5103924..70298ed 100644
--- a/src/smi_exa.c
+++ b/src/smi_exa.c
@@ -91,7 +91,7 @@ SMI_DoneComposite(PixmapPtr pDst);
 Bool
 SMI_EXAInit(ScreenPtr pScreen)
 {
-ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 SMIPtr pSmi = SMIPTR(pScrn);

 ENTER();
@@ -187,7 +187,7 @@ SMI_EXAInit(ScreenPtr pScreen)
 static void
 SMI_EXASync(ScreenPtr pScreen, int marker)
 {
-ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 
 ENTER();
 
@@ -222,7 +222,7 @@ static Bool
 SMI_PrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir, int ydir,
int alu, Pixel planemask)
 {
-ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pDstPixmap->drawable.pScreen);
 SMIPtr pSmi = SMIPTR(pScrn);
 int src_pitch, dst_pitch;
 unsigned long src_offset, dst_offset;
@@ -289,7 +289,7 @@ static void
 SMI_Copy(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX,
 int dstY, int width, int height)
 {
-ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pDstPixmap->drawable.pScreen);
 SMIPtr pSmi = SMIPTR(pScrn);
 
 ENTER();
@@ -367,7 +367,7 @@ CARD8 SMI_SolidRop[16] =/* table stolen from KAA */
 static Bool
 SMI_PrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
 {
-ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
 SMIPtr pSmi = SMIPTR(pScrn);
 int dst_pitch;
 unsigned long dst_offset;
@@ -437,7 +437,7 @@ SMI_PrepareSolid(PixmapPtr pPixmap, int alu, Pixel 
planemask, Pixel fg)
 static void
 SMI_Solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
 {
-ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
 SMIPtr pSmi = SMIPTR(pScrn);
 int w, h;
 
@@ -509,7 +509,7 @@ Bool
 SMI_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
   char *src, int src_pitch)
 {
-ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
 SMIPtr pSmi = SMIPTR(pScrn);
 int dst_pixelpitch, src_pixelpitch, align, aligned_pitch;
 unsigned long dst_offset;
@@ -621,7 +621,7 @@ static Bool
 SMI_PrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, 
PicturePtr pDstPicture,
   PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
 {
-ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
 SMIPtr pSmi = SMIPTR(pScrn);
 int src_pitch = exaGetPixmapPitch(pSrc) / (pSrc->drawable.bitsPerPixel >> 
3);
 int dst_pitch = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel >> 
3);
@@ -671,7 +671,7 @@ static void
 SMI_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int width, int height)

xserver-xorg-video-qxl: Changes to 'upstream-ubuntu'

2012-07-19 Thread Maarten Lankhorst 
Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srnsg-0001ia...@vasks.debian.org

xserver-xorg-video-qxl: Changes to 'ubuntu'

2012-07-19 Thread Maarten Lankhorst 
 .gitignore  |1 
 ChangeLog   |  721 +
 README.xspice   |   12 
 configure.ac|   17 
 debian/Xspice.1 |   72 +++
 debian/changelog|   52 ++
 debian/control  |   21 
 debian/copyright|3 
 debian/rules|   17 
 debian/source/options   |2 
 debian/xserver-xorg-video-qxl.docs  |2 
 debian/xserver-xspice.docs  |2 
 debian/xserver-xspice.install   |1 
 debian/xserver-xspice.manpages  |1 
 examples/spiceqxl.xorg.conf.example |   37 -
 scripts/Makefile.am |4 
 scripts/Xspice  |  128 +
 scripts/xspice  |  125 -
 src/Makefile.am |   13 
 src/compat-api.h|   99 
 src/lookup3.c   |  769 
 src/lookup3.h   |   26 -
 src/mspace.c|   44 +-
 src/mspace.h|   10 
 src/murmurhash3.c   |  357 
 src/murmurhash3.h   |   39 +
 src/qxl.h   |   53 +-
 src/qxl_cursor.c|3 
 src/qxl_driver.c|  393 +-
 src/qxl_image.c |  159 +++
 src/qxl_mem.c   |   59 ++
 src/qxl_option_helpers.c|   41 +
 src/qxl_option_helpers.h|   14 
 src/qxl_ring.c  |7 
 src/qxl_surface.c   |  368 ++---
 src/spiceqxl_display.c  |7 
 src/spiceqxl_driver.c   |3 
 src/spiceqxl_inputs.c   |   12 
 src/spiceqxl_io_port.c  |   14 
 src/spiceqxl_main_loop.c|   20 
 src/spiceqxl_spice_server.c |   38 -
 src/spiceqxl_spice_server.h |1 
 src/uxa/uxa-accel.c |2 
 src/uxa/uxa-damage.c|1 
 src/uxa/uxa-glyphs.c|   12 
 src/uxa/uxa-priv.h  |3 
 src/uxa/uxa-unaccel.c   |   11 
 src/uxa/uxa.c   |   51 +-
 48 files changed, 2356 insertions(+), 1491 deletions(-)

New commits:
commit 9435bbf5c852017f538024e896f9f7e59a80912f
Author: Maarten Lankhorst 
Date:   Thu Jul 19 12:18:38 2012 +0200

Sync with ubuntu again.

diff --git a/debian/changelog b/debian/changelog
index 047084a..2ca3898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,21 @@ xserver-xorg-video-qxl (0.0.18~gitde66207-1) UNRELEASED; 
urgency=low
 
  -- Maarten Lankhorst   Thu, 19 Jul 2012 
11:25:04 +0200
 
+xserver-xorg-video-qxl (0.0.17-2ubuntu2) quantal; urgency=low
+
+  * No-change rebuild for the new xserver-video-abi-12.
+
+ -- Adam Conrad   Tue, 26 Jun 2012 02:08:08 -0600
+
+xserver-xorg-video-qxl (0.0.17-2ubuntu1) quantal; urgency=low
+
+  * Remove xserver-xspice for amd64 which is dependent on the universe package
+libspice-server-dev. xserver-xspice was not provided in Precise, so
+its not likely to be missed in Quantal. It will require an MIR for
+spice to do so.
+
+ -- Tim Gardner   Thu, 21 Jun 2012 10:07:19 -0400
+
 xserver-xorg-video-qxl (0.0.17-2) unstable; urgency=low
 
   * Enable Xspice (Closes: 668537)
diff --git a/debian/control b/debian/control
index 2701e96..4a62f18 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: xserver-xorg-video-qxl
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force 
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: Debian X Strike Force 
 Uploaders: Liang Guo , Cyril Brulebois 

 Build-Depends:
  debhelper (>= 8),
@@ -21,7 +22,6 @@ Build-Depends:
  xutils-dev (>= 1:7.5),
  quilt (>= 0.46-7~),
  libspice-protocol-dev (>= 0.8.1~),
- libspice-server-dev [amd64],
  python,
 Standards-Version: 3.9.3
 Homepage: http://spice-space.org/
@@ -54,16 +54,3 @@ Description: X.Org X server -- QXL display driver (debugging 
symbols)
  .
  This package contains the debugging symbols for this driver.
 
-Package: xserver-xspice
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xserver-xorg, 
xserver-xorg-video-qxl (>= 0.0.17-2), python-argparse
-Description: Xspice X server
- Xspice is an X server and Spice server in one. It consists of a wrapper script
- for executing Xorg with the right parameters and environment variables, a
- module names spiceqxl_drv.so implementing three drivers: a video mostly
- code identical to the guest qxl X driver, and keyboard and mouse reading from
- the spice inputs channel.
- .
- Xspice allows regular X connections, while a spice client provides the 
keyboard
- and mouse and video output.
-
diff --git a/debian/rules b/debian/rules
index c3c8e8f..3492905 100755
--- a/debian/rules
+++ b/debian/rules
@@

xserver-xorg-video-qxl: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
 .gitignore  |1 
 debian/Xspice.1 |   72 
 2 files changed, 73 insertions(+)

New commits:
commit a9164839fb99f9b072b0659c401f603fa5505123
Author: Maarten Lankhorst 
Date:   Thu Jul 19 12:11:01 2012 +0200

Add debian/Xspice.1 to version control.

.gitignore accidentally added this to ignore.

diff --git a/.gitignore b/.gitignore
index e32a9c3..d23b754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ core
 #  Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 #
+!debian/Xspice.1
diff --git a/debian/Xspice.1 b/debian/Xspice.1
new file mode 100644
index 000..02fc49d
--- /dev/null
+++ b/debian/Xspice.1
@@ -0,0 +1,72 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.8.
+.TH XSPICE "1" "April 2012" "Xspice" "User Commands"
+.SH NAME
+Xspice \- X server and SPICE server
+.SH DESCRIPTION
+usage: Xspice [Xspice and Xorg options intermixed]
+.PP
+example usage: Xspice \fB\-\-port\fR 5900 \fB\-\-disable\-ticketing\fR :1.0
+.SS "optional arguments:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.HP
+\fB\-\-xorg\fR XORG
+.HP
+\fB\-\-config\fR CONFIG
+.TP
+\fB\-\-port\fR PORT
+standard spice port
+.TP
+\fB\-\-tls\-port\fR TLS_PORT
+spice tls port
+.TP
+\fB\-\-disable\-ticketing\fR
+do not require a client password
+.TP
+\fB\-\-sasl\fR
+enable sasl
+.TP
+\fB\-\-x509\-dir\fR X509_DIR
+x509 directory for tls
+.TP
+\fB\-\-cacert\-file\fR CACERT_FILE
+ca certificate file for tls
+.TP
+\fB\-\-x509\-cert\-file\fR X509_CERT_FILE
+server certificate file for tls
+.TP
+\fB\-\-x509\-key\-file\fR X509_KEY_FILE
+server key file for tls
+.TP
+\fB\-\-x509\-key\-password\fR X509_KEY_PASSWORD
+key file password for tls
+.HP
+\fB\-\-tls\-ciphers\fR TLS_CIPHERS
+.HP
+\fB\-\-dh\-file\fR DH_FILE
+.TP
+\fB\-\-password\fR PASSWORD
+set password required to connect to server
+.TP
+\fB\-\-image\-compression\fR {off,auto_glz,auto_lz,quic,glz,lz}
+auto_glz by default
+.TP
+\fB\-\-jpeg\-wan\-compression\fR {auto,never,always}
+auto by default
+.TP
+\fB\-\-zlib\-glz\-wan\-compression\fR {auto,never,always}
+auto by default
+.TP
+\fB\-\-streaming\-video\fR {off,all,filter}
+filter by default
+.HP
+\fB\-\-ipv4\-only\fR
+.HP
+\fB\-\-ipv6\-only\fR
+.PP
+Any options not parsed by Xspice get passed to Xorg as is.
+.SH SEE ALSO
+Spice related documents can be found at 
http://www.spice-space.org/documentation.html
+.PP
+This manual page was generated with help2man by Liang Guo 
, for the Debian project (and may be used by others).


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srnph-0001yx...@vasks.debian.org

xserver-xorg-video-qxl: Changes to 'debian-unstable'

2012-07-19 Thread Maarten Lankhorst 
 .gitignore  |1 
 debian/Xspice.1 |   72 
 2 files changed, 73 insertions(+)

New commits:
commit b511d040609e90b3d76d8af315311c7d611f7fe1
Author: Maarten Lankhorst 
Date:   Thu Jul 19 12:11:01 2012 +0200

Add debian/Xspice.1 to version control.

.gitignore accidentally added this to ignore.

diff --git a/.gitignore b/.gitignore
index e32a9c3..d23b754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ core
 #  Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 #
+!debian/Xspice.1
diff --git a/debian/Xspice.1 b/debian/Xspice.1
new file mode 100644
index 000..02fc49d
--- /dev/null
+++ b/debian/Xspice.1
@@ -0,0 +1,72 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.8.
+.TH XSPICE "1" "April 2012" "Xspice" "User Commands"
+.SH NAME
+Xspice \- X server and SPICE server
+.SH DESCRIPTION
+usage: Xspice [Xspice and Xorg options intermixed]
+.PP
+example usage: Xspice \fB\-\-port\fR 5900 \fB\-\-disable\-ticketing\fR :1.0
+.SS "optional arguments:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.HP
+\fB\-\-xorg\fR XORG
+.HP
+\fB\-\-config\fR CONFIG
+.TP
+\fB\-\-port\fR PORT
+standard spice port
+.TP
+\fB\-\-tls\-port\fR TLS_PORT
+spice tls port
+.TP
+\fB\-\-disable\-ticketing\fR
+do not require a client password
+.TP
+\fB\-\-sasl\fR
+enable sasl
+.TP
+\fB\-\-x509\-dir\fR X509_DIR
+x509 directory for tls
+.TP
+\fB\-\-cacert\-file\fR CACERT_FILE
+ca certificate file for tls
+.TP
+\fB\-\-x509\-cert\-file\fR X509_CERT_FILE
+server certificate file for tls
+.TP
+\fB\-\-x509\-key\-file\fR X509_KEY_FILE
+server key file for tls
+.TP
+\fB\-\-x509\-key\-password\fR X509_KEY_PASSWORD
+key file password for tls
+.HP
+\fB\-\-tls\-ciphers\fR TLS_CIPHERS
+.HP
+\fB\-\-dh\-file\fR DH_FILE
+.TP
+\fB\-\-password\fR PASSWORD
+set password required to connect to server
+.TP
+\fB\-\-image\-compression\fR {off,auto_glz,auto_lz,quic,glz,lz}
+auto_glz by default
+.TP
+\fB\-\-jpeg\-wan\-compression\fR {auto,never,always}
+auto by default
+.TP
+\fB\-\-zlib\-glz\-wan\-compression\fR {auto,never,always}
+auto by default
+.TP
+\fB\-\-streaming\-video\fR {off,all,filter}
+filter by default
+.HP
+\fB\-\-ipv4\-only\fR
+.HP
+\fB\-\-ipv6\-only\fR
+.PP
+Any options not parsed by Xspice get passed to Xorg as is.
+.SH SEE ALSO
+Spice related documents can be found at 
http://www.spice-space.org/documentation.html
+.PP
+This manual page was generated with help2man by Liang Guo 
, for the Debian project (and may be used by others).


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srnho-000132...@vasks.debian.org

xserver-xorg-video-qxl: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
 ChangeLog   |  721 
 README.xspice   |4 
 configure.ac|   15 
 debian/changelog|6 
 src/Makefile.am |3 
 src/compat-api.h|   99 ++
 src/mspace.c|   44 ++
 src/mspace.h|   10 
 src/qxl.h   |   26 +
 src/qxl_cursor.c|3 
 src/qxl_driver.c|  237 +-
 src/qxl_image.c |4 
 src/qxl_mem.c   |   59 +++
 src/qxl_option_helpers.c|4 
 src/qxl_ring.c  |4 
 src/qxl_surface.c   |  123 ++-
 src/spiceqxl_display.c  |7 
 src/spiceqxl_driver.c   |3 
 src/spiceqxl_inputs.c   |3 
 src/spiceqxl_io_port.c  |   11 
 src/spiceqxl_main_loop.c|   20 +
 src/spiceqxl_spice_server.c |3 
 src/uxa/uxa-accel.c |2 
 src/uxa/uxa-damage.c|1 
 src/uxa/uxa-glyphs.c|   12 
 src/uxa/uxa-priv.h  |3 
 src/uxa/uxa.c   |   18 -
 27 files changed, 1288 insertions(+), 157 deletions(-)

New commits:
commit 6067a058c4a56391240f80ff8a38433e39e37201
Author: Maarten Lankhorst 
Date:   Thu Jul 19 11:27:19 2012 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 6bb3bce..047084a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-qxl (0.0.18~gitde66207-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Thu, 19 Jul 2012 
11:25:04 +0200
+
 xserver-xorg-video-qxl (0.0.17-2) unstable; urgency=low
 
   * Enable Xspice (Closes: 668537)

commit 208d03ae96ab7a7b4087015d739145643bbf1fba
Author: Maarten Lankhorst 
Date:   Thu Jul 19 11:27:12 2012 +0200

bump changelog

diff --git a/ChangeLog b/ChangeLog
index 669c70e..6899b64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,724 @@
+commit de66207883efc1f32e96907c3e64f17b2bdf6c3e
+Author: Alon Levy 
+Date:   Sun Jul 8 14:05:08 2012 +0300
+
+qxl_driver/qxl_switch_mode: destroy is not idempotent
+
+commit 6267b1a56f6104409fcb970eddc4ea9606421331
+Author: Alon Levy 
+Date:   Wed Mar 7 14:30:58 2012 +0200
+
+spiceqxl_display: reformat & rephrase Xspice comment
+
+commit e0f301fc0512502542573b3f8dd9452f5a7ea6e1
+Author: Jeremy White 
+Date:   Wed Jun 13 17:04:12 2012 -0500
+
+Compute totalPixmapSize using the same logic as in dix/pixmap.c, rather 
than hard coding 100.
+
+This was found while building with a modified X server; one with a 
PixmapRec size of 224, not 64 :-/.
+
+commit 6832c0fd917556c52f56f8e82706a83942ed3dc1
+Author: Jeremy White 
+Date:   Sun Jun 3 10:28:05 2012 -0500
+
+Actually process write watches in the wakeup handler
+
+My apologies for the churn; this is, I think, a slightly better patch than
+my previous patch, 'Process watches even when there is no X activity', in 
that
+it avoids doing an extra polling select when we're idle.
+
+commit 72a0def8114073c0051f3df880f731d3968cb344
+Author: Alon Levy 
+Date:   Wed May 30 13:44:40 2012 +0300
+
+qxl_switch_mode: don't evacuate, just recreate primary surface
+
+In summary, on vt enter we still:
+ reset
+ recreate memory slots
+ clear our mspace allocators
+ and then do what switch mode below says
+
+On vt leave we still:
+ reset (this is redundant since the first VGA access will trigger a
+ reset on the device side)
+
+On switch mode however we only:
+ destroy primary surface
+ create primary surface (different size)
+
+commit 8df3eba368e80f60ce815300b85a567a9b02141c
+Author: Alon Levy 
+Date:   Thu May 31 13:04:01 2012 +0300
+
+qxl_surface: don't unlink surface 0
+
+The primary surface, i.e. qxl->primary, the only surface with id==0, is
+allocated in qxl_surface_cache_create_primary with prev==next==NULL.
+Unlinking it was producing a wrong cache->free_surfaces == NULL. This
+was not a problem because unlinking the primary only happened in
+switch_host, which then called surface_cache_init. In a following commit
+switch_host is simplified to destroy-primary+create-primary, so this bug
+needs to be fixed first to avoid leaking surfaces and reaching a no
+surface available situation.
+
+commit 22157d4750f9090927d2e3473aa3d3a4f5232792
+Author: Alon Levy 
+Date:   Thu May 31 13:03:54 2012 +0300
+
+qxl_surface: add DEBUG_SURFACE_LIFECYCLE helpers
+
+commit 0f817bb4e1b4e33ef50c0399c92f1cc091840ef5
+Author: Alon Levy 
+Date:   Tue May 29 12:25:12 2012 +0300
+
+io: add qxl_io_destroy_primary
+
+commit 326b80974b4080ed7519801f7d1c96077f5ae0b9
+Author: Alon Levy 
+Date:   Wed May 23 20:50:46 2012 +0300
+
+prefix io with qxl_io, add several
+
+commit 73981e02c90cc81dd462f9fc2a00b5b11a9eab00
+Author: Alon Levy 
+Date:   Wed May 23 20:52:48 2012 +0300
+
+qxl.h: add device_primary tri state UNDEFINED/NONE/CREATED
+
+commit b600edc4

xserver-xorg-video-qxl: Changes to 'upstream-experimental'

2012-07-19 Thread Maarten Lankhorst 
 README.xspice   |4 
 configure.ac|   15 +-
 src/Makefile.am |3 
 src/compat-api.h|   99 ++
 src/mspace.c|   44 ++--
 src/mspace.h|   10 +
 src/qxl.h   |   26 +++-
 src/qxl_cursor.c|3 
 src/qxl_driver.c|  237 +---
 src/qxl_image.c |4 
 src/qxl_mem.c   |   59 ++
 src/qxl_option_helpers.c|4 
 src/qxl_ring.c  |4 
 src/qxl_surface.c   |  123 ++
 src/spiceqxl_display.c  |7 -
 src/spiceqxl_driver.c   |3 
 src/spiceqxl_inputs.c   |3 
 src/spiceqxl_io_port.c  |   11 +-
 src/spiceqxl_main_loop.c|   20 +++
 src/spiceqxl_spice_server.c |3 
 src/uxa/uxa-accel.c |2 
 src/uxa/uxa-damage.c|1 
 src/uxa/uxa-glyphs.c|   12 +-
 src/uxa/uxa-priv.h  |3 
 src/uxa/uxa.c   |   18 +--
 25 files changed, 561 insertions(+), 157 deletions(-)

New commits:
commit de66207883efc1f32e96907c3e64f17b2bdf6c3e
Author: Alon Levy 
Date:   Sun Jul 8 14:05:08 2012 +0300

qxl_driver/qxl_switch_mode: destroy is not idempotent

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index a6d7636..e4c477a 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -701,10 +701,9 @@ qxl_switch_mode(SWITCH_MODE_ARGS_DECL)
 {
qxl_surface_kill (qxl->primary);
qxl_surface_cache_sanity_check (qxl->surface_cache);
+qxl_io_destroy_primary(qxl);
 }
 
-qxl_io_destroy_primary(qxl);
-
 qxl->primary = qxl_surface_cache_create_primary (qxl->surface_cache, m);
 qxl->current_mode = m;
 qxl->bytes_per_pixel = (qxl->pScrn->bitsPerPixel + 7) / 8;

commit 6267b1a56f6104409fcb970eddc4ea9606421331
Author: Alon Levy 
Date:   Wed Mar 7 14:30:58 2012 +0200

spiceqxl_display: reformat & rephrase Xspice comment

diff --git a/src/spiceqxl_display.c b/src/spiceqxl_display.c
index ea61430..b1ce557 100644
--- a/src/spiceqxl_display.c
+++ b/src/spiceqxl_display.c
@@ -67,8 +67,8 @@
 
 
 /* XSpice:
- * We only need a single identify slot, no need to change it for the lifetime
- * We actually need no slots, but less changes if we leave one.
+ * We only need a single static identity slot.
+ * We actually need no slots, but less changes if we use one.
  * We currently add it during attache_worker - should not be called more
  * then once during lifetime (but we don't check)
  */

commit e0f301fc0512502542573b3f8dd9452f5a7ea6e1
Author: Jeremy White 
Date:   Wed Jun 13 17:04:12 2012 -0500

Compute totalPixmapSize using the same logic as in dix/pixmap.c, rather 
than hard coding 100.

This was found while building with a modified X server; one with a 
PixmapRec size of 224, not 64 :-/.

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 54bbd4a..a6d7636 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -1138,8 +1138,6 @@ qxl_screen_init(SCREEN_INIT_ARGS_DECL)
 ErrorF ("allocated %d x %d  %p\n", pScrn->virtualX, pScrn->virtualY, 
qxl->fb);
 #endif
 
-pScreen->totalPixmapSize = 100;
-
 pScrn->virtualX = pScrn->currentMode->HDisplay;
 pScrn->virtualY = pScrn->currentMode->VDisplay;
 
@@ -1198,6 +1196,10 @@ qxl_screen_init(SCREEN_INIT_ARGS_DECL)
 
 DamageSetup(pScreen);
 
+/* We need to set totalPixmapSize after setup_uxa and Damage,
+   as the privatessize is not computed correctly until then */
+pScreen->totalPixmapSize = BitmapBytePad((sizeof(PixmapRec) + 
dixPrivatesSize(PRIVATE_PIXMAP) ) * 8);
+
 miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
 if (!miCreateDefColormap(pScreen))
   goto out;

commit 6832c0fd917556c52f56f8e82706a83942ed3dc1
Author: Jeremy White 
Date:   Sun Jun 3 10:28:05 2012 -0500

Actually process write watches in the wakeup handler

My apologies for the churn; this is, I think, a slightly better patch than
my previous patch, 'Process watches even when there is no X activity', in 
that
it avoids doing an extra polling select when we're idle.

diff --git a/src/spiceqxl_main_loop.c b/src/spiceqxl_main_loop.c
index 1718861..e57fb91 100644
--- a/src/spiceqxl_main_loop.c
+++ b/src/spiceqxl_main_loop.c
@@ -315,9 +315,24 @@ static void select_and_check_watches(void)
 }
 }
 
+static int no_write_watches(Ring *w)
+{
+SpiceWatch *watch;
+RingItem *link;
+RingItem *next;
+
+RING_FOREACH_SAFE(link, next, w) {
+watch = (SpiceWatch*)link;
+if (!watch->remove && (watch->event_mask & SPICE_WATCH_EVENT_WRITE))
+return 0;
+}
+
+return 1;
+}
+
 static void xspice_wakeup_handler(pointer data, int nfds, pointer readmask)
 {
-if (!nfds) {
+if (!nfds && no_write_watches(&watches)) {
 return;
 }
 select_and_check_watches();

commit 72a0def8114073c0051f3df880f731d3968cb344
Author: Alon Levy 
Date:   Wed

xserver-xorg-video-openchrome: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
Rebased ref, commits from common ancestor:
commit 1c156535e656c4830bee6e6982e78c90209b1dfb
Author: Maarten Lankhorst 
Date:   Thu Jul 19 11:13:10 2012 +0200

New upstream release.

Comment out debian/patches/10-Deal-with-xserver-1.12.diff
- Needs confirmation to be dropped, or rebased.

diff --git a/debian/changelog b/debian/changelog
index e98d387..7eb5f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-openchrome (1:0.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Comment out debian/patches/10-Deal-with-xserver-1.12.diff
+- Needs confirmation to be dropped, or rebased.
+
+ -- Maarten Lankhorst   Thu, 19 Jul 2012 
10:58:11 +0200
+
 xserver-xorg-video-openchrome (1:0.2.906-2) UNRELEASED; urgency=low
 
   * Move to git.
diff --git a/debian/control b/debian/control
index 3249b09..af16659 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
  libxvmc-dev,
  quilt
 Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.openchrome.org
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-openchrome.git
diff --git a/debian/patches/series b/debian/patches/series
index 0ea68a3..7e27e68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-10-Deal-with-xserver-1.12.diff
+#10-Deal-with-xserver-1.12.diff

commit 99180e2dd75e306687f211ac03a49af0757517be
Author: Maarten Lankhorst 
Date:   Thu Jul 19 11:12:47 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index 04f0642..3685bf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,2713 +1,5063 @@
-2011-05-10  Bartosz Kosiorek  
+commit 00e7b2f89669ce497c2284b80e7af562862b172f
+Author: Xavier Bachelot 
+Date:   Wed Jul 18 00:22:30 2012 +0200
 
-   Workaround EXA crash with new libcairo2 (#298)
+fix 0.3.0 release date
 
-   * src/via_accel.c: (viaExaPrepareComposite):
+commit ac46c3539641ab4e348ed3fc5c3da9099d9ed320
+Author: Dave Airlie 
+Date:   Mon Jul 16 20:04:02 2012 +1000
 
-2011-05-08  Bartosz Kosiorek  
+openchrome: fix issues with compat-api against latest server.
+
+Signed-off-by: Dave Airlie 
 
-   Fix cursor garbage after suspend/resume for Xserver 1.10 (#405)
+commit aa862646bf51b03fcc3131cf74de6ae43e91c46a
+Merge: deae12b 2f940bf
+Author: James Simmons 
+Date:   Fri Jul 6 16:50:12 2012 -0400
 
-   * src/via_video.c: (viaRestoreVideo):
+Merge branch 'kms_branch'
 
-2011-05-04  Bartosz Kosiorek  
+commit deae12b325b85a0beb9c06d46daa785563644a1c
+Author: Xavier Bachelot 
+Date:   Fri Jul 6 10:57:14 2012 +0200
 
-   Fix XAA displaying issues
+HP Compaq dx2040 (reported by Tom Li)
 
-   * src/via_accel.c: (viaInitXAA):
+commit 2f940bf4e5eae22a9dd172ad73cf74deb809b1bd
+Author: Xavier Bachelot 
+Date:   Fri Jul 6 10:57:14 2012 +0200
 
-2011-01-23  Bartosz Kosiorek  
+HP Compaq dx2040 (reported by Tom Li)
 
-   Enable hardware cursor for VX900
+commit dbcd4649d1a84a860217e609eed287e32758851f
+Author: Xavier Bachelot 
+Date:   Sun Jul 1 23:53:35 2012 +0200
 
-   * src/via_cursor.c: (viaHWCursorInit):
-   * src/via_mode.c: (ViaModeSet):
+update NEWS file for upcoming 0.3
 
-2010-12-16  Bartosz Kosiorek  
+commit bdd19000ad1d5b7eeaa9d8f4a2fb83ce51db6d82
+Author: James Simmons 
+Date:   Fri Jun 29 20:58:33 2012 -0400
 
-   Merge vx900_branch - initial VX900 support
+Since DP handling is not very functional disable it unless forced by 
ActiveDevice
 
-   * src/via_accel.c: (viaFlushPCI), (viaDisableVQ),
-   (viaInitialize2DEngine), (viaAccelSync), (viaPitchHelper),
-   (viaInitXAA):
-   * src/via_bandwidth.c: (ViaSetPrimaryFIFO), (ViaSetSecondaryFIFO):
-   * src/via_bios.h:
-   * src/via_crtc.c: (ViaFirstCRTCSetMode), (ViaSecondCRTCSetMode):
-   * src/via_cursor.c: (viaHWCursorInit), (viaCursorStore),
-   (viaCursorRestore), (viaShowCursor), (viaHideCursor),
-   (viaSetCursorPosition), (viaLoadCursorImage), (viaSetCursorColors):
-   * src/via_driver.c: (VIASetupDefaultOptions), (VIAPreInit),
-   (VIALeaveVT), (VIASave), (VIARestore), (ViaMMIOEnable),
-   (ViaMMIODisable), (VIAMapFB), (VIAWriteMode), (VIACloseScreen):
-   * src/via_driver.h:
-   * src/via_id.c:
-   * src/via_id.h:
-   * src/via_mode.c: (ViaDFPDetect), (ViaOutputsDetect),
-   (ViaOutputsSelect), (ViaGetMemoryBandwidth), (ViaSetDotclock),
-   (ViaModeSet):
-   * src/via_mode.h:
-   * src/via_panel.c: (ViaPanelScaleDisable), (ViaPanelPreInit),
-   (ViaPanelGetSizeFromDDC):
-   * src/via_video.c: (DecideOverlaySupport):
-   * src/via_xvmc.c: (ViaInitXVMC):
+commit 28f00c86fbfccb539af748ff13aa9d64b5da091b
+Merge: 6754933 bb0329d
+Author: James Simmons 
+Date:   Fri Jun 29 08:45:35 2012 -0400
 
-2010-12-15  Bartosz Kosiorek  
+Merge branch 'master' into km

xserver-xorg-video-openchrome: Changes to 'upstream-experimental'

2012-07-19 Thread Maarten Lankhorst 
Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srmow-0006sq...@vasks.debian.org

xserver-xorg-video-openchrome: Changes to 'upstream-unstable'

2012-07-19 Thread Maarten Lankhorst 
Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srmro-0005ck...@vasks.debian.org

xserver-xorg-video-vesa: Changes to 'debian-experimental'

2012-07-19 Thread Maarten Lankhorst 
 ChangeLog|   52 +
 configure.ac |2 -
 debian/changelog |   14 +++
 debian/control   |4 +-
 src/Makefile.am  |1 
 src/compat-api.h |   98 +++
 src/vesa.c   |   92 ++-
 7 files changed, 215 insertions(+), 48 deletions(-)

New commits:
commit 7e5d4d96ec77b7a1396a6bc9d0877aae99317d81
Author: Maarten Lankhorst 
Date:   Thu Jul 19 09:46:24 2012 +0200

Bump Standards-Version to 3.9.3 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 2c4a40e..98c6188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-vesa (1:2.3.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.9.3 (no changes needed).
 
  -- Maarten Lankhorst   Thu, 19 Jul 2012 
09:44:43 +0200
 
diff --git a/debian/control b/debian/control
index 99a71a7..88e9a9b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  xutils-dev (>= 1:7.5+4),
  quilt,
  libpciaccess-dev (>= 0.12.901),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git
 

commit 6526371be953097a74b4211153b1925ca9fb2c04
Author: Maarten Lankhorst 
Date:   Thu Jul 19 09:45:03 2012 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 2fc5392..2c4a40e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vesa (1:2.3.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Thu, 19 Jul 2012 
09:44:43 +0200
+
 xserver-xorg-video-vesa (1:2.3.1-1) unstable; urgency=low
 
   * New upstream release.

commit a456e0ebf79a38b76b06468408dc7b2e7bc39b4e
Author: Maarten Lankhorst 
Date:   Thu Jul 19 09:44:28 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index f7bd897..01da09e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit 0249d01a2623c4f7769914fc0a7b50657a50560f
+Author: Dave Airlie 
+Date:   Wed Jul 18 20:02:49 2012 +1000
+
+vesa: bump to 2.3.2
+
+Signed-off-by: Dave Airlie 
+
+commit 86f1d894cd3c06a61abbd16e3e73d60db2c98621
+Author: Dave Airlie 
+Date:   Fri Jun 1 12:55:19 2012 +0100
+
+vesa: add api 13 compat layer.
+
+Signed-off-by: Dave Airlie 
+
+commit 378e55e375cbb659d66d6739891553d7a83e6a65
+Author: Dave Airlie 
+Date:   Wed May 23 11:30:51 2012 +0100
+
+vesa: fix make distcheck.
+
+Add missing compat-api header
+
+Signed-off-by: Dave Airlie 
+
+commit 18bf00600c75b1dc055d174c8ba9ec1dc4ae8b5a
+Author: Dave Airlie 
+Date:   Wed May 23 11:25:14 2012 +0100
+
+vesa: convert to new screen conversion APIs.
+
+Generated by util/modular/x-driver-screen-scrn-conv.sh
+
+Signed-off-by: Dave Airlie 
+
+commit 76c67b2735a5b0ee1cf231ff85eb3273a30b4ccc
+Author: Dave Airlie 
+Date:   Wed May 23 11:24:57 2012 +0100
+
+vesa: add compat-api.h
+
+Signed-off-by: Dave Airlie 
+
 commit 8cd553551767c0f970912fb73cae3aa733434106
 Author: Adam Jackson 
 Date:   Thu Mar 22 17:32:22 2012 -0400

commit 0249d01a2623c4f7769914fc0a7b50657a50560f
Author: Dave Airlie 
Date:   Wed Jul 18 20:02:49 2012 +1000

vesa: bump to 2.3.2

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index 4288bdd..6317acd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-vesa],
-[2.3.1],
+[2.3.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-vesa])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 86f1d894cd3c06a61abbd16e3e73d60db2c98621
Author: Dave Airlie 
Date:   Fri Jun 1 12:55:19 2012 +0100

vesa: add api 13 compat layer.

Signed-off-by: Dave Airlie 

diff --git a/src/compat-api.h b/src/compat-api.h
index 1bb7724..d4d3882 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -38,4 +38,61 @@
 #define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
 #endif
 
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, 
pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, i

xserver-xorg-video-vesa: Changes to 'upstream-experimental'

2012-07-19 Thread Maarten Lankhorst 
 configure.ac |2 -
 src/Makefile.am  |1 
 src/compat-api.h |   98 +++
 src/vesa.c   |   92 ++-
 4 files changed, 147 insertions(+), 46 deletions(-)

New commits:
commit 0249d01a2623c4f7769914fc0a7b50657a50560f
Author: Dave Airlie 
Date:   Wed Jul 18 20:02:49 2012 +1000

vesa: bump to 2.3.2

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index 4288bdd..6317acd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-vesa],
-[2.3.1],
+[2.3.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-vesa])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 86f1d894cd3c06a61abbd16e3e73d60db2c98621
Author: Dave Airlie 
Date:   Fri Jun 1 12:55:19 2012 +0100

vesa: add api 13 compat layer.

Signed-off-by: Dave Airlie 

diff --git a/src/compat-api.h b/src/compat-api.h
index 1bb7724..d4d3882 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -38,4 +38,61 @@
 #define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
 #endif
 
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, 
pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
+
+#define SCRN_OR_INDEX_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer 
pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScrn
+
+#define SCRN_OR_INDEX_ARG(x) (x)
+
+#endif
+
 #endif
diff --git a/src/vesa.c b/src/vesa.c
index ab64060..8ac77da 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -75,17 +75,16 @@ static Bool VESAPciProbe(DriverPtr drv, int entity_num,
  struct pci_device *dev, intptr_t match_data);
 #endif
 static Bool VESAPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool VESAScreenInit(int Index, ScreenPtr pScreen, int argc,
-  char **argv);
-static Bool VESAEnterVT(int scrnIndex, int flags);
-static void VESALeaveVT(int scrnIndex, int flags);
-static Bool VESACloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool VESAScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool VESAEnterVT(VT_FUNC_ARGS_DECL);
+static void VESALeaveVT(VT_FUNC_ARGS_DECL);
+static Bool VESACloseScreen(CLOSE_SCREEN_ARGS_DECL);
 static Bool VESASaveScreen(ScreenPtr pScreen, int mode);
 
-static Bool VESASwitchMode(int scrnIndex, DisplayModePtr pMode, int flags);
+static Bool VESASwitchMode(SWITCH_MODE_ARGS_DECL);
 static Bool VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode);
-static void VESAAdjustFrame(int scrnIndex, int x, int y, int flags);
-static void VESAFreeScreen(int scrnIndex, int flags);
+static void VESAAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+static void VESAFreeScreen(FREE_SCREEN_ARGS_DECL);
 static void VESAFreeRec(ScrnInfoPtr pScrn);
 static VESAPtr VESAGetRec(ScrnInfoPtr pScrn);
 
@@ -342,11 +341,11 @@ vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr 
vbe)
 }
 
 static ModeStatus
-VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
+VESAValidMode(SCRN_ARG_TYPE arg, DisplayModePtr p, Bool flag, int pass)
 {
+SCRN_INFO_PTR(arg);
 static int warned = 0;
 int found = 0;
-ScrnInfoPtr pScrn = xf86Screens[scrn];
 VESAPtr pVesa = VESAGetRec(pScrn);
 MonPtr mon = pScrn->monitor;
 ModeStatus ret = MODE_BAD;
@@ -357,7 +356,7 @@ VESAValidMode(int scrn,