Bug#721978: xterm: "ls -al /etc/ssl/certs" causes xterm to stop

2013-09-06 Thread John Moyer 
On Fri, Sep 06, 2013 at 08:14:40PM -0400, Thomas Dickey wrote:
> On Fri, Sep 06, 2013 at 06:30:03PM -0500, John Moyer wrote:
> > On Fri, Sep 06, 2013 at 06:10:33PM -0400, Thomas Dickey wrote:
> > > On Fri, Sep 06, 2013 at 07:53:40AM -0500, John Moyer wrote:
> > > > Package: xterm
> > > > Version: 278-4
> > > > Severity: normal
> > 
> > > >* What led up to the situation?
> > > > ls -al /etc/ssl/certs
> > > > start xterm on local host. ssh to remote host running Wheezy. ls
> > > > There is no problem if I do this on local host, so maybe ther problem 
> > > > is 
> > > > some combination of ssh and xterm. strace on ssh shows it is in read().
> > 
> > > > ls -al /etc/ssl/certs | cat -v 
> > > > behaves as expected.
> > > > 
> > > > /etc/ssl/certs/T*Sertifika* is the file name that causes problems. 
> > > > There is no
> > > > problem with the Xfce desktop terminal except that the filename does not
> > > > display correctly.
> > > > 
> > > >  2f 65 74 63 2f 73 73 6c 2f 63 65 72 74 73 2f 54  
> > > > /etc/ssl/certs/T
> > > > 0010 c3 9c 42 c4 b0 54 41 4b 5f 55 45 4b 41 45 5f 4b  
> > > > ..B..TAK_UEKAE_K
> > > > 0020 c3 b6 6b 5f 53 65 72 74 69 66 69 6b 61 5f 48 69  
> > > > ..k_Sertifika_Hi
> > > > 0030 7a 6d 65 74 5f 53 61 c4 9f 6c 61 79 c4 b1 63 c4  
> > > > zmet_Sa..lay..c.
> > > > 0040 b1 73 c4 b1 5f 2d 5f 53 c3 bc 72 c3 bc 6d 5f 33  
> > > > .s.._-_S..r..m_3
> > > > 0050 2e 70 65 6d 0a   .pem.
> > > > 
> > > > lrwxrwxrwx 1 root root   104 May 17 19:11 
> > > > T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.pem 
> > > > -> 
> > > > /usr/share/ca-certificates/mozilla/T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.crt
> > > 
> > > The string is encoded with UTF-8, but according to the summary, your
> > > locale is C (POSIX).  The 9f begins a string which is not terminated
> > > (see ctlseqs.ms):
> > >  
> > > ESC _
> > >  Application Program Command (APC  is 0x9f).
> > >  
> > > Also see the discussion of brokenStringTerm in the manpage.
> > > 
> > > (This is not a bug in xterm, by the way).
> > >  
> > > > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
> > > 
> > > -- 
> > > Thomas E. Dickey 
> > > http://invisible-island.net
> > > ftp://invisible-island.net
> > 
> > Thank you for your reply.
> > 
> > Should I will try setting brokenStringTerm to true in an X resources file.
> 
> Setting that helps - but then you can run into the occasional problem
> where you're wondering why part of the output is missing.  You would
> miss text between the start of the control and the next newline.
> 
> > Should I use a different locale?
> 
> I think the problem is with the locale.  xterm's locale resource is normally
> configured in Debian so that running it in a UTF-8 locale will do something
> reasonable.
> 
> But connecting via ssh sounds as if it is using POSIX locale, ignoring your
> starting point.  Reflecting on this, it seems that ssh generally doesn't
> pass-through the locale settings, though it usually passes TERM - a possible
> reason for that is because ssh's developers use OpenBSD which doesn't do
> anything useful with locales...  Instead, we get various systems just
> setting the locale.
> 
> There are workarounds, but most are nuisances to setup (see for example,
> ssh_config's SendEnv and AcceptEnv settings).  If you have a small number
> of local/remote machines to configure, that is the place to try first.
> 
> You can of course override the locale in a shell.
> 
> (I work-around a different way - connecting to machines with X forwarding,
> and running uxterm when a remote machine has UTF-8 locale turned on -
> it also has the advantage that I can run screen in the uxterm or xterm).
>  
> > Is this a bug in ssh? Was it ssh that was stopping?
> 
> ssh contibutes to the problem, but reporting a bug there is a waste of time.
>  
> > Is this a Mozilla bug, using an improper file name?
> 
> UTF-8 filenames are legal :-)
> 
> ls doesn't check locale of course (I suppose it's hardcoded in that
> way just like its color support).
>  
> > Should I report this bug elsewhere?
> 
> I think you came to the right place :-)
> 
> -- 
> Thomas E. Dickey 
> http://invisible-island.net
> ftp://invisible-island.net

Thanks again.

It seems to me that two work arounds are OK for me.

 xterm -en UTF-8
or
 run uxterm instead of xterm

So, I think there is no bug, only behavior that I did not expect.

Thanks for all of your help.

I hope some of this will be useful to someone else.

John

-- 
John Moyer (KC5GSX)
mailto:j...@rsok.com
http://www.RSOK.com/~jrm/


-- 
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/20130907005501.ga19...@rsok.com

Bug#721978: xterm: "ls -al /etc/ssl/certs" causes xterm to stop

