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

2011-01-26 Thread Christopher Halse Rogers
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59137106840e18c0f0e54617f6372b1b0b49f961
Author: Christopher James Halse Rogers 
Date:   Wed Nov 24 22:03:50 2010 +1100

Finalise changelog

diff --git a/debian/changelog b/debian/changelog
index 0b501e2..58fdb9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:6.13.2-1ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.13.2-1ubuntu2) natty; urgency=low
 
   * debian/patches/101_select_between_classic_and_gallium_dri.patch
 + Select between r300c/r300g and r600c/r600g as the DRI driver.  Classic


-- 
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/e1pijux-00047c...@alioth.debian.org



xserver-xorg-input-synaptics: Changes to 'ubuntu'

2011-01-26 Thread Christopher Halse Rogers
 .gitignore   |   76 
 COPYING  |3 
 ChangeLog| 1208 
+
 Makefile.am  |   11 
 README   |   27 
 TODO |7 
 conf/Makefile.am |8 
 configure.ac |  188 -
 debian/changelog |   59 
 debian/control   |7 
 debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch |   18 
 debian/patches/114_jumpy_cursor_first_part.patch |  113 
 debian/xserver-xorg-input-synaptics.docs |1 
 debian/xsfbs/xsfbs.mk|4 
 include/Makefile.am  |1 
 include/synaptics-properties.h   |2 
 include/synaptics.h  |   14 
 man/Makefile.am  |   64 
 man/synaptics.man|  178 -
 man/synclient.man|   18 
 src/Makefile.am  |5 
 src/alpscomm.c   |   36 
 src/eventcomm.c  |  162 -
 src/properties.c |  135 -
 src/ps2comm.c|  206 -
 src/psmcomm.c|   39 
 src/psmcomm.h|   29 
 src/synaptics.c  | 1251 
+-
 src/synapticsstr.h   |   20 
 src/synproto.h   |   18 
 tools/.gitignore |3 
 tools/Makefile.am|   18 
 tools/synclient.c|   30 
 tools/syndaemon.c|   89 
 34 files changed, 2687 insertions(+), 1361 deletions(-)

New commits:
commit 4a6056074060d01329fabab33a39b7b84ffe4c4b
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 14:19:52 2011 +1100

Release to Natty

diff --git a/debian/changelog b/debian/changelog
index c813cfa..b9a7c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu1) 
UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu1) natty; 
urgency=low
 
   [ Cyril Brulebois ]
   * Switch to Architecture: any, adding armhf support (Closes: #604672).

commit b52ed9a96d6e53cea9b8d7c9b4f82cc86de4a388
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 13:33:42 2011 +1100

Update upstream version to match configure.ac

diff --git a/debian/changelog b/debian/changelog
index d4729e1..c813cfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.3.0+git20110116.0e27ce3a-1ubuntu1) UNRELEASED; 
urgency=low
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu1) 
UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Switch to Architecture: any, adding armhf support (Closes: #604672).

commit 1e431755c646231a9d4051b7f8a4744d444e582c
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 13:05:48 2011 +1100

Refresh patches, update changelog

diff --git a/debian/changelog b/debian/changelog
index eaaf3b3..d4729e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.3.0-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.3.0+git20110116.0e27ce3a-1ubuntu1) UNRELEASED; 
urgency=low
 
   [ Cyril Brulebois ]
   * Switch to Architecture: any, adding armhf support (Closes: #604672).
@@ -20,6 +20,12 @@ xserver-xorg-input-synaptics (1.3.0-1ubuntu1) UNRELEASED; 
urgency=low
 - Specify ‘ubuntu’ branch in gbp.conf
 - 115_evdev_only.patch: Only bind to /dev/input/event* evdev devices
   (LP 624985)
+  * Update to git snapshot to fix build against Xserver 1.10 input API
+  * debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch:
+- Refresh for new upstream.
+  * debian/patches/114_jumpy_cursor_first_part.patch:
+- Refresh for new upstream.  Drop the multi-touch chunk of the quirk,
+  as that is handled by upstream commit a6ca4d25.
 
  -- Christopher James Halse Rogers   Tue

xserver-xorg-input-synaptics: Changes to 'upstream-ubuntu'

2011-01-26 Thread Christopher Halse Rogers
New branch 'upstream-ubuntu' available with the following commits:


-- 
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/e1piiq0-m0...@alioth.debian.org



Bug#611232: Acknowledgement (libx11-6: XrmSetDatabase is documented to not free the database, but frees it, causing crashes)

2011-01-26 Thread Marc Lehmann
Further info:

This problem is related to, but not the same, as this one:

   https://bugs.freedesktop.org//show_bug.cgi?id=21974
   http://osdir.com/ml/bug-gnu-emacs-gnu/2009-05/msg00653.html

And apparently, the faulty code was introduced by this commit:

   
http://lists.freedesktop.org/archives/xorg-commit-diffs/2004-March/000239.html

It also shows that XrmSetDatabase is broken in any case, as the flag is not
reset in all cases.

-- 
The choice of a   Deliantra, the free code+content MORPG
  -==- _GNU_  http://www.deliantra.net
  ==-- _   generation
  ---==---(_)__  __   __  Marc Lehmann
  --==---/ / _ \/ // /\ \/ /  schm...@schmorp.de
  -=/_/_//_/\_,_/ /_/\_\



-- 
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/20110127021340.ga...@schmorp.de



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

2011-01-26 Thread Christopher Halse Rogers
 debian/changelog |9 ++
 debian/patches/101_copy-fb.patch |   56 ---
 2 files changed, 39 insertions(+), 26 deletions(-)

New commits:
commit e13f2f08f7cce64dc91948d8c94222b3b2b2cbab
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 11:57:13 2011 +1100

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 86fc937..41277aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.14.0-1ubuntu2) natty; urgency=low
+
+  * debian/patches/101_copy-fb.patch:
+- Remove call to non-existent intel_batch_wait_last function.  Fixes
+  X crash on startup due to missing symbols.
+- Update to build against both X server 1.9 and 1.10 ABIs.
+
+ -- Christopher James Halse Rogers   Thu, 27 Jan 2011 
11:40:37 +1100
+
 xserver-xorg-video-intel (2:2.14.0-1ubuntu1) natty; urgency=low
 
   * New upstream release.

