Re: Best practices for OpenGL ES

2012-01-17 Thread Sylvain
Hi,

On Mon, Jan 16, 2012 at 11:58:54PM +0100, Tobias Hansen wrote:
> Am 16.01.2012 20:01, schrieb Sylvain:
> > On Mon, Jan 16, 2012 at 02:28:19PM +0100, Tobias Hansen wrote:
> >> * Most systems with GL (and shaders) provided by Mesa also support
> GLES(2).
> >
> > Do you have examples on how this is done?
> >
> > Last time I checked, I could only find Mesa's EGL
> > src/egl/opengles2/tri demo which display a triangle through OpenGL ES
> > shaders + GLES2 EGL initialization, and I couldn't figure if:
> > - it happened to work in an OpenGL non-ES environment or,
> > - if Mesa was truly enforcing OpenGL ES mode
> 
> 
> I don't understand exactly what you want to know, but if the program is
> linked with libGLESv2 and libEGL instead of libGL and initialization is
> done using EGL, it uses GLES2. The program I mentioned earlier which
> works with GLES2 on Debian is sludge (opensludge.sourceforge.net).

My question is ultimately: can a classic desktop environment run the
GLES2-only version?
(e.g. my Athlon II desktop with its Radeon HD 5450)

This way, a simple application could be written in GLES2 and run
everywhere (desktop and mobile).


> > Also I wonder how the existing libraries/frameworks (SDL, SFML,
> > Pyglet, etc.)  behave in that regard (Do they support OpenGL ES-only
> > GPUs? Can they initialize an OpenGL ES context?).
> 
> SDL 1.2 works alongside GLES, but doesn't provide any specific support.
> Initialization has to be done using EGL. SDL 1.3 has some support for
> GLES I think.
> 
> Am 16.01.2012 23:40, schrieb Sylvain:
> > On Mon, Jan 16, 2012 at 08:29:37PM +0100, Julien Cristau wrote:
> >> On Mon, Jan 16, 2012 at 20:01:51 +0100, Sylvain wrote:
> >>
> >>> Alternatively, can the packages detect the OpenGL version at runtime
> >>> and act accordingly?
> >>>
> >> You can detect the GL version and extensions at runtime as much as you
> >> want.  GL vs GLES is not the same thing though.
> > 
> > Yeah, I meant "detect the OpenGL ES/non-ES variant at runtime and act
> > accordingly".
> 
> No, the program can't be linked against both libGLESv2 and libGL.

Too bad :/

Thanks a lot for the info.

Would there be a way to install the appropriate version automatically,
or will the user have to chose the package explicitely?

-- 
Sylvain


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120117103023.ga10...@perso.beuc.net



xorg-server: Changes to 'ubuntu+1'

2012-01-17 Thread Chase Douglas
 ChangeLog|   69 +++
 debian/changelog |7 +++
 debian/patches/220_grab_event_time.patch |   38 -
 debian/patches/series|1 
 dix/events.c |5 +-
 render/animcur.c |3 +
 6 files changed, 56 insertions(+), 67 deletions(-)

New commits:
commit 0fddbe32539b4d0a4080089dc5673c2c19e1459d
Author: Chase Douglas 
Date:   Tue Jan 17 19:52:18 2012 +0100

releasing version 2:1.11.3-0ubuntu4

diff --git a/debian/changelog b/debian/changelog
index e59db4b..266632f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.11.3-0ubuntu4) UNRELEASED; urgency=low
+xorg-server (2:1.11.3-0ubuntu4) precise; urgency=low
 
   * Merge in input changes from upstream master through commit 954bb99
   * Remove temporary patch 220_grab_event_time.patch
 
- -- Chase Douglas   Tue, 17 Jan 2012 19:51:45 +0100
+ -- Chase Douglas   Tue, 17 Jan 2012 19:52:04 +0100
 
 xorg-server (2:1.11.3-0ubuntu3) precise; urgency=low
 

commit 14a5279300f7c473285c6d9455e3a79816ef04b5
Author: Chase Douglas 
Date:   Tue Jan 17 19:52:00 2012 +0100

Remove temporary patch 220_grab_event_time.patch

diff --git a/debian/changelog b/debian/changelog
index 1d78c47..e59db4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xorg-server (2:1.11.3-0ubuntu4) UNRELEASED; urgency=low
 
   * Merge in input changes from upstream master through commit 954bb99
+  * Remove temporary patch 220_grab_event_time.patch
 
- -- Chase Douglas   Tue, 17 Jan 2012 19:50:43 +0100
+ -- Chase Douglas   Tue, 17 Jan 2012 19:51:45 +0100
 
 xorg-server (2:1.11.3-0ubuntu3) precise; urgency=low
 