2013-09-06 Thread Thomas Dickey 
On Fri, Sep 06, 2013 at 06:30:03PM -0500, John Moyer wrote:
> On Fri, Sep 06, 2013 at 06:10:33PM -0400, Thomas Dickey wrote:
> > On Fri, Sep 06, 2013 at 07:53:40AM -0500, John Moyer wrote:
> > > Package: xterm
> > > Version: 278-4
> > > Severity: normal
> 
> > >* What led up to the situation?
> > > ls -al /etc/ssl/certs
> > > start xterm on local host. ssh to remote host running Wheezy. ls
> > > There is no problem if I do this on local host, so maybe ther problem is 
> > > some combination of ssh and xterm. strace on ssh shows it is in read().
> 
> > > ls -al /etc/ssl/certs | cat -v 
> > > behaves as expected.
> > > 
> > > /etc/ssl/certs/T*Sertifika* is the file name that causes problems. There 
> > > is no
> > > problem with the Xfce desktop terminal except that the filename does not
> > > display correctly.
> > > 
> > >  2f 65 74 63 2f 73 73 6c 2f 63 65 72 74 73 2f 54  
> > > /etc/ssl/certs/T
> > > 0010 c3 9c 42 c4 b0 54 41 4b 5f 55 45 4b 41 45 5f 4b  
> > > ..B..TAK_UEKAE_K
> > > 0020 c3 b6 6b 5f 53 65 72 74 69 66 69 6b 61 5f 48 69  
> > > ..k_Sertifika_Hi
> > > 0030 7a 6d 65 74 5f 53 61 c4 9f 6c 61 79 c4 b1 63 c4  
> > > zmet_Sa..lay..c.
> > > 0040 b1 73 c4 b1 5f 2d 5f 53 c3 bc 72 c3 bc 6d 5f 33  
> > > .s.._-_S..r..m_3
> > > 0050 2e 70 65 6d 0a   .pem.
> > > 
> > > lrwxrwxrwx 1 root root   104 May 17 19:11 
> > > T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.pem -> 
> > > /usr/share/ca-certificates/mozilla/T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.crt
> > 
> > The string is encoded with UTF-8, but according to the summary, your
> > locale is C (POSIX).  The 9f begins a string which is not terminated
> > (see ctlseqs.ms):
> >  
> > ESC _
> >  Application Program Command (APC  is 0x9f).
> >  
> > Also see the discussion of brokenStringTerm in the manpage.
> > 
> > (This is not a bug in xterm, by the way).
> >  
> > > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
> > 
> > -- 
> > Thomas E. Dickey 
> > http://invisible-island.net
> > ftp://invisible-island.net
> 
> Thank you for your reply.
> 
> Should I will try setting brokenStringTerm to true in an X resources file.

Setting that helps - but then you can run into the occasional problem
where you're wondering why part of the output is missing.  You would
miss text between the start of the control and the next newline.

> Should I use a different locale?

I think the problem is with the locale.  xterm's locale resource is normally
configured in Debian so that running it in a UTF-8 locale will do something
reasonable.

But connecting via ssh sounds as if it is using POSIX locale, ignoring your
starting point.  Reflecting on this, it seems that ssh generally doesn't
pass-through the locale settings, though it usually passes TERM - a possible
reason for that is because ssh's developers use OpenBSD which doesn't do
anything useful with locales...  Instead, we get various systems just
setting the locale.

There are workarounds, but most are nuisances to setup (see for example,
ssh_config's SendEnv and AcceptEnv settings).  If you have a small number
of local/remote machines to configure, that is the place to try first.

You can of course override the locale in a shell.

(I work-around a different way - connecting to machines with X forwarding,
and running uxterm when a remote machine has UTF-8 locale turned on -
it also has the advantage that I can run screen in the uxterm or xterm).
 
> Is this a bug in ssh? Was it ssh that was stopping?

ssh contibutes to the problem, but reporting a bug there is a waste of time.
 
> Is this a Mozilla bug, using an improper file name?

UTF-8 filenames are legal :-)

ls doesn't check locale of course (I suppose it's hardcoded in that
way just like its color support).
 
> Should I report this bug elsewhere?

I think you came to the right place :-)

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


signature.asc
Description: Digital signature

Bug#721978: xterm: "ls -al /etc/ssl/certs" causes xterm to stop

2013-09-06 Thread John Moyer 
On Fri, Sep 06, 2013 at 06:10:33PM -0400, Thomas Dickey wrote:
> On Fri, Sep 06, 2013 at 07:53:40AM -0500, John Moyer wrote:
> > Package: xterm
> > Version: 278-4
> > Severity: normal

> >* What led up to the situation?
> > ls -al /etc/ssl/certs
> > start xterm on local host. ssh to remote host running Wheezy. ls
> > There is no problem if I do this on local host, so maybe ther problem is 
> > some combination of ssh and xterm. strace on ssh shows it is in read().

> > ls -al /etc/ssl/certs | cat -v 
> > behaves as expected.
> > 
> > /etc/ssl/certs/T*Sertifika* is the file name that causes problems. There is 
> > no
> > problem with the Xfce desktop terminal except that the filename does not
> > display correctly.
> > 
> >  2f 65 74 63 2f 73 73 6c 2f 63 65 72 74 73 2f 54  
> > /etc/ssl/certs/T
> > 0010 c3 9c 42 c4 b0 54 41 4b 5f 55 45 4b 41 45 5f 4b  
> > ..B..TAK_UEKAE_K
> > 0020 c3 b6 6b 5f 53 65 72 74 69 66 69 6b 61 5f 48 69  
> > ..k_Sertifika_Hi
> > 0030 7a 6d 65 74 5f 53 61 c4 9f 6c 61 79 c4 b1 63 c4  
> > zmet_Sa..lay..c.
> > 0040 b1 73 c4 b1 5f 2d 5f 53 c3 bc 72 c3 bc 6d 5f 33  
> > .s.._-_S..r..m_3
> > 0050 2e 70 65 6d 0a   .pem.
> > 
> > lrwxrwxrwx 1 root root   104 May 17 19:11 
> > T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.pem -> 
> > /usr/share/ca-certificates/mozilla/T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.crt
> 
> The string is encoded with UTF-8, but according to the summary, your
> locale is C (POSIX).  The 9f begins a string which is not terminated
> (see ctlseqs.ms):
>  
> ESC _
>  Application Program Command (APC  is 0x9f).
>  
> Also see the discussion of brokenStringTerm in the manpage.
> 
> (This is not a bug in xterm, by the way).
>  
> > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
> 
> -- 
> Thomas E. Dickey 
> http://invisible-island.net
> ftp://invisible-island.net

Thank you for your reply.

Should I will try setting brokenStringTerm to true in an X resources file.
Should I use a different locale?

Is this a bug in ssh? Was it ssh that was stopping?

Is this a Mozilla bug, using an improper file name?

Should I report this bug elsewhere?

Thanks again.

John


-- 
John Moyer (KC5GSX)
mailto:j...@rsok.com
http://www.RSOK.com/~jrm/


-- 
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/20130906233003.ga18...@rsok.com

