Re: xserver-xorg-video-nouveau: Changes to 'debian-experimental'

2013-06-12 Thread Maarten Lankhorst 
Hey,

Op 12-06-13 19:27, Sven Joachim schreef:
> Hi,
>
> it is currently not necessary to use the debian-experimental branch,
> especially since there has been a newer version in unstable.
>
> On 2013-06-12 11:32 +0200, Maarten Lankhorst wrote:
>
>>  .gitignore   |2 
>>  ChangeLog|16944 
>> ---
> FWIW, I don't agree with deleting this file - package contents now
> depend on whether you're building from git or from a tarball, and
> ChangeLog is also used by the 01-set-NV_DRIVER_DATE-from-ChangeLog.diff
> patch.
I don't see a point of keeping NV_DRIVER_DATE, it was useful in the 0.0.16 days 
where everything
was just a git snapshot, but I now regularly do xf86-video-nouveau, so there's 
never a big delta
between versions. Does anyone have any objections if I zap NV_DRIVER_DATE 
upstream?

~Maarten


-- 
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/51b8dc63.10...@gmail.com

Bug#633786: libdrm-nouveau1a: Doesn't Depends on a sufficiently recent version of libdrm2

2013-06-12 Thread Julien Cristau 
On Wed, Jun 12, 2013 at 20:36:53 +0200, Sven Joachim wrote:

> The following patch (applicable against version 1.0.8) seems to actually
> work:
> 
> --8<---cut here---start->8---
> diff --git a/configure.ac b/configure.ac
> index 6f7f870..15c8402 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -84,6 +84,10 @@ PKG_CHECK_MODULES(LIBDRM_NOUVEAU, [libdrm_nouveau >= 
> 2.4.25])
>  AC_SUBST(LIBDRM_NOUVEAU_CFLAGS)
>  AC_SUBST(LIBDRM_NOUVEAU_LIBS)
>  
> +PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.17])
> +AC_SUBST(LIBDRM_CFLAGS)
> +AC_SUBST(LIBDRM_LIBS)
> +

PKG_CHECK_MODULES does the AC_SUBST for these already.

>  PKG_CHECK_MODULES(XORG, [xorg-server >= 1.8] xproto fontsproto libdrm 
> $REQUIRED_MODULES)
>  PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
> HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
> [xextproto 7.1 available]),
> diff --git a/src/Makefile.am b/src/Makefile.am
> index f54e135..5836ead 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -23,10 +23,10 @@
>  # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
>  # _ladir passes a dummy rpath to libtool so the thing will actually link
>  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
> -AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@
> +AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ 
> @LIBDRM_CFLAGS@
>  nouveau_drv_la_LTLIBRARIES = nouveau_drv.la
>  nouveau_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_NOUVEAU_LIBS@ \
> -  @LIBUDEV_LIBS@
> +  @LIBUDEV_LIBS@ @LIBDRM_LIBS@
>  nouveau_drv_ladir = @moduledir@/drivers
>  
>  nouveau_drv_la_SOURCES = \
> --8<---cut here---end--->8---
> 
> I'm not really an autotools expert though, so I would prefer to get some
> feedback before I send it upstream.
> 
Other than the minor nit above, looks fine to me.

(Arguably the drivers should also be linked against pixman...)

Cheers,
Julien


signature.asc
Description: Digital signature

Bug#711901: random xserver deadlocks in evdev

2013-06-12 Thread Goetz Gaycken 
I applied the patch i.e.

1cb8f074df8d16879ec80d778d26fb5b9af05a3b

from

git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev

and it seems that the problem disappeared. at least it did not show up
in the last two days.

Thanks !

Cheers,
  Götz Gaycken


-- 
Götz Gaycken  - Physikalisches Institut der Universität Bonn
Office : CERN bat. 304-1-042   Tel : +41-22-76-78052


-- 
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/1371068109.14526.4.ca...@pcatlbnp01.cern.ch

Bug#712024: Characters go missing when ESC [ K occurs when wrapping a line

2013-06-12 Thread Thomas Dickey 
On Wed, Jun 12, 2013 at 02:10:04PM +0300, Riku Saikkonen wrote:
> (Following up to my own bug report.)
> 
> Hmm. I just found the same problem reported as bug #456943 (reassigned
> to grep), where the first few messages indicate that this is not
> actually an xterm bug but intended behavior for VT100-compatible
> terminals. Though it does not appear to be easy to find out what grep
> should do either...
> 
> Also, a friend of mine found a real-life DEC VT220 terminal and tried to
> see what happens there; and the VT220 terminal acts exactly like xterm
> does. See the attached picture of the screen. (The latter example in the
> image turns on auto-wrap in case it wasn't on before, but here it was
> (the default setting is user-configurable in the menus of the terminal
> itself).)

thanks.  I had some confirmation of this when I added a test-screen to
vttest a while back to demonstrate the differences.
 
> So it appears that xterm (and rxvt) is indeed correct and
> gnome-terminal, konsole, screen, tmux and rxvt-unicode do not emulate
> the VT220 exactly, and grep does the wrong thing by default in this
> case.
> 
> Now I'm not sure what should be done with this bug report. Maybe
> reassign it to grep and merge it with #456943? Should I report separate
> bugs against gnome-terminal, konsole, screen, tmux and rxvt-unicode
> because they don't behave like a real VT220 does?

tmux is maintained - might help - I'm not sure about the others.

pterm (putty) also differs.

-- 
Thomas E. Dickey 
http://invisible-island.net
ftp://invisible-island.net


signature.asc
Description: Digital signature

Bug#633786: libdrm-nouveau1a: Doesn't Depends on a sufficiently recent version of libdrm2