commit b1c7c2fd7bed33b28ce41b916d26c9cfdec991e1
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 11:57:06 2011 +1100

Drop removed intel_batch_wait_last reference; fixes crash on startup

diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch
index 81f8d01..8bc7699 100644
--- a/debian/patches/101_copy-fb.patch
+++ b/debian/patches/101_copy-fb.patch
@@ -155,7 +155,6 @@ Index: xserver-xorg-video-intel/src/intel_display.c
 +
 +  intel_batch_emit_flush(scrn);
 +  intel_batch_submit(scrn, TRUE);
-+  intel_batch_wait_last(scrn);
 +
 +  (*pScreen->DestroyPixmap)(src);
 +  (*pScreen->DestroyPixmap)(dst);

commit 7917ba1038f75eeb886da7f1194250f9539848e3
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 11:56:35 2011 +1100

Allow 101_copy-fb to build against either Xserver 1.9 or 1.10

diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch
index 270737e..81f8d01 100644
--- a/debian/patches/101_copy-fb.patch
+++ b/debian/patches/101_copy-fb.patch
@@ -49,7 +49,12 @@ Index: xserver-xorg-video-intel/src/intel_display.c
}
  
intel->modes = mode;
++
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
++  srcn->pScreen->canDoBGNoneRoot = TRUE;
++#else
 +  scrn->canDoBGNoneRoot = TRUE;
++#endif
 +
return TRUE;
  }

commit b8ea2746379393a4d66a2e5266f34f74f9de00f5
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 11:56:00 2011 +1100

Refresh 101_copy-fb.patch

diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch
index 69dfad9..270737e 100644
--- a/debian/patches/101_copy-fb.patch
+++ b/debian/patches/101_copy-fb.patch
@@ -1,8 +1,8 @@
-diff --git a/src/intel.h b/src/intel.h
-index 9e8323c..dc5d570 100644
 a/src/intel.h
-+++ b/src/intel.h
-@@ -420,6 +420,7 @@ typedef struct intel_screen_private {
+Index: xserver-xorg-video-intel/src/intel.h
+===
+--- xserver-xorg-video-intel.orig/src/intel.h  2011-01-27 11:42:50.680785002 
+1100
 xserver-xorg-video-intel/src/intel.h   2011-01-27 11:46:07.540785001 
+1100
+@@ -472,6 +472,7 @@
OptionInfoPtr Options;
  
/* Driver phase/state information */
@@ -10,18 +10,18 @@ index 9e8323c..dc5d570 100644
Bool suspended;
  
enum last_3d last_3d;
-@@ -445,6 +446,7 @@ extern void intel_mode_fini(intel_screen_private *intel);
+@@ -501,6 +502,7 @@
  extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr 
crtc);
  extern int intel_crtc_id(xf86CrtcPtr crtc);
  extern int intel_output_dpms_status(xf86OutputPtr output);
 +extern void intel_copy_fb(ScrnInfoPtr scrn);
  
- extern Bool intel_do_pageflip(ScreenPtr screen, dri_bo *new_front, void 
*data);
- 
-diff --git a/src/intel_display.c b/src/intel_display.c
-index 97c1a0a..13924c0 100644
 a/src/intel_display.c