Bug#721978: xterm: "ls -al /etc/ssl/certs" causes xterm to stop

2013-09-06 Thread John Moyer 
On Fri, Sep 06, 2013 at 06:30:03PM -0500, John Moyer wrote:
> On Fri, Sep 06, 2013 at 06:10:33PM -0400, Thomas Dickey wrote:
> > On Fri, Sep 06, 2013 at 07:53:40AM -0500, John Moyer wrote:
> > > Package: xterm
> > > Version: 278-4
> > > Severity: normal
> 
> > >* What led up to the situation?
> > > ls -al /etc/ssl/certs
> > > start xterm on local host. ssh to remote host running Wheezy. ls
> > > There is no problem if I do this on local host, so maybe ther problem is 
> > > some combination of ssh and xterm. strace on ssh shows it is in read().
> 


> > Also see the discussion of brokenStringTerm in the manpage.
> > 
> > (This is not a bug in xterm, by the way).
> >  
> > > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
> > 
> > -- 
> > Thomas E. Dickey 
> > http://invisible-island.net
> > ftp://invisible-island.net
> 
> Thank you for your reply.
> 
> Should I will try setting brokenStringTerm to true in an X resources file.
> Should I use a different locale?
> 
> Is this a bug in ssh? Was it ssh that was stopping?
> 
> Is this a Mozilla bug, using an improper file name?
> 
> Should I report this bug elsewhere?
> 

I think that I am slowly beginning to understand. 

On remote machine,
LANG=en_US.UTF-8
while on local machine,
LANG=C

If I run xterm on local machine as
 LANG=en_US.UTF-8 xterm
and then ssh to remote machine, in that case there is no problem.

Thanks again.

John

-- 
John Moyer (KC5GSX)
mailto:j...@rsok.com
http://www.RSOK.com/~jrm/


-- 
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/20130907000833.ga19...@rsok.com

Bug#721978: xterm: "ls -al /etc/ssl/certs" causes xterm to stop

2013-09-06 Thread Thomas Dickey 
On Fri, Sep 06, 2013 at 07:53:40AM -0500, John Moyer wrote:
> Package: xterm
> Version: 278-4
> Severity: normal
> 
> Dear Maintainer,
> *** Please consider answering these questions, where appropriate ***
> 
>* What led up to the situation?
> ls -al /etc/ssl/certs
> start xterm on local host. ssh to remote host running Wheezy. ls
> There is no problem if I do this on local host, so maybe ther problem is 
> some combination of ssh and xterm. strace on ssh shows it is in read().
> 
>* What exactly did you do (or not do) that was effective (or
>  ineffective)?
> stty sane < /dev/pts/0 > /dev/pts/0
>* What was the outcome of this action?
> No change
>* What outcome did you expect instead?
> characters echoed and input accepted
> 
> ls -al /etc/ssl/certs | cat -v 
> behaves as expected.
> 
> /etc/ssl/certs/T*Sertifika* is the file name that causes problems. There is no
> problem with the Xfce desktop terminal except that the filename does not
> display correctly.
> 
>  2f 65 74 63 2f 73 73 6c 2f 63 65 72 74 73 2f 54  /etc/ssl/certs/T
> 0010 c3 9c 42 c4 b0 54 41 4b 5f 55 45 4b 41 45 5f 4b  ..B..TAK_UEKAE_K
> 0020 c3 b6 6b 5f 53 65 72 74 69 66 69 6b 61 5f 48 69  ..k_Sertifika_Hi
> 0030 7a 6d 65 74 5f 53 61 c4 9f 6c 61 79 c4 b1 63 c4  zmet_Sa..lay..c.
> 0040 b1 73 c4 b1 5f 2d 5f 53 c3 bc 72 c3 bc 6d 5f 33  .s.._-_S..r..m_3
> 0050 2e 70 65 6d 0a   .pem.
> 
> lrwxrwxrwx 1 root root   104 May 17 19:11 
> T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.pem -> 
> /usr/share/ca-certificates/mozilla/T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.crt

The string is encoded with UTF-8, but according to the summary, your
locale is C (POSIX).  The 9f begins a string which is not terminated
(see ctlseqs.ms):
 
ESC _
 Application Program Command (APC  is 0x9f).
 
Also see the discussion of brokenStringTerm in the manpage.

(This is not a bug in xterm, by the way).
 
> Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

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


signature.asc
Description: Digital signature

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

2013-09-06 Thread Michele Cane 
 debian/changelog |1 +
 debian/rules |3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 8947249572ae95a01ec5422a209b6b4fcfa32929
Author: Michele Cane 
Date:   Fri Sep 6 17:24:54 2013 +0200

Disable silent build rules.

diff --git a/debian/changelog b/debian/changelog
index 8ab2955..5d6a1d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-mach64 (6.9.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * Drop 01_fix_build.diff
   * Bump Standards-Version to 3.9.4, no changes needed.
+  * Disable silent build rules.
 
  -- Michele Cane   Fri, 06 Sep 2013 16:39:00 +0200
 
diff --git a/debian/rules b/debian/rules
index 12bc01a..7a15cb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+override_dh_auto_configure:
+   dh_auto_configure -- --disable-silent-rules
+
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:
dh_auto_install --destdir=debian/tmp


-- 
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/e1vhxui-yp...@vasks.debian.org

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

2013-09-06 Thread Michele Cane 
 configure.ac  |2 -
 src/atimach64exa.c|   60 --
 src/atimach64render.c |   17 --
 src/atiscreen.c   |   21 -
 src/atistruct.h   |1 
 5 files changed, 8 insertions(+), 93 deletions(-)

New commits:
commit 0d8639f3cd4128ae856ae27f3787c1da224bb564
Author: Alan Coopersmith 
Date:   Wed Dec 19 22:14:08 2012 -0800

xf86-video-mach64 6.9.4

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 2282f79..95f336b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-mach64],
-[6.9.3],
+[6.9.4],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-mach64])
 AC_CONFIG_SRCDIR([Makefile.am])

commit f694490b3cec78d7b17eeb0a9c4daadd1028776a
Author: Alan Coopersmith 
Date:   Tue Dec 18 15:42:30 2012 -0800

Remove call to obsolete miInitializeBackingStore()