2013-06-12 Thread Sven Joachim 
Sorry for having this linger for so long. :-(

On 2011-07-18 22:37 +0200, Sven Joachim wrote:

> On 2011-07-18 21:06 +0200, Julien Cristau wrote:
>
>> On Wed, Jul 13, 2011 at 20:16:56 +0200, Sven Joachim wrote:
>>
>>> Except that libdrm-nouveau1a does not reference drmGetDeviceNameFromFd
>>> anywhere.  The DDX driver (xserver-xorg-video-nouveau) does, however.
>>> But for some reason this package does not depend on libdrm2 at all,
>>> although /usr/lib/xorg/modules/drivers/nouveau_drv.so is linked against
>>> libdrm.so.2.
>>> 
>> Doesn't look like it uses -ldrm actually.  Something like this
>> (untested)?
>>
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index e9e84ae..3b9f0f6 100644
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -25,8 +25,10 @@
>>  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
>>  AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@
>>  nouveau_drv_la_LTLIBRARIES = nouveau_drv.la
>> -nouveau_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_NOUVEAU_LIBS@ \
>> -@LIBUDEV_LIBS@
>> +nouveau_drv_la_LDFLAGS = -module -avoid-version
>> +nouveau_drv_la_LIBADD = @LIBDRM_NOUVEAU_LIBS@ \
>> +@LIBUDEV_LIBS@ \
>> +@XORG_LIBS@
>>  nouveau_drv_ladir = @moduledir@/drivers
>>  
>>  nouveau_drv_la_SOURCES = \
>
> Does not work out of the box because your mailer converted tabs into
> spaces. :-/ After fixing that it works, with only the minor problem that
> xserver-xorg-video-nouveau gains an unneeded dependency on
> libpciaccess0:
>
> ,
> | dpkg-shlibdeps: warning: dependency on libpciaccess.so.0 could be
> | avoided if
> | 
> "debian/xserver-xorg-video-nouveau/usr/lib/xorg/modules/drivers/nouveau_drv.so"
> | were not uselessly linked against it (they use none of its symbols).
> `

The following patch (applicable against version 1.0.8) seems to actually
work:

--8<---cut here---start->8---
diff --git a/configure.ac b/configure.ac
index 6f7f870..15c8402 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,10 @@ PKG_CHECK_MODULES(LIBDRM_NOUVEAU, [libdrm_nouveau >= 2.4.25])
 AC_SUBST(LIBDRM_NOUVEAU_CFLAGS)
 AC_SUBST(LIBDRM_NOUVEAU_LIBS)
 
+PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.17])
+AC_SUBST(LIBDRM_CFLAGS)
+AC_SUBST(LIBDRM_LIBS)
+
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.8] xproto fontsproto libdrm 
$REQUIRED_MODULES)
 PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
diff --git a/src/Makefile.am b/src/Makefile.am
index f54e135..5836ead 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,10 +23,10 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ 
@LIBDRM_CFLAGS@
 nouveau_drv_la_LTLIBRARIES = nouveau_drv.la
 nouveau_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_NOUVEAU_LIBS@ \
-@LIBUDEV_LIBS@
+@LIBUDEV_LIBS@ @LIBDRM_LIBS@
 nouveau_drv_ladir = @moduledir@/drivers
 
 nouveau_drv_la_SOURCES = \
--8<---cut here---end--->8---

I'm not really an autotools expert though, so I would prefer to get some
feedback before I send it upstream.

Cheers,
   Sven


-- 
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/87zjuvw4ze@turtle.gmx.de

Bug#659816: marked as done (libxdmcp: libXdmcp Segmentation fault with php5)

2013-06-12 Thread Debian Bug Tracking System 
Your message dated Wed, 12 Jun 2013 20:19:48 +0200
with message-id <20130612181948.gd6...@betterave.cristau.org>
and subject line Re: Bug#659816: libxdmcp: libXdmcp Segmentation fault with php5
has caused the Debian Bug report #659816,
regarding libxdmcp: libXdmcp Segmentation fault with php5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
659816: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=659816
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: libxdmcp
Version: 6.0.0
Severity: critical
Tags: upstream
Justification: causes serious data loss


When running a php5-cli script, it finishes normally, but after the end, I get 
a random "Segmentation fault" sign (on some runs it happens, on some - it 
doesnt).
The /var/log/user.log gets those lines:

Feb 14 01:30:27 localhost kernel: [44767.578453] php5-cgi[30496]: segfault at 
b64d9562 ip b64d9562 sp ac8b72e8 error 4
Feb 14 01:30:27 localhost kernel: [44767.578471] php5-cgi[30494]: segfault at 
b64d9562 ip b64d9562 sp b43e82e8 error 4
Feb 14 01:30:27 localhost kernel: [44767.578488] php5-cgi[30495]: segfault at 
b64d94e2 ip b64d94e2 sp ad0b82e8 error 4 in libXdmcp.so.6.0.0[b6a78000+4000] in 
libXdmcp.so.6.0.0[b6a78000+4000] in libXdmcp.so.6.0.0[b6a78000+4000]




-- System Information:
Debian Release: 6.0.4
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash


--- End Message ---
--- Begin Message ---
On Tue, Feb 14, 2012 at 14:15:26 +0100, Cyril Brulebois wrote:

> Arkadiy Kulev  (14/02/2012):
> > When running a php5-cli script, it finishes normally, but after the
> > end, I get a random "Segmentation fault" sign (on some runs it
> > happens, on some - it doesnt).  The /var/log/user.log gets those
> > lines:
> > 
> > Feb 14 01:30:27 localhost kernel: [44767.578453] php5-cgi[30496]: segfault 
> > at b64d9562 ip b64d9562 sp ac8b72e8 error 4
> > Feb 14 01:30:27 localhost kernel: [44767.578471] php5-cgi[30494]: segfault 
> > at b64d9562 ip b64d9562 sp b43e82e8 error 4
> > Feb 14 01:30:27 localhost kernel: [44767.578488] php5-cgi[30495]: segfault 
> > at b64d94e2 ip b64d94e2 sp ad0b82e8 error 4 in 
> > libXdmcp.so.6.0.0[b6a78000+4000] in libXdmcp.so.6.0.0[b6a78000+4000] in 
> > libXdmcp.so.6.0.0[b6a78000+4000]
> 
> you'll have to be more specific. Which script, in which environment,
> with which input? Also, get a full backtrace, once you have installed
> libxdmcp6-dbg.
> 
Closing as there's not enough info to do anything here and no evidence
of a libXdmcp bug.

Cheers,
Julien--- End Message ---

Bug#711994: libgl1-mesa-dri: Blank output on Radeon HD 6450/7450/8450

2013-06-12 Thread Jan Hudec 
On Wednesday 12 of June 2013 11:13:43 Michel Dänzer wrote:
> On Die, 2013-06-11 at 22:03 +0200, Jan Hudec wrote:
> > Package: libgl1-mesa-dri
> > Version: 9.1.3-6
> > Severity: important
> > 
> > After update to 9.1.3-6, output of anything OpenGL is blank. Downgrading
> > to 8.0.5-6 from Jessie fixes the problem (obviously all of mesa is
> > upgraded or downgraded together, not just libgl1-mesa-dri in
> > particular).
> > 
> > I've tried turning off OpenGL in kwin (strangely with it turned on it did
> > display apparently fine)
> 
> Sounds like not everything OpenGL is affected after all. :)

It seems I wrote that too fast. After downgrading I switched it back to OpenGL 
and it said something like "OpenGL is disabled, because it crashed. If you 
think you have working version now, save all your work and click this to retry 
it. Warning, might crash immediately." So it was selected, but apparently 
wasn't actually used.

> Does glxgears print the framerate every 5 seconds? If not, can you try
> running it in gdb and see if it's hanging somewhere?

Yes, it does. The frame-rate was as expected and it decreased when I enlarged 
the window to full screen exactly as it does when everything works.

-- 
 - Jan Hudec 


--
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/201306121933.16318.b...@ucw.cz

Re: xserver-xorg-video-nouveau: Changes to 'debian-experimental'

2013-06-12 Thread Sven Joachim 
Hi,

it is currently not necessary to use the debian-experimental branch,
especially since there has been a newer version in unstable.

On 2013-06-12 11:32 +0200, Maarten Lankhorst wrote:

>  .gitignore   |2 
>  ChangeLog|16944 
> ---

FWIW, I don't agree with deleting this file - package contents now
depend on whether you're building from git or from a tarball, and
ChangeLog is also used by the 01-set-NV_DRIVER_DATE-from-ChangeLog.diff
patch.

Cheers,
   Sven


-- 
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/877ghzxmqz@turtle.gmx.de

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

2013-06-12 Thread Maarten Lankhorst 
 autogen.sh|4 +-
 configure.ac  |2 -
 src/driver.c  |   71 +++---
 src/drmmode_display.c |   93 --
 src/drmmode_display.h |2 -
 5 files changed, 140 insertions(+), 32 deletions(-)

New commits:
commit 58d3dc53a89c5aa2acfc93e4ae5719dd92b785b9
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:11:53 2013 +0200

bump to 0.8.0

Signed-off-by: Maarten Lankhorst 

diff --git a/configure.ac b/configure.ac
index f0c267f..6f7a7be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-modesetting],
-[0.7.0],
+[0.8.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])

commit a299400b8404f935e5e2bc6a5b9c17821844bd0d
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:05:19 2013 +0200

modesetting: probe only succeeds if connectors are detected

This will prevent modesetting being used for outputless intel or nvidia 
cards.

Signed-off-by: Maarten Lankhorst 

diff --git a/src/driver.c b/src/driver.c
index c3d78be..cc526f6 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -201,12 +201,25 @@ static int open_hw(char *dev)
 return fd;
 }
 
+static int check_outputs(int fd)
+{
+drmModeResPtr res = drmModeGetResources(fd);
+int ret;
+
+if (!res)
+return FALSE;
+ret = res->count_connectors > 0;
+drmModeFreeResources(res);
+return ret;
+}
+
 static Bool probe_hw(char *dev)
 {
 int fd = open_hw(dev);
 if (fd != -1) {
+int ret = check_outputs(fd);
 close(fd);
-return TRUE;
+return ret;
 }
 return FALSE;
 }
@@ -226,7 +239,7 @@ ms_DRICreatePCIBusID(const struct pci_device *dev)
 
 static Bool probe_hw_pci(char *dev, struct pci_device *pdev)
 {
-int fd = open_hw(dev);
+int ret = FALSE, fd = open_hw(dev);
 char *id, *devid;
 drmSetVersion sv;
 
@@ -247,13 +260,12 @@ static Bool probe_hw_pci(char *dev, struct pci_device 
*pdev)
 devid = ms_DRICreatePCIBusID(pdev);
 close(fd);
 
-if (!id || !devid)
-   return FALSE;
-
-if (!strcmp(id, devid))
-   return TRUE;
+if (id && devid && !strcmp(id, devid))
+ret = check_outputs(fd);
 
-return FALSE;
+free(id);
+free(devid);
+return ret;
 }
 static const OptionInfoRec *
 AvailableOptions(int chipid, int busid)

commit a62d5e60896166be88fcf3778921b8d10baec2c1
Author: Dave Airlie 
Date:   Tue Jun 11 10:29:25 2013 +1000

modesetting: fix adjust frame crash

When SDL called this it was totally broken, actually hook
up to the underlying drmmode function.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64808

Thanks to Peter Wu  for harassing me.

Signed-off-by: Dave Airlie 

diff --git a/src/driver.c b/src/driver.c
index 742aadd..c3d78be 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -956,16 +956,9 @@ static void
 AdjustFrame(ADJUST_FRAME_ARGS_DECL)
 {
 SCRN_INFO_PTR(arg);
-xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-xf86OutputPtr output = config->output[config->compat_output];
-xf86CrtcPtr crtc = output->crtc;
-
-if (crtc && crtc->enabled) {
-   crtc->funcs->mode_set(crtc, pScrn->currentMode, pScrn->currentMode, x,
- y);
-   crtc->x = output->initial_x + x;
-   crtc->y = output->initial_y + y;
-}
+modesettingPtr ms = modesettingPTR(pScrn);
+
+drmmode_adjust_frame(pScrn, &ms->drmmode, x, y);
 }
 
 static void
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 2dc7576..ce90cea 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1267,7 +1267,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr 
drmmode, int cpp)
return TRUE;
 }
 
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int 
y, int flags)
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y)
 {
xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86OutputPtr  output = config->output[config->compat_output];
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index 1d5522b..adf4b99 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -118,7 +118,7 @@ Bool drmmode_SetSlaveBO(PixmapPtr ppix,
 #endif
 
 extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp);
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int 
y, int flags);
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int 
y);
 extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
 extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn);
 

commit cba29fd8c2f605ed66718aa3a6b5833deb5d4cf9
Author: Maarten Lankhorst 
Date:   Wed Apr 3 12:08:44 2013 +0

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

2013-06-12 Thread Maarten Lankhorst 
 configure.ac  |2 +-
 debian/changelog  |2 +-
 src/driver.c  |   43 ---
 src/drmmode_display.c |2 +-
 src/drmmode_display.h |2 +-
 5 files changed, 28 insertions(+), 23 deletions(-)

New commits:
commit 9949a0fdc3290717eed4f55a6cbee87ef74708b0
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:34:36 2013 +0200

bump version

diff --git a/debian/changelog b/debian/changelog
index ac74449..9a55573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-modesetting (0.7.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Require x-server 1.13rc1

commit 58d3dc53a89c5aa2acfc93e4ae5719dd92b785b9
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:11:53 2013 +0200

bump to 0.8.0

Signed-off-by: Maarten Lankhorst 

diff --git a/configure.ac b/configure.ac
index f0c267f..6f7a7be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-modesetting],
-[0.7.0],
+[0.8.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])

commit a299400b8404f935e5e2bc6a5b9c17821844bd0d
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:05:19 2013 +0200

modesetting: probe only succeeds if connectors are detected

This will prevent modesetting being used for outputless intel or nvidia 
cards.

Signed-off-by: Maarten Lankhorst 

diff --git a/src/driver.c b/src/driver.c
index c3d78be..cc526f6 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -201,12 +201,25 @@ static int open_hw(char *dev)
 return fd;
 }
 
+static int check_outputs(int fd)
+{
+drmModeResPtr res = drmModeGetResources(fd);
+int ret;
+
+if (!res)
+return FALSE;
+ret = res->count_connectors > 0;
+drmModeFreeResources(res);
+return ret;
+}
+
 static Bool probe_hw(char *dev)
 {
 int fd = open_hw(dev);
 if (fd != -1) {
+int ret = check_outputs(fd);
 close(fd);
-return TRUE;
+return ret;
 }
 return FALSE;
 }
@@ -226,7 +239,7 @@ ms_DRICreatePCIBusID(const struct pci_device *dev)
 
 static Bool probe_hw_pci(char *dev, struct pci_device *pdev)
 {
-int fd = open_hw(dev);
+int ret = FALSE, fd = open_hw(dev);
 char *id, *devid;
 drmSetVersion sv;
 
@@ -247,13 +260,12 @@ static Bool probe_hw_pci(char *dev, struct pci_device 
*pdev)
 devid = ms_DRICreatePCIBusID(pdev);
 close(fd);
 
-if (!id || !devid)
-   return FALSE;
-
-if (!strcmp(id, devid))
-   return TRUE;
+if (id && devid && !strcmp(id, devid))
+ret = check_outputs(fd);
 
-return FALSE;
+free(id);
+free(devid);
+return ret;
 }
 static const OptionInfoRec *
 AvailableOptions(int chipid, int busid)

commit a62d5e60896166be88fcf3778921b8d10baec2c1
Author: Dave Airlie 
Date:   Tue Jun 11 10:29:25 2013 +1000

modesetting: fix adjust frame crash

When SDL called this it was totally broken, actually hook
up to the underlying drmmode function.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64808

Thanks to Peter Wu  for harassing me.

Signed-off-by: Dave Airlie 

diff --git a/src/driver.c b/src/driver.c
index 742aadd..c3d78be 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -956,16 +956,9 @@ static void
 AdjustFrame(ADJUST_FRAME_ARGS_DECL)
 {
 SCRN_INFO_PTR(arg);
-xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-xf86OutputPtr output = config->output[config->compat_output];
-xf86CrtcPtr crtc = output->crtc;
-
-if (crtc && crtc->enabled) {
-   crtc->funcs->mode_set(crtc, pScrn->currentMode, pScrn->currentMode, x,
- y);
-   crtc->x = output->initial_x + x;
-   crtc->y = output->initial_y + y;
-}
+modesettingPtr ms = modesettingPTR(pScrn);
+
+drmmode_adjust_frame(pScrn, &ms->drmmode, x, y);
 }
 
 static void
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 2dc7576..ce90cea 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1267,7 +1267,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr 
drmmode, int cpp)
return TRUE;
 }
 
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int 
y, int flags)
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y)
 {
xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86OutputPtr  output = config->output[config->compat_output];
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index 1d5522b..adf4b99 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -118,7 +118,7 @@ Bool drmmode_SetSlaveBO(PixmapPtr ppix,
 #endif
 
 extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp);
-void drmmode_adjust

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

2013-06-12 Thread Maarten Lankhorst 
 configure.ac|2 -
 debian/changelog|   21 +
 debian/patches/.gitignore   |1 
 debian/patches/series   |2 -
 debian/patches/support-32bpp-on-24bpp.patch |   13 
 src/driver.c|   43 +++-
 src/drmmode_display.c   |2 -
 src/drmmode_display.h   |2 -
 8 files changed, 42 insertions(+), 44 deletions(-)

New commits:
commit 4eea451d67ff7c6ac7685ef74a00f14afc22004f
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:37:22 2013 +0200

release to saucy

diff --git a/debian/changelog b/debian/changelog
index 1e11b40..98464ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-modesetting (0.8.0-0ubuntu1) saucy; urgency=low
+
+  * Merge from unreleased debian git.
+- Drop support-32bpp-on-24bpp.patch, upstreamed.
+
+ -- Maarten Lankhorst   Wed, 12 Jun 2013 
14:35:29 +0200
+
 xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
deleted file mode 100644
index 69f1bf4..000
--- a/debian/patches/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!*.patch
diff --git a/debian/patches/series b/debian/patches/series
index 58ae276..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-support-32bpp-on-24bpp.patch
+# placeholder
diff --git a/debian/patches/support-32bpp-on-24bpp.patch 
b/debian/patches/support-32bpp-on-24bpp.patch
deleted file mode 100644
index 4e9c5a8..000
--- a/debian/patches/support-32bpp-on-24bpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/driver.c b/src/driver.c
-index 06d6d53..742aadd 100644
 a/src/driver.c
-+++ b/src/driver.c
-@@ -650,7 +650,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
- #endif
- drmmode_get_default_bpp(pScrn, &ms->drmmode, &defaultdepth, &defaultbpp);
- if (defaultdepth == 24 && defaultbpp == 24)
--  bppflags = Support24bppFb;
-+  bppflags = SupportConvert32to24 | Support24bppFb;
- else
-   bppflags = PreferConvert24to32 | SupportConvert24to32 | 
Support32bppFb;
- 

commit 9949a0fdc3290717eed4f55a6cbee87ef74708b0
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:34:36 2013 +0200

bump version

diff --git a/debian/changelog b/debian/changelog
index ac74449..9a55573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-modesetting (0.7.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Require x-server 1.13rc1

commit 58d3dc53a89c5aa2acfc93e4ae5719dd92b785b9
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:11:53 2013 +0200

bump to 0.8.0

Signed-off-by: Maarten Lankhorst 

diff --git a/configure.ac b/configure.ac
index f0c267f..6f7a7be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-modesetting],
-[0.7.0],
+[0.8.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])

commit a299400b8404f935e5e2bc6a5b9c17821844bd0d
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:05:19 2013 +0200

modesetting: probe only succeeds if connectors are detected

This will prevent modesetting being used for outputless intel or nvidia 
cards.

Signed-off-by: Maarten Lankhorst 

diff --git a/src/driver.c b/src/driver.c
index c3d78be..cc526f6 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -201,12 +201,25 @@ static int open_hw(char *dev)
 return fd;
 }
 
+static int check_outputs(int fd)
+{
+drmModeResPtr res = drmModeGetResources(fd);
+int ret;
+
+if (!res)
+return FALSE;
+ret = res->count_connectors > 0;
+drmModeFreeResources(res);
+return ret;
+}
+
 static Bool probe_hw(char *dev)
 {
 int fd = open_hw(dev);
 if (fd != -1) {
+int ret = check_outputs(fd);
 close(fd);
-return TRUE;
+return ret;
 }
 return FALSE;
 }
@@ -226,7 +239,7 @@ ms_DRICreatePCIBusID(const struct pci_device *dev)
 
 static Bool probe_hw_pci(char *dev, struct pci_device *pdev)
 {
-int fd = open_hw(dev);
+int ret = FALSE, fd = open_hw(dev);
 char *id, *devid;
 drmSetVersion sv;
 
@@ -247,13 +260,12 @@ static Bool probe_hw_pci(char *dev, struct pci_device 
*pdev)
 devid = ms_DRICreatePCIBusID(pdev);
 close(fd);
 
-if (!id || !devid)
-   return FALSE;
-
-if (!strcmp(id, devid))
-   return TRUE;
+if (id && devid && !strcmp(id, devid))
+ret = check_outputs(fd);
 
-return FALSE;
+free(id);
+free(devid);
+return ret;
 }
 static const OptionInfoRec *
 AvailableOptions(int chipid, int busid)

commit a62d5e60896166be88fcf3778921b8d1

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

2013-06-12 Thread Timo Aaltonen 
 debian/changelog |7 +
 debian/patches/series|1 
 debian/patches/sna-make-sure-the-source-is-coherent.diff |   61 +++
 3 files changed, 69 insertions(+)

New commits:
commit dafde3c2fa205a90ab0a1509dcc835a54f645b45
Author: Timo Aaltonen 
Date:   Tue Jun 11 20:26:15 2013 +0300

sna-make-sure-the-source-is-coherent.diff: Fix corruptions on firefox (LP: 
#1189850)

diff --git a/debian/changelog b/debian/changelog
index 47626dc..0397dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.9-0ubuntu2) saucy; urgency=low
+
+  * sna-make-sure-the-source-is-coherent.diff: Fix corruptions on firefox
+(LP: #1189850)
+
+ -- Timo Aaltonen   Tue, 11 Jun 2013 20:10:33 +0300
+
 xserver-xorg-video-intel (2:2.21.9-0ubuntu1) saucy; urgency=low
 
   * Merge from unreleased debian git, remaining changes:
diff --git a/debian/patches/series b/debian/patches/series
index 23ed8a4..1bb2a98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-Update-manpage-for-new-accelmethod-option.patch
+sna-make-sure-the-source-is-coherent.diff
diff --git a/debian/patches/sna-make-sure-the-source-is-coherent.diff 
b/debian/patches/sna-make-sure-the-source-is-coherent.diff
new file mode 100644
index 000..eebbab2
--- /dev/null
+++ b/debian/patches/sna-make-sure-the-source-is-coherent.diff
@@ -0,0 +1,61 @@
+commit 7d91051c50210560dbd93a9e36f30d9f74ce9133
+Author: Chris Wilson 
+Date:   Tue Jun 11 14:23:57 2013 +0100
+
+sna: Make sure the source is coherent on the CPU before uploading
+
+Makes the presumption that for the upload path the region is stored on
+the CPU explicit.
+
+References: https://bugs.freedesktop.org/show_bug.cgi?id=61628
+Signed-off-by: Chris Wilson 
+
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 69a151c..1663fe3 100644
+--- a/src/sna/sna_accel.c
 b/src/sna/sna_accel.c
+@@ -4861,6 +4861,22 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr 
gc,
+   }
+   }
+ 
++  if (src_priv) {
++  bool ret;
++
++  RegionTranslate(region, src_dx, src_dy);
++  ret = 
sna_drawable_move_region_to_cpu(&src_pixmap->drawable,
++region, 
MOVE_READ);
++  RegionTranslate(region, -src_dx, -src_dy);
++  if (!ret)
++  goto fallback;
++
++  assert(!src_priv->mapped);
++  if (src_pixmap->devPrivate.ptr == NULL)
++  /* uninitialised!*/
++  return;
++  }
++
+   if (alu != GXcopy) {
+   PixmapPtr tmp;
+   struct kgem_bo *src_bo;
+@@ -4936,21 +4952,6 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr 
gc,
+   DBG(("%s: dst is on the GPU, src is on the CPU, 
uploading into dst\n",
+__FUNCTION__));
+ 
+-  if (src_priv) {
+-  /* Fixup the shadow pointer as necessary */
+-  if (src_priv->mapped) {
+-  assert(!src_priv->shm);
+-  src_pixmap->devPrivate.ptr = NULL;
+-  src_priv->mapped = false;
+-  }
+-  if (src_pixmap->devPrivate.ptr == NULL) {
+-  if (!src_priv->ptr) /* uninitialised!*/
+-  return;
+-  src_pixmap->devPrivate.ptr = 
PTR(src_priv->ptr);
+-  src_pixmap->devKind = src_priv->stride;
+-  }
+-  }
+-
+   if (!dst_priv->pinned && replaces) {
+   stride = src_pixmap->devKind;
+   bits = src_pixmap->devPrivate.ptr;


-- 
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/e1umtoz-0003v8...@vasks.debian.org

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

2013-06-12 Thread Maarten Lankhorst 
 .gitignore   |2 
 ChangeLog|16944 ---
 Makefile.am  |   15 
 configure.ac |   35 
 debian/changelog |8 
 debian/control   |2 
 src/Makefile.am  |   35 
 src/drmmode_display.c|   40 
 src/nouveau_dri2.c   |   19 
 src/nouveau_xv.c |4 
 src/nv_accel_common.c|5 
 src/nv_driver.c  |  146 
 src/nv_proto.h   |1 
 src/nv_type.h|   14 
 src/nvc0_accel.c |   45 
 src/nvc0_shader.h|  444 -
 src/nve0_shader.h|  440 -
 src/shader/.gitignore|1 
 src/shader/Makefile  |   30 
 src/shader/exac8nvc0.fp  |   41 
 src/shader/exac8nvc0.fpc |   22 
 src/shader/exac8nve0.fp  |   42 
 src/shader/exac8nve0.fpc |   28 
 src/shader/exacanvc0.fp  |   41 
 src/shader/exacanvc0.fpc |   25 
 src/shader/exacanve0.fp  |   43 
 src/shader/exacanve0.fpc |   30 
 src/shader/exacmnvc0.fp  |   41 
 src/shader/exacmnvc0.fpc |   25 
 src/shader/exacmnve0.fp  |   43 
 src/shader/exacmnve0.fpc |   30 
 src/shader/exas8nvc0.fp  |   37 
 src/shader/exas8nvc0.fpc |   14 
 src/shader/exas8nve0.fp  |   38 
 src/shader/exas8nve0.fpc |   20 
 src/shader/exasanvc0.fp  |   41 
 src/shader/exasanvc0.fpc |   25 
 src/shader/exasanve0.fp  |   43 
 src/shader/exasanve0.fpc |   30 
 src/shader/exascnvc0.fp  |   34 
 src/shader/exascnvc0.fpc |   11 
 src/shader/exascnve0.fp  |   35 
 src/shader/exascnve0.fpc |   14 
 src/shader/videonvc0.fp  |   47 
 src/shader/videonvc0.fpc |   37 
 src/shader/videonve0.fp  |   50 
 src/shader/videonve0.fpc |   44 
 src/shader/xfrm2nvc0.vp  |   63 
 src/shader/xfrm2nvc0.vpc |   69 
 src/shader/xfrm2nve0.vp  |   63 
 src/shader/xfrm2nve0.vpc |   70 
 51 files changed, 1496 insertions(+), 17930 deletions(-)

New commits:
commit a3dd588c4392e59ea52f814f6eb80f4635465b16
Author: Maarten Lankhorst 
Date:   Wed Jun 12 11:16:38 2013 +0200

Replace dependency on x11proto-xf86dri-dev with x11proto-dri2-dev.

Upstream removed dri1 dependency.

diff --git a/debian/changelog b/debian/changelog
index 6b643e1..5d56bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-video-nouveau (1:1.0.8-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Replace dependency on x11proto-xf86dri-dev with x11proto-dri2-dev.
+- Upstream removed dri1 dependency.
 
  -- Maarten Lankhorst   Wed, 12 Jun 2013 
10:58:45 +0200
 
diff --git a/debian/control b/debian/control
index 4975203..486fc7e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-xext-dev,
  libdrm-dev (>= 2.4.40-1),
- x11proto-xf86dri-dev,
+ x11proto-dri2-dev,
  x11proto-gl-dev,
  mesa-common-dev,
  libudev-dev,

commit dbb64a8e0cade7f8e85f75090d1f1a7ae8980ab8
Author: Maarten Lankhorst 
Date:   Wed Jun 12 10:59:11 2013 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 84c8d87..6b643e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Wed, 12 Jun 2013 
10:58:45 +0200
+
 xserver-xorg-video-nouveau (1:1.0.7-1) experimental; urgency=low
 
   [ Maarten Lankhorst ]

commit 7f20a6af25ae28452ec9c971bfa2227857e6ee93
Author: Maarten Lankhorst 
Date:   Wed Jun 12 10:46:39 2013 +0200

bump to 1.0.8

diff --git a/configure.ac b/configure.ac
index 575f69d..bf19d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-nouveau],
-[1.0.7],
+[1.0.8],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-nouveau])
 

commit 1fda669c0e5a25eac7f9f1e9a743120cae50ff51
Author: Emil Velikov 
Date:   Sat Feb 16 20:48:47 2013 +

configure: printout the configuration info

Let the bikeshedding begin

Signed-off-by: Emil Velikov 

diff --git a/configure.ac b/configure.ac
index 4f9f0b1..575f69d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,3 +132,21 @@ AC_CONFIG_FILES([
man/Makefile
 ])
 AC_OUTPUT
+
+dnl
+dnl Output some configuration info for the user
+dnl
+echo ""
+echo "prefix:  $prefix"
+echo "exec_prefix: $exec_prefix"
+echo "libdir:  $libdir"
+echo "includedir:  $includedir"
+
+echo ""
+echo "CFLAGS:  $CFLAGS"
+echo "CXXFLAGS:$CXXFLAGS"
+echo "Macros:  $DEFINES"
+
+echo ""
+echo "Run '${MAKE-make}' to build xf86-video-nouveau"
+echo ""

commit 45dbcaac301efce04d0bb492337f4febf8129ed9
Author: Emil Velikov 
Date:   Sat Feb 16 20:48:45 2013 +

nouveau: mandate dri2 build

Building nouveau without dri2 is just silly

Signed-off-by: Emil Velikov 

diff --git a/configure.ac b/configure.ac
index fa4a2dc..4f9

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

2013-06-12 Thread Maarten Lankhorst 
 .gitignore   |2 
 ChangeLog|16944 ---
 Makefile.am  |   15 
 configure.ac |   35 
 debian/changelog |   36 
 debian/control   |2 
 debian/rules |   11 
 src/Makefile.am  |   35 
 src/drmmode_display.c|   40 
 src/nouveau_dri2.c   |   19 
 src/nouveau_xv.c |4 
 src/nv_accel_common.c|5 
 src/nv_driver.c  |  146 
 src/nv_proto.h   |1 
 src/nv_type.h|   14 
 src/nvc0_accel.c |   45 
 src/nvc0_shader.h|  444 -
 src/nve0_shader.h|  440 -
 src/shader/.gitignore|1 
 src/shader/Makefile  |   30 
 src/shader/exac8nvc0.fp  |   41 
 src/shader/exac8nvc0.fpc |   22 
 src/shader/exac8nve0.fp  |   42 
 src/shader/exac8nve0.fpc |   28 
 src/shader/exacanvc0.fp  |   41 
 src/shader/exacanvc0.fpc |   25 
 src/shader/exacanve0.fp  |   43 
 src/shader/exacanve0.fpc |   30 
 src/shader/exacmnvc0.fp  |   41 
 src/shader/exacmnvc0.fpc |   25 
 src/shader/exacmnve0.fp  |   43 
 src/shader/exacmnve0.fpc |   30 
 src/shader/exas8nvc0.fp  |   37 
 src/shader/exas8nvc0.fpc |   14 
 src/shader/exas8nve0.fp  |   38 
 src/shader/exas8nve0.fpc |   20 
 src/shader/exasanvc0.fp  |   41 
 src/shader/exasanvc0.fpc |   25 
 src/shader/exasanve0.fp  |   43 
 src/shader/exasanve0.fpc |   30 
 src/shader/exascnvc0.fp  |   34 
 src/shader/exascnvc0.fpc |   11 
 src/shader/exascnve0.fp  |   35 
 src/shader/exascnve0.fpc |   14 
 src/shader/videonvc0.fp  |   47 
 src/shader/videonvc0.fpc |   37 
 src/shader/videonve0.fp  |   50 
 src/shader/videonve0.fpc |   44 
 src/shader/xfrm2nvc0.vp  |   63 
 src/shader/xfrm2nvc0.vpc |   69 
 src/shader/xfrm2nve0.vp  |   63 
 src/shader/xfrm2nve0.vpc |   70 
 52 files changed, 1522 insertions(+), 17943 deletions(-)

New commits:
commit 4f1a24481f5b7a123bbb9f042cf7683b10dcfd7e
Author: Maarten Lankhorst 
Date:   Wed Jun 12 11:30:52 2013 +0200

release to saucy

diff --git a/debian/changelog b/debian/changelog
index 39c0682..709b3f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-nouveau (1:1.0.8-0ubuntu1) saucy; urgency=low
+
+  * Sync to unreleased debian experimental git.
+  * Remaining differences:
+- Try to enable vblank if available (LP: #1019131)
+  - 100-vblank-on.diff
+  * Add support for displayless cards. (LP: #1142733)
+
+ -- Maarten Lankhorst   Wed, 12 Jun 2013 
11:24:18 +0200
+
 xserver-xorg-video-nouveau (1:1.0.8-1) UNRELEASED; urgency=low
 
   * New upstream release.

commit a3dd588c4392e59ea52f814f6eb80f4635465b16
Author: Maarten Lankhorst 
Date:   Wed Jun 12 11:16:38 2013 +0200

Replace dependency on x11proto-xf86dri-dev with x11proto-dri2-dev.

Upstream removed dri1 dependency.

diff --git a/debian/changelog b/debian/changelog
index 6b643e1..5d56bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-video-nouveau (1:1.0.8-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Replace dependency on x11proto-xf86dri-dev with x11proto-dri2-dev.
+- Upstream removed dri1 dependency.
 
  -- Maarten Lankhorst   Wed, 12 Jun 2013 
10:58:45 +0200
 
diff --git a/debian/control b/debian/control
index 4975203..486fc7e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-xext-dev,
  libdrm-dev (>= 2.4.40-1),
- x11proto-xf86dri-dev,
+ x11proto-dri2-dev,
  x11proto-gl-dev,
  mesa-common-dev,
  libudev-dev,

commit dbb64a8e0cade7f8e85f75090d1f1a7ae8980ab8
Author: Maarten Lankhorst 
Date:   Wed Jun 12 10:59:11 2013 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 84c8d87..6b643e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Wed, 12 Jun 2013 
10:58:45 +0200
+
 xserver-xorg-video-nouveau (1:1.0.7-1) experimental; urgency=low
 
   [ Maarten Lankhorst ]

commit 7f20a6af25ae28452ec9c971bfa2227857e6ee93
Author: Maarten Lankhorst 
Date:   Wed Jun 12 10:46:39 2013 +0200

bump to 1.0.8

diff --git a/configure.ac b/configure.ac
index 575f69d..bf19d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-nouveau],
-[1.0.7],
+[1.0.8],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-nouveau])
 

commit 1fda669c0e5a25eac7f9f1e9a743120cae50ff51
Author: Emil Velikov 
Date:   Sat Feb 16 20:48:47 2013 +

configure: printout the configuration info

Let the bikeshedding begin

Signed-off-by: Emil Velikov 

diff --git a/configure.ac b/configure.ac
index 4f9f0b1..575f69d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,3 +132,21 @@ AC_CONFIG_FILES([
man/Makefile
 ])
 AC_OUTPUT
+
+dnl
+dnl Output some configur

Bug#675138: weston: not installable, fails to build from source

2013-06-12 Thread Emilio Pozuelo Monfort 
On 12/06/13 11:33, Schrober wrote:
> On Wednesday 12 June 2013 11:22:09 Emilio Pozuelo Monfort wrote:
> [...]
>> I had weston and all the stack (libdrm, mesa, wayland, cairo, pixman, gtk+,
>> clutter...) built from git and working fairly well (I have a script in case
>> you're interested).
> 
> Yes, I would be extreme interested in the build script. Thanks for your work
> 

Sure, attached. It's highly based on the wayland build instructions. It's pretty
simple, it will just update the repos and build the whole stack. It doesn't
clone the git repos (I didn't add that as I already had the repos cloned by the
time I wrote it). You can probably skip (i.e. comment) some modules now that
they are up to date in Debian, but it doesn't hurt to build them either. The
flags may need some tweaking, I haven't ran the script for quite a while.

You can find other similar scripts (probably more complete) if you look around
or ask in #wayland. E.g. there's one in
http://www.chaosreigns.com/code/buildtest/. Feel free to use whichever you want.

Cheers,
Emilio


update-wayland-stack.sh
Description: application/shellscript

Bug#675138: weston: not installable, fails to build from source

2013-06-12 Thread Schrober 
On Wednesday 12 June 2013 11:22:09 Emilio Pozuelo Monfort wrote:
[...]
> I had weston and all the stack (libdrm, mesa, wayland, cairo, pixman, gtk+,
> clutter...) built from git and working fairly well (I have a script in case
> you're interested).

Yes, I would be extreme interested in the build script. Thanks for your work
-- 
Franz Schrober


-- 
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/1436927.5pj3LTbq4E@bentobox

Bug#711994: libgl1-mesa-dri: Blank output on Radeon HD 6450/7450/8450

2013-06-12 Thread Michel Dänzer 
On Die, 2013-06-11 at 22:03 +0200, Jan Hudec wrote:
> Package: libgl1-mesa-dri
> Version: 9.1.3-6
> Severity: important
> 
> After update to 9.1.3-6, output of anything OpenGL is blank. Downgrading to
> 8.0.5-6 from Jessie fixes the problem (obviously all of mesa is upgraded or
> downgraded together, not just libgl1-mesa-dri in particular).
> 
> I've tried turning off OpenGL in kwin (strangely with it turned on it did
> display apparently fine)

Sounds like not everything OpenGL is affected after all. :)

Does glxgears print the framerate every 5 seconds? If not, can you try
running it in gdb and see if it's hanging somewhere?


-- 
Earthling Michel Dänzer   |   http://www.amd.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/1371028423.28382.11.camel@thor.local

Bug#675138: weston: not installable, fails to build from source

2013-06-12 Thread Emilio Pozuelo Monfort 
On 12/06/13 10:58, Schrober wrote:
> On Wednesday 12 June 2013 10:44:10 Cyril Brulebois wrote:
>> Schrober  (12/06/2013):
 thanks for the heads-up on IRC by the way. Since binNMUs dramatically
 failed due to yet another libpng mess, I'm pondering just uploading
 weston to unstable instead, but I'd have to see which toy apps to enable
 and how. That might take some days as it's low priority on my todo list.
>>>
>>> The weston situation in Debian is extreme frustrating. […]
>>
>> JFTR, a bunch of iterations were needed to get all of libdrm, wayland,
>> and mesa to build in experimental. weston will come after those.
> 
> Just before a misunderstanding happens here: I didn't criticise the people 
> behind all the stuff. I am extreme happy that there are some encouraged 
> people 
> which try to get this stuff working.
> 
> It is just the situation that currently each step taken by me ended with my 
> toe stubbed on another edge. It all started with me trying to fix some 
> programs which don't work as expected under wayland and I still aren't at the 
> point were I could reproduce the problem because I failed miserably to get 
> the 
> test environment to work at all.

I had weston and all the stack (libdrm, mesa, wayland, cairo, pixman, gtk+,
clutter...) built from git and working fairly well (I have a script in case
you're interested). Now that things in Debian are up to date except for weston,
you can probably build just weston though. libunwind is missing the .pcs in the
Debian packages indeed (I reported that bug) but you can --disable-unwind in
weston (I think a patch to autodetect if libunwind is present has been just
committed to git). As for cairo, it was disabled temporarily because of
multi-arch. I'll look at enabling it back again later today.

As for weston in Debian, I'm too busy lately but I want to get it updated. But
let's get cairo fixed first, then we can take care of weston.

Cheers,
Emilio


-- 
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/51b83dc1.3010...@debian.org

Bug#712024: Characters go missing when ESC [ K occurs when wrapping a line

2013-06-12 Thread Riku Saikkonen 
Package: xterm
Version: 278-4

(Summary, if I'm guessing right: the terminal emulation code has a bug
related to the ESC [ K control sequence if it occurs when the line is
just about to wrap. And grep uses ESC [ K when changing colors, so the
bug is quite easy to see.)

The command:

  perl -e 'print "a"x79 . "bc" . "a"x5 . "\n";' | grep --color=always c

when run on a terminal exactly 80 characters wide should print a line
containing a's and one b, and on the next line a colored (red) c plus
five a's, like this:

rjs@anar:~/t$ perl -e 'print "a"x79 . "bc" . "a"x5 . "\n";' | grep 
--color=always c
aaab
ca
rjs@anar:~/t$ 

(the above lines were cut-and-pasted from a gnome-terminal window, with
a line break added manually after "b", as displayed on-screen; the "c"
is red)

However, on xterm, the b and c go missing; the following is
cut-and-pasted from an xterm window with a line-break added (that's how
it looks on screen, with all characters the same color):

rjs@anar:~/t$ perl -e 'print "a"x79 . "bc" . "a"x5 . "\n";' | grep 
--color=always c


rjs@anar:~/t$ 

Rxvt breaks in the same way as xterm. But the command works properly in
gnome-terminal and konsole, as well as in tmux, even when tmux is run
inside an xterm. But both rxvt-unicode and screen break in another way:
the b at the end of the line goes missing, but the red c remains (in
screen, apparently regardless of where screen is run). I just found out
that (apparently) the same bug has been reported five years ago for rxvt
as bug #477463 .


Which escape sequences does grep actually produce? In an xterm
(TERM=xterm):

rjs@anar:~/t$ perl -e 'print "a"x79 . "bc" . "a"x5 . "\n";' | grep 
--color=always c | cat -A
aaab^[[01;31m^[[Kc^[[m^[[Ka$
rjs@anar:~/t$ 

(the bug remains when adding | cat without -A to the end of the command)

So grep prints extra ESC [ K control sequences before and after the
match. Why? The grep source code has a long comment about it:

, Debian wheezy grep-2.12/src/main.c lines 143-201
| /* Select Graphic Rendition (SGR, "\33[...m") strings.  */
| /* Also Erase in Line (EL) to Right ("\33[K") by default.  */
| /*Why have EL to Right after SGR?
|  -- The behavior of line-wrapping when at the bottom of the
| terminal screen and at the end of the current line is often
| such that a new line is introduced, entirely cleared with
| the current background color which may be different from the
| default one (see the boolean back_color_erase terminfo(5)
| capability), thus scrolling the display by one line.
| The end of this new line will stay in this background color
| even after reverting to the default background color with
| "\33[m', unless it is explicitly cleared again with "\33[K"
| (which is the behavior the user would instinctively expect
| from the whole thing).  There may be some unavoidable
| background-color flicker at the end of this new line because
| of this (when timing with the monitor's redraw is just right).
|  -- The behavior of HT (tab, "\t") is usually the same as that of
| Cursor Forward Tabulation (CHT) with a default parameter
| of 1 ("\33[I"), i.e., it performs pure movement to the next
| tab stop, without any clearing of either content or screen
| attributes (including background color); try
|printf 'asdfqwerzxcv\rASDF\tZXCV\n'
| in a bash(1) shell to demonstrate this.  This is not what the
| user would instinctively expect of HT (but is ok for CHT).
| The instinctive behavior would include clearing the terminal
| cells that are skipped over by HT with blank cells in the
| current screen attributes, including background color;
| the boolean dest_tabs_magic_smso terminfo(5) capability
| indicates this saner behavior for HT, but only some rare
| terminals have it (although it also indicates a special
| glitch with standout mode in the Teleray terminal for which
| it was initially introduced).  The remedy is to add "\33K"
| after each SGR sequence, be it START (to fix the behavior
| of any HT after that before another SGR) or END (to fix the
| behavior of an HT in default background color that would
| follow a line-wrapping at the bottom of the screen in another
| background color, and to complement doing it after START).
| Piping grep's output through a pager such as less(1) avoids
| any HT problems since the pager per

Bug#675138: weston: not installable, fails to build from source

2013-06-12 Thread Schrober 
On Wednesday 12 June 2013 10:44:10 Cyril Brulebois wrote:
> Schrober  (12/06/2013):
> > > thanks for the heads-up on IRC by the way. Since binNMUs dramatically
> > > failed due to yet another libpng mess, I'm pondering just uploading
> > > weston to unstable instead, but I'd have to see which toy apps to enable
> > > and how. That might take some days as it's low priority on my todo list.
> > 
> > The weston situation in Debian is extreme frustrating. […]
> 
> JFTR, a bunch of iterations were needed to get all of libdrm, wayland,
> and mesa to build in experimental. weston will come after those.

Just before a misunderstanding happens here: I didn't criticise the people 
behind all the stuff. I am extreme happy that there are some encouraged people 
which try to get this stuff working.

It is just the situation that currently each step taken by me ended with my 
toe stubbed on another edge. It all started with me trying to fix some 
programs which don't work as expected under wayland and I still aren't at the 
point were I could reproduce the problem because I failed miserably to get the 
test environment to work at all.
-- 
Franz Schrober


--
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/1716999.Sns7ZX7pmn@bentobox

Bug#675138: weston: not installable, fails to build from source

2013-06-12 Thread Cyril Brulebois 
Schrober  (12/06/2013):
> > thanks for the heads-up on IRC by the way. Since binNMUs dramatically
> > failed due to yet another libpng mess, I'm pondering just uploading
> > weston to unstable instead, but I'd have to see which toy apps to enable
> > and how. That might take some days as it's low priority on my todo list.
> 
> The weston situation in Debian is extreme frustrating. […]

JFTR, a bunch of iterations were needed to get all of libdrm, wayland,
and mesa to build in experimental. weston will come after those.

Mraw,
KiBi.


signature.asc
Description: Digital signature

Bug#687571: patch for weston

2013-06-12 Thread Schrober 
tags 687571 - patch
thanks

On Thursday 13 September 2012 13:58:10 Benjamin Kerensa wrote:
> Package: weston
> Severity: minor
> Version: 0.85.0-1
> Tags: patch
> 
> 
> Hello I have found that weston lacks a Homepage entry in control and
> has an outdated standards-version both are fixed
> in the attached patch. Thanks

This patch is extreme unclean (patch in a patch for something which is already 
patched?). Did you actually check whether the standard version can be bumped 
or that there may be changes necessary?
-- 
Franz Schrober


-- 
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/13722004.sD4YCPWnpv@bentobox

Processed: Re: patch for weston

2013-06-12 Thread Debian Bug Tracking System 
Processing commands for cont...@bugs.debian.org:

> tags 687571 - patch
Bug #687571 [weston] weston: Missing Homepage field in debian/control
Removed tag(s) patch.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
687571: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687571
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
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/handler.s.c.137102632422275.transcr...@bugs.debian.org

Processed: thanks

2013-06-12 Thread Debian Bug Tracking System 
Processing commands for cont...@bugs.debian.org:

> block 699045 by 711854
Bug #699045 [weston] New upstream release
699045 was not blocked by any bugs.
699045 was not blocking any bugs.
Added blocking bug(s) of 699045: 711854
> block 699045 by 712022
Bug #699045 [weston] New upstream release
699045 was blocked by: 711854
699045 was not blocking any bugs.
Added blocking bug(s) of 699045: 712022
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
699045: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699045
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
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/handler.s.c.137102579816520.transcr...@bugs.debian.org

Processed: block

2013-06-12 Thread Debian Bug Tracking System 
Processing commands for cont...@bugs.debian.org:

> block 675138 by 711854
Bug #675138 [weston] weston: not installable, fails to build from source
675138 was not blocked by any bugs.
675138 was not blocking any bugs.
Added blocking bug(s) of 675138: 711854
> block 675138 by 712022
Bug #675138 [weston] weston: not installable, fails to build from source
675138 was blocked by: 711854
675138 was not blocking any bugs.
Added blocking bug(s) of 675138: 712022
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
675138: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675138
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
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/handler.s.c.137102514011461.transcr...@bugs.debian.org

Bug#699045: New upstream release

2013-06-12 Thread Schrober 
blocked 675138 by 711854
blocked 675138 by 712022
thanks

On Saturday 26 January 2013 13:01:17 you wrote:
> Package: weston
> Version: 0.85.0-1
> 
> The latest Debian packages of wayland and weston are of version 0.85.
> That was obsoleted by v0.95 in June 2012.  There has since been a stable
> release (1.0) in October 2012, and they've stopped doing API breaks.  The
> current release is v1.0.4: http://wayland.freedesktop.org/releases.html

The weston situation in Debian is extreme frustrating. Neither the version in 
sid is installable/buildable but also the version in git FTBFS.

  GEN  screenshooter-protocol.c
make[3]: *** No rule to make target `text-cursor-position-server-protocol.h', 
needed by `all'.  Stop.
make[3]: Leaving directory `/tmp/buildd/weston-1.0.5/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/tmp/buildd/weston-1.0.5'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/tmp/buildd/weston-1.0.5'
dh_auto_build: make -j1 returned exit code 2

I've just imported weston 1.1.1 using

git-import-orig --upstream-branch=upstream-unstable --debian-branch=debian-
unstable ../weston_1.1.1.orig.tar.gz

But now the libunwind-dev in Debian is missing the .pc file. And cairo is 
missing the -egl stuff again
-- 
Franz Schrober


-- 
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/3031619.LsFT1B1CIX@bentobox

Bug#675138: weston: not installable, fails to build from source

2013-06-12 Thread Schrober 
On Wednesday 30 May 2012 09:40:56 you wrote:
> twied  (30/05/2012):
> > Dear Maintainer,
> > package weston (0.85.0-1) is currently uninstallable due to a depend
> > (=0.85.0-1) on libwayland0. This depend should read (=0.85.0-2) or (>=
> > 0.85.0-1).
> > 
> > The package also fails to build from source, some libpng12 vs.
> > libpng15 issues. See
> > https://buildd.debian.org/status/package.php?p=weston&suite=experimental
> 
> Yep,
> 
> thanks for the heads-up on IRC by the way. Since binNMUs dramatically
> failed due to yet another libpng mess, I'm pondering just uploading
> weston to unstable instead, but I'd have to see which toy apps to enable
> and how. That might take some days as it's low priority on my todo list.

The weston situation in Debian is extreme frustrating. Neither the version in 
sid is installable/buildable but also the version in git FTBFS.

  GEN  screenshooter-protocol.c
make[3]: *** No rule to make target `text-cursor-position-server-protocol.h', 
needed by `all'.  Stop.
make[3]: Leaving directory `/tmp/buildd/weston-1.0.5/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/tmp/buildd/weston-1.0.5'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/tmp/buildd/weston-1.0.5'
dh_auto_build: make -j1 returned exit code 2

I've just imported weston 1.1.1 using

git-import-orig --upstream-branch=upstream-unstable --debian-branch=debian-
unstable ../weston_1.1.1.orig.tar.gz

But now the libunwind-dev in Debian is missing the .pc file. And cairo is 
missing the -egl stuff again


-- 
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/2064173.G8ODvMSPqI@bentobox