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

[Brice Goglin]

 configure.ac  |2 
 man/intel.man |2 
 src/bios_reader/bios_reader.c |4 -
 src/i830_accel.c  |2 
 src/i830_display.c|   34 +++-
 src/i830_driver.c |4 +
 src/i830_lvds.c   |   86 ++
 uxa/uxa-glyphs.c  |9 ++--
 8 files changed, 125 insertions(+), 18 deletions(-)

New commits:
commit 5cd65d965c8ed388275fe2084553302aad601d4a
Author: Zhenyu Wang 
Date:   Thu Jan 15 13:45:14 2009 +0800

Bump version 2.6.0

diff --git a/configure.ac b/configure.ac
index d0f47ab..bb69f72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-2.5.99.2,
+2.6.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-intel)
 

commit ff67517db91a572a640e7a0ba247b8b71bfa2335
Author: Owain G. Ainsworth 
Date:   Tue Jan 13 18:42:44 2009 +

Fix ioctl type.

I915_EMIT_IRQ is a read/write ioctl, not a write only. Found by OpenBSd's
kernel code which checks these things a long more strongly than Linux.
(cherry picked from commit 9f306193c4b128ec72c5b4db16d07302cee50ab5)

diff --git a/src/i830_accel.c b/src/i830_accel.c
index 7dff714..5ee53bb 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -205,7 +205,7 @@ I830Sync(ScrnInfoPtr pScrn)
* register reads for idle.
*/
emit.irq_seq = &wait.irq_seq;
-   ret = drmCommandWrite(pI830->drmSubFD, DRM_I830_IRQ_EMIT, &emit,
+   ret = drmCommandWriteRead(pI830->drmSubFD, DRM_I830_IRQ_EMIT, &emit,
sizeof(emit));
if (ret != 0)
   FatalError("Failure to emit IRQ: %s\n", strerror(-ret));

commit e84f21db824b2e9e7fe660927ecfbbf04b068f7a
Author: Owain G. Ainsworth 
Date:   Tue Jan 13 17:02:59 2009 +

use ifdef __linux__ where needed.

since modesetting is compiled by default now, ifdef __linux__ the linux
only includes and ioctls.
(cherry picked from commit 1e8588ad5087c69eb77399cfaab8e4ec15eb4da9)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index beb134d..4c40d40 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1131,7 +1131,9 @@ i830SetHotkeyControl(ScrnInfoPtr pScrn, int mode)
  * DRM mode setting Linux only at this point... later on we could
  * add a wrapper here.
  */
+#ifdef __linux__
 #include 
+#endif
 
 static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
 {
@@ -1157,7 +1159,9 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
 if (ret)
return FALSE;
 
+#ifdef __linux__
 ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
+#endif
 
 return TRUE;
 }

commit 70ba6d45c9a00756e0ad36a58136281adba138f9
Author: Zhenyu Wang 
Date:   Wed Jan 14 16:39:08 2009 +0800

Revert "Assign rotation memory dri_bo to rotation pixmap."

This reverts commit d994978488648a68ade0d518e5dd40d100e953ed.
This requires i830_set_pixmap_bo() on master that is not in
2.6 branch.

diff --git a/src/i830_display.c b/src/i830_display.c
index e1ba661..022d519 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1624,7 +1624,6 @@ static PixmapPtr
 i830_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 {
 ScrnInfoPtr pScrn = crtc->scrn;
-I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
 I830Ptr pI830 = I830PTR(pScrn);
 unsigned long rotate_pitch;
 PixmapPtr rotate_pixmap;
@@ -1645,8 +1644,6 @@ i830_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int 
width, int height)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
   "Couldn't allocate shadow pixmap for rotated CRTC\n");
 }
-if (intel_crtc->rotate_mem && intel_crtc->rotate_mem->bo)
-   i830_set_pixmap_bo(rotate_pixmap, intel_crtc->rotate_mem->bo);
 return rotate_pixmap;
 }
 

commit 3743747dbcf538ddd6db882bde7243656d0c5596
Author: Ma Ling 
Date:   Wed Jan 14 14:46:52 2009 +0800

Disable VGA plane reliably

This fixes #17235, VGA random hang on recent G45/43 board.
From spec, SR01 bit 5 should be set before VGA plane disable through
control register, otherwise we might get random crash and lockups.
(cherry picked from commit db9f5915ce812144ffd9d2aa42e8ba856129c35e)

diff --git a/src/i830_display.c b/src/i830_display.c
index 82a068c..e1ba661 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -779,6 +779,37 @@ static void i830_modeset_ctl(xf86CrtcPtr crtc, int 
dpms_state)
 }
 #endif /* DRM_IOCTL_MODESET_CTL && (XF86DRI || DRI2) */
 
+static void
+i830_disable_vga_plane (xf86CrtcPtr crtc)
+{
+ScrnInfoPtr pScrn = crtc->scrn;
+I830Ptr pI830 = I830PTR(pScrn);
+uint32_t vgacntrl = INREG(VGACNTRL);
+uint8_t sr01;
+
+if (vgacntrl & VGA_DISP_DISABLE)
+   return;
+
+/*
+   Set bit 5 of SR01;
+   Wait 30us;
+   */
+OUTREG8(SRX, 1);
+sr01 = INREG8(SRX + 1);
+OUTREG8(SRX

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

[Brice Goglin]

 configure.ac  |2 
 debian/changelog  |6 ++
 man/intel.man |2 
 src/bios_reader/bios_reader.c |4 -
 src/i830_accel.c  |2 
 src/i830_display.c|   34 +++-
 src/i830_driver.c |4 +
 src/i830_lvds.c   |   86 ++
 uxa/uxa-glyphs.c  |9 ++--
 9 files changed, 131 insertions(+), 18 deletions(-)

New commits:
commit 0856c81e9cd907803e3de851b24b9baa104b1b00
Author: Brice Goglin 
Date:   Thu Jan 15 10:54:29 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index a8ecfd0..b3048a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.6.0-1) experimental; urgency=low
 
   * New upstream release.
 
- -- Brice Goglin   Thu, 15 Jan 2009 10:53:48 +0100
+ -- Brice Goglin   Thu, 15 Jan 2009 10:54:17 +0100
 
 xserver-xorg-video-intel (2:2.5.99.2-1) experimental; urgency=low
 

commit 02ab5d882a8cc143d41460a27c1a27bc173bb2fc
Author: Brice Goglin 
Date:   Thu Jan 15 10:16:40 2009 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 7c895d7..a8ecfd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.6.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Brice Goglin   Thu, 15 Jan 2009 10:53:48 +0100
+
 xserver-xorg-video-intel (2:2.5.99.2-1) experimental; urgency=low
 
   * New upstream release.

commit 5cd65d965c8ed388275fe2084553302aad601d4a
Author: Zhenyu Wang 
Date:   Thu Jan 15 13:45:14 2009 +0800

Bump version 2.6.0

diff --git a/configure.ac b/configure.ac
index d0f47ab..bb69f72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-2.5.99.2,
+2.6.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-intel)
 

commit ff67517db91a572a640e7a0ba247b8b71bfa2335
Author: Owain G. Ainsworth 
Date:   Tue Jan 13 18:42:44 2009 +

Fix ioctl type.

I915_EMIT_IRQ is a read/write ioctl, not a write only. Found by OpenBSd's
kernel code which checks these things a long more strongly than Linux.
(cherry picked from commit 9f306193c4b128ec72c5b4db16d07302cee50ab5)

diff --git a/src/i830_accel.c b/src/i830_accel.c
index 7dff714..5ee53bb 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -205,7 +205,7 @@ I830Sync(ScrnInfoPtr pScrn)
* register reads for idle.
*/
emit.irq_seq = &wait.irq_seq;
-   ret = drmCommandWrite(pI830->drmSubFD, DRM_I830_IRQ_EMIT, &emit,
+   ret = drmCommandWriteRead(pI830->drmSubFD, DRM_I830_IRQ_EMIT, &emit,
sizeof(emit));
if (ret != 0)
   FatalError("Failure to emit IRQ: %s\n", strerror(-ret));

commit e84f21db824b2e9e7fe660927ecfbbf04b068f7a
Author: Owain G. Ainsworth 
Date:   Tue Jan 13 17:02:59 2009 +

use ifdef __linux__ where needed.

since modesetting is compiled by default now, ifdef __linux__ the linux
only includes and ioctls.
(cherry picked from commit 1e8588ad5087c69eb77399cfaab8e4ec15eb4da9)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index beb134d..4c40d40 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1131,7 +1131,9 @@ i830SetHotkeyControl(ScrnInfoPtr pScrn, int mode)
  * DRM mode setting Linux only at this point... later on we could
  * add a wrapper here.
  */
+#ifdef __linux__
 #include 
+#endif
 
 static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
 {
@@ -1157,7 +1159,9 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
 if (ret)
return FALSE;
 
+#ifdef __linux__
 ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
+#endif
 
 return TRUE;
 }

commit 70ba6d45c9a00756e0ad36a58136281adba138f9
Author: Zhenyu Wang 
Date:   Wed Jan 14 16:39:08 2009 +0800

Revert "Assign rotation memory dri_bo to rotation pixmap."

This reverts commit d994978488648a68ade0d518e5dd40d100e953ed.
This requires i830_set_pixmap_bo() on master that is not in
2.6 branch.

diff --git a/src/i830_display.c b/src/i830_display.c
index e1ba661..022d519 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1624,7 +1624,6 @@ static PixmapPtr
 i830_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 {
 ScrnInfoPtr pScrn = crtc->scrn;
-I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
 I830Ptr pI830 = I830PTR(pScrn);
 unsigned long rotate_pitch;
 PixmapPtr rotate_pixmap;
@@ -1645,8 +1644,6 @@ i830_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int 
width, int height)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
   "Couldn't allocate shadow pixmap for rotated CRTC\n");
 }
-if (intel_crtc->rotate_mem && intel_crtc->rotate_mem->bo)
-   i8

xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.6.0-1'

[Brice Goglin]

Tag 'xserver-xorg-video-intel-2_2.6.0-1' created by Brice Goglin 
 at 2009-01-15 10:10 +

Tagging upload of xserver-xorg-video-intel 2:2.6.0-1 to experimental.

Changes since xserver-xorg-video-intel-2_2.5.99.2-1:
Alan Coopersmith (1):
  Remove xorgconfig & xorgcfg from See Also list in man page

Bernhard Rosenkraenzer (1):
  UXA: Declare glyph cache picture as component-alpha when necessary.

Brice Goglin (3):
  Merge tag 'xf86-video-intel-2.6.0' into debian-experimental
  New upstream release
  Prepare changelog for upload

Ian Romanick (1):
  Prevent redefinitions of CARD8 and friends.  Fixes build.

Keith Packard (2):
  Fix LVDS EDID to match all possible default modes
  Assign rotation memory dri_bo to rotation pixmap.

Ma Ling (2):
  set continuous-frequency flag in get modes function
  Disable VGA plane reliably

Owain G. Ainsworth (2):
  use ifdef __linux__ where needed.
  Fix ioctl type.

Zhenyu Wang (2):
  Revert "Assign rotation memory dri_bo to rotation pixmap."
  Bump version 2.6.0

---
 configure.ac  |2 
 debian/changelog  |6 ++
 man/intel.man |2 
 src/bios_reader/bios_reader.c |4 -
 src/i830_accel.c  |2 
 src/i830_display.c|   34 +++-
 src/i830_driver.c |4 +
 src/i830_lvds.c   |   86 ++
 uxa/uxa-glyphs.c  |9 ++--
 9 files changed, 131 insertions(+), 18 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processing of xserver-xorg-video-intel_2.6.0-1_i386.changes

[Archive Administrator]

xserver-xorg-video-intel_2.6.0-1_i386.changes uploaded successfully to localhost
along with the files:
  xserver-xorg-video-intel_2.6.0-1.dsc
  xserver-xorg-video-intel_2.6.0.orig.tar.gz
  xserver-xorg-video-intel_2.6.0-1.diff.gz
  xserver-xorg-video-intel_2.6.0-1_i386.deb
  xserver-xorg-video-intel-dbg_2.6.0-1_i386.deb

Greetings,