Definition was deleted from Xorg during 1.14 merge window, but has
been a no-op since 1.10 merge window.

Signed-off-by: Alan Coopersmith 
Reviewed-by: Alex Deucher 

diff --git a/src/atiscreen.c b/src/atiscreen.c
index 62a4dd9..15f399e 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -532,7 +532,6 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
 #endif /* AVOID_DGA */
 
 /* Initialise backing store */
-miInitializeBackingStore(pScreen);
 xf86SetBackingStore(pScreen);
 
 /* Initialise cursor */

commit ece8d3557eb1ffb27104bffb7841503aae4dcd6f
Author: Connor Behan 
Date:   Fri Dec 7 13:53:38 2012 -0800

Remove dummy UTS / DFS hooks

When EXA was added to mach64, it included UploadToScreen and
DownloadFromScreen hooks that did the same thing that EXA would do in a
software fallback. Now they are out of date and cause crashes. The
slight benefit of reimplementing those hooks (if there is any) is not
worth the maintenance burden of having to rewrite them every time there
is a change to the way EXA handles pixmaps.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=51137

Signed-off-by: Connor Behan 
Tested-by: Alan Coopersmith 
Signed-off-by: Alan Coopersmith 

diff --git a/src/atimach64exa.c b/src/atimach64exa.c
index e4d5307..ea4c98e 100644
--- a/src/atimach64exa.c
+++ b/src/atimach64exa.c
@@ -387,60 +387,6 @@ Mach64Solid
 
 static void Mach64DoneSolid(PixmapPtr pPixmap) { }
 
-/*
- * Memcpy-based UTS.
- */
-static Bool
-Mach64UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
-char *src, int src_pitch)
-{
-char  *dst= pDst->devPrivate.ptr;
-intdst_pitch  = exaGetPixmapPitch(pDst);
-
-int bpp= pDst->drawable.bitsPerPixel;
-int cpp= (bpp + 7) / 8;
-int wBytes = w * cpp;
-
-exaWaitSync(pDst->drawable.pScreen);
-
-dst += (x * cpp) + (y * dst_pitch);
-
-while (h--) {
-memcpy(dst, src, wBytes);
-src += src_pitch;
-dst += dst_pitch;
-}
-
-return TRUE;
-}
-
-/*
- * Memcpy-based DFS.
- */
-static Bool
-Mach64DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
-char *dst, int dst_pitch)
-{
-char  *src= pSrc->devPrivate.ptr;
-intsrc_pitch  = exaGetPixmapPitch(pSrc);
-
-int bpp= pSrc->drawable.bitsPerPixel;
-int cpp= (bpp + 7) / 8;
-int wBytes = w * cpp;
-
-exaWaitSync(pSrc->drawable.pScreen);
-
-src += (x * cpp) + (y * src_pitch);
-
-while (h--) {
-memcpy(dst, src, wBytes);
-src += src_pitch;
-dst += dst_pitch;
-}
-
-return TRUE;
-}
-
 #include "atimach64render.c"
 
 /* Compute log base 2 of val. */
@@ -659,12 +605,6 @@ Bool ATIMach64ExaInit(ScreenPtr pScreen)
 pExa->Copy = Mach64Copy;
 pExa->DoneCopy = Mach64DoneCopy;
 
-/* EXA hits more optimized paths when it does not have to fallback because
- * of missing UTS/DFS, hook memcpy-based UTS/DFS.
- */
-pExa->UploadToScreen = Mach64UploadToScreen;
-pExa->DownloadFromScreen = Mach64DownloadFromScreen;
-
 if (pATI->RenderAccelEnabled) {
if (pATI->Chip >= ATI_CHIP_264GTPRO) {
/* 3D Rage Pro does not support NPOT textures. */

commit f0d44c18d71e7450b99189c1221a2f89c7817ab6
Author: Alan Coopersmith 
Date:   Thu Dec 6 16:49:12 2012 -0800

Mach64PixelARGB should use exaGetPixmapFirstPixel

Fixes crash attempting to read a pixel from a NULL pPixmap->devPrivate.ptr

Signed-off-by: Alan Coopersmith 
Reviewed-by: Michel Dänzer 

diff --git a/src/atimach64render.c b/src/atimach64render.c
index 4862cd4..ffde2cb 100644
--- a/src/atimach64render.c
+++ b/src/atimach64render.c
@@ -209,22 +209,7 @@ Mach64PixelARGB(PixmapPtr pPixmap, CARD32 format, CARD32 
*argb)
 CARD8  comp;
 intbits, shift;
 
-/* Ensure that texture drawing has completed. */
-exaWaitSync(pPixmap->drawable.pScreen);
-
-/* exaGetPixmapFir

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

2013-09-06 Thread Michele Cane 
 ChangeLog |  155 ++
 README|8 +-
 configure.ac  |   25 +++-
 debian/changelog  |   20 ++
 debian/control|4 -
 debian/patches/series |1 
 src/Makefile.am   |3 
 src/ati.h |1 
 src/atiadjust.c   |   14 +---
 src/atiadjust.h   |2 
 src/aticonsole.c  |   45 --
 src/aticonsole.h  |8 +-
 src/atidga.c  |9 +-
 src/atidri.c  |   50 
 src/atimach64accel.c  |2 
 src/atimach64accel.h  |2 
 src/atimach64cursor.c |4 -
 src/atimach64exa.c|   76 ++--
 src/atimach64probe.c  |2 
 src/atimach64render.c |   25 +---
 src/atimach64xv.c |4 -
 src/atipreinit.c  |2 
 src/atiscreen.c   |   69 +++---
 src/atiscreen.h   |4 -
 src/atistruct.h   |3 
 src/ativalid.c|6 -
 src/ativalid.h|2 
 src/compat-api.h  |  101 
 28 files changed, 415 insertions(+), 232 deletions(-)

New commits:
commit 5d02b6228b4c0ed68cf36d6981b21dca0413
Author: Michele Cane 
Date:   Fri Sep 6 16:51:29 2013 +0200

Bump Standards-Version to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index dedd05b..8ab2955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-mach64 (6.9.4-1) UNRELEASED; urgency=low
   [ Michele Cane ]
   * New upstream release.
   * Drop 01_fix_build.diff
+  * Bump Standards-Version to 3.9.4, no changes needed.
 
  -- Michele Cane   Fri, 06 Sep 2013 16:39:00 +0200
 
diff --git a/debian/control b/debian/control
index c2382dc..4d7b49c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  x11proto-xf86dri-dev,
  quilt,
  xutils-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mach64
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mach64.git
 

commit 0634f7530d5235671ce6bfe17f9e6b6354a91a81
Author: Michele Cane 
Date:   Fri Sep 6 16:49:34 2013 +0200

Drop 01_fix_build.diff

diff --git a/debian/changelog b/debian/changelog
index e8081d3..dedd05b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-mach64 (6.9.4-1) UNRELEASED; urgency=low
 
   [ Michele Cane ]
   * New upstream release.
+  * Drop 01_fix_build.diff
 
  -- Michele Cane   Fri, 06 Sep 2013 16:39:00 +0200
 
diff --git a/debian/patches/01_fix_build.diff b/debian/patches/01_fix_build.diff
deleted file mode 100644
index 22b1d3b..000
--- a/debian/patches/01_fix_build.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/atiscreen.c b/src/atiscreen.c
-index 2957877..b1fbd3c 100644
 a/src/atiscreen.c
-+++ b/src/atiscreen.c
-@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
- #ifdef TV_OUT
- /* Fix-up TV out after ImpacTV probe */
- if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
--ATISwitchMode(0, pScreenInfo->currentMode, 0);
-+ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, 
pScreenInfo->currentMode));
- #endif /* TV_OUT */
- 
- #ifdef XF86DRI_DEVEL
diff --git a/debian/patches/series b/debian/patches/series
index 1f24f51..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_fix_build.diff
+