diff --git a/debian/patches/220_grab_event_time.patch 
b/debian/patches/220_grab_event_time.patch
deleted file mode 100644
index e28920f..000
--- a/debian/patches/220_grab_event_time.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7aca9306a2ef3c9df5abfb1c0a2e86b2022d00f8 Mon Sep 17 00:00:00 2001
-From: Chase Douglas 
-Date: Wed, 11 Jan 2012 07:31:06 -0800
-Subject: [PATCH 2/2] Use event time instead of CurrentTime for grab times
-
-When {XI,X,}AllowEvents is called, the timestamp is compared against the
-grab time to ensure that the request pertains to the current grab in the
-server. While many clients may use CurrentTime (client-side), the
-timestamp of the event causing the grab is also valid.
-
-This change ensures that the server's notion of the grab time is the
-time of the event that activated the grab rather than the time that the
-grab is actually activated.
-
-This bug was exposed through nested touch then pointer grabs.
-
-Signed-off-by: Chase Douglas 

- dix/events.c |3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/dix/events.c b/dix/events.c
-index 5360267..d4b00e0 100644
 a/dix/events.c
-+++ b/dix/events.c
-@@ -3723,7 +3723,8 @@ ActivatePassiveGrab(DeviceIntPtr device, GrabPtr grab, 
InternalEvent *event,
- }
- }
- 
--(*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-+(*grabinfo->ActivateGrab)(device, grab,
-+  ClientTimeToServerTime(event->any.time), TRUE);
- 
- if (xE)
- {
--- 
-1.7.7.3
-
diff --git a/debian/patches/series b/debian/patches/series
index d9abe51..a37033e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,4 +27,3 @@
 208_switch_on_release.diff
 209_add_legacy_bgnone_option.patch
 214_glx_dri_searchdirs.patch
-220_grab_event_time.patch

commit a23b34ed3fc06c659964dcd78ffaf6d3f3bb235e
Author: Chase Douglas 
Date:   Tue Jan 17 19:51:20 2012 +0100

Merge in input changes from upstream master through commit 954bb99

diff --git a/ChangeLog b/ChangeLog
index 5733c56..8fcaea4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,42 +1,59 @@
-commit a607cde134173b158335b2c1d92a91b2ec876aa9
-Author: Keith Packard 
-Date:   Mon Jan 9 13:17:37 2012 -0800
+commit 7014cf0a6497f122bfa2b0e6e7794dc3e30c0c6f
+Author: Chase Douglas 
+Date:   Wed Jan 11 07:38:12 2012 -0800
 
-Merge remote-tracking branch 'whot/multitouch'
+Use event time instead of CurrentTime for grab times
 
-(cherry picked from commit e476af417d83730b11054f4e5b127ab5540bb332)
+When {XI,X,}AllowEvents is called, the timestamp is compared against the
+grab time to ensure that the request pertains to the current grab in the
+server. While many clients may use CurrentTime (client-side), the
+timestamp of the event causing the grab is also valid.
 
-Conflicts:
+This change ensures that the server's notion of the grab time is the
+time of the event that activated the grab rather than the time that the
+grab is actually activated.
 
-   configure.ac
+This bug was exposed through nested touch then pointer grabs.
+
+Signed-off-by: Chase Douglas 
+Reviewed-by: Peter Hutterer 
+Signed-off-by: Peter Hutt

xorg-server: Changes to 'upstream-1.11+input'

2012-01-17 Thread Chase Douglas
 dix/events.c |5 +++--
 render/animcur.c |3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7014cf0a6497f122bfa2b0e6e7794dc3e30c0c6f
Author: Chase Douglas 
Date:   Wed Jan 11 07:38:12 2012 -0800

Use event time instead of CurrentTime for grab times

When {XI,X,}AllowEvents is called, the timestamp is compared against the
grab time to ensure that the request pertains to the current grab in the
server. While many clients may use CurrentTime (client-side), the
timestamp of the event causing the grab is also valid.

This change ensures that the server's notion of the grab time is the
time of the event that activated the grab rather than the time that the
grab is actually activated.

This bug was exposed through nested touch then pointer grabs.

Signed-off-by: Chase Douglas 
Reviewed-by: Peter Hutterer 
Signed-off-by: Peter Hutterer 
(cherry picked from commit f9e6858d5c10be6a8439c0f18bfb2325fa0ee070)

Signed-off-by: Chase Douglas 

diff --git a/dix/events.c b/dix/events.c
index 0c4255c..04d7fb5 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3723,7 +3723,8 @@ ActivatePassiveGrab(DeviceIntPtr device, GrabPtr grab, 
InternalEvent *event,
 }
 }
 
-(*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
+(*grabinfo->ActivateGrab)(device, grab,
+  ClientTimeToServerTime(event->any.time), TRUE);
 
 if (xE)
 {

commit 4989bff6bfe2c0409127a523e56f177b3141b8d1
Author: Peter Hutterer 
Date:   Fri Jan 6 13:20:45 2012 +1000

render: don't bother with animated cursors on floating slaves (#39989)

X.Org Bug 39989 

Signed-off-by: Peter Hutterer 
Reviewed-by: Jeremy Huddleston 
(cherry picked from commit bbb6b8c834e0e1491ca14403b5d0840dd14380d3)

Signed-off-by: Chase Douglas 

diff --git a/render/animcur.c b/render/animcur.c
index 31cbab9..8d4a9c2 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -208,6 +208,9 @@ AnimCurDisplayCursor (DeviceIntPtr pDev,
 AnimCurScreenPtras = GetAnimCurScreen(pScreen);
 Bool   ret;
 
+if (IsFloating(pDev))
+   return FALSE;
+
 Unwrap (as, pScreen, DisplayCursor);
 if (IsAnimCur(pCursor))
 {

commit b5f71a5f124eb44eab08f68d3c8ef946df05bb45
Author: Peter Hutterer 
Date:   Mon Jan 9 15:04:10 2012 +1000

dix: Update pointer limits for floating devices too (#43635)

When the screen is restructured, the pointer limits need to be reset for
floating slave devices as well, not just for master pointers. Only skip
devices that don't have a cursor (attached slaves and keyboard)

Bug reproducer: float an absolute slave device, rotate the screen - the
device is now confined to a section of the screen only.

X.Org Bug 43635 

Signed-off-by: Peter Hutterer 
Reviewed-by: Chase Douglas 
(cherry picked from commit 35bd77e9d0701daae87d681900d749604fc6471f)

Signed-off-by: Chase Douglas 

diff --git a/dix/events.c b/dix/events.c
index 5360267..0c4255c 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1368,7 +1368,7 @@ ScreenRestructured (ScreenPtr pScreen)
 
 for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
 {
-if (!DevHasCursor(pDev))
+if (!IsFloating(pDev) && !DevHasCursor(pDev))
 continue;
 
 /* GrabDevice doesn't have a confineTo field, so we don't need to


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



Bug#655991: xorg: X sometimes crashes when opening web pages in FF 9

2012-01-17 Thread garkein
Ok, it crashed again with xserver and intel driver from
experimental:

The trigger this time was opening the preview window of xsane.


[40.735] 
X.Org X Server 1.11.99.901 (1.12.0 RC 1)
Release Date: 2011-12-27
[40.735] X Protocol Version 11, Revision 0
[40.735] Build Operating System: Linux 2.6.32-5-amd64 i686 Debian
[40.735] Current Operating System: Linux thinkpad 3.2.1 #10 SMP Mon
Jan 16 23:38:11 CET 2012 i686
[40.735] Kernel command line: BOOT_IMAGE=/vmlinuz-3.2.1
root=/dev/mapper/thinkpad-root ro quiet i915.i915_enable_rc6=1
[40.735] Build Date: 30 December 2011  01:22:16AM
[40.735] xorg-server 2:1.11.99.901-1 (Cyril Brulebois
) 
[40.735] Current version of pixman: 0.24.0
[40.735]Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[40.735] Markers: (--) probed, (**) from config file, (==) default
setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[40.735] (==) Log file: "/var/log/Xorg.0.log", Time: Tue Jan 17
20:23:42 2012
[40.802] (==) Using system config directory
"/usr/share/X11/xorg.conf.d"
[40.851] (==) No Layout section.  Using the first Screen section.
[40.851] (==) No screen section available. Using defaults.
[40.851] (**) |-->Screen "Default Screen Section" (0)
[40.851] (**) |   |-->Monitor ""
[40.869] (==) No monitor specified for screen "Default Screen
Section".
Using a default monitor configuration.
[40.869] (==) Automatically adding devices
[40.869] (==) Automatically enabling devices
[41.088] (WW) The directory "/usr/share/fonts/X11/cyrillic" does not
exist.
[41.088]Entry deleted from font path.
[41.295] (==) FontPath set to:
/usr/share/fonts/X11/misc,
/usr/share/fonts/X11/100dpi/:unscaled,
/usr/share/fonts/X11/75dpi/:unscaled,
/usr/share/fonts/X11/Type1,
/usr/share/fonts/X11/100dpi,
/usr/share/fonts/X11/75dpi,
/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,
built-ins
[41.295] (==) ModulePath set to "/usr/lib/xorg/modules"
[41.295] (II) The server relies on udev to provide the list of input
devices.
If no devices become available, reconfigure udev or disable
AutoAddDevices.
[41.295] (II) Loader magic: 0xb7713580
[41.295] (II) Module ABI versions:
[41.295]X.Org ANSI C Emulation: 0.4
[41.295]X.Org Video Driver: 12.0
[41.295]X.Org XInput driver : 16.0
[41.295]X.Org Server Extension : 6.0
[41.296] (--) PCI:*(0:0:2:0) 8086:0126:17aa:21da rev 9, Mem @
0xf000/4194304, 0xe000/268435456, I/O @ 0x5000/64
[41.296] (II) Open ACPI successful (/var/run/acpid.socket)
[41.296] (II) LoadModule: "extmod"
[41.312] (II) Loading /usr/lib/xorg/modules/extensions/libextmod.so
[41.342] (II) Module extmod: vendor="X.Org Foundation"
[41.343]compiled for 1.11.99.901, module version = 1.0.0
[41.343]Module class: X.Org Server Extension
[41.343]ABI class: X.Org Server Extension, version 6.0
[41.343] (II) Loading extension SELinux
[41.343] (II) Loading extension MIT-SCREEN-SAVER
[41.343] (II) Loading extension XFree86-VidModeExtension
[41.343] (II) Loading extension XFree86-DGA
[41.343] (II) Loading extension DPMS
[41.343] (II) Loading extension XVideo
[41.343] (II) Loading extension XVideo-MotionCompensation
[41.343] (II) Loading extension X-Resource
[41.343] (II) LoadModule: "dbe"
[41.343] (II) Loading /usr/lib/xorg/modules/extensions/libdbe.so
[41.356] (II) Module dbe: vendor="X.Org Foundation"
[41.356]compiled for 1.11.99.901, module version = 1.0.0
[41.356]Module class: X.Org Server Extension
[41.356]ABI class: X.Org Server Extension, version 6.0
[41.356] (II) Loading extension DOUBLE-BUFFER
[41.356] (II) LoadModule: "glx"
[41.356] (II) Loading /usr/lib/xorg/modules/extensions/libglx.so
[41.377] (II) Module glx: vendor="X.Org Foundation"
[41.377]compiled for 1.11.99.901, module version = 1.0.0
[41.377]ABI class: X.Org Server Extension, version 6.0
[41.377] (==) AIGLX enabled
[41.377] (II) Loading extension GLX
[41.378] (II) LoadModule: "record"
[41.378] (II) Loading /usr/lib/xorg/modules/extensions/librecord.so
[41.386] (II) Module record: vendor="X.Org Foundation"
[41.386]compiled for 1.11.99.901, module version = 1.13.0
[41.386]Module class: X.Org Server Extension
[41.386]ABI class: X.Org Server Extension, version 6.0
[41.386] (II) Loading extension RECORD
[41.386] (II) LoadModule: "dri"
[41.386] (II) Loading /usr/lib/xorg/modules/extensions/libdri.so
[41.406] (II) Module dri: vendor="X.Org Foundation"
[41.406]compiled for 1.11.99.901, module version = 1.0.0
[41.406]ABI class: X.Org Server Extension, version 6.0
[  

xorg-server: Changes to 'ubuntu+1'

2012-01-17 Thread Chase Douglas
 debian/changelog |   10 ++
 debian/control   |4 
 2 files changed, 14 insertions(+)

New commits:
commit ddc9f2dbd671c5245d75d38bba8fa17d018e60f4
Author: Chase Douglas 
Date:   Tue Jan 17 22:03:49 2012 +0100

releasing version 2:1.11.3-0ubuntu5

diff --git a/debian/changelog b/debian/changelog
index 9328415..2351511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.11.3-0ubuntu5) UNRELEASED; urgency=low
+xorg-server (2:1.11.3-0ubuntu5) precise; urgency=low
 
   * Add Breaks clause for XInput changes
 - qt4-x11 < 4:4.8.0-1ubuntu2 (crashes due to XI ABI change)
@@ -6,7 +6,7 @@ xorg-server (2:1.11.3-0ubuntu5) UNRELEASED; urgency=low
 - utouch-frame < 2.1.0 (crashes due to XI ABI change)
 - unity < 5.0.0 (crashes if utouch stack is unavailable)
 
- -- Chase Douglas   Tue, 17 Jan 2012 21:58:01 +0100
+ -- Chase Douglas   Tue, 17 Jan 2012 22:03:35 +0100
 
 xorg-server (2:1.11.3-0ubuntu4) precise; urgency=low
 

commit 54a418cb0d6caefcd802211bcfbcac493b0099ef
Author: Chase Douglas 
Date:   Tue Jan 17 22:03:29 2012 +0100

Add Breaks clause for XInput changes

* Add Breaks clause for XInput changes
  - qt4-x11 < 4:4.8.0-1ubuntu2 (crashes due to XI ABI change)
  - utouch-geis < 2.2.3 (infinite loop if utouch XCB backend is unavailable)
  - utouch-frame < 2.1.0 (crashes due to XI ABI change)
  - unity < 5.0.0 (crashes if utouch stack is unavailable)

diff --git a/debian/changelog b/debian/changelog
index 266632f..9328415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.11.3-0ubuntu5) UNRELEASED; urgency=low
+
+  * Add Breaks clause for XInput changes
+- qt4-x11 < 4:4.8.0-1ubuntu2 (crashes due to XI ABI change)
+- utouch-geis < 2.2.3 (infinite loop if utouch XCB backend is unavailable)
+- utouch-frame < 2.1.0 (crashes due to XI ABI change)
+- unity < 5.0.0 (crashes if utouch stack is unavailable)
+
+ -- Chase Douglas   Tue, 17 Jan 2012 21:58:01 +0100
+
 xorg-server (2:1.11.3-0ubuntu4) precise; urgency=low
 
   * Merge in input changes from upstream master through commit 954bb99
diff --git a/debian/control b/debian/control
index e334140..d2dba41 100644
--- a/debian/control
+++ b/debian/control
@@ -120,6 +120,10 @@ Breaks:
  xserver-xorg-video-vga (<= 1:4.1.0-8),
  libgl1-mesa-dri (<< 7.10.2-4),
  libgl1-mesa-dri-experimental (<< 7.10.2-4),
+ qt4-x11 (<< 4:4.8.0-1ubuntu2),
+ utouch-geis (<< 2.2.3),
+ utouch-frame (<< 2.1.0),
+ unity (<< 5.0.0),
 Provides:
  ${videoabi},
  ${inputabi},


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



xorg: Changes to 'ubuntu'

2012-01-17 Thread Timo Aaltonen
 debian/changelog | 2633 ---
 debian/control   |6 
 debian/local/xserver-wrapper.c   |   14 
 debian/po/sr.po  |   60 
 debian/po/s...@latin.po|   61 
 debian/rules |9 
 debian/scripts/vars.s390x|8 
 debian/xserver-xorg.postinst.in  |   17 
 xsf-docs/index.txt   |1 
 xsf-docs/reference/squeeze-backports.txt |  134 -
 10 files changed, 291 insertions(+), 2652 deletions(-)

New commits:
commit f2dba93ad941cbc42fb4adc0b6c0ce2b63b7c0bc
Author: Julien Cristau 
Date:   Thu Dec 15 23:46:14 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 13dc513..632ff14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+10) UNRELEASED; urgency=low
+xorg (1:7.6+10) unstable; urgency=high
 
   * Fixes for xserver-wrapper:
 - when we drop privileges, don't forget to also reset effective group id,
@@ -9,7 +9,7 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
 - use major() and minor() macros instead of manually extracting them
   * Build the X wrapper with hardening enabled.
 
- -- Julien Cristau   Tue, 01 Nov 2011 15:13:52 +0100
+ -- Julien Cristau   Thu, 15 Dec 2011 23:45:48 +0100
 
 xorg (1:7.6+9) unstable; urgency=low
 

commit 0ebabb840bf52e5e5347414487668ae26ec16332
Author: Julien Cristau 
Date:   Thu Dec 15 21:22:22 2011 +0100

Build the X wrapper with hardening enabled.

diff --git a/debian/changelog b/debian/changelog
index 20d3f7f..13dc513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
   things like /dev/tty and /dev/ptmx, which are world-readable (closes:
   #652249).  Thanks to vladz for the report.
 - use major() and minor() macros instead of manually extracting them
+  * Build the X wrapper with hardening enabled.
 
  -- Julien Cristau   Tue, 01 Nov 2011 15:13:52 +0100
 
diff --git a/debian/control b/debian/control
index b825221..dfa7aa4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force 
 Uploaders: Drew Parsons , Cyril Brulebois 

 Standards-Version: 3.9.2
 Build-Depends:
+ dpkg (>= 1.16.1),
  debhelper (>= 7),
  po-debconf,
 # xsf-docs:
diff --git a/debian/rules b/debian/rules
index 861737a..8d2c970 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,13 @@ CC=$(DEB_HOST_GNU_TYPE)-gcc
 else
 CC ?=gcc
 endif
+CFLAGS = \
+   -Wall \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
CFLAGS)
+CPPFLAGS = \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
CPPFLAGS)
+LDFLAGS = \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
LDFLAGS)
 
 # debhelper
 export DH_OPTIONS
@@ -49,7 +56,7 @@ build: build-stamp
 build-stamp: scripts-stamp
dh_testdir
# build Debian's X server wrapper
-   $(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
+   $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o debian/local/X 
debian/local/xserver-wrapper.c
$(MAKE) -C xsf-docs
touch $@
 

commit 1d5cfd6fe0d46fcfcb6f79316cdc600f6da77f54
Author: Julien Cristau 
Date:   Thu Dec 15 21:06:31 2011 +0100

xserver-wrapper: use major() and minor() macros instead of manually 
extracting them

diff --git a/debian/changelog b/debian/changelog
index ac28258..20d3f7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 xorg (1:7.6+10) UNRELEASED; urgency=low
 
-  * xserver-wrapper: when we drop privileges, don't forget to also reset
-effective group id, since we're installed setgid root.
-  * xserver-wrapper: revert change to allow devices with major 5 as consoles.
-This includes things like /dev/tty and /dev/ptmx, which are
-world-readable (closes: #652249).  Thanks to vladz for the report.
+  * Fixes for xserver-wrapper:
+- when we drop privileges, don't forget to also reset effective group id,
+  since we're installed setgid root.
+- revert change to allow devices with major 5 as consoles.  This includes
+  things like /dev/tty and /dev/ptmx, which are world-readable (closes:
+  #652249).  Thanks to vladz for the report.
+- use major() and minor() macros instead of manually extracting them
 
  -- Julien Cristau   Tue, 01 Nov 2011 15:13:52 +0100
 
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 1e0d416..d4a6ab8 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -162,8 +162,8 @@ onConsole()
 return FALSE;
   }
   if (S_ISCHR(s.st_mode) &&
-(((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
-  (s.st_rdev & 0xff) < 64)) {
+(major(s.st_rdev) == TTY_MAJOR_DEV &&
+ minor(s.st_rdev) < 64)) {
 return TRUE;
   }
 #elif defined(__FreeBSD__) || defined(__FreeBSD

xorg-server: Changes to 'ubuntu+1'

2012-01-17 Thread Chase Douglas
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f75f93e7b70eaa4b97cce3283ddc62b6c76025a4
Author: Chase Douglas 
Date:   Tue Jan 17 22:23:13 2012 +0100

releasing version 2:1.11.3-0ubuntu6

diff --git a/debian/changelog b/debian/changelog
index f5fb126..8288890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.11.3-0ubuntu6) UNRELEASED; urgency=low
+xorg-server (2:1.11.3-0ubuntu6) precise; urgency=low
 
   * Bump Build-Depends on x11proto-input-dev to 2.1.99.5
 
- -- Chase Douglas   Tue, 17 Jan 2012 22:21:54 +0100
+ -- Chase Douglas   Tue, 17 Jan 2012 22:22:57 +0100
 
 xorg-server (2:1.11.3-0ubuntu5) precise; urgency=low
 

commit 1d7991682371fcb124af692f1603cf588b93
Author: Chase Douglas 
Date:   Tue Jan 17 22:22:50 2012 +0100

Bump Build-Depends on x11proto-input-dev to 2.1.99.5

diff --git a/debian/changelog b/debian/changelog
index 2351511..f5fb126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.11.3-0ubuntu6) UNRELEASED; urgency=low
+
+  * Bump Build-Depends on x11proto-input-dev to 2.1.99.5
+
+ -- Chase Douglas   Tue, 17 Jan 2012 22:21:54 +0100
+
 xorg-server (2:1.11.3-0ubuntu5) precise; urgency=low
 
   * Add Breaks clause for XInput changes
diff --git a/debian/control b/debian/control
index d2dba41..a80659e 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
  x11proto-xf86vidmode-dev (>= 2.2.99.1),
  xtrans-dev (>= 1.2.2),
  libxau-dev (>= 1:1.0.5-2),
- x11proto-input-dev (>= 2.1.99.4),
+ x11proto-input-dev (>= 2.1.99.5),
  x11proto-dri2-dev (>= 2.6),
  libxdmcp-dev (>= 1:0.99.1),
  libxfont-dev (>= 1:1.4.2),


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



intel-gpu-tools: Changes to 'debian-unstable'

2012-01-17 Thread Tormod Volden
 debian/changelog   |2 +-
 debian/intel-gpu-tools.install |2 ++
 debian/rules   |2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5033a0ac38e80f1343c523c35e294a4d83210678
Author: Tormod Volden 
Date:   Mon Jan 16 23:39:09 2012 +0100

Clarify why the test suite is disabled.

diff --git a/debian/changelog b/debian/changelog
index a5bb1a4..06ead44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low
 - Switch debhelper build-dep and compat to 8.
 - Use dh-autoreconf and quilt as in other X packages.
 - Use --fail-missing and .install accordingly.
-  * Disable test suite: it needs to be run as root.
+  * Disable test suite, "make test" checks GPU/drm, not the build
 
  -- Cyril Brulebois   Sun, 25 Dec 2011 18:16:47 +0100
 
diff --git a/debian/rules b/debian/rules
index 30b44fb..6d954b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 # Disable test suite:
 override_dh_auto_test:
-   echo 'Test suite disabled: it needs to be run as root, with no X 
running.'
+   echo 'Test suite disabled (does not perform a build check).'
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:

commit 20276c99aca771645ce0195812971e10218aa408
Author: Tormod Volden 
Date:   Mon Jan 16 23:33:29 2012 +0100

Add missing debian/intel-gpu-tools.install

diff --git a/debian/intel-gpu-tools.install b/debian/intel-gpu-tools.install
new file mode 100644
index 000..a65408f
--- /dev/null
+++ b/debian/intel-gpu-tools.install
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man


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



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

2012-01-17 Thread Chase Douglas
 debian/changelog  |8 
 debian/patches/series |1 +
 debian/rules  |4 
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit c606adfc86ef2bd620c3c680cad95087fcf6784a
Author: Chase Douglas 
Date:   Tue Jan 17 23:15:47 2012 +0100

Sync up to 1:2.6.99.901-1ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 608bb2a..512f7c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-evdev (1:2.6.99.901-1ubuntu2) precise; urgency=low
+
+  * Patch configure.ac for Ubuntu Xi 2.2 support
+- 0004-xi22-ubuntu.patch
+  * Remove obsolete --enable-multitouch configure flag
+
+ -- Chase Douglas   Tue, 10 Jan 2012 15:00:27 +0100
+
 xserver-xorg-input-evdev (1:2.6.99.901-1ubuntu1) precise; urgency=low
 
   * Add patch to set default resolution to 0
diff --git a/debian/patches/series b/debian/patches/series
index ce65e8a..7d46eb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-configure.ac-Fix-udev-libudev-dependency.patch
 0002-default-resolution.patch
 0003-copy-mt-vals.patch
+0004-xi22-ubuntu.patch
diff --git a/debian/rules b/debian/rules
index 52a891c..3d192dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
 #!/usr/bin/make -f
 
-# Enable multitouch
-override_dh_auto_configure:
-   dh_auto_configure -- --enable-multitouch
-
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:
dh_auto_install --destdir=debian/tmp


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



libxi: Changes to 'ubuntu'

2012-01-17 Thread Christopher Halse Rogers
 debian/changelog |   13 +
 debian/control   |4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 5c2125e70099ff87007223af4e3083ebefc6d619
Author: Christopher James Halse Rogers 
Date:   Wed Jan 18 11:47:14 2012 +1100

Bump build-depends on x11proto-input-dev to ensure we really get the MT 
protocol

diff --git a/debian/changelog b/debian/changelog
index e1cd9c4..a97ab3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.5.99.2-0ubuntu3) precise; urgency=low
+
+  * Bump build depends on x11proto-input-dev to 2.1.99.5.  Our 2.1.99.4 package
+is really 2.0.2, so 2.1.99.5 is the first version with MT support.
+
+ -- Christopher James Halse Rogers   Wed, 18 Jan 2012 
11:44:39 +1100
+
 libxi (2:1.5.99.2-0ubuntu2) precise; urgency=low
 
   * Bump build depends on libx11-dev
diff --git a/debian/control b/debian/control
index 385a09d..5226e40 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 8.1.3),
  x11proto-core-dev (>= 7.0.13),
  x11proto-xext-dev (>= 7.0.3),
- x11proto-input-dev (>= 2.1.99.4),
+ x11proto-input-dev (>= 2.1.99.5),
  libx11-dev (>= 2:1.4.99.1),
  libxext-dev (>= 2:1.1.1-3),
  xmlto,

commit f112c10ec56c35e81a735eca4ee957d5838fde26
Author: Christopher James Halse Rogers 
Date:   Wed Jan 18 11:42:57 2012 +1100

Bump build-depends on libx11-dev

diff --git a/debian/changelog b/debian/changelog
index 1c2b4b8..e1cd9c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.5.99.2-0ubuntu2) precise; urgency=low
+
+  * Bump build depends on libx11-dev
+
+ -- Chase Douglas   Fri, 13 Jan 2012 17:31:04 +0100
+
 libxi (2:1.5.99.2-0ubuntu1) precise; urgency=low
 
   * New upstream release candidate:
diff --git a/debian/control b/debian/control
index 796a3f0..385a09d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  x11proto-core-dev (>= 7.0.13),
  x11proto-xext-dev (>= 7.0.3),
  x11proto-input-dev (>= 2.1.99.4),
- libx11-dev (>= 2:1.3.3-2),
+ libx11-dev (>= 2:1.4.99.1),
  libxext-dev (>= 2:1.1.1-3),
  xmlto,
  asciidoc (>= 8.4.5),


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



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

2012-01-17 Thread Christopher Halse Rogers
 .gitignore|1 
 ChangeLog | 4138 ++
 Makefile.am   |8 
 NEWS  |   67 
 configure.ac  |   55 
 debian/changelog  |   35 
 debian/control|5 
 debian/patches/101_copy-fb.patch  |   39 
 debian/patches/102_remove_surface_binding_cache.patch |  119 
 debian/patches/120_check_privates.patch   |   14 
 debian/patches/series |2 
 man/intel.man |2 
 src/Makefile.am   |   14 
 src/common.h  |   10 
 src/i915_video.c  |1 
 src/i965_reg.h|4 
 src/i965_render.c |  102 
 src/i965_video.c  |3 
 src/intel.h   |   16 
 src/intel_batchbuffer.c   |   52 
 src/intel_display.c   |2 
 src/intel_dri.c   |   15 
 src/intel_driver.c|   13 
 src/intel_module.c|   14 
 src/intel_uxa.c   |   31 
 src/intel_video.c |   38 
 src/legacy/i810/Makefile.am   |1 
 src/legacy/i810/i810.h|   14 
 src/legacy/i810/i810_cursor.c |   19 
 src/legacy/i810/i810_driver.c |   21 
 src/legacy/i810/i810_io.c |  133 
 src/legacy/i810/xvmc/I810XvMC.c   |2 
 src/sna/Makefile.am   |   12 
 src/sna/blt.c |   57 
 src/sna/compiler.h|   51 
 src/sna/gen2_render.c | 1016 +-
 src/sna/gen3_render.c |  984 +-
 src/sna/gen4_render.c |  334 
 src/sna/gen5_render.c |  768 +
 src/sna/gen5_render.h |   47 
 src/sna/gen6_render.c |  734 +
 src/sna/gen7_render.c |  388 
 src/sna/gen7_render.h |6 
 src/sna/kgem.c|  851 +-
 src/sna/kgem.h|   79 
 src/sna/kgem_debug.c  |   24 
 src/sna/kgem_debug.h  |3 
 src/sna/kgem_debug_gen2.c |  631 +
 src/sna/kgem_debug_gen3.c |1 
 src/sna/kgem_debug_gen7.c |  747 +
 src/sna/rop.h |  264 
 src/sna/sna.h |  150 
 src/sna/sna_accel.c   | 7301 +++---
 src/sna/sna_blt.c |  823 +-
 src/sna/sna_composite.c   |  190 
 src/sna/sna_damage.c  |  704 +
 src/sna/sna_damage.h  |   81 
 src/sna/sna_display.c |   85 
 src/sna/sna_dri.c | 1051 +-
 src/sna/sna_driver.c  |  141 
 src/sna/sna_glyphs.c  |  439 -
 src/sna/sna_gradient.c|   67 
 src/sna/sna_io.c  |   51 
 src/sna/sna_reg.h |   50 
 src/sna/sna_render.c  |  141 
 src/sna/sna_render.h  |   62 
 src/sna/sna_render_inline.h   |   37 
 src/sna/sna_tiling.c  |   29 
 src/sna/sna_trapezoids.c  | 4208 +++---
 src/sna/sna_video.c   |  261 
 src/sna/sna_video.h   |   25 
 src/sna/sna_video_overlay.c   |   36 
 src/sna/sna_video_textured.c  |   77 
 src/xvmc/i965_xvmc.c  |2 
 src/xvmc/intel_batchbuffer.h  |1 
 src/xvmc/intel_xvmc.c |2 
 src/xvmc/xvmc_vld.c   |2 
 test/.gitignore   |1 
 test/Makefile.am  

Bug#655974: GPU hangs often on Sandybridge HD3000

2012-01-17 Thread joe
Hello,

On Mon, Jan 16, 2012 at 12:44:59AM +0100, Cyril Brulebois wrote:
> Please get a full backtrace:
>   http://x.debian.net/howto/use-gdb.html
> 
> (beware of gdm3 which doesn't feed the -core option anymore..)
> 
> I'll upload a new -intel version in a few minutes to experimental.
> Please check that one and file a bug upstream if the crash is still
> reproducible. If it is, please file a bug on:
>   https://bugs.freedesktop.org/
> 
> Product is xorg, component is Driver/intel. Chris will likely be able to
> tell whether that's a kernel/driver/server bug.
> 
> Please let us know the bug number for tracking.

Done.  It's bug #44874.
https://bugs.freedesktop.org/show_bug.cgi?id=44874

> Mraw,
> KiBi.

--Joe



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120118032129.ga17...@brain.nahmias.net



Bug#648222: Significant 2D performance regression with ColorTiling

2012-01-17 Thread Andrew Deason
Hi, I have experienced this same issue; same symptoms and ColorTiling
workaround as Iustin reported. (I was complaining about this in 639621,
though at the time I didn't know this was the issue; I have an r300
card: X1300.) Just a couple more thoughts:

On Sun, Nov 13, 2011 at 1:34 PM, Iustin Pop  wrote:
>
> I've tested further and this seems to be a problem specific to xterm
> (and possibly other software? not sure how to test e.g. firefox's UI
> speed):

Fluxbox also appears to be severely impacted by this while moving and
resizing windows. It's hard to give a quantitative benchmark for such a
thing, but the resizing/moving can easily not keep up with the
resize/move requests if done quickly enough. I'm not sure how similar
this is to openbox; fluxbox displays the window position/size in the
center of the screen while moving/resizing... it may just be updating
that part of the display that causes the delay.

This issue I find is also very difficult to find; I was only able to
figure out anything wrt this by flipping random options in xorg.conf,
until flipping ColorTiling made a difference. If you consider this to
just be a bug in the relevant applications and the default should not be
changed, I still would have found it immensely helpful to have some kind
of indication to the user that ColorTiling is a switch that they may
want to flip. Would mentioning this in the radeon man page sound
acceptable?

-- 
Andrew Deason
adea...@dson.org



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