Your Debian queue daemon


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-intel_2.6.0-1_i386.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-video-intel-dbg_2.6.0-1_i386.deb
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel-dbg_2.6.0-1_i386.deb
xserver-xorg-video-intel_2.6.0-1.diff.gz
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.6.0-1.diff.gz
xserver-xorg-video-intel_2.6.0-1.dsc
  to pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.6.0-1.dsc
xserver-xorg-video-intel_2.6.0-1_i386.deb
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.6.0-1_i386.deb
xserver-xorg-video-intel_2.6.0.orig.tar.gz
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.6.0.orig.tar.gz


Override entries for your package:
xserver-xorg-video-intel-dbg_2.6.0-1_i386.deb - extra x11
xserver-xorg-video-intel_2.6.0-1.dsc - source x11
xserver-xorg-video-intel_2.6.0-1_i386.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#511898: xserver-xorg-video-intel: xorg experimental package does not startup my intel chipset see logs

[Jelle de Jong]

Package: xserver-xorg-video-intel
Version: 2:2.5.1-1
Severity: important


I am typing this report from tty0 since my xorg is not working with my
intel chipset on my eeepc 901. The screen startup in 800x600 and i cant 
move my mouse or use the keyboard

I attached the xorg log file

Thanks in advance,

Jelle de Jong

-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 2008-11-29 23:04 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1623452 2008-11-11 23:26 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
00:02.0 VGA compatible controller: Intel Corporation Mobile 945GME Express 
Integrated Graphics Controller (rev 03)

/var/lib/x11/xorg.conf.md5sum does not exist.

Xorg X server configuration file status:
-rw--- 1 jelle jelle 1133 2008-11-29 23:35 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
Section "Module"
Disable "glx"
Disable "dri"
EndSection

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "kbd"
Option  "XkbRules"  "xorg"
Option  "XkbModel"  "pc105"
Option  "XkbLayout" "us"
Option  "XkbOptions""compose:ralt"
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
Option  "CorePointer"
EndSection

Section "Device"
Identifier  "Configured Video Device"
EndSection

Section "Monitor"
Identifier  "Configured Monitor"
EndSection

Section "Screen"
Identifier  "Default Screen"
Monitor "Configured Monitor"
Device  "Configured Video Device"
SubSection "Display"
Virtual 1440 900
EndSubSection
EndSection

Section "ServerLayout"
Identifier  "Default Layout"
Screen  "Default Screen"
Option  "BlankTime" "0"
Option  "StandbyTime"   "0"
Option  "SuspendTime"   "0"
Option  "OffTime"   "0"
EndSection


Xorg X server log files on system:
-rw--- 1 root root 17159 2009-01-15 14:45 /var/log/Xorg.0.log

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


-- System Information:
Debian Release: 5.0
  APT prefers unstable
  APT policy: (990, 'unstable'), (50, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash

Versions of packages xserver-xorg-video-intel depends on:
ii  libc6   2.7-18   GNU C Library: Shared libraries
ii  libdrm-inte 2.4.1+git+20081116+930c0e7-1 Userspace interface to Intel-speci
ii  libdrm2 2.4.3+git+20090105+a8c5480-1 Userspace interface to kernel rend
ii  libpciacces 0.10.5-1 Generic PCI access library for X
ii  xserver-xor 2:1.5.3-1Xorg X server - core server

xserver-xorg-video-intel recommends no packages.

xserver-xorg-video-intel suggests no packages.

-- no debconf information

X.Org X Server 1.5.3
Release Date: 5 November 2008
X Protocol Version 11, Revision 0
Build Operating System: Linux 2.6.26-1-686 i686 Debian
Current Operating System: Linux debian-eeepc 2.6.26-1-686 #1 SMP Sat Jan 10 
18:29:31 UTC 2009 i686
Build Date: 11 November 2008  11:19:34PM
xorg-server 2:1.5.3-1 (jcris...@debian.org) 
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/Xorg.0.log", Time: Thu Jan 15 14:44:50 2009
(==) Using config file: "/etc/X11/xorg.conf"
(==) ServerLayout "Default Layout"
(**) |-->Screen "Default Screen" (0)
(**) |   |-->Monitor "Configured Monitor"
(**) |   |-->Device "Configured Video Device"
(**) Option "BlankTime" "0"
(**) Option "StandbyTime" "0"
(**) Option "SuspendTime" "0"
(**) Option "OffTime" "0"
(==) Automatically adding devices
(==) Automatically enabling devices
(==) No FontPath specified.  Using compiled-in default.
(WW) The directory "/usr/share/fonts/X11/cyrillic" does not exist.
Entry deleted from font path.
(WW) `fonts.dir' not found (or not valid) in "/usr/share/fonts/X11/100dpi/".
Entry deleted from font path.
(Run 'mkfontdir' on "/usr/share/fonts/X11/100dpi/").
(WW) The directory "/usr/share/fonts/X11/75dpi/" does not exist.
Entry deleted from font path.
(WW) `fonts.dir' not found (or not valid) in "/usr/share/fonts/X11/100dpi".
Entry deleted from font path.
(Run 'mkfontdir' on "/usr/share/fonts/X11/100dpi").
(WW) The directory "/usr/share/fonts/X11/75dpi" does not exist.
Entry deleted from font path.
(==) FontPath set to:
  

Bug#511898: output VGA using initial mode 640x480!

[Jelle de Jong]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

The fact that my keyboard and mouse where not working was my own mistake
I forgot tho install the input drivers (pebkec).

sudo aptitude install xserver-xorg-input-all

However there is something broken:

(II) intel(0): Output VGA connected
(II) intel(0): Output LVDS connected
(II) intel(0): Using fuzzy aspect match for initial modes
(II) intel(0): Output VGA using initial mode 640x480
(II) intel(0): Output LVDS using initial mode 640x480
(II) intel(0): Monitoring connected displays enabled
(II) intel(0): detected 256 kB GTT.
(II) intel(0): detected 7932 kB stolen memory.
(==) intel(0): video overlay key set to 0x101fe
(==) intel(0): Intel XvMC decoder disabled
(==) intel(0): Will not try to enable page flipping
(==) intel(0): Triple buffering disabled

I don't know what the problem is but the screen resolutions is not set
correctly.

Best regards,

Jelle de Jong
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)

iJwEAQECAAYFAklvQ6kACgkQ1WclBW9j5HkHSAP8DstMOt/8RYSgOmFIfeH/5vX5
rpkgLiDzTCGmO69rTTNdarQNeBCmr3unntRgbxeVMvvnP0vuF6ALWYzaNGdh/UhE
spdyhrFati5EsKLSYhS6YdMsh0ToZKZaYM1rVWib4Rq1X32eFhl4ozkElmQ7wyyg
rMgz0QibVoEEYCBzkwU=
=wbVZ
-END PGP SIGNATURE-



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#511898: xserver-xorg-video-intel: xorg experimental package does not startup my intel chipset see logs

[Brice Goglin]

Jelle de Jong wrote:
> I am typing this report from tty0 since my xorg is not working with my
> intel chipset on my eeepc 901. The screen startup in 800x600
>   

Do you actually have a VGA monitor plugged _and_ the internal panel
enabled? Or are you only using the internal panel?

By the way, I uploaded intel 2.6.0 to experimental today.

Brice




-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#511830: 2.6.0 just released does not fix the problem for me

[Eric Valette]

FYI.

--eric




-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 525d04d5b8d15d9fb2a17a50df69268b5472a971
Author: Bryce Harrington 
Date:   Thu Jan 15 13:39:50 2009 -0800

Add glxinfo to apport reports

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 8f0977d..c0136d3 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -61,6 +61,12 @@ def add_info(report):
 pass
 
 try:
+script = subprocess.Popen(['glxinfo'], stdout=subprocess.PIPE)
+report['glxinfo'] = script.communicate()[0]
+except OSError:
+pass
+
+try:
 script = subprocess.Popen(['setxkbmap', '-print'], 
stdout=subprocess.PIPE)
 report['setxkbmap'] = script.communicate()[0]
 except OSError:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#511650: marked as done (libxdmcp-dev is missing libXdmcp.la on amd64)

[Debian Bug Tracking System]

Your message dated Fri, 16 Jan 2009 01:17:01 +0100
with message-id <1232065021.7083.5.ca...@radis.liafa.jussieu.fr>
and subject line Re: Bug#511650: libxdmcp-dev is missing libXdmcp.la on amd64
has caused the Debian Bug report #511650,
regarding libxdmcp-dev is missing libXdmcp.la on amd64
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.)


-- 
511650: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511650
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: libxdmcp-dev
Version: 1.3-16

When I try to link programs (like libXv), they fail on trying to link
against /usr/lib64/libXdmcp.la. This bug exists at least on Lenny and
prevents you from compiling xorg server so the file should be added to
the package. I've heard from an i386 user that it exists on the i386
version of the package.

I'm using Debian Lenny on an amd64 system with libc6_2.7-16.


--- End Message ---
--- Begin Message ---
On Wed, 2009-01-14 at 14:21 +0200, Seppo Yli-Olli wrote:
> I was attempting to install a newer version of X.org suite (read: a
> much more up-to-date version from git trees) on the side of the old one
> into /usr/local. While installing libXv, I ran into linker errors when
> trying to link against libXdcmp and it complained about the lack of
> libXdcmp.la. I suspect you could work around the problem by telling it
> not to use libtool and tell it the library paths directly but the
> default behaviour for libXv compiling seemed to require the existence
> of the file. If the build log is relevant, I can attempt to re-obtain
> it.

I suspect one of your locally installed libs has a reference to a
libXdmcp.la, but it could only get such a reference if you installed
libXdmcp locally, because the package has never done so.  You could
remove all the .la files in /usr/local/lib as a workaround.  In any case
I'm closing this bug since I'm pretty sure this isn't due to the
libxdmcp packages.

Cheers,
Julien

--- End Message ---

Bug#511729: marked as done (xkb-data: XkbOptions" "compose:rwin" does not work)

[Debian Bug Tracking System]

Your message dated Fri, 16 Jan 2009 01:20:13 +0100
with message-id <1232065213.7083.8.ca...@radis.liafa.jussieu.fr>
and subject line Re: Bug#511729: xkb-data: XkbOptions" "compose:rwin" does not 
work
has caused the Debian Bug report #511729,
regarding xkb-data: XkbOptions" "compose:rwin" does not work
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.)


-- 
511729: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511729
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xkb-data
Version: 1.4-1
Severity: normal

I cannot get the Compose Key to work anymore. My xorg.conf:

# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database. 
#   
# Edit this file with caution, and see the xorg.conf manual page.   
# (Type "man xorg.conf" at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "kbd"
Option  "XkbRules"  "xorg"
Option  "XkbModel"  "asus_laptop"
Option  "XkbLayout" "us"
Option  "XkbOptions""compose:rwin"
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
EndSection

Section "Device"
Identifier  "Configured Video Device"
EndSection

Section "Monitor"
Identifier  "Configured Monitor"
EndSection

Section "Screen"
Identifier  "Default Screen"
Monitor "Configured Monitor"
EndSection

-- System Information:
Debian Release: 5.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- no debconf information


--- End Message ---
--- Begin Message ---
On Wed, 2009-01-14 at 13:58 -0500, Arnout Boelens wrote:
> On Wednesday 14 January 2009 03:15:44 you wrote:
> > On Tue, Jan 13, 2009 at 16:17:45 -0500, Arnout Boelens wrote:
> > > I cannot get the Compose Key to work anymore. My xorg.conf:
> >
> > Hi,
> >
> > please send your X log as well, and the output of 'setxkbmap -print'.
> 
You're using the X server from experimental and the evdev input driver.
The inputdevice sections in xorg.conf are ignored, and the default xkb
settings move from xorg.conf to hal.  There already are other bugs
covering this transition (which is a work in progress), so I'm closing
this one.

Cheers,
Julien

--- End Message ---

Bug#511717: startx mis-parses initial client and serverarguments which begin with / or ./

[Julien Cristau]

tag 511717 upstream fixed-upstream patch
kthxbye