commit 0d2049af6a7b9db862c9e876e4fbf56480b8d68a
Author: Michele Cane 
Date:   Fri Sep 6 16:40:14 2013 +0200

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 4a6395a..fe45b7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,544 @@
+commit 0d8639f3cd4128ae856ae27f3787c1da224bb564
+Author: Alan Coopersmith 
+Date:   Wed Dec 19 22:14:08 2012 -0800
+
+xf86-video-mach64 6.9.4
+
+Signed-off-by: Alan Coopersmith 
+
+commit f694490b3cec78d7b17eeb0a9c4daadd1028776a
+Author: Alan Coopersmith 
+Date:   Tue Dec 18 15:42:30 2012 -0800
+
+Remove call to obsolete miInitializeBackingStore()
+
+Definition was deleted from Xorg during 1.14 merge window, but has
+been a no-op since 1.10 merge window.
+
+Signed-off-by: Alan Coopersmith 
+Reviewed-by: Alex Deucher 
+
+commit ece8d3557eb1ffb27104bffb7841503aae4dcd6f
+Author: Connor Behan 
+Date:   Fri Dec 7 13:53:38 2012 -0800
+
+Remove dummy UTS / DFS hooks
+
+When EXA was added to mach64, it included UploadToScreen and
+DownloadFromScreen hooks that did the same thing that EXA would do in a
+software fallback. Now they are out of date and cause crashes. The
+slight benefit of reimplementing those hooks (if there is any) is not
+worth the maintenance burden of having to rewrite them every time there
+is a change to the way EXA handles pixmaps.
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=51137
+
+Signed-off-by: Connor Behan 
+Tested-by: Alan Coopersmith 
+Signed-off-by: Alan Coopersmith

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

2013-09-06 Thread Michele Cane 
 configure.ac  |  118 
 man/r128.man  |   21 +
 src/Makefile.am   |8 
 src/compat-api.h  |   99 +++
 src/r128.h|   98 ++-
 src/r128_accel.c  |   48 +++
 src/r128_cursor.c |   56 ++--
 src/r128_dga.c|   20 -
 src/r128_dri.c|   90 +-
 src/r128_driver.c |  469 ++---
 src/r128_exa.c|  493 +++
 src/r128_exa_render.c |  695 ++
 src/r128_misc.c   |3 
 src/r128_probe.c  |4 
 src/r128_probe.h  |   14 -
 src/r128_video.c  |  158 ---
 16 files changed, 2137 insertions(+), 257 deletions(-)

New commits:
commit ef4467b4aac70b9a8a1ef1194eb02d7551be2602
Author: Dave Airlie 
Date:   Fri Sep 28 11:25:17 2012 +1000

r128: bump to 6.9.1

Signed-off-by: Dave Airlie 

diff --git a/configure.ac b/configure.ac
index c5cbc69..38dc9bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-r128],
-[6.9.0],
+[6.9.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-r128])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 1793fe6e84a0ee4e4924d90e9e777213a6a5ea20
Author: Dave Airlie 
Date:   Fri Sep 28 11:24:53 2012 +1000

fix make distcheck

Signed-off-by: Dave Airlie 

diff --git a/src/Makefile.am b/src/Makefile.am
index 4ee9725..23e6c49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,4 +53,5 @@ EXTRA_DIST = \
r128_reg.h \
r128_sarea.h \
r128_version.h \
+   r128_exa_render.c \
atipcirename.h

commit e0222a5f5e7cad482044a542e4b1ebc32f774648
Author: Dave Airlie 
Date:   Fri Sep 28 11:22:40 2012 +1000

r128: bump release to 6.9.0

Signed-off-by: Dave Airlie 

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

commit e8b741e8fd4acebd79ee495cdd5437746ae80c39
Author: Dave Airlie 
Date:   Fri Sep 28 11:20:41 2012 +1000

r128: enable EXA by default if XAA isn't available at build time.

Signed-off-by: Dave Airlie 

diff --git a/src/r128_driver.c b/src/r128_driver.c
index ae16e97..a062a60 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -2251,6 +2251,11 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
 
 R128TRACE(("R128ScreenInit %x %d\n", pScrn->memPhysBase, pScrn->fbOffset));
 info->useEXA = FALSE;
+#ifdef USE_EXA
+#ifndef HAVE_XAA_H
+info->useEXA = TRUE;
+#endif
+#endif
 
 #ifdef USE_EXA
 optstr = (char *)xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);

commit 4ecd6e67fbbfd52e0ac77a6c48bd3c6a6d5598e7
Author: Connor Behan 
Date:   Fri Aug 31 00:19:21 2012 -0700