-+++ b/src/intel_display.c
+ extern Bool intel_do_pageflip(intel_screen_private *intel,
+ dri_bo *new_front,
+Index: xserver-xorg-video-intel/src/intel_display.c
+===
+--- xserver-xorg-video-intel.orig/src/intel_display.c  2011-01-27 
11:42:50.670785002 +1100
 xserver-xorg-video-intel/src/intel_display.c   2011-01-27 
11:48:03.070785001 +1100
 @@ -36,6 +36,8 @@
  #include 
  #include 
@@ -31,7 +31,7 @@ index 97c1a0a..13924c0 100644
  #include "xorgVersion.h"
  
  #include "intel.h"
-@@ -888,6 +890,13 @@ intel_output_dpms(xf86OutputPtr output, int dpms)
+@@ -928,6 +930,13 @@
drmModeConnectorPtr koutput = intel_output->mode_output;
struct intel_mode *mode = intel_output->mode;
int i;
@@ -39,13 +39,13 @@ index 97c1a0a..13924c0 100644
 +
 +  /* xf86Crtc.c calls dpms off in set desired modes, so ignore
 +   * the request if we're starting up. */
-+  
++
 +  if (intel->starting)
 +  return;
  
for (i = 0; i < koutput->count_props; i++) {
drmModePropertyP

Bug#611232: libx11-6: XrmSetDatabase is documented to not free the database, but frees it, causing crashes

2011-01-26 Thread Marc Lehmann
Package: libx11-6
Version: 2:1.3.3-4
Severity: normal


The documentation for XrmSetDatabase says:

   "The database previously associated with the display (if any) is not
   destroyed."

Consequently, to avoid memory leaks, rxvt-unicode uses this to replace it:

   XrmDestroyDatabase (XrmGetDatabase (dpy));
   XrmSetDatabase (dpy, get_resources (true));

This works almost always. However, sometimes, some third-party library
calls XGetDefault itself, and this causes the undocumented behaviour of
freeing the resource database in XrmSetDatabase.

LockDisplay(display);
/* destroy database if set up imlicitely by XGetDefault() */
if (display->db && (display->flags & XlibDisplayDfltRMDB)) {
XrmDestroyDatabase(display->db);
display->flags &= ~XlibDisplayDfltRMDB;
}
display->db = database;
UnlockDisplay(display);

This makes it basically impossible to both avoid a memory leak AND not
crashing on a double free.

And either the manpage is wrong (which claims the database isn't freed) or
the code.

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.37-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages libx11-6 depends on:
hi  libc6 2.11.2-7   Embedded GNU C Library: Shared lib
ii  libx11-data   2:1.3.3-4  X11 client-side library
ii  libxcb1   1.6-1  X C Binding

libx11-6 recommends no packages.

libx11-6 suggests no packages.

-- debconf information excluded



-- 
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/20110127013134.31968.55853.reportbug@cerebro.laendle



Bug#546836: Bug confirmed: Matrox G550 unusable under squeeze

2011-01-26 Thread Cyril Brulebois
Etienne Vogt  (26/01/2011):
> So there's a reference to an old libXfont.so.1 in /usr/X11R6/lib/ on
> the affected system which is apparently quite old stuff.

IIRC the last time it was that library as well.

> Probably these old files in /usr/X11R6 are a leftover from that
> manual install.

I've just made a note, I'll probably add a check for /usr/X11R6 in the
bug script. Thanks for confirming.

KiBi.


signature.asc
Description: Digital signature


Bug#546836: Bug confirmed: Matrox G550 unusable under squeeze

2011-01-26 Thread Etienne Vogt



On Wed, 26 Jan 2011, Cyril Brulebois wrote:


That reminds me of some bug report where there were some libraries
left over from really old stuff, like X11R6 files. You may want to try
locate or find and see whether there are such files left. You could
also try ldd on /usr/bin/Xorg (though I'm not sure it was that binary
which was picking up old libraries).


There's the following error in /var/log/gdm/\:0.log

xorg-server 2:1.7.7-11 (Cyril Brulebois )
Current version of pixman: 0.16.4
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: Wed Jan 26 22:56:38 2011
(==) Using config file: "/etc/X11/xorg.conf"
(==) Using system config directory "/usr/share/X11/xorg.conf.d"
SELinux: Disabled on system, not enabling in X server
/usr/bin/X: symbol lookup error: /usr/bin/X: undefined symbol: 
BuiltinRegisterFpeFunctions


ldd /usr/bin/X gives :
linux-gate.so.1 =>  (0xb7862000)
libc.so.6 => /lib/libc.so.6 (0xb770a000)
/lib/ld-linux.so.2 (0xb7863000)

On the working squeeze system, it gives :
linux-gate.so.1 =>  (0xb7731000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75db000)
/lib/ld-linux.so.2 (0xb7732000)

/lib/i686/cmov/libc.so.6 is in the libc6-i686 package which is
not present on the affected system. I tried installing it but to no
avail.

I tried then ldd /usr/bin/Xorg on the still affected system :
linux-gate.so.1 =>  (0xb78d7000)
libudev.so.0 => /lib/libudev.so.0 (0xb78b6000)
libpciaccess.so.0 => /usr/lib/libpciaccess.so.0 (0xb78ae000)
libdl.so.2 => /lib/i686/cmov/libdl.so.2 (0xb78aa000)
libpthread.so.0 => /lib/i686/cmov/libpthread.so.0 (0xb7891000)
libXfont.so.1 => /usr/X11R6/lib/libXfont.so.1 (0xb7816000)
libXau.so.6 => /usr/lib/libXau.so.6 (0xb7812000)
libpixman-1.so.0 => /usr/lib/libpixman-1.so.0 (0xb77b9000)
libXdmcp.so.6 => /usr/lib/libXdmcp.so.6 (0xb77b4000)
libgcrypt.so.11 => /usr/lib/libgcrypt.so.11 (0xb774)
libaudit.so.0 => /lib/libaudit.so.0 (0xb7727000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb770)
librt.so.1 => /lib/i686/cmov/librt.so.1 (0xb76f7000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75b1000)
libz.so.1 => /usr/lib/libz.so.1 (0xb759d000)
/lib/ld-linux.so.2 (0xb78d8000)
libgpg-error.so.0 => /usr/lib/libgpg-error.so.0 (0xb7599000)

and on the working one:
linux-gate.so.1 =>  (0xb7884000)
libudev.so.0 => /lib/libudev.so.0 (0xb7866000)
libpciaccess.so.0 => /usr/lib/libpciaccess.so.0 (0xb785e000)
libdl.so.2 => /lib/i686/cmov/libdl.so.2 (0xb785a000)
libpthread.so.0 => /lib/i686/cmov/libpthread.so.0 (0xb7841000)
libXfont.so.1 => /usr/lib/libXfont.so.1 (0xb780b000)
libXau.so.6 => /usr/lib/libXau.so.6 (0xb7807000)
libpixman-1.so.0 => /usr/lib/libpixman-1.so.0 (0xb77ae000)
libXdmcp.so.6 => /usr/lib/libXdmcp.so.6 (0xb77a9000)
libgcrypt.so.11 => /usr/lib/libgcrypt.so.11 (0xb7735000)
libaudit.so.0 => /lib/libaudit.so.0 (0xb771c000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb76f6000)
librt.so.1 => /lib/i686/cmov/librt.so.1 (0xb76ec000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a6000)
libz.so.1 => /usr/lib/libz.so.1 (0xb7592000)
/lib/ld-linux.so.2 (0xb7885000)
libfreetype.so.6 => /usr/lib/libfreetype.so.6 (0xb751b000)
libbz2.so.1.0 => /lib/libbz2.so.1.0 (0xb750a000)
libfontenc.so.1 => /usr/lib/libfontenc.so.1 (0xb7503000)
libgpg-error.so.0 => /usr/lib/libgpg-error.so.0 (0xb74ff000)

So there's a reference to an old libXfont.so.1 in /usr/X11R6/lib/
on the affected system which is apparently quite old stuff.
Since it is no longer referenced in any installed package, I removed the
whole /usr/X11R6 directory from the system and X is now working
again :-)
I remember now that when the system was installed in potatoe, I had
to reinstall XFree manually as the XFree in potatoe didn't support
the Matrox G550 which was a brand new card at the time.
Probably these old files in /usr/X11R6 are a leftover from that
manual install.

Good guess, Thanks !

--
Etienne Vogt.



--
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/pine.lnx.4.64.1101262314560.20...@zuul.vogt-bodving.test



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

2011-01-26 Thread Christopher Halse Rogers
 ChangeLog |  536 ++
 configure.ac  |2 
 man/nouveau.man   |   18 
 src/drmmode_display.c |  325 +
 src/nouveau_class.h   | 1171 ++
 src/nouveau_dri2.c|  311 -
 src/nouveau_exa.c |  102 +---
 src/nouveau_local.h   |   11 
 src/nouveau_wfb.c |2 
 src/nouveau_xv.c  |   71 +--
 src/nv04_exa.c|   43 +
 src/nv04_xv_blit.c|   13 
 src/nv10_exa.c|1 
 src/nv30_exa.c|3 
 src/nv30_shaders.c|1 
 src/nv30_xv_tex.c |   20 
 src/nv40_exa.c|3 
 src/nv40_xv_tex.c |   20 
 src/nv50_accel.c  |   82 ++-
 src/nv50_accel.h  |   12 
 src/nv50_exa.c|   23 
 src/nv50_xv.c |  188 ++--
 src/nv_accel_common.c |  109 
 src/nv_const.h|8 
 src/nv_dma.c  |   24 -
 src/nv_driver.c   |  150 +++---
 src/nv_include.h  |4 
 src/nv_proto.h|   17 
 src/nv_type.h |9 
 29 files changed, 2766 insertions(+), 513 deletions(-)

New commits:
commit 8d2f1207d232c6c3ad3d0323b91434ad2bf8008e
Author: Christopher James Halse Rogers 
Date:   Wed Jan 26 13:00:35 2011 +1100

Imported Upstream version 0.0.16+git20110107+b795ca6e

diff --git a/ChangeLog b/ChangeLog
index 71b05d6..39fbc4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,484 @@
+commit 889629becd8ac2ea718c3a2fc1f8be29596a8ffa
+Merge: b9f414c b795ca6
+Author: Christopher James Halse Rogers 
+Date:   Wed Jan 26 12:56:27 2011 +1100
+
+Merge commit 'b795ca6e97fae9' into upstream-ubuntu
+
+commit b795ca6e97fae9735843748585401098dae1c3e1
+Author: Ben Skeggs 
+Date:   Fri Jan 7 13:33:36 2011 +1000
+
+nv50: fix pitch of linear scanout buffers
+
+Un-breaks NoAccel on these chipsets.
+
+Signed-off-by: Ben Skeggs 
+
+commit dc89dac734167bcbc667b39ca6ee2043871a60bf
+Author: Xavier Chantry 
+Date:   Sun Dec 19 23:17:34 2010 +0100
+
+nv04/exa: kill useless WAIT_RING
+
+Signed-off-by: Francisco Jerez 
+
+commit b76b43928bf4dcf5ce3a4b58c7fefe780070c0d3
+Author: Ben Skeggs 
+Date:   Tue Dec 21 16:25:23 2010 +1000
+
+add back generic include of nouveau_pushbuf.h
+
+So places that FIRE_RING() still work.
+
+Signed-off-by: Ben Skeggs 
+
+commit c2092a458401377f421d9bdfe1d97ce580b99508
+Author: Ben Skeggs 
+Date:   Mon Dec 20 11:50:57 2010 +1000
+
+include nv04_pushbuf.h for ring macros, rather than nouveau_pushbuf.h
+
+Signed-off-by: Ben Skeggs 
+
+commit aa2821a42706ac7b69703d1869e2d00a4ced9f4b
+Author: Ben Skeggs 
+Date:   Mon Dec 20 11:53:53 2010 +1000
+
+kill NVSync(), it's rather useless
+
+Signed-off-by: Ben Skeggs 
+
+commit 1fc564fe3494cf0abcc848d0e90bf2232f8fd272
+Author: Ben Skeggs 
+Date:   Thu Dec 16 09:49:09 2010 +1000
+
+nv50/xv: use mad in nv12 shader, rather than mul+add
+
+Signed-off-by: Ben Skeggs 
+
+commit b6cb21b91f7d0409794a14ddbdd606728d4d49e3
+Author: Ben Skeggs 
+Date:   Mon Feb 8 12:51:47 2010 +1000
+
+set canDoBGNoneRoot if building against new enough server
+
+commit 11510f9ce8c9eab15e7f6d5962b83fc0052c8619
+Author: Ben Skeggs 
+Date:   Tue Dec 14 15:39:01 2010 +1000
+
+nv50/xv: implement brightness/contrast/saturation/hue controls
+
+Adapted from the code in xf86-video-ati.
+
+Signed-off-by: Ben Skeggs 
+
+commit 214ea264cdb386520a1308a29f204e441f349cb1
+Author: Ben Skeggs 
+Date:   Tue Dec 14 14:42:24 2010 +1000
+
+nv50/xv: kick csc parameters out into a constant buffer
+
+These were previously inlined into the shader, which is simple, but makes
+implementing brightness/contrast adjustments impossible.
+
+Signed-off-by: Ben Skeggs 
+
+commit 8bb8231236a6b877895663aeaa9cef731d67fe68
+Author: Ben Skeggs 
+Date:   Tue Nov 30 15:27:36 2010 +1000
+
+dri2: fix certain clients blocking forever when sync-to-vblank unavailable
+
+Signed-off-by: Ben Skeggs 
+
+commit f29afe65b67c9b89ceba421d9b3aee590f7ded20
+Author: Ben Skeggs 
+Date:   Mon Nov 29 09:23:35 2010 +1000
+
+dri2: don't return failure from get_msc if sync-to-vblank isn't available
+
+Signed-off-by: Ben Skeggs 
+
+commit 4b1d26578116f4d1745dd92a7c99413972a2bedf
+Author: Francisco Jerez 
+Date:   Thu Nov 25 21:33:46 2010 +0100
+
+dri2: Don't return failure from schedule_wait if sync-to-vblank is 
unavailable.
+
+Reported-by: Ben Skeggs 
+Signed-off-by: Francisco Jerez 
+
+commit 1143e7a97dce1b741376e178b73b8b766e03849a
+Author: Jesse Adkins 
+Date:   Tue Oct 26 16:05:32 2010 -0700
+
+Purge cvs tags.
+
+Signed-off-by: Jesse Adkins 
+Signed-off-by: Francisco Jerez 
+
+commit 22020457f43eceaf26532ecb50e46d743f4a691f
+Author: Francisco Jerez 
+Date:   Tue Oct 26 00:24:06 2010 +0200
+
+dri2: Fix throttling on occluded drawables.
+
+Signed-off-by: Francisco Jerez 
+
+commit 9737a812aacbc544b93eeaa031cf1c2e8adbd661
+Author: Ben Skeggs 
+Date:   Mon Oc

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

2011-01-26 Thread Christopher Halse Rogers
 ChangeLog   |  459 
 configure.ac|2 
 debian/README.Debian|   21 -
 debian/README.source|   20 +
 debian/changelog|   61 +++
 debian/control  |   12 
 debian/patches/02_nouveau_bgnr  |   21 -
 debian/patches/03_use_older_libdrm_headers.diff |  205 ++
 debian/patches/series   |2 
 debian/watch|2 
 man/nouveau.man |   18 
 src/drmmode_display.c   |  305 +++
 src/nouveau_class.h |2 
 src/nouveau_dri2.c  |  299 +++
 src/nouveau_exa.c   |   92 +---
 src/nouveau_local.h |   11 
 src/nouveau_wfb.c   |2 
 src/nouveau_xv.c|   53 +-
 src/nv04_exa.c  |   39 +-
 src/nv04_xv_blit.c  |   13 
 src/nv10_exa.c  |1 
 src/nv30_exa.c  |1 
 src/nv30_shaders.c  |1 
 src/nv30_xv_tex.c   |   20 -
 src/nv40_exa.c  |1 
 src/nv40_xv_tex.c   |   20 -
 src/nv50_accel.c|   74 ++-
 src/nv50_accel.h|   12 
 src/nv50_exa.c  |1 
 src/nv50_xv.c   |  188 -
 src/nv_accel_common.c   |  109 +
 src/nv_const.h  |8 
 src/nv_dma.c|   24 -
 src/nv_driver.c |  118 --
 src/nv_include.h|4 
 src/nv_proto.h  |   17 
 src/nv_type.h   |9 
 37 files changed, 1853 insertions(+), 394 deletions(-)

New commits:
commit a1e2fdcf0ff00e846b394c40d09319c54182fc12
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 09:00:16 2011 +1100

Document how to update to a new snapshot

diff --git a/debian/README.source b/debian/README.source
index b09a1ab..ed40ebd 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -14,6 +14,26 @@ Quick Guide To Patching This Package For The Impatient
 Alternatively, instead of using quilt directly, you can drop the patch in to 
 debian/patches and add the name of the patch to debian/patches/series.
 
+-
+Updating this package
+-
+
+Because nouveau has no releases, packaging a new upstream version has a
+slightly different process to normal.  As there is no canonical tarball,
+we need to generate one ourselves in such a way that it can be regenerated
+properly.  To do this, we use the pristine-tar functionality of 
git-buildpackage
+
+The outline of an update is:
+
+ * Merge upstream into upstream-ubuntu
+ * Create a source tarball, including the git log as $(TOP)/ChangeLog
+ * Import this tarball with git-import-orig
+ * Update debian/changelog
+
+The easiest way to create a new source tarball is to run the get-orig-source
+target of debian/rules, which will create a tarball of upstream/master.
+git-buildpackage is set up to do the right thing when git-import-orig is 
called.
+
 
 Guide To The X Strike Force Packages
 
diff --git a/debian/changelog b/debian/changelog
index c10af58..3401027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xserver-xorg-video-nouveau 
(1:0.0.16+git20110107+b795ca6e-0ubuntu1) natty; urgen
   * debian/patches/02_nouveau_bgnr:
 - Update to build against both Ubuntu-patched and upstream 1.10 BG None
   ABIs.
+  * debian/README.source:
+- Document how to update to a new upstream snapshot.
 
  -- Christopher James Halse Rogers   Wed, 26 Jan 2011 
13:48:15 +1100
 

commit b17844a66a54d456633aa10c16b60969fe357385
Author: Christopher James Halse Rogers 
Date:   Wed Jan 26 13:49:41 2011 +1100

Refresh patches for new Xserver ABI, build against released libdrm

diff --git a/debian/changelog b/debian/changelog
index 5a3c3a8..c10af58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,14 @@ xserver-xorg-video-nouveau 
(1:0.0.16+git20110107+b795ca6e-0ubuntu1) natty; urgen
   * Drop debian/patches/03_work-around-exa-hangs.patch; natty's 2.6.37 kernel
 now has the accompanying kernel commit.
   * New upstream snapshot
-
- -- Christopher James Halse Rogers   Wed, 26 Jan 2011 
13:05:54 +1100
+  * debian/patches/03_use_older_libdrm_headers.diff:
+- Rever

xserver-xorg-video-nouveau: Changes to 'pristine-tar'

2011-01-26 Thread Christopher Halse Rogers
 xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz.delta 
|binary
 xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz.id|
1 +
 2 files changed, 1 insertion(+)

New commits:
commit ee91244c861812635665da5656bafddd344dabbc
Author: Christopher James Halse Rogers 
Date:   Wed Jan 26 13:00:35 2011 +1100

pristine-tar data for 
xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz

diff --git 
a/xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz.delta 
b/xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz.delta
new file mode 100644
index 000..7226214
Binary files /dev/null and 
b/xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz.delta 
differ
diff --git 
a/xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz.id 
b/xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz.id
new file mode 100644
index 000..d3185b6
--- /dev/null
+++ b/xserver-xorg-video-nouveau_0.0.16+git20110107+b795ca6e.orig.tar.gz.id
@@ -0,0 +1 @@
+8d2f1207d232c6c3ad3d0323b91434ad2bf8008e


-- 
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/e1pidki-0001gp...@alioth.debian.org



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

2011-01-26 Thread Bryce Harrington
 debian/changelog  |   31 ++-
 debian/control|7 ---
 debian/patches/series |1 +
 3 files changed, 35 insertions(+), 4 deletions(-)

New commits:
commit 0899c79f46dbfc33b50b152a7100c120e397edad
Author: Bryce Harrington 
Date:   Wed Jan 26 12:28:12 2011 -0800

* New upstream release.
  - Sandy Bridge RENDER and XVIDEO acceleration
  - i965+ RENDER acceleration
  - Fix backlight on Arrandale (LP: #705949)
* Remaining Ubuntu Changes:
  - 107_solid_nullptr_check.patch: Check null return from 
uxa_acquire_solid()
* Change dep on libudev-dev to not limit to linux-any (fixes FTBS when
  using pbuilder, see deb bug 600823)
* Add python-dev recommends for xserver-xorg-video-intel, needed by
  debian/apport-gpu-error-intel.py
* Drop 106_restore_backlight_at_mode_set.patch:  Included in release
* Add 107_solid_null_ptr.patch: uxa_acquire_solid() can return NULL
  under some circumstances, so check for this when called.
  (LP: #705078)
* Add 106_restore_backlight_at_mode_set.patch: Force DPMS to On for all
  outputs, to match kernel behavior, and restore the backlight level on
  resume.
  (LP: #685767)

diff --git a/debian/changelog b/debian/changelog
index 6bad586..86fc937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 xserver-xorg-video-intel (2:2.14.0-1ubuntu1) natty; urgency=low
 
-  * New upstream release. Remaining Ubuntu Changes:
+  * New upstream release.
+- Sandy Bridge RENDER and XVIDEO acceleration
+- i965+ RENDER acceleration
+- Fix backlight on Arrandale (LP: #705949)
+  * Remaining Ubuntu Changes:
 - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev,
   debian/xserver-xorg-video-intel:
   Add apport script to collect debug information on GPU hangs
@@ -15,6 +19,14 @@ xserver-xorg-video-intel (2:2.14.0-1ubuntu1) natty; 
urgency=low
   Don't install /etc/modprobe.d/i915-kms.conf, and remove it on upgrades.
   At best it's redundant (as the kernel defaults to KMS), at worst it 
breaks
   the ability to disable KMS.
+- 107_solid_nullptr_check.patch: Check null return from uxa_acquire_solid()
+
+  [Bryce Harrington]
+  * Change dep on libudev-dev to not limit to linux-any (fixes FTBS when
+using pbuilder, see deb bug 600823)
+  * Add python-dev recommends for xserver-xorg-video-intel, needed by
+debian/apport-gpu-error-intel.py
+  * Drop 106_restore_backlight_at_mode_set.patch:  Included in release
 
  -- Robert Hooker   Mon, 24 Jan 2011 12:58:42 -0500
 
@@ -37,6 +49,23 @@ xserver-xorg-video-intel (2:2.13.903-1) experimental; 
urgency=low
 
  -- Cyril Brulebois   Tue, 04 Jan 2011 15:43:17 +0100
 
+xserver-xorg-video-intel (2:2.13.901-2ubuntu3) natty; urgency=low
+
+  * Add 107_solid_null_ptr.patch: uxa_acquire_solid() can return NULL
+under some circumstances, so check for this when called.
+(LP: #705078)
+
+ -- Bryce Harrington   Fri, 21 Jan 2011 19:17:34 -0800
+
+xserver-xorg-video-intel (2:2.13.901-2ubuntu2) natty; urgency=low
+
+  * Add 106_restore_backlight_at_mode_set.patch: Force DPMS to On for all
+outputs, to match kernel behavior, and restore the backlight level on
+resume.
+(LP: #685767)
+
+ -- Bryce Harrington   Mon, 13 Dec 2010 15:26:39 -0800
+
 xserver-xorg-video-intel (2:2.13.901-2ubuntu1) natty; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index f5bb2f0..ba241b9 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,8 @@ Build-Depends:
  libxcb-aux0-dev,
  libxcb-dri2-0-dev,
 # end xvmc
- libudev-dev [linux-any],
+# libudev-dev [linux-any],
+ libudev-dev,
  dpkg-dev (>= 1.14.17),
  quilt,
  automake,
@@ -43,7 +44,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.g
 Package: xserver-xorg-video-intel
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
-Recommends: intel-gpu-tools
+Recommends: intel-gpu-tools, python-dev
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-i810 (<< 2:1.9.91-1), 
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, 
xserver-xorg-driver-i810
 Conflicts: xserver-xorg-video-i810 (<< 2:1.9.91-1), 
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, 
xserver-xorg-driver-i810, 915resolution
@@ -62,7 +63,7 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
 
 Package: xserver-xorg-video-intel-dbg
 Architecture: amd64 i386
-Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
+Depends: xserver-xorg-video-intel (= ${binary:Version}), ${misc:Depends}, 
${shlibs:Depends}
 Recommends: intel-gpu-tools
 Section: debug
 Priority: extra
diff --git a/debian/patches/series b/debian/patches/series
index 3e44212..004eef1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 101_copy-fb.pa

Bug#546836: Bug confirmed: Matrox G550 unusable under squeeze

2011-01-26 Thread Cyril Brulebois
Etienne Vogt  (26/01/2011):
> I checked in /usr/local and found nothing obvious (no old libraries
> there), but this system is old, it was first installed in Debian
> potatoe and upgraded all the way up to squeeze over the time.  The
> system that works fine was installed in lenny and upgraded to
> squeeze.  I also tried removing old files in /etc/X11/ (not present
> on the working system) without success.

That reminds me of some bug report where there were some libraries
left over from really old stuff, like X11R6 files. You may want to try
locate or find and see whether there are such files left. You could
also try ldd on /usr/bin/Xorg (though I'm not sure it was that binary
which was picking up old libraries).

KiBi.


signature.asc
Description: Digital signature


Bug#546836: Bug confirmed: Matrox G550 unusable under squeeze

2011-01-26 Thread Etienne Vogt



On Wed, 26 Jan 2011, Michel Dänzer wrote:


If the X log file ends abruptly like that, there's usually more
information in the X server stderr output, which should be captured in
the gdm/kdm/... log file.


Ok, I will check the gdm logfile next time.


Finally, I put the original hard disk back in, upgraded Xorg again
to the squeeze version and the problem reappeared :-(

So, I have something on that disk that is causing trouble. I already
know it's not xorg.conf nor the kernel. And I have the same set of
xserver-* packages on the two systems.


Symptoms such as above are often caused by stale libraries in /usr/local
or so, resulting in unresolved symbols.


I checked in /usr/local and found nothing obvious (no old libraries
there), but this system is old, it was first installed in Debian potatoe
and upgraded all the way up to squeeze over the time.
The system that works fine was installed in lenny and upgraded to squeeze.
I also tried removing old files in /etc/X11/ (not present on the working 
system) without success.


By the way, the problem is definitely not in the mga driver: I tried
the vesa driver and it crashed in exactly the same way. So, there's
a general problem with the X server from squeeze on this system.

--
Etienne Vogt.




--
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/pine.lnx.4.64.1101261148130.16...@zuul.vogt-bodving.test



Bug#611169: x11-xkb-utils: Numlock never enable

2011-01-26 Thread Laurent Grawet
Package: x11-xkb-utils
Version: 7.5+5
Severity: important

Hi,

There is a long standing bug (~ Aug. 2010) with NumLock not activating
automatically in X or having inverted behaviour (led off - numlock on).
All computers I saw where concerned. This is really annoying.

According to this post, the bug is located in this package :
http://forums.debian.net/viewtopic.php?f=10&t=55725&start=15#p332929

NumLock seems to work fine with x11-xkb-utils 7.4+1 (=Lenny)
You can read the thread for more details.

Regards,

Laurent

-- System Information:
Debian Release: 6.0
  APT prefers testing
  APT policy: (990, 'testing'), (300, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages x11-xkb-utils depends on:
ii  libc6 2.11.2-9   Embedded GNU C Library: Shared lib
ii  libx11-6  2:1.3.3-4  X11 client-side library
ii  libxaw7   2:1.0.7-1  X11 Athena Widget library
ii  libxkbfile1   1:1.0.6-2  X11 keyboard file manipulation lib
ii  libxmu6   2:1.0.5-2  X11 miscellaneous utility library
ii  libxt61:1.0.7-1  X11 toolkit intrinsics library
ii  x11-common1:7.5+8X Window System (X.Org) infrastruc

x11-xkb-utils recommends no packages.

x11-xkb-utils suggests no packages.

-- no debconf information



-- 
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/20110126104528.6549.6540.report...@pcgrawet.sipr.ucl.ac.be



Bug#546836: Bug confirmed: Matrox G550 unusable under squeeze

2011-01-26 Thread Michel Dänzer
On Mit, 2011-01-26 at 00:45 +0100, Etienne Vogt wrote: 
> 
> On Tue, 25 Jan 2011, Cyril Brulebois wrote:
> 
> > could you please check whether there's something in Xorg.0.log.old?
> > Maybe the one with no info is a restarted one?
> 
> No, it ends up with :
> drmOpenByBusid: Searching for BusID pci::01:00.0
> drmOpenDevice: node name is /dev/dri/card0
> drmOpenDevice: open result is 14, (OK)
> drmOpenByBusid: drmOpenMinor returns 14
> drmOpenByBusid: Interface 1.4 failed, trying 1.1
> drmOpenByBusid: drmGetBusid reports pci::01:00.0
> (II) AIGLX: enabled GLX_SGI_make_current_read
> (II) AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control
> (II) AIGLX: Loaded and initialized /usr/lib/dri/mga_dri.so
> (II) GLX: Initialized DRI GL provider for screen 0

If the X log file ends abruptly like that, there's usually more
information in the X server stderr output, which should be captured in
the gdm/kdm/... log file.


> Anyways, I did some test with the Matrox G550 card in another system
> also in squeeze and it worked fine in that system, with the
> same xorg.conf and the same kernel. 
> I then plugged the card back in the affected system but swapped the
> harddisks, and it also worked fine.
> Finally, I put the original hard disk back in, upgraded Xorg again
> to the squeeze version and the problem reappeared :-(
> 
> So, I have something on that disk that is causing trouble. I already
> know it's not xorg.conf nor the kernel. And I have the same set of
> xserver-* packages on the two systems.

Symptoms such as above are often caused by stale libraries in /usr/local
or so, resulting in unresolved symbols.


-- 
Earthling Michel Dänzer   |http://www.vmware.com
Libre software enthusiast |  Debian, X and DRI developer



--
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/1296031120.8612.213.camel@thor.local