On Wed, 2009-01-14 at 22:46 -0800, Robert Macomber wrote:
> Oops, that was an incorrect patch of course, it'd misparse something
> like "startx foo /abs/path bar" as wanting the client to be "/abs/path
> foo bar".  Corrected one attached.

Thanks, the fix is upstream now.
http://cgit.freedesktop.org/xorg/app/xinit/commit/?id=57f917f8934d441ebb6501c4691a2b59fa217f3f

Cheers,
Julien



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processed: Re: Bug#511717: startx mis-parses initial client and serverarguments which begin with / or ./

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tag 511717 upstream fixed-upstream patch
Bug#511717: startx mis-parses initial client and server arguments which begin 
with / or ./
There were no tags set.
Tags added: upstream, fixed-upstream, patch

> kthxbye
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#511987: xserver-xorg-input-evtouch: patch to support LEO 8800

[Brett Wuth]

Package: xserver-xorg-input-evtouch
Version: 0.8.7-3
Severity: normal
Tags: patch


The patch below allows evtouch to work with the LEO 8800 touch screen
controller.

Quortech's open source packages are available at:
  ftp://ftp.quortech.com/eclipse/deb-packages

xf86-input-evtouch_0.8.7-3quortech3.dsc includes this patch.


-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.22-14-generic
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)

*** quortech-absolute-code.patch
# Description: This patch adapts evtouch to certain touch screen
#   controllers (such as LEO 8800) that give their absolute position
#   with the high bit set in the code.
#
# Changes
#   o EVTouchProcessAbs() : Simplified and reworked to handle normal
# and codes with high bit set.
#
# Feel free to send comments, critics, suggestions to w...@acm.org To
# apply simply change into the toplevel directory of the source to be
# modified and enter: patch -p1 < 
# 
# All patches are available under the GNU GPL, I hope they might be
# useful for you (-:
# - Brett Wuth
#
Index: xf86-input-evtouch-0.8.7/evtouch.c
===
--- xf86-input-evtouch-0.8.7.orig/evtouch.c 2009-01-15 14:14:33.0 
-0700
+++ xf86-input-evtouch-0.8.7/evtouch.c  2009-01-15 14:14:36.0 -0700
@@ -342,46 +342,61 @@
 }
 }
 