Scale Xv with the vertical stretch ratio

If we are using a resolution lower than the native resolution of the
flat panel, the video overlay needs to know this. Otherwise a black bar
appears beneath the video. This is essentially Conn's patch from the bug
tracker except it doesn't always rely on info->PanelYRes. ACPI events
can change this without the driver's knowledge.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=6493

Signed-off-by: Connor Behan 

diff --git a/src/r128_video.c b/src/r128_video.c
index 4507b30..bb5a655 100644
--- a/src/r128_video.c
+++ b/src/r128_video.c
@@ -661,13 +661,25 @@ R128DisplayVideo422(
 R128InfoPtr info = R128PTR(pScrn);
 unsigned char *R128MMIO = info->MMIO;
 R128PortPrivPtr pPriv = info->adaptor->pPortPrivates[0].ptr;
-int v_inc, h_inc, step_by, tmp;
+int v_inc, h_inc, step_by, tmp, v_inc_shift;
 int p1_h_accum_init, p23_h_accum_init;
 int p1_v_accum_init;
+Bool rmx_active;
 
 R128ECP(pScrn, pPriv);
 
-v_inc = (src_h << 20) / drw_h;
+v_inc_shift = 20;
+if (pScrn->currentMode->Flags & V_INTERLACE)
+v_inc_shift++;
+if (pScrn->currentMode->Flags & V_DBLSCAN)
+v_inc_shift--;
+
+rmx_active = INREG(R128_FP_VERT_STRETCH) & R128_VERT_STRETCH_ENABLE;
+if (rmx_active) {
+v_inc = ((src_h * pScrn->currentMode->CrtcVDisplay / info->PanelYRes) 
<< v_inc_shift) / drw_h;
+} else {
+v_inc = (src_h << v_inc_shift) / drw_h;
+}
 h_inc = (src_w << (12 + pPriv->ecp_div)) / drw_w;
 step_by = 1;
 
@@ -735,11 +747,23 @@ R128DisplayVideo420(
 R128InfoPtr info = R128PTR(pScrn);
 unsigned char *R128MMIO = info->MMIO;
 R128PortPrivPtr pPriv = info->adaptor->pPortPrivates[0].ptr;
-int v_inc, h_inc, step_by, tmp, leftUV;
+int v_inc, h_inc, step_by, tmp, leftUV, v_inc_shift;
 int p1_h_accum_init, p23_h_accum_init;
 int p1

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

2013-09-06 Thread Michele Cane 
 ChangeLog |  157 +++
 configure.ac  |  118 
 debian/changelog  |   29 ++
 debian/control|8 
 debian/patches/series |1 
 man/r128.man  |   21 +
 src/Makefile.am   |8 
 src/compat-api.h  |   99 +++
 src/r128.h|   98 ++-
 src/r128_accel.c  |   48 +++
 src/r128_cursor.c |   56 ++--
 src/r128_dga.c|   20 -
 src/r128_dri.c|   90 +-
 src/r128_driver.c |  469 ++---
 src/r128_exa.c|  493 +++
 src/r128_exa_render.c |  695 ++
 src/r128_misc.c   |3 
 src/r128_probe.c  |4 
 src/r128_probe.h  |   14 -
 src/r128_video.c  |  158 ---
 20 files changed, 2329 insertions(+), 260 deletions(-)

New commits:
commit 521324de2e6a8da6d97704e4c7d7c31454e220a5
Author: Michele Cane 
Date:   Fri Sep 6 16:27:59 2013 +0200

Bump Standards-Version to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index ff8429f..bb0cf5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-r128 (6.9.1-1) UNRELEASED; urgency=low
 
+  [ Maarten Lankhorst ]
   * New upstream release.
   * Bump Standards-Version to 3.9.3
 
+  [ Michele Cane ]
+  * Bump Standards-Version to 3.9.4, no changes deeded.
+
  -- Maarten Lankhorst   Wed, 18 Jul 2012 
16:13:52 +0200
 
 xserver-xorg-video-r128 (6.8.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 45eec5e..04b28ac 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  x11proto-xf86dri-dev,
  quilt,
  xutils-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-r128.git
 

commit 1aae585e509241bde988a043ad9808137cc3d8a2
Author: Timo Aaltonen 
Date:   Mon Oct 1 12:26:04 2012 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index bb89291..938043d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,126 @@
+commit ef4467b4aac70b9a8a1ef1194eb02d7551be2602
+Author: Dave Airlie 
+Date:   Fri Sep 28 11:25:17 2012 +1000
+
+r128: bump to 6.9.1
+
+Signed-off-by: Dave Airlie 
+
+commit 1793fe6e84a0ee4e4924d90e9e777213a6a5ea20
+Author: Dave Airlie 
+Date:   Fri Sep 28 11:24:53 2012 +1000
+
+fix make distcheck
+
+Signed-off-by: Dave Airlie 
+
+commit e0222a5f5e7cad482044a542e4b1ebc32f774648
+Author: Dave Airlie 
+Date:   Fri Sep 28 11:22:40 2012 +1000
+
+r128: bump release to 6.9.0
+
+Signed-off-by: Dave Airlie 
+
+commit e8b741e8fd4acebd79ee495cdd5437746ae80c39
+Author: Dave Airlie 
+Date:   Fri Sep 28 11:20:41 2012 +1000
+
+r128: enable EXA by default if XAA isn't available at build time.
+
+Signed-off-by: Dave Airlie 
+
+commit 4ecd6e67fbbfd52e0ac77a6c48bd3c6a6d5598e7
+Author: Connor Behan 
+Date:   Fri Aug 31 00:19:21 2012 -0700
+
+Scale Xv with the vertical stretch ratio
+
+If we are using a resolution lower than the native resolution of the
+flat panel, the video overlay needs to know this. Otherwise a black bar
+appears beneath the video. This is essentially Conn's patch from the bug
+tracker except it doesn't always rely on info->PanelYRes. ACPI events
+can change this without the driver's knowledge.
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=6493
+
+Signed-off-by: Connor Behan 
+
+commit 7f279e9d4e329ccb95de16f205ea4cd0ab37a65b
+Author: Connor Behan 
+Date:   Wed Aug 29 16:06:39 2012 -0700
+
+Remove nested preprocessor checks
+
+When checking for R128DRI and RENDER, it is better to use two lines
+instead of four.
+
+Signed-off-by: Connor Behan 
+
+commit deb05ac9cf58608b3d8d9947f52e9bcc5e0ae6b5
+Author: Connor Behan 
+Date:   Mon Jul 30 14:28:05 2012 +1000
+
+Fix build without XAA again
+
+referring to info->accel instead of info->accelOn
+
+Signed-off-by: Connor Behan 
+Signed-off-by: Dave Airlie 
+
+commit 310d998b7bb6d1befb1001deb565fb51a4b17013
+Author: Connor Behan 
+Date:   Fri Jul 27 11:49:38 2012 +1000
+
+r128: fix missing preprocessor check for R128DRI
+
+This fixes one build problem seen in tinderbox.
+
+[airlied: split out from larger patch]
+Signed-off-by: Connor Behan 
+Signed-off-by: Dave Airlie 
+
+commit f83ee3144236bcca35eeadee2924e8bc15092447
+Author: Connor Behan 
+Date:   Tue Jul 17 22:53:17 2012 -0700
+
+Fix build without EXA
+
+The offscreen area used by EXA needs to be declared even with lazy
+evaluation.
+
+Signed-off-by: Connor Behan 
+
+commit 599c69a9cbf78c8717fb9ec92d9e764d9b358cf3
+Author: Connor Behan 
+Date:   Tue Jul 17 22:33:43 2012 -0700
+
+Make debug mode work again
+
+The source should not assume that debugging is turned o

Bug#721978: xterm: "ls -al /etc/ssl/certs" causes xterm to stop

2013-09-06 Thread John Moyer 
Package: xterm
Version: 278-4
Severity: normal

Dear Maintainer,
*** Please consider answering these questions, where appropriate ***

   * What led up to the situation?
ls -al /etc/ssl/certs
start xterm on local host. ssh to remote host running Wheezy. ls
There is no problem if I do this on local host, so maybe ther problem is 
some combination of ssh and xterm. strace on ssh shows it is in read().

   * What exactly did you do (or not do) that was effective (or
 ineffective)?
stty sane < /dev/pts/0 > /dev/pts/0
   * What was the outcome of this action?
No change
   * What outcome did you expect instead?
characters echoed and input accepted

ls -al /etc/ssl/certs | cat -v 
behaves as expected.

/etc/ssl/certs/T*Sertifika* is the file name that causes problems. There is no
problem with the Xfce desktop terminal except that the filename does not
display correctly.

 2f 65 74 63 2f 73 73 6c 2f 63 65 72 74 73 2f 54  /etc/ssl/certs/T
0010 c3 9c 42 c4 b0 54 41 4b 5f 55 45 4b 41 45 5f 4b  ..B..TAK_UEKAE_K
0020 c3 b6 6b 5f 53 65 72 74 69 66 69 6b 61 5f 48 69  ..k_Sertifika_Hi
0030 7a 6d 65 74 5f 53 61 c4 9f 6c 61 79 c4 b1 63 c4  zmet_Sa..lay..c.
0040 b1 73 c4 b1 5f 2d 5f 53 c3 bc 72 c3 bc 6d 5f 33  .s.._-_S..r..m_3
0050 2e 70 65 6d 0a   .pem.

lrwxrwxrwx 1 root root   104 May 17 19:11 
T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.pem -> 
/usr/share/ca-certificates/mozilla/T##B##TAK_UEKAE_K##k_Sertifika_Hizmet_Sa##lay##c##s##_-_S##r##m_3.crt




*** End of the template - remove these lines ***


-- System Information:
Debian Release: 7.1
  APT prefers stable
  APT policy: (990, 'stable'), (10, 'testing'), (5, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

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

Versions of packages xterm depends on:
ii  libc6   2.13-38
ii  libfontconfig1  2.9.0-7.1
ii  libice6 2:1.0.8-2
ii  libtinfo5   5.9-10
ii  libutempter01.1.5-4
ii  libx11-62:1.5.0-1+deb7u1
ii  libxaw7 2:1.0.10-2
ii  libxft2 2.3.1-1
ii  libxmu6 2:1.1.1-1
ii  libxt6  1:1.1.3-1+deb7u1
ii  xbitmaps1.1.1-1

Versions of packages xterm recommends:
ii  x11-utils  7.7~1

Versions of packages xterm suggests:
pn  xfonts-cyrillic  

-- 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/20130906125340.6834.33591.report...@jm.rsok.com

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

2013-09-06 Thread Michele Cane 
 configure.ac   |2 -
 src/Makefile.am|2 +
 src/compat-api.h   |  101 +
 src/dummy.h|   10 -
 src/dummy_cursor.c |4 +-
 src/dummy_dga.c|   10 ++---
 src/dummy_driver.c |   61 
 7 files changed, 150 insertions(+), 40 deletions(-)

New commits:
commit fee6b520a620eed80e22840b8149abc50815f771
Author: Dave Airlie 
Date:   Wed Jul 18 19:39:32 2012 +1000

dummy: bump to 0.3.6 for release

Signed-off-by: Dave Airlie 

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

commit 1491470ee0745bf8303fa085bd30f7464098f1f2
Author: Dave Airlie 
Date:   Tue Jun 5 11:14:37 2012 +0100

dummy: convert to the new server APIs.

Signed-off-by: Dave Airlie 

diff --git a/src/compat-api.h b/src/compat-api.h
index 1bb7724..b74a582 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -38,4 +38,64 @@
 #define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
 #endif
 
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, 
pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
+
+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer 
pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+#define FREE_SCREEN_ARGS(x) (x)
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS(flags) pScrn
+
+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
+
+#endif
+
 #endif
diff --git a/src/dummy.h b/src/dummy.h
index 24279a2..c3fdd6e 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -20,8 +20,8 @@ typedef enum {
 
 /* function prototypes */
 
-extern Bool DUMMYSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-extern void DUMMYAdjustFrame(int scrnIndex, int x, int y, int flags);
+extern Bool DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL);
+extern void DUMMYAdjustFrame(ADJUST_FRAME_ARGS_DECL);
 
 /* in dummy_cursor.c */
 extern Bool DUMMYCursorInit(ScreenPtr pScrn);
diff --git a/src/dummy_dga.c b/src/dummy_dga.c
index a35f3c9..d16d09f 100644
--- a/src/dummy_dga.c
+++ b/src/dummy_dga.c
@@ -116,8 +116,8 @@ DUMMY_SetMode(
if(!pMode) { /* restore the original mode */
if(pDUMMY->DGAactive) { 
pScrn->currentMode = DUMMYSavedDGAModes[index];
-DUMMYSwitchMode(index, pScrn->currentMode, 0);
-   DUMMYAdjustFrame(index, 0, 0, 0);
+DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode));
+   DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0));
pDUMMY->DGAactive = FALSE;
}
} else {
@@ -126,7 +126,7 @@ DUMMY_SetMode(
pDUMMY->DGAactive = TRUE;
}
 
-DUMMYSwitchMode(index, pMode->mode, 0);
+DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pMode->mode));
}

return TRUE;
@@ -149,7 +149,7 @@ DUMMY_SetViewport(
 ){
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
 
-   DUMMYAdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+   DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y));
pDUMMY->DGAViewportStatus = 0;  
 }
 
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index f5d1f4c..62066d

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

2013-09-06 Thread Michele Cane 
 ChangeLog  |   56 +
 configure.ac   |2 -
 debian/changelog   |   17 
 debian/control |4 +-
 src/Makefile.am|2 +
 src/compat-api.h   |  101 +
 src/dummy.h|   10 -
 src/dummy_cursor.c |4 +-
 src/dummy_dga.c|   10 ++---
 src/dummy_driver.c |   61 
 10 files changed, 225 insertions(+), 42 deletions(-)

New commits:
commit c655d2b5369b80a1ed8964d178418aea64a8f5ed
Author: Michele Cane 
Date:   Fri Sep 6 11:20:42 2013 +0200

Bump Standards-Version to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 8771957..3e9dfd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-dummy (1:0.3.6-1) UNRELEASED; urgency=low
 
+  [ Maarten Lankhorst ]
   * New upstream release.
   * Bump Standards-Version to 3.9.3 (no changes needed)
 
+  [ Michele Cane ]
+  * Bump Standards-Version to 3.9.4, no changes needed.
+
  -- Maarten Lankhorst   Wed, 18 Jul 2012 