+
 void EVTouchProcessAbs(EVTouchPrivatePtr priv)
 {
-struct input_event *ev; /* packet being/just read */
-
-ev = &priv->ev;
+  struct input_event *ev; /* packet being/just read */
 
-if ( (ev->code == ABS_X) || (ev->code == ABS_Z) ) {
-   dbg_loc( &ev->value, NULL, NULL, NULL );
+  ev = &priv->ev;
 
-   if ((priv->cur_x - ev->value < priv->move_limit)
-&& (priv->cur_x - ev->value > -priv->move_limit))
-return;
-priv->cur_x = ev->value;
-// libtouchSetXPos(priv->libtouch, priv->cur_x);
+  switch (ev->code) {
+/* At least one touch screen controller (LEO 8800) produces
+ * messages with bit 1 of the code turned on.  So instead of ABS
+ * we get ABS_X|0x2 and instead of ABS_Y we get ABS_Y|0x2.  These
+ * are normally the codes for ABS_Z and ABS_RX respectively.  Not
+ * sure whether this is A/ a bug in the controller, B/ a bug in
+ * the kernel driver, or C/ a change in the definition of the code
+ * value.  We check for either value.
+ */
+  case ABS_X:
+  case ABS_X|0x2:
+dbg_loc( &ev->value, NULL, NULL, NULL );
+
+if ((priv->cur_x - ev->value < priv->move_limit)
+   && (priv->cur_x - ev->value > -priv->move_limit))
+  return;
+priv->cur_x = ev->value;
+//libtouchSetXPos(priv->libtouch, priv->cur_x);
+break;
+
+  case ABS_Y:
+  case ABS_Y|0x2:
+dbg_loc( NULL, &ev->value, NULL, NULL );
+
+if ((priv->cur_y - ev->value < priv->move_limit)
+   && (priv->cur_y - ev->value > -priv->move_limit))
+  return;
+priv->cur_y = ev->value;
+// libtouchSetYPos(priv->libtouch, priv->cur_y);
+break;
+
+  case ABS_WHEEL:
+{
+  LocalDevicePtr local = priv->local;
+  if (ev->value > 0) {
+   for (; ev->value > 0; ev->value--) {
+ PostButtonEvent (local, 4,1,priv->cur_x,priv->cur_y);
+ PostButtonEvent (local, 4,0,priv->cur_x,priv->cur_y);
}
-
-if ( (ev->code == ABS_Y) || (ev->code == ABS_RX) ) {
-   dbg_loc( NULL, &ev->value, NULL, NULL );
-
-   if ((priv->cur_y - ev->value < priv->move_limit)
-&& (priv->cur_y - ev->value > -priv->move_limit))
-return;
-priv->cur_y = ev->value;
-// libtouchSetYPos(priv->libtouch, priv->cur_y);
-   }
-
-   if (ev->code == ABS_WHEEL) {
-   LocalDevicePtr local = priv->local;
-   if (ev->value > 0) {
-   for (; ev->value > 0; ev->value--) {
-   PostButtonEvent (local, 
4,1,priv->cur_x,priv->cur_y);
-   PostButtonEvent (local, 
4,0,priv->cur_x,priv->cur_y);
-   }
-   } else if (ev->value < 0) {
-   for (ev->value = -ev->value; ev->value > 0; 
ev->value--) {
-   PostButtonEvent (local, 
5,1,priv->cur_x,priv->cur_y);
-   PostButtonEvent (local, 
5,0,priv->cur_x,priv->cur_y);
-   }
-   }
+  } else if (ev->value < 0) {
+   for (ev->value = -ev->value; ev->value > 0; ev->value--) {
+ PostButtonEvent (local, 5,1,priv->cur_x,priv->cur_y);
+ PostButtonEvent (local, 5,0,priv->cur_x,priv->cur_y);
}
+  }
+}
+break;
+  }
 }
 
 



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a sub

Bug#511988: xserver-xorg-input-evtouch: fix ARM compiler warnings

[Brett Wuth]

Package: xserver-xorg-input-evtouch
Version: 0.8.7-3
Severity: minor
Tags: patch


This patch fixes minor bugs in evtouch that cause warnings on gnu ARM
compiler.

Changes
  o EVTouchRead(), p_mtx_attr, priv : Remove unused symbols.
  o Fix "%0.2x" -> "%.2x" formatting.

Quortech open source packages are available at:
  ftp://ftp.quortech.com/eclipse/deb-packages/

The files associated with xf86-input-evtouch_0.8.7-3quortech3.dsc
implement this patch.

-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.22-14-generic
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
# Description: This patch fixes minor bugs in evtouch that cause
#   warnings on gnu ARM compiler.
#
# Changes
#   o EVTouchRead(), p_mtx_attr, priv : Remove unused symbols.
#   o Fix "%0.2x" -> "%.2x" formatting.
#
# Feel free to send comments, critics, suggestions to w...@acm.org. To
# apply simply change into the toplevel directory of the source to be
# modified and enter: patch -p1 < 
# 
# All patches are available under the GNU GPL, I hope they might be
# useful for you (-:
# - Brett Wuth
#
Index: xf86-input-evtouch-0.8.7/ev_calibrate.c
===
--- xf86-input-evtouch-0.8.7.orig/ev_calibrate.c2009-01-14 
15:55:48.0 -0700
+++ xf86-input-evtouch-0.8.7/ev_calibrate.c 2009-01-14 15:56:19.0 
-0700
@@ -178,7 +178,6 @@
   Thread-Attributes NULL means default
 */
 pthread_attr_t attr;
-pthread_mutexattr_t  *p_mtx_attr = NULL;
 min_max_t min_max;
 
 
Index: xf86-input-evtouch-0.8.7/evtouch.c
===
--- xf86-input-evtouch-0.8.7.orig/evtouch.c 2009-01-14 15:56:17.0 
-0700
+++ xf86-input-evtouch-0.8.7/evtouch.c  2009-01-14 15:56:37.0 -0700
@@ -716,17 +716,6 @@
 
 
 
-static unsigned char
-EVTouchRead(EVTouchPrivatePtr priv)
-{
-unsigned char c;
-XisbBlockDuration (priv->buffer, EV_TIMEOUT);
-c = XisbRead(priv->buffer);
-return (c);
-}
-
-
-
 static Bool
 EVTouchGetPacket (EVTouchPrivatePtr priv)
 {
@@ -774,7 +763,7 @@
 while (EVTouchGetPacket (priv) == Success)
 {
 ev = &priv->ev;
-   DBGOUT(2, "EVTouch: %s type:%0.2x code: 0x%0.4x value:%d\n",
+   DBGOUT(2, "EVTouch: %s type:%.2x code: 0x%.4x value:%d\n",
__FUNCTION__, ev->type, ev->code, ev->value);
 
InputSetScreen(local);
@@ -1287,8 +1276,6 @@
 
 static void
 PostButtonEvent(LocalDevicePtr local, int button, int is_down,int x, int y) {
-EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
-
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
  ConvertProc(local,0,2,x,y,0,0,0,0,&x,&y);
 #endif

Bug#511989: xserver-xorg-input-evtouch: more robust debugging system

[Brett Wuth]

Package: xserver-xorg-input-evtouch
Version: 0.8.7-3
Severity: wishlist
Tags: patch


This patch improves the debugging support in evtouch.

Major changes:
* Reimplementation of debug macros are less likely to cause unintended
  side effects (e.g. merging with adjacent statements, mismatched else's).
* debug_level controls all debugging.
* Globally changable reporting levels for features.
* More features instrumented.
* Live reporting mode for location information.

Quortech open source packages can be found at:
  ftp://ftp.quortech.com/eclipse/deb-packages/

This patch is included in xf86-input-evtouch_0.8.7-3quortech3.dsc.

-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.22-14-generic
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
# Description: This patch improves the debugging support in evtouch.
#
# Changes
#   o Statements_M : Utility macro to make debugging macros simpler and
# more robust.
#   o debug_level : Combine to single global provided by libtouch.c.
#   o DBG : Move to libtouch.h to be shared with evtouch.c.  Make more
# robust.  Allow entire blocks of debugging statements to be skipped.
#   o DBGOUT : Move to evtouch.c, the only place it's currently used.
#   o DBGOUT : Local control through DebugLevel option of output.
# Avoids uncontrolled output size in /var/log/Xorg.0.log with noisy
# touch screen.  Encapsulate debugging statements that weren't using.
#   o DBGOUT : Make robust to surrounding statements.
#   o DBGXF86, DBGLOC : Globally changable reporting levels for features.
#   o DBGXF86 : Instrument tracing of xf86 calls.
#   o dbg_loc : Report location information as received and transmitted.
#   o DBGLOC_INLINE : Overwrites location information in place on ASCII
# terminal.  Useful for live testing of accuracy of touch screen.
#   o EVTouchDumpPacketToLog : Reduce single usage to DBGOUT call.
#
# Feel free to send comments, critics, suggestions to w...@acm.org
# To apply simply change into the toplevel directory of the source to be 
modified and enter:
# patch -p1 < 
# 
# All patches are available under the GNU GPL, I hope they might be useful for 
you (-:
# - Brett Wuth
#
Index: xf86-input-evtouch-0.8.7/evtouch.c
===
--- xf86-input-evtouch-0.8.7.orig/evtouch.c 2009-01-15 14:55:33.0 
-0700
+++ xf86-input-evtouch-0.8.7/evtouch.c  2009-01-15 15:38:41.0 -0700
@@ -92,6 +92,14 @@
 #include "libtouch.h"
 #include "evtouch.h"
 
+/* The verbosity levels at which to output various */
+#define DBGXF86 (9) /* XF86 calls */
+#define DBGLOC  (1) /* location information */
+
+#define DBGLOC_INLINE (1) /* whether to display location information
+  * on one line continously updated (1), or
+  * on multiple lines (0) */
+
 /*
  *Variables without includable headers
  /
@@ -106,7 +114,17 @@
 static void
 EVTouchPtrCtrl(DeviceIntPtr device, PtrCtrl *ctrl);
 
-static int debug_level = 0;
+#ifdef EVDBG
+  /* Only output the debug statement if it meets *our* debug_level.
+   */
+#define DBGOUT(lvl, ...) DBG( (lvl), xf86ErrorFVerb( (lvl), __VA_ARGS__ ); )
+#else
+  /* Do nothing, but require the user to include trailing ";"
+   * so that syntax rules of normal statements are maintained.
+   * Compiler will optimize this statement away.
+   */
+#define DBGOUT(lvl, ...) Statements_M()
+#endif
 
 InputDriverRec EVTOUCH = {
 1,
@@ -150,9 +168,12 @@
   int *errmaj,
   int *errmin )
 {
-xf86AddModuleInfo(&EVTouchInfo, module);
-xf86AddInputDriver(&EVTOUCH, module, 0);
-return module;
+  DBGOUT( DBGXF86, "EVTouch: xf86AddModuleInfo(&EVTouchInfo, module)\n" );
+  xf86AddModuleInfo(&EVTouchInfo, module);
+
+  DBGOUT( DBGXF86, "EVTouch: xf86AddInputDriver(&EVTOUCH, module, 0)\n" );
+  xf86AddInputDriver(&EVTOUCH, module, 0);
+  return module;
 }
 
 
@@ -201,6 +222,39 @@
  /
 
 
+/* Report the current location information as received and as sent on to X */
+static void
+dbg_loc( int *in_x,  /* the received X location, NULL if no change */
+int *in_y,  /* the received Y location, NULL if no change */
+int *out_x, /* the sent X location, NULL if no change */
+int *out_y  /* the sent Y location, NULL if no change */
+)
+{
+  static int last_in_x, last_in_y, last_out_x, last_out_y;
+
+  if (in_x) last_in_x = *in_x;
+  if (in_y) last_in_y = *in_y;
+  if (out_x) last_out_x = *out_x;
+  if (out_y) last_out_y = *out_y;
+
+  /* Print the current location as received and sent.
+   * Fields that have been updated are marked with a le

Bug#511992: xserver-xorg-input-evtouch: race conditions in timers drop events

[Brett Wuth]

Package: xserver-xorg-input-evtouch
Version: 0.8.7-3
Severity: normal
Tags: patch


The attached patch fixes race conditions in the timer code which can
result in some taps going missing.  Also included is a fix to have a
timer go off immediately (if set to 0).  And the ability to turn a
timer off (if set to -1).

Quortech's open source packages are available at:
  ftp://ftp.quortech.com/eclipse/deb-packages/

The packages associated with xf86-input-evtouch_0.8.7-3quortech3.dsc
implement this patch.

-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.22-14-generic
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
# Description: This patch fixes a data-loss bug and enhances the timers
#   in evtouch.
#
# Changes
#   o disable_timers() : Move to state change routine, as old timers
# must be cancelled with *every* state change.
#   o libtouchEnhancedTimerSet : Time values can also be off (-1) or
# immediate (0).
#   o libtouchTriggerSM : Fix bug where not protected from reentrant
# call when timer goes off.  Potential for state changes to be lost
# and output events not reflecting input events.
#
# Feel free to send comments, critics, suggestions to w...@acm.org. To
# apply simply change into the toplevel directory of the source to be
# modified and enter: patch -p1 < 
# 
# All patches are available under the GNU GPL, I hope they might be
# useful for you (-:
# - Brett Wuth
#
Index: xf86-input-evtouch-0.8.7/evtouch.c
===
--- xf86-input-evtouch-0.8.7.orig/evtouch.c 2009-01-15 14:53:27.0 
-0700
+++ xf86-input-evtouch-0.8.7/evtouch.c  2009-01-15 14:53:27.0 -0700
@@ -440,11 +440,12 @@
 
 if (priv->emulate3) {
 if ( (ev->value==1) && (priv->emulate3_timer==NULL) )
-priv->emulate3_timer = TimerSet(priv->emulate3_timer,
-0,
-priv->emulate3_timeout,
-emulate3Timer,
-local);
+priv->emulate3_timer =
+ libtouchEnhancedTimerSet( priv->emulate3_timer,
+   0,
+   priv->emulate3_timeout,
+   emulate3Timer,
+   local );
 
 if ( (ev->value == 1) && (ev->code == BTN_LEFT) ) {
 priv->touch_flags |= LB_STAT;
Index: xf86-input-evtouch-0.8.7/libtouch.c
===
--- xf86-input-evtouch-0.8.7.orig/libtouch.c2009-01-15 14:53:27.0 
-0700
+++ xf86-input-evtouch-0.8.7/libtouch.c 2009-01-15 14:53:27.0 -0700
@@ -328,6 +328,50 @@
 }
 
 
+/* A special value which means a timer should never trigger.
+ */
+#define TimerNever_M ((CARD32)-1)
+
+
+/* Set the timer but handle special values for millis (the time).
+ * if flags set to relative time, millis is interpretted as:
+ * 0 : trigger immediately (TimerSet ignores)
+ * TimerNever_M : never trigger
+ */
+OsTimerPtr
+libtouchEnhancedTimerSet( OsTimerPtr timer,
+ int flags,
+ CARD32 millis,
+ OsTimerCallback func,
+ pointer arg )
+{
+  int/*bool*/ relative = !(flags & TimerAbsolute);
+  int/*bool*/ immediate = relative && (millis == 0);
+
+  if (relative && (millis == TimerNever_M))
+{
+  /* Still want to process other flags, but not to set the timer.
+   * 0 is a value that means that to TimerSet() */
+  millis = 0;
+  DBG(4, ErrorF( "LibTouch: timer set to NEVER\n" ));
+}
+
+  /* If millis is 0, will not process timer, but will process other
+   * flags (TimerForceOld).
+   * See TimerSet definition in os/WaitFor.c
+   */
+  OsTimerPtr retVal = TimerSet( timer, flags, millis, func, arg );
+
+  if (immediate)
+{
+  /* Since wasn't called by TimerSet, we call it ourselves */
+  (void) (*func)( NULL, GetTimeInMillis(), arg );
+}
+
+  return (retVal);
+}
+
+
 static CARD32
 tap_timer_func(OsTimerPtr timer, CARD32 now, pointer _priv)
 {
@@ -364,7 +408,6 @@
 int bit_size = sizeof(priv->pressed_btn_stat) * 8;
 
 priv->touch_flags = 0;
-disable_timers(priv);
 
 /* do an untouch for all pressed buttons */
 for (i = 0; i < bit_size; i++)
@@ -424,10 +467,10 @@
 
 static void enter_touched(LibTouchRecPtr priv)
 {
-disable_timers(priv);
-priv->longtouch_timer = TimerSet(priv->longtouch_timer, 0,
- priv->longtouch_timeo,

xorg-server: Changes to 'debian-experimental'

[Julien Cristau]

 debian/changelog |7 
 debian/copyright |  390 ---
 2 files changed, 7 insertions(+), 390 deletions(-)

New commits:
commit b7c7000b5d66f9d92a9a3827fce3d77320bd7435
Author: Julien Cristau 
Date:   Fri Jan 16 04:09:29 2009 +0100

Remove a couple of obsolete licenses from debian/copyright.

Ditch the GLX Public License and the CID Font Code Public License from
debian/copyright.  The CID code has been removed a while ago, and all code
under the GLXPL has been relicensed to the SGI Free Software License B 2.0.
This finally closes: #211765.

diff --git a/debian/changelog b/debian/changelog
index 26e121f..c95b380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.5.99.3-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream beta version.
 + adds autodetection of sbus devices (closes: #483942).
   Thanks, Bernhard R. Link!
@@ -30,6 +31,12 @@ xorg-server (2:1.5.99.3-1) UNRELEASED; urgency=low
   * debian/{input,video}abiver: Bump the input (4) and videoabiver (5).
   * debian/serverminver: Bump to 2:1.5.99.3.
 
+  [ Julien Cristau ]
+  * Ditch the GLX Public License and the CID Font Code Public License from
+debian/copyright.  The CID code has been removed a while ago, and all code
+under the GLXPL has been relicensed to the SGI Free Software License B 2.0.
+This finally closes: #211765.
+
  -- Timo Aaltonen   Mon, 08 Dec 2008 08:39:38 +0200
 
 xorg-server (2:1.5.3-1) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 877985f..8fe50d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -343,396 +343,6 @@ AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 
PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
 
-3.4  GLX Public License
-
-GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
-
-Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
-grants permission to Recipient (defined below), under Recipient's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below), and to permit persons to whom the Subject Software is furnished in
-accordance with this License to do the same, subject to all of the following
-terms and conditions, which Recipient accepts by engaging in any such use,
-copying, modifying, merging, publishing, distributing, sublicensing or sell-
-ing:
-
-1. Definitions.
-
- (a) "Original Software" means source code of computer software code
- which is described in Exhibit A as Original Software.
-
- (b) "Modifications" means any addition to or deletion from the sub-
- stance or structure of either the Original Software or any previous
- Modifications. When Subject Software is released as a series of
- files, a Modification means (i) any addition to or deletion from
- the contents of a file containing Original Software or previous
- Modifications and (ii) any new file that contains any part of the
- Original Code or previous Modifications.
-
- (c) "Subject Software" means the Original Software or Modifications
- or the combination of the Original Software and Modifications, or
- portions of any of the foregoing.
-
- (d) "Recipient" means an individual or a legal entity exercising
- rights under, and complying with all of the terms of, this License.
- For legal entities, "Recipient" includes any entity which controls,
- is controlled by, or is under common control with Recipient. For
- purposes of this definition, "control" of an entity means (a) the
- power, direct or indirect, to direct or manage such entity, or (b)
- ownership of fifty percent (50%) or more of the outstanding shares
- or beneficial ownership of such entity.
-
-2. Redistribution of Source Code Subject to These Terms. Redistributions of
-Subject Software in source code form must retain the notice set forth in
-Exhibit A, below, in every file. A copy of this License must be included in
-any documentation for such Subject Software where the recipients' rights
-relating to Subject Software are described. Recipient may distribute the
-source code version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13
-of this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the source code version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Re

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 251d0d8090322b2c9dc0c8b7bef001f338d19433
Author: Keith Packard 
Date:   Mon Jan 12 13:03:30 2009 -0800

Update version to 1.5.99.901 (1.6 RC1)

diff --git a/configure.ac b/configure.ac
index cd53288..da5f488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.99.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.5.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 71628cabc9dddf5c9fe12d555ae0c47d5902b2f7
Author: Keith Packard 
Date:   Mon Jan 12 11:51:28 2009 -0800

Merge include/dix-config-post-verbatim.h into include/dix-config.h.in

No sense having an extra include file here; it makes building stuff harder.

Signed-off-by: Keith Packard 

diff --git a/include/dix-config-post-verbatim.h 
b/include/dix-config-post-verbatim.h
deleted file mode 100644
index 4bbb9b0..000
--- a/include/dix-config-post-verbatim.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Do not include this file directly.  It is included at the end of 
 */
-
-/* Correctly set _XSERVER64 for OSX fat binaries */
-#ifdef __APPLE__
-#if defined(__LP64__) && !defined(_XSERVER64)
-#define _XSERVER64 1
-#elif !defined(__LP64__) && defined(_XSERVER64)
-#undef _XSERVER64
-#endif
-#endif
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 977bff3..8e047c4 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -429,6 +429,13 @@
 /* Define to 1 if you have the `ffs' function. */
 #undef HAVE_FFS
 
-#include 
+/* Correctly set _XSERVER64 for OSX fat binaries */
+#ifdef __APPLE__
+#if defined(__LP64__) && !defined(_XSERVER64)
+#define _XSERVER64 1
+#elif !defined(__LP64__) && defined(_XSERVER64)
+#undef _XSERVER64
+#endif
+#endif
 
 #endif /* _DIX_CONFIG_H_ */

commit cbd977cc15cf22a3e42b10942d5657cb8b9ac335
Author: Alban Browaeys 
Date:   Mon Jan 12 10:57:11 2009 -0800

Fix dmx compile on 1.6 branch.


http://www.mail-archive.com/pld-cvs-com...@lists.pld-linux.org/msg166742.html
contains a patch from "arekm" which I build upon to make up this one.

Mostly fixes for Xcalloc which I previously tried to fix the same way but
without finding the right spot.

I cannot tell if dmx works though. Only that it at least compile.

Signed-off-by: Keith Packard 

diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c
index 4e7279a..ae6eb6f 100644
--- a/hw/dmx/dmxcb.c
+++ b/hw/dmx/dmxcb.c
@@ -43,6 +43,12 @@
 #include "dmxinput.h"
 #include "dmxlog.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 extern int connBlockScreenStart;
 
 #ifdef PANORAMIX
diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index d20c844..91479e7 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -64,6 +64,12 @@
 #include   /* For DMX_BAD_* */
 #include "cursorstr.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 /* The default font is declared in dix/globals.c, but is not included in
  * _any_ header files. */
 extern FontPtr  defaultFont;
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index b70f7d2..c739159 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -49,6 +49,12 @@
 #include "dixfont.h"
 #include "dixstruct.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 static int (*dmxSaveProcVector[256])(ClientPtr);
 static int   dmxFontLastError;
 
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 37dfa10..8bce689 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -56,6 +56,12 @@
 #include "mipict.h"
 #include "fbpict.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 
 extern int RenderErrBase;
 extern int (*ProcRenderVector[RenderNumberRequests])(ClientPtr);
diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index 7360750..28c8b01 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -61,6 +61,12 @@
 #include "mipointer.h"
 #include "micmap.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 extern Bool dmxCloseScreen(int idx, ScreenPtr pScreen);
 static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
 
diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
index 080992e..e3056bb 100644
--- a/hw/dmx/glxProxy/glxutil.c
+++ b/hw/dmx/glxProxy/glxutil.c
@@ -36,6 +36,12 @@
 #include 
 #include "glxutil.h"
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 //
 
 void __glXNop(void) {}
diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c
index b961dfa..c8b1eea 100644
--- a/hw/dmx/glxProxy/glxvisuals.c
+++ b/hw/dmx/glxProxy/glxvisuals.c
@@ -38,6 +38,12 @@
 #include "glxutil.h"
 #include

xorg-server: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog   |  910 
++
 Xext/sync.c |   51 
 Xi/exevents.c   |   12 
 acinclude.m4|2 
 configure.ac|   33 
 debian/changelog|7 
 dix/devices.c   |3 
 dix/enterleave.c| 1403 
--
 dix/enterleave.h|   25 
 dix/events.c|  303 --
 dix/getevents.c |   10 
 dix/window.c|3 
 exa/exa.c   |6 
 exa/exa_unaccel.c   |4 
 glx/dispatch.h  |2 
 glx/glapi.h |   17 
 glx/glapitable.h|1 
 glx/glthread.c  |1 
 glx/indirect_dispatch.c |   11 
 glx/indirect_dispatch_swap.c|   11 
 glx/indirect_reqsize.c  |3 
 hw/dmx/dmxcb.c  |6 
 hw/dmx/dmxextension.c   |6 
 hw/dmx/dmxfont.c|6 
 hw/dmx/dmxpict.c|6 
 hw/dmx/dmxscrinit.c |6 
 hw/dmx/glxProxy/glxutil.c   |6 
 hw/dmx/glxProxy/glxvisuals.c|6 
 hw/xfree86/common/xf86Config.c  |   12 
 hw/xfree86/common/xf86Xinput.c  |   16 
 hw/xfree86/modes/xf86Crtc.c |   10 
 hw/xfree86/modes/xf86Crtc.h |7 
 hw/xfree86/modes/xf86RandR12.c  |8 
 hw/xfree86/modes/xf86Rotate.c   |   14 
 hw/xfree86/os-support/bsd/bsd_init.c|   88 
 hw/xfree86/os-support/linux/lnx_init.c  |6 
 hw/xfree86/os-support/shared/sigio.c|2 
 hw/xfree86/ramdac/xf86Cursor.c  |3 
 hw/xfree86/xaa/xaaInitAccel.c   |9 
 hw/xquartz/Makefile.am  |3 
 hw/xquartz/X11Application.m |  113 
 hw/xquartz/X11Controller.m  |  102 
 hw/xquartz/bundle/Info.plist|   39 
 hw/xquartz/bundle/Info.plist.cpp|   39 
 hw/xquartz/bundle/Makefile.am   |   16 
 hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib   |   68 
 hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/X11.sh|   15 
 hw/xquartz/bundle/cpprules.in   |   37 
 hw/xquartz/bundle/mk_bundke.sh  |3 
 hw/xquartz/darwin.c |   17 
 hw/xquartz/darwinEvents.c   |   49 
 hw/xquartz/doc/Xquartz.man.pre  |6 
 hw/xquartz/mach-startup/Makefile.am |   18 
 hw/xquartz/mach-startup/bundle-main.c   |   91 
 hw/xquartz/pbproxy/Makefile.am  |4 
 hw/xquartz/pbproxy/main.m   |   29 
 hw/xquartz/pbproxy/pbproxy.h|2 
 hw/xquartz/pbproxy/x-input.m|  125 
 hw/xquartz/quartz.c |   25 
 hw/xquartz/quartzKeyboard.c |   28 
 hw/xquartz/xpr/xprCursor.c  |   27 
 hw/xquartz/xpr/xprScreen.c  |   30 
 include/dix-config.h.in |   22 
 include/input.h   

Processed: setting package to xdmx-tools xvfb xnest xserver-xorg-core xserver-xfbdev xserver-xorg-core-dbg xserver-xorg-dev xdmx xorg-server xserver-common xserver-xephyr ...

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> #xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
> #
> #  * Ditch the GLX Public License and the CID Font Code Public License from
> #debian/copyright.  The CID code has been removed a while ago, and all 
> code
> #under the GLXPL has been relicensed to the SGI Free Software License B 
> 2.0.
> #This finally closes: #211765.
> #
> package xdmx-tools xvfb xnest xserver-xorg-core xserver-xfbdev 
> xserver-xorg-core-dbg xserver-xorg-dev xdmx xorg-server xserver-common 
> xserver-xephyr
Ignoring bugs not assigned to: xdmx-tools xvfb xserver-xorg-core xnest 
xserver-xfbdev xserver-xorg-core-dbg xserver-xorg-dev xdmx xorg-server 
xserver-xephyr xserver-common

> tags 211765 + pending
Bug#211765: xorg-server: material under GLX Public License is not DFSG-free
Tags were: fixed-upstream lenny-ignore help upstream etch-ignore sarge-ignore
Bug#368564: xorg-server: material under GLX Public License is not DFSG-free
Tags added: pending

>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processed: closing 488669

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> close 488669
Bug#488669: kernel changes break X on sparc64/pci
'close' is deprecated; see http://www.debian.org/Bugs/Developer#closing.
Bug#500358: mach64 stopped working on the Sun Ultra 5 graphics card after 
upgrade
Bug closed, send any further explanations to Marco Guidetti 

>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#510410: evtouch 0.8.8 released, fixes various bugs.

[Mattia Dongili]

On Thu, Jan 01, 2009 at 12:55:26PM -0300, Ernesto Manríquez wrote:
> Package: xserver-xorg-input-evtouch
> Version: 0.8.7-3
> 
> The evtouch author released a new version, 0.8.8, in this web site.
> 
> http://www.conan.de/touchscreen/evtouch.html
> 
> This release fixes for me 2 problems I had with an eGalax touchscreen. It is
> required that you change the website for evtouch, because
> http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html is stuck at
> 0.8.7.

hey! thanks for pointing this out.
I'll try to revive my touchscreen equipped PC (HD died some time ago)
this weekend and I'll; update the package.

cheers
-- 
mattia
:wq!



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xtrans: Changes to 'refs/tags/xtrans-1.2.3-1'

[Julien Cristau]

Tag 'xtrans-1.2.3-1' created by Julien Cristau  at 
2009-01-16 03:54 +

Tagging upload of xtrans 1.2.3-1 to experimental.

Changes since xtrans-1.2.2-1:
Alan Coopersmith (4):
  18748: xtrans.m4 causes configure --help to list --enable-ipv6 in wrong 
case.
  Switch ChangeLog generation to use XORG_CHANGELOG from xorg-macros 1.2
  Add bugzilla, mailing list & git repo pointers to README
  Version 1.2.3

Alan Hourihane (1):
  add winsock check for windows builds

Julien Cristau (3):
  Merge tag 'xtrans-1.2.3' into debian-experimental
  update changelogs and build-deps for new upstream
  Prepare changelog for upload

---
 ChangeLog|   32 
 Makefile.am  |2 +-
 README   |   50 --
 configure.ac |7 ++-
 debian/changelog |7 +++
 debian/control   |2 +-
 xtrans.m4|3 ++-
 7 files changed, 85 insertions(+), 18 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xtrans: Changes to 'upstream-experimental'

[Julien Cristau]

 Makefile.am  |2 +-
 README   |   50 --
 configure.ac |7 ++-
 xtrans.m4|3 ++-
 4 files changed, 45 insertions(+), 17 deletions(-)

New commits:
commit 1cf4a1a6716f2c0adf5ee4d0a194a1013be53105
Author: Alan Coopersmith 
Date:   Sun Jan 11 10:54:52 2009 -0800

Version 1.2.3

diff --git a/configure.ac b/configure.ac
index dff9d46..cf5ec71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xtrans, 1.2.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
+AC_INIT(xtrans, 1.2.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit d0c5592142369afa93dcd58ca6f390dbd127a28a
Author: Alan Coopersmith 
Date:   Sun Jan 11 10:51:49 2009 -0800

Add bugzilla, mailing list & git repo pointers to README

diff --git a/README b/README
index 551f129..8560b5d 100644
--- a/README
+++ b/README
@@ -1,14 +1,36 @@
-xtrans is a library of code that is shared among various X packages to handle
-network protocol transport in a modular fashion, allowing a single place to
-add new transport types.   It is used by the X server, libX11, libICE, the
-X font server, and related components.
-
-It is however, *NOT* a shared library, but code which each consumer includes 
and
-builds it's own copy of with various #ifdef flags to make each copy slightly
-different.   To support this in the modular build system, this package simply 
-installs the C source files into $(prefix)/include/X11/Xtrans and installs a
-pkg-config file and an autoconf m4 macro file with the flags needed to use it.
-
-Documentation of the xtrans API can be found in the xorg-docs package, in
-PostScript format in xorg-docs/hardcopy/xtrans/Xtrans.PS.gz and in the original
-troff format in xorg-docs/specs/xtrans/Xtrans.mm .
\ No newline at end of file
+xtrans is a library of code that is shared among various X packages to
+handle network protocol transport in a modular fashion, allowing a
+single place to add new transport types.  It is used by the X server,
+libX11, libICE, the X font server, and related components.
+
+It is however, *NOT* a shared library, but code which each consumer
+includes and builds it's own copy of with various #ifdef flags to make
+each copy slightly different.  To support this in the modular build
+system, this package simply installs the C source files into
+$(prefix)/include/X11/Xtrans and installs a pkg-config file and an
+autoconf m4 macro file with the flags needed to use it.
+
+Documentation of the xtrans API can be found in the xorg-docs package,
+in PostScript format in xorg-docs/hardcopy/xtrans/Xtrans.PS.gz and in
+the original troff format in xorg-docs/specs/xtrans/Xtrans.mm .
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+   https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+under the component "Lib/xtrans".
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+   http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+   git://anongit.freedesktop.org/git/xorg/lib/libxtrans
+
+   http://cgit.freedesktop.org/xorg/lib/libxtrans
+
+For more information on the git code manager, see:
+
+   http://wiki.x.org/wiki/GitPage

commit 9f12a154437554938a4fa18b7d3948c7dff8d631
Author: Alan Coopersmith 
Date:   Mon Dec 1 13:58:31 2008 -0800

Switch ChangeLog generation to use XORG_CHANGELOG from xorg-macros 1.2

diff --git a/Makefile.am b/Makefile.am
index 39b67d3..07e0153 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,6 @@ CLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-   (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' >&2)
+   $(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 19b736f..dff9d46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,10 @@ AC_INIT(xtrans, 1.2.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 # Because xtrans is included into other modules rather than being linked
 # with, these defines have to be added to the cflags line
 
@@ -44,6 +48,7 @@ sticky_bit_define="-DHAS_STICKY_DIR_BIT"
 AC_SUBST(sticky_bit_define)
 
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
xtrans.pc])

commit 8c313881a0c586179c09922a7e00a1f8d669a68a
Author: Alan Coopersmith 
Date:   Mon Dec 1 08:37:42 2008 -0800

18748: xtra

xtrans: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|   32 
 Makefile.am  |2 +-
 README   |   50 --
 configure.ac |7 ++-
 debian/changelog |7 +++
 debian/control   |2 +-
 xtrans.m4|3 ++-
 7 files changed, 85 insertions(+), 18 deletions(-)

New commits:
commit 8af51825be5fd4a1045e95b5251d4d2e4055106f
Author: Julien Cristau 
Date:   Fri Jan 16 04:53:20 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 5d88619..cbf0441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xtrans (1.2.3-1) UNRELEASED; urgency=low
+xtrans (1.2.3-1) experimental; urgency=low
 
   * New upstream release.
   * Bump xutils-dev build-dep to >= 1:7.4+4 for util-macros 1.2.
 
- -- Julien Cristau   Fri, 16 Jan 2009 04:50:22 +0100
+ -- Julien Cristau   Fri, 16 Jan 2009 04:53:05 +0100
 
 xtrans (1.2.2-1) experimental; urgency=low
 

commit f679ff2480df4183a6986d61331e481365eef4c3
Author: Julien Cristau 
Date:   Fri Jan 16 04:52:34 2009 +0100

update changelogs and build-deps for new upstream

* New upstream release.
* Bump xutils-dev build-dep to >= 1:7.4+4 for util-macros 1.2.

diff --git a/ChangeLog b/ChangeLog
index 7552df2..9f97eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+commit 1cf4a1a6716f2c0adf5ee4d0a194a1013be53105
+Author: Alan Coopersmith 
+Date:   Sun Jan 11 10:54:52 2009 -0800
+
+Version 1.2.3
+
+commit d0c5592142369afa93dcd58ca6f390dbd127a28a
+Author: Alan Coopersmith 
+Date:   Sun Jan 11 10:51:49 2009 -0800
+
+Add bugzilla, mailing list & git repo pointers to README
+
+commit 9f12a154437554938a4fa18b7d3948c7dff8d631
+Author: Alan Coopersmith 
+Date:   Mon Dec 1 13:58:31 2008 -0800
+
+Switch ChangeLog generation to use XORG_CHANGELOG from xorg-macros 1.2
+
+commit 8c313881a0c586179c09922a7e00a1f8d669a68a
+Author: Alan Coopersmith 
+Date:   Mon Dec 1 08:37:42 2008 -0800
+
+18748: xtrans.m4 causes configure --help to list --enable-ipv6 in wrong 
case.
+
+X.Org Bug #18748 
+
+commit c626a4298e98f4988701dd587bc8355c62542ec4
+Author: Alan Hourihane 
+Date:   Wed Oct 15 11:19:41 2008 +0100
+
+add winsock check for windows builds
+
 commit 005bd80a9eab736aea737869b8a1079c565e1cd6
 Author: Adam Jackson 
 Date:   Tue Oct 7 09:56:49 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index 5ee4bd3..5d88619 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xtrans (1.2.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Bump xutils-dev build-dep to >= 1:7.4+4 for util-macros 1.2.
+
+ -- Julien Cristau   Fri, 16 Jan 2009 04:50:22 +0100
+
 xtrans (1.2.2-1) experimental; urgency=low
 
   [ Brice Goglin ]
diff --git a/debian/control b/debian/control
index cb0a81f..5024fc1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Brice Goglin 
, Julien Cristau 
-Build-Depends: debhelper (>= 5.0.0), quilt, automake, xutils-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, automake, xutils-dev (>= 1:7.4+4)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xtrans
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xtrans.git

commit 1cf4a1a6716f2c0adf5ee4d0a194a1013be53105
Author: Alan Coopersmith 
Date:   Sun Jan 11 10:54:52 2009 -0800

Version 1.2.3

diff --git a/configure.ac b/configure.ac
index dff9d46..cf5ec71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xtrans, 1.2.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
+AC_INIT(xtrans, 1.2.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit d0c5592142369afa93dcd58ca6f390dbd127a28a
Author: Alan Coopersmith 
Date:   Sun Jan 11 10:51:49 2009 -0800

Add bugzilla, mailing list & git repo pointers to README

diff --git a/README b/README
index 551f129..8560b5d 100644
--- a/README
+++ b/README
@@ -1,14 +1,36 @@
-xtrans is a library of code that is shared among various X packages to handle
-network protocol transport in a modular fashion, allowing a single place to
-add new transport types.   It is used by the X server, libX11, libICE, the
-X font server, and related components.
-
-It is however, *NOT* a shared library, but code which each consumer includes 
and
-builds it's own copy of with various #ifdef flags to make each copy slightly
-different.   To support this in the modular build system, this package simply 
-installs the C source files into $(prefix)/include/X11/Xtrans and installs a
-pkg-config file and an autoconf m4 macro file with the flags needed to use it.
-
-Documentation of the xtrans API can be found in the xorg-docs package, in
-Pos

Processing of xtrans_1.2.3-1_amd64.changes

[Archive Administrator]

xtrans_1.2.3-1_amd64.changes uploaded successfully to localhost
along with the files:
  xtrans_1.2.3-1.dsc
  xtrans_1.2.3.orig.tar.gz
  xtrans_1.2.3-1.diff.gz
  xtrans-dev_1.2.3-1_all.deb

Greetings,

Your Debian queue daemon


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xtrans_1.2.3-1_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xtrans-dev_1.2.3-1_all.deb
  to pool/main/x/xtrans/xtrans-dev_1.2.3-1_all.deb
xtrans_1.2.3-1.diff.gz
  to pool/main/x/xtrans/xtrans_1.2.3-1.diff.gz
xtrans_1.2.3-1.dsc
  to pool/main/x/xtrans/xtrans_1.2.3-1.dsc
xtrans_1.2.3.orig.tar.gz
  to pool/main/x/xtrans/xtrans_1.2.3.orig.tar.gz


Override entries for your package:
xtrans-dev_1.2.3-1_all.deb - optional x11
xtrans_1.2.3-1.dsc - source x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xserver-xorg-input-synaptics: Changes to 'debian-experimental'

[Julien Cristau]

 .gitignore |1 
 INSTALL|  106 
 Makefile.am|4 
 configure.ac   |8 
 debian/changelog   |3 
 debian/rules   |2 
 fdi/11-x11-synaptics.fdi   |   13 -
 include/Makefile.am|4 
 include/synaptics-properties.h |  142 +++
 include/synaptics.h|1 
 man/synaptics.man  |   39 ++-
 src/Makefile.am|3 
 src/alpscomm.c |3 
 src/eventcomm.c|  137 +++---
 src/properties.c   |  522 +
 src/ps2comm.c  |3 
 src/psmcomm.c  |3 
 src/psmcomm.h  |2 
 src/synaptics.c|  491 +-
 src/synapticsstr.h |   13 -
 src/synproto.h |1 
 tools/synclient.c  |6 
 tools/syndaemon.c  |   21 +
 xorg-synaptics.pc.in   |6 
 24 files changed, 1296 insertions(+), 238 deletions(-)

New commits:
commit fb860330702ede91dbc095d0bd8586bb1a0c8c06
Author: Julien Cristau 
Date:   Fri Jan 16 05:28:09 2009 +0100

update changelog for new upstream

INSTALL is not created by automake, don't delete it

diff --git a/debian/changelog b/debian/changelog
index f240675..610ca18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfree86-driver-synaptics (0.15.0+git20080820-2) UNRELEASED; urgency=low
+xfree86-driver-synaptics (0.99.3-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * Run autoreconf at build time; build-depend on automake, libtool and
@@ -6,6 +6,7 @@ xfree86-driver-synaptics (0.15.0+git20080820-2) UNRELEASED; 
urgency=low
 
   [ Julien Cristau ]
   * Add watch file.
+  * New upstream release.
 
  -- Timo Aaltonen   Fri, 05 Sep 2008 10:18:01 +0300
 
diff --git a/debian/rules b/debian/rules
index 8e29b0a..93c5fcc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ clean: xsfclean
rm -rf obj-*
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
-   rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in
+   rm -f ltmain.sh missing aclocal.m4 config.h.in
 
dh_clean
 

commit 8ee8aa5ec764c9c816fc95e0bfc5f4e2aee3ba0f
Author: Peter Hutterer 
Date:   Mon Dec 15 09:34:34 2008 +1000

synaptics 1.0 RC3

diff --git a/configure.ac b/configure.ac
index 5718987..37bf3a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-synaptics],
-0.99.2,
+0.99.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-synaptics)
 

commit b3bf47cf8ac5d24e3358c937d7456570378ceb6e
Author: Peter Hutterer 
Date:   Wed Dec 10 09:22:33 2008 +1000

Fix compilation issue (opts undeclared) for XINPUT ABI 0. (#18988)

HistorySize is now deprecated for ABI > 0, so list it as a removed option in
the man page.

X.Org Bug 18988 

Signed-off-by: Peter Hutterer 
Signed-off-by: Christoph Brill 
Signed-off-by: Henrik Rydberg 
(cherry picked from commit 8d5cf39e7f37ce78aaec423a9da397d72b1629d2)

diff --git a/man/synaptics.man b/man/synaptics.man
index 0030680..aaa448c 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -634,6 +634,8 @@ edge scrolling is enabled for both horizontal and vertical 
scrolling.
 The following options are no longer part of the driver configuration:
 .TP
 .BI "Option \*qRepeater\*q \*q" string \*q
+.TP
+.BI "Option \*qHistorySize\*q \*q" integer \*q
 
 .SH "AUTHORS"
 .LP
diff --git a/src/synaptics.c b/src/synaptics.c
index 8ccfb69..664d2fa 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -595,7 +595,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 }
 
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-local->history_size = xf86SetIntOption(opts, "HistorySize", 0);
+local->history_size = xf86SetIntOption(local->options, "HistorySize", 0);
 #endif
 
 xf86ProcessCommonOptions(local, local->options);

commit 3db3f4e04c7038477a03b092c55dfd063224f034
Author: Fedor P. Goncharov (Fredy) 
Date:   Thu Dec 4 17:16:40 2008 +0600

Auto-adjust right_edge for touchpads with hardware scroll area.

If RightEdge is specified as a config option, ignore the SpecialScrollArea.
Otherwise, adjust right_edge to the bounds of the hardware scroll area.

Signed-off-by: Peter Hutterer 
Signed-off-by: Christoph Brill 
Signed-off-by: Henrik Rydberg 
(cherry picked from commit 0f2802726fe7374afeca7447e3127bc1d7f3247c)

diff --git a/man/synaptics.man b/man/synaptics.man
index 79958e7..0030680 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -101,7 +101,9 @@ user can access the configuration.
 X coordinate for left edge.
 .

xserver-xorg-input-evdev: Changes to 'debian-experimental'

[Julien Cristau]

 ChangeLog|   84 +++
 configure.ac |2 -
 debian/changelog |3 +
 man/evdev.man|2 -
 src/emuMB.c  |5 +++
 src/evdev.c  |   28 +-
 src/evdev.h  |   32 
 7 files changed, 133 insertions(+), 23 deletions(-)

New commits:
commit 1a967b5e9b0fb51b61b80dd8e2c9e35f36531dd3
Author: Julien Cristau 
Date:   Fri Jan 16 05:12:17 2009 +0100

update changelogs for new upstream

diff --git a/ChangeLog b/ChangeLog
index 9740312..7a2f78f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,87 @@
+commit 11d506dce6363525e80eda219aee8af429fb302e
+Author: Peter Hutterer 
+Date:   Tue Jan 13 11:32:05 2009 +1000
+
+evdev 2.1.1
+
+commit a34a2cd3476441f29c9faa79ffa9289dbf2eebf4
+Author: Michael Chapman 
+Date:   Fri Jan 9 19:07:10 2009 +1100
+
+Disable middle mouse button emulation when a middle mouse button event is 
registered
+
+Signed-off-by: Peter Hutterer 
+(cherry picked from commit 0592d97fbb5a1241ee79397ce9203346d050a9f9)
+
+commit 78c00bd77f983aa22611c9966fbcb7e22453b588
+Author: Matt Helsley 
+Date:   Tue Jan 13 11:03:04 2009 +1000
+
+Fix FOO_MAX off-by-one
+
+In linux/input.h each section's (e.g. ABS) FOO_MAX is the maximum FOO
+value. Recent kernels define FOO_CNT as the maximum number of FOO there
+will ever be. Hence using FOO_MAX to size the bit vectors representing
+the capabilities of an evdev device is off by one.
+
+Define FOO_CNT values for use with Linux kernels which lack them. Use
+FOO_CNT whenever we need to know the number of bits needed -- usually to
+calculate the number of longs needed.
+
+When iterating over the values FOO_MAX still seems appropriate however
+the loop test should include FOO_MAX rather than skip it.
+
+Signed-off-by: Matt Helsley 
+Signed-off-by: Peter Hutterer 
+(cherry picked from commit 4dfd86b2201b2b19761a1abb3c580cecf0060224)
+
+Conflicts:
+
+   src/evdev.c
+
+commit 760f1c6bb184e3b48ca6a6bfe8942d306f378148
+Author: Matt Helsley 
+Date:   Sun Jan 11 18:04:40 2009 -0800
+
+rename NBITS to NLONGS to reflect its actual meaning
+
+NBITS really convers the number of bits passed as its argument
+into a number of longs. This is somewhat atypical of many
+function-like-macro names. Rename it to NLONGS.
+
+Signed-off-by: Matt Helsley 
+Signed-off-by: Peter Hutterer 
+
+(cherry-picked from commit d3fd42d8644310abcae23bbf534f8c445296bcb7)
+Not really required, but it makes cherry-picking
+4dfd86b2201b2b19761a1abb3c580cecf0060224 easier.
+
+commit 2db04ba3c35e4976b34d92f8f7c6c2c9ec09f3ab
+Author: Alan Coopersmith 
+Date:   Fri Jan 9 16:13:09 2009 -0800
+
+Remove xorgconfig & xorgcfg from See Also list in man page
+(cherry picked from commit 0f0a149067abdd1ed89717de43febe89b2a3490b)
+
+commit 363d0bdb9fcae7f57f53c50667429ac9b37d41cc
+Author: Yan Li 
+Date:   Mon Jan 5 16:35:09 2009 +0800
+
+Fix XkbModel parsing error
+
+Signed-off-by: Yan Li 
+Signed-off-by: Peter Hutterer 
+(cherry picked from commit d170cba0cdd8f7a2e500e094f5b21fc33aefb52a)
+
+commit 16a26a1eca6395284fcb8e62be7b2bc30becb0d3
+Author: Peter Hutterer 
+Date:   Wed Nov 26 15:01:57 2008 +1000
+
+Finalize MB emu (and wakeup handlers) before closing the fd.
+
+Signed-off-by: Peter Hutterer 
+(cherry picked from commit 2bf6e29b40f0da2bc417964fd2bd819306e5d3ed)
+
 commit b879ae73510ad733c266fba80e0ec4b0f903e71b
 Author: Peter Hutterer 
 Date:   Mon Nov 17 09:27:25 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index 84ef79d..69250b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-input-evdev (1:2.1.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.1.1-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * Update debian/copyright from upstream's COPYING.
 
  -- Julien Cristau   Wed, 03 Dec 2008 00:09:44 +0100

commit 11d506dce6363525e80eda219aee8af429fb302e
Author: Peter Hutterer 
Date:   Tue Jan 13 11:32:05 2009 +1000

evdev 2.1.1

diff --git a/configure.ac b/configure.ac
index f668d1e..28294e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-2.1.0,
+2.1.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-evdev)
 

commit a34a2cd3476441f29c9faa79ffa9289dbf2eebf4
Author: Michael Chapman 
Date:   Fri Jan 9 19:07:10 2009 +1100

Disable middle mouse button emulation when a middle mouse button event is 
registered

Signed-off-by: Peter Hutterer 
(cherry picked from commit 0592d97fbb5a1241ee79397ce9203346d050a9f9)

diff --git a/src/emuMB.c b/src/emuMB.c
index e5a767a..028d27f 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -231,6 +231,11 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL 
press)
 if (!pEvd

xserver-xorg-input-evdev: Changes to 'upstream-experimental'

[Julien Cristau]

 configure.ac  |2 +-
 man/evdev.man |2 +-
 src/emuMB.c   |5 +
 src/evdev.c   |   28 +++-
 src/evdev.h   |   32 +---
 5 files changed, 47 insertions(+), 22 deletions(-)

New commits:
commit 11d506dce6363525e80eda219aee8af429fb302e
Author: Peter Hutterer 
Date:   Tue Jan 13 11:32:05 2009 +1000

evdev 2.1.1

diff --git a/configure.ac b/configure.ac
index f668d1e..28294e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-2.1.0,
+2.1.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-evdev)
 

commit a34a2cd3476441f29c9faa79ffa9289dbf2eebf4
Author: Michael Chapman 
Date:   Fri Jan 9 19:07:10 2009 +1100

Disable middle mouse button emulation when a middle mouse button event is 
registered

Signed-off-by: Peter Hutterer 
(cherry picked from commit 0592d97fbb5a1241ee79397ce9203346d050a9f9)

diff --git a/src/emuMB.c b/src/emuMB.c
index e5a767a..028d27f 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -231,6 +231,11 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL 
press)
 if (!pEvdev->emulateMB.enabled)
 return ret;
 
+if (button == 2) {
+EvdevMBEmuEnable(pInfo, FALSE);
+return ret;
+}
+
 /* don't care about other buttons */
 if (button != 1 && button != 3)
 return ret;

commit 78c00bd77f983aa22611c9966fbcb7e22453b588
Author: Matt Helsley 
Date:   Tue Jan 13 11:03:04 2009 +1000

Fix FOO_MAX off-by-one

In linux/input.h each section's (e.g. ABS) FOO_MAX is the maximum FOO
value. Recent kernels define FOO_CNT as the maximum number of FOO there
will ever be. Hence using FOO_MAX to size the bit vectors representing
the capabilities of an evdev device is off by one.

Define FOO_CNT values for use with Linux kernels which lack them. Use
FOO_CNT whenever we need to know the number of bits needed -- usually to
calculate the number of longs needed.

When iterating over the values FOO_MAX still seems appropriate however
the loop test should include FOO_MAX rather than skip it.

Signed-off-by: Matt Helsley 
Signed-off-by: Peter Hutterer 
(cherry picked from commit 4dfd86b2201b2b19761a1abb3c580cecf0060224)

Conflicts:

src/evdev.c

diff --git a/src/evdev.c b/src/evdev.c
index e48edd9..5601caa 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -236,7 +236,7 @@ static void
 PostKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value)
 {
 int code = ev->code + MIN_KEYCODE;
-static char warned[KEY_MAX];
+static char warned[KEY_CNT];
 
 /* filter repeat events for chording keys */
 if (value == 2 &&
@@ -248,7 +248,7 @@ PostKbdEvent(InputInfoPtr pInfo, struct input_event *ev, 
int value)
  ev->code == KEY_SCROLLLOCK)) /* XXX windows keys? */
 return;
 
-if (code > 255 && ev->code < KEY_MAX) {
+if (code > 255 && ev->code <= KEY_MAX) {
if (!warned[ev->code])
xf86Msg(X_WARNING, "%s: unable to handle keycode %d\n",
pInfo->name, ev->code);
@@ -1202,12 +1202,12 @@ EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare)
 int i;
 
 char name[1024]  = {0};
-long bitmask[NLONGS(EV_MAX)]  = {0};
-long key_bitmask[NLONGS(KEY_MAX)] = {0};
-long rel_bitmask[NLONGS(REL_MAX)] = {0};
-long abs_bitmask[NLONGS(ABS_MAX)] = {0};
-long led_bitmask[NLONGS(LED_MAX)] = {0};
-struct input_absinfo absinfo[ABS_MAX];
+long bitmask[NLONGS(EV_CNT)]  = {0};
+long key_bitmask[NLONGS(KEY_CNT)] = {0};
+long rel_bitmask[NLONGS(REL_CNT)] = {0};
+long abs_bitmask[NLONGS(ABS_CNT)] = {0};
+long led_bitmask[NLONGS(LED_CNT)] = {0};
+struct input_absinfo absinfo[ABS_CNT];
 
 if (ioctl(pInfo->fd,
   EVIOCGNAME(sizeof(name) - 1), name) < 0) {
@@ -1266,7 +1266,7 @@ EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare)
 
 memset(absinfo, 0, sizeof(absinfo));
 
-for (i = 0; i < ABS_MAX; i++)
+for (i = ABS_X; i <= ABS_MAX; i++)
 {
 if (TestBit(i, abs_bitmask))
 {
@@ -1302,9 +1302,9 @@ error:
 static int
 EvdevProbe(InputInfoPtr pInfo)
 {
-long key_bitmask[NLONGS(KEY_MAX)] = {0};
-long rel_bitmask[NLONGS(REL_MAX)] = {0};
-long abs_bitmask[NLONGS(ABS_MAX)] = {0};
+long key_bitmask[NLONGS(KEY_CNT)] = {0};
+long rel_bitmask[NLONGS(REL_CNT)] = {0};
+long abs_bitmask[NLONGS(ABS_CNT)] = {0};
 int i, has_axes, has_keys, num_buttons;
 int kernel24 = 0;
 EvdevPtr pEvdev = pInfo->private;
diff --git a/src/evdev.h b/src/evdev.h
index 107dc77..cdbc87d 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -40,6 +40,22 @@
 #include 
 #endif
 
+#ifndef EV_CNT /* linux 2.4 kernels and earlier lack _CNT defines */
+#define EV_CNT (EV_MAX+1)
+#endif
+#ifndef KEY_CNT
+#define KEY_CNT (KEY_MAX+1)
+#endif
+#ifndef REL_CNT

xserver-xorg-input-mutouch: Changes to 'refs/tags/xserver-xorg-input-mutouch-1_1.2.0-3'

[Julien Cristau]

Tag 'xserver-xorg-input-mutouch-1_1.2.0-3' created by Julien Cristau 
 at 2009-01-16 06:32 +

Tagging upload of xserver-xorg-input-mutouch 1:1.2.0-3 to unstable.

Changes since xserver-xorg-input-mutouch-1_1.2.0-2:
Fernando Vicente (1):
  Fix calculation of coordinates with inverted axes

Julien Cristau (1):
  Prepare changelog for upload

---
 debian/changelog  |8 
 src/xf86MuTouch.c |4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xserver-xorg-input-mutouch: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |8 
 src/xf86MuTouch.c |4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit b74a7c66d5a28f7a9faaf759f55e5740d052fd3b
Author: Julien Cristau 
Date:   Fri Jan 16 07:32:08 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c8f763c..405d70a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-mutouch (1:1.2.0-3) unstable; urgency=medium
+
+  * Cherry-pick one more fix from upstream: Fix calculation of coordinates
+with inverted axes.  Thanks to Fernando Vicente for the report and the
+patch.
+
+ -- Julien Cristau   Fri, 16 Jan 2009 07:31:55 +0100
+
 xserver-xorg-input-mutouch (1:1.2.0-2) unstable; urgency=medium
 
   * Cherry-picked from upstream: Handle axis inversion in the driver.

commit d6f7e2f90eb2828b169d83fb32fc3a6885d7de5b
Author: Fernando Vicente 
Date:   Fri Jan 16 06:53:22 2009 +0100

Fix calculation of coordinates with inverted axes

Signed-off-by: Julien Cristau 
Signed-off-by: Peter Hutterer 
(cherry picked from commit 301153d4c833590c8f5a19b9f0780c8426abb2d0)

diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c
index 37caa7a..8222baa 100644
--- a/src/xf86MuTouch.c
+++ b/src/xf86MuTouch.c
@@ -790,9 +790,9 @@ xf86MuTReadInput(LocalDevicePtr local)
 * or we will feed X with quite bogus event positions.
 */
 if (priv->x_inverted)
-  cur_x = priv->max_x - cur_x;
+  cur_x = priv->max_x - cur_x + priv->min_x;
 if (priv->y_inverted)
-  cur_y = priv->max_y - cur_y;
+  cur_y = priv->max_y - cur_y + priv->min_y;
xf86PostMotionEvent(local_to_use->dev, TRUE, 0, 2, cur_x, cur_y);

/*


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processing of xserver-xorg-input-mutouch_1.2.0-3_amd64.changes

[Archive Administrator]

xserver-xorg-input-mutouch_1.2.0-3_amd64.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-input-mutouch_1.2.0-3.dsc
  xserver-xorg-input-mutouch_1.2.0-3.diff.gz
  xserver-xorg-input-mutouch_1.2.0-3_amd64.deb

Greetings,

Your Debian queue daemon


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xserver-xorg-input-mutouch_1.2.0-3_amd64.changes ACCEPTED

[Debian Installer]

Accepted:
xserver-xorg-input-mutouch_1.2.0-3.diff.gz
  to 
pool/main/x/xserver-xorg-input-mutouch/xserver-xorg-input-mutouch_1.2.0-3.diff.gz
xserver-xorg-input-mutouch_1.2.0-3.dsc
  to 
pool/main/x/xserver-xorg-input-mutouch/xserver-xorg-input-mutouch_1.2.0-3.dsc
xserver-xorg-input-mutouch_1.2.0-3_amd64.deb
  to 
pool/main/x/xserver-xorg-input-mutouch/xserver-xorg-input-mutouch_1.2.0-3_amd64.deb


Override entries for your package:
xserver-xorg-input-mutouch_1.2.0-3.dsc - source x11
xserver-xorg-input-mutouch_1.2.0-3_amd64.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#368559: marked as done (x11-proto-gl: material under GLX Public License is not DFSG-free)

[Debian Bug Tracking System]

Your message dated Fri, 16 Jan 2009 08:16:49 +0100
with message-id <1232090209.13241.20.ca...@radis.liafa.jussieu.fr>
and subject line Re: Bug#368559: GLX-covered files now free software
has caused the Debian Bug report #368559,
regarding x11-proto-gl: material under GLX Public License is not DFSG-free
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.)


-- 
368559: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=368559
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xfree86
Version: 4.2.1-6
Severity: serious

The following sections of the debian/copyright file for xfree86:

  2.4  GLX Public License
  2.5  CID Font Code Public License

contain clauses which debian-legal has found to be non-free according
to the DFSG - see thread starting at
http://lists.debian.org/debian-legal/2003/debian-legal-200309/msg00723.html

Code covered by these licenses need to be relicensed or removed from
Debian's distribution of XFree86.

The licence

  "SGI FREE SOFTWARE LICENCE B"

which is found in the copyright file for version 4.2.1-11, also
contains a non-free clause (discussed in the same thread). Since only
the Debian revision differs, I suppose that whatever code that is
covered by will also be present in 4.2.1-6.

Since the BTS wants a version, I give the one curtrently in sarge
(which is where we need most urgently to keep track of
release-critical issues), but the ones in woody and sid, plus the
expermental 4.3.0 packages, all look to be affected too.

-- 
Henning Makholm"*Vi vil ha wienerbrød!*"

--- End Message ---
--- Begin Message ---
On Wed, 2009-01-14 at 16:18 -0500, Brett Smith wrote:
> The files discussed in this bug are now free software.  You can find
> details in the recent discussion in #211765.

Closing the bug accordingly. (As far as I can see in git there have been
no changes to glxint.h since 2004, so the relicensing should apply to
everything in the archive, thus not closing in a particular version.)

Cheers,
Julien

--- End Message ---

x11proto-gl: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 +
 debian/copyright |  243 ---
 2 files changed, 7 insertions(+), 243 deletions(-)

New commits:
commit 6a06ddb853becc4f512cdf4138e8796452f32998
Author: Julien Cristau 
Date:   Fri Jan 16 08:39:03 2009 +0100

debian/copyright update

All the code under the GLX Public License has been made available
under the SGI Free Software License B, so remove GLXPL from
debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 522a2e9..0ea0587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-gl (1.4.9-3) UNRELEASED; urgency=low
+
+  * All the code under the GLX Public License has been made available under
+the SGI Free Software License B, so remove GLXPL from debian/copyright.
+
+ -- Julien Cristau   Fri, 16 Jan 2009 08:34:55 +0100
+
 x11proto-gl (1.4.9-2) unstable; urgency=low
 
   * Update debian/copyright to the SGI Free Software License B, version 2.0.
diff --git a/debian/copyright b/debian/copyright
index c5c3082..6706a22 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,6 @@
 This package was downloaded from
 http://xorg.freedesktop.org/releases/individual/proto/
 
-glcore.h, glxmd.h, glxproto.h, glxtokens.h are copyright of:
 The headers in this module are copyright 1991-1999 Silicon Graphics, Inc.
 
 License Applicability. Except to the extent portions of this file are
@@ -20,39 +19,6 @@ DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED 
WARRANTIES AND
 CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
 PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 
-A entire text of the FreeB license can be found below.
-
-glxint.h is copyright of Silicon Graphics Inc and it's releasend under the 
terms of:
-
-Original Code. The Original Code is: OpenGL Sample Implementation,
-Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-Copyright in any portions created by third parties is as indicated
-elsewhere herein. All Rights Reserved.
-
-Additional Notice Provisions: This software was created using the
-OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-not been independently verified as being compliant with the OpenGL(R)
-version 1.2.1 Specification.
-
-The contents of this file are subject to the GLX Public License Version 1.0
-(the "License"). You may not use this file except in compliance with the
-License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-or at http://www.sgi.com/software/opensource/glx/license.html.
-
-Software distributed under the License is distributed on an "AS IS"
-basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-language governing rights and limitations under the License.
-
-The Original Software is GLX version 1.2 source code, released February,
-1999. The developer of the Original Software is Silicon Graphics, Inc.
-Those portions of the Subject Software created by Silicon Graphics, Inc.
-are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-SGI FreeB license:
 
 SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
 
@@ -80,212 +46,3 @@ Except as contained in this notice, the name of Silicon 
Graphics, Inc. shall
 not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Silicon
 Graphics, Inc.
-
-GLX License:
-
-GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
-
-Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
-grants permission to Recipient (defined below), under Recipient's
-copyrights in the Original Software (defined below), to use, copy,
-modify, merge, publish, distribute, sublicense and/or sell copies of
-Subject Software (defined below), and to permit persons to whom the
-Subject Software is furnished in accordance with this License to do the
-same, subject to all of the following terms and conditions, which
-Recipient accepts by engaging in any such use, copying, modifying,
-merging, publishing, distributing, sublicensing or selling:
-
-1. Definitions.
-
-(a) "Original Software" means source code of computer software code
-which is described in Exhibit A as Original Software.
-
-(b) "Modifications" means any addition to or deletion from the
-substance or structure of either the Original Software or any
-previous Modifications. When Subject Software is released as a
-series of files, a Modification means (i) any addition to or
-deletion from the contents of a file containing Original Software or
-previous Modifications and (ii) any new file that contains any part
-of the Original Cod

xorg-server: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog |   14 ++
 debian/patches/155_no_checkmotion_for_disabled_devices.patch |   53 +--
 debian/patches/156_exevents_copykeyclass_nullptrcheck.patch  |   20 
 debian/patches/series|1 
 4 files changed, 59 insertions(+), 29 deletions(-)

New commits:
commit 61066ae446805b21ae56465e8f9d4c2dc641a71d
Author: Bryce Harrington 
Date:   Thu Jan 15 23:28:31 2009 -0800

Fix up patch 155 to better match the latest changes in the upstream tree
regarding this bug.

Add patch 156 with nullptr checks for inside CopyKeyClass() itself, to
prevent segfaults like in bug 311254.

diff --git a/debian/changelog b/debian/changelog
index d7f1add..e4e136c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,14 +6,20 @@ xorg-server (2:1.5.99.3-0ubuntu4) UNRELEASED; urgency=low
   * Disable patch 107 for now, to see what kind of a performance hit 
 it'll be. The problem it causes is random garbage on windows
 while apps are being loaded.
+(LP: #254468)
   * Remove patches 150, 151, applied upstream.
 
   [Bryce Harrington]
   * 155_no_checkmotion_for_disabled_devices.patch: Cherrypick upstream
-patch to fix crash when a device is not enabled (such as after a
-suspend/resume).  LP: #313567
-
- -- Bryce Harrington   Thu, 08 Jan 2009 18:30:42 -0800
+changes to fix crash when a device is not enabled (such as after a
+suspend/resume).
+(LP: #313567)
+  * 156_exevents_copykeyclass_nullptrcheck.patch: Add several NULL pointer
+checks in CopyKeyClass to prevent SEGFAULT seen when pressing button
+on an ATI USB remote control.
+(LP: #311254)
+
+ -- Bryce Harrington   Thu, 15 Jan 2009 23:26:13 -0800
 
 xorg-server (2:1.5.99.3-0ubuntu3) jaunty; urgency=low
 
diff --git a/debian/patches/155_no_checkmotion_for_disabled_devices.patch 
b/debian/patches/155_no_checkmotion_for_disabled_devices.patch
index 00d4a54..24fb3d3 100644
--- a/debian/patches/155_no_checkmotion_for_disabled_devices.patch
+++ b/debian/patches/155_no_checkmotion_for_disabled_devices.patch
@@ -1,27 +1,30 @@
-commit e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a
-Author: Peter Hutterer 
-Date:   Tue Dec 23 10:00:34 2008 +1000
-
-xfree86: don't call CheckMotion if a device hasn't been enabled. #19176
-
-X.Org Bug 
-
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index fe62772..e39c087 100644
 a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -549,10 +549,11 @@ xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, 
BOOL enable)
- ActivateDevice(dev);
- /* Enable it if it's properly initialised and we're currently in the VT */
- if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)
-+{
- EnableDevice(dev);
+diff -Nurp patched/mi/mieq.c working/mi/mieq.c
+--- patched/mi/mieq.c  2009-01-15 23:18:21.0 -0800
 working/mi/mieq.c  2009-01-15 23:23:01.0 -0800
+@@ -354,17 +354,15 @@ mieqProcessInputEvents(void)
+ NewCurrentScreen (dev, DequeueScreen(dev), x, y);
+ }
+ else {
+-/* Force a copy of the key class into the VCK so that the layout
+-   is transferred. */
+-if (event->u.u.type == DeviceKeyPress ||
+-event->u.u.type == DeviceKeyRelease)
+-CopyKeyClass(dev, master);
 -
--/* send enter/leave event, update sprite window */
--CheckMotion(NULL, dev);
-+/* send enter/leave event, update sprite window */
-+CheckMotion(NULL, dev);
-+}
+-if (master)
+-CopyGetMasterEvent(master, event,
+-   &master_event, nevents);
+-else
+-master_event = NULL;
++if (master) {
++/* Force a copy of the key class into the VCK so that the 
layout
++   is transferred. */
++if (event->u.u.type == DeviceKeyPress ||
++event->u.u.type == DeviceKeyRelease)
++CopyKeyClass(dev, master);
++
++CopyGetMasterEvent(master, event, masterEvents, nevents);
++}
  
- *pdev = dev;
- return Success;
+ /* If someone's registered a custom event handler, let them
+  * steal it. */
diff --git a/debian/patches/156_exevents_copykeyclass_nullptrcheck.patch 
b/debian/patches/156_exevents_copykeyclass_nullptrcheck.patch
new file mode 100644
index 000..06bd5ab
--- /dev/null
+++ b/debian/patches/156_exevents_copykeyclass_nullptrcheck.patch
@@ -0,0 +1,20 @@
+diff -Nurp patched/Xi/exevents.c working/Xi/exevents.c
+--- patched/Xi/exevents.c  2009-01-15 23:02:52.0 -0800
 working/Xi/exevents.c  2009-01-15 23:09:42.0 -0800
+@@ -194,12 +194,15 @@ CopyKeyClass(DeviceIntPtr device, Device
+ BOOL sen