15:57:12 +0200
 
 xserver-xorg-video-dummy (1:0.3.5-2) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 022cc01..e6afe91 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  x11proto-randr-dev,
  x11proto-render-dev,
  xutils-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-dummy
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-dummy.git
 

commit 54a8e8937fa00a876fe82306cad7444e1cc496a0
Author: Maarten Lankhorst 
Date:   Wed Jul 18 15:58:12 2012 +0200

Bump Standards-Version to 3.9.3 (no changes needed)

diff --git a/debian/changelog b/debian/changelog
index bc5afb9..8771957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-dummy (1:0.3.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.9.3 (no changes needed)
 
  -- Maarten Lankhorst   Wed, 18 Jul 2012 
15:57:12 +0200
 
diff --git a/debian/control b/debian/control
index 080964e..022cc01 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  x11proto-randr-dev,
  x11proto-render-dev,
  xutils-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-dummy
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-dummy.git
 

commit 9e9c4fccc138077817d9b2069df271652700a1f8
Author: Maarten Lankhorst 
Date:   Wed Jul 18 15:57:51 2012 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index ff8fa03..bc5afb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-dummy (1:0.3.6-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Wed, 18 Jul 2012 
15:57:12 +0200
+
 xserver-xorg-video-dummy (1:0.3.5-2) unstable; urgency=high
 
   * Merge upstream master up to 02918fd534:

commit 50811dbdc765b7e2a81d332109ef405b8058db25
Author: Maarten Lankhorst 
Date:   Wed Jul 18 15:57:40 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index 4e09967..a5bcc2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+commit fee6b520a620eed80e22840b8149abc50815f771
+Author: Dave Airlie 
+Date:   Wed Jul 18 19:39:32 2012 +1000
+
+dummy: bump to 0.3.6 for release
+
+Signed-off-by: Dave Airlie 
+
+commit 1491470ee0745bf8303fa085bd30f7464098f1f2
+Author: Dave Airlie 
+Date:   Tue Jun 5 11:14:37 2012 +0100
+
+dummy: convert to the new server APIs.
+
+Signed-off-by: Dave Airlie 
+
+commit 6ff612955a1a8591bf21f6aa56e7b6ebd8e2db48
+Author: Dave Airlie 
+Date:   Wed May 23 11:37:01 2012 +0100
+
+dummy: convert to new scrn conversion APIs.
+
+Generated from util/modular/x-driver-screen-scrn-conv.sh
+
+Signed-off-by: Dave Airlie 
+
+commit 20fcd59d3f8d7393586d8b64bfac18adede726ca
+Author: Dave Airlie 
+Date:   Wed May 23 11:36:22 2012 +0100
+
+dummy: add scrn conversion api compat header.
+
+Signed-off-by: Dave Airlie 
+
+commit a78d524cfb332909dba89df5d709081515f0ed36
+Author: Yaakov Selkowitz 
+Date:   Wed Mar 28 00:07:28 2012 -0500
+
+Add XORG_LIBS to LIBADD
+
+This affects only Cygwin, where drivers must be linked against the
+Xorg implib.  On other systems, XORG_LIBS will be empty.
+
+Signed-off-by: Yaakov Selkowitz 
+Reviewed-by: Alan Coopersmith 
+Reviewed-by: Jeremy Huddleston 
+
+commit 668223a665af38600b8b20152c7e53e731c76234
+Author: Yaakov Selkowitz 
+Date:   Wed Mar 28 00:06:32 2012 -0500
+
+Only include Xv headers if server supports it
+
+Signed-off-by: Yaakov Selkowitz 
+Reviewed-by: Jeremy Huddleston 
+
 commit 02918fd53434a23a72fe878a90f4ec48ef0e0416
 Author: Jeremy Huddleston 
 Date:   Mon Jan 9 01:00:40 2012 -0800

commit fee6b520a620eed80e