Bug#519221: libpixman -- bug recently submitted related to your patch
On Mit, 2009-03-11 at 17:06 -0600, Arren Lex wrote: I have a dual-monitor setup -- one is 1280x1024 and one is 1680x1050. I usually run konsole maximized across the larger monitor, and it is terribly slow like that. When I make the konsole window smaller, the problem becomes less noticeable (but even when the window is very small, you can easily tell the problem is still there because the text makes waves as it scrolls). This behaviour leads me to think it might be falling back to software rendering for painting the text now. Is that possible? Yes, otherwise pixman (the software rendering library) shouldn't matter for performance. So the question is why it's falling back to software rendering, but there are many possibilities. If you provide the full Xorg.0.log and the output of xrandr, that might be a good start for ideas. -- Earthling Michel Dänzer |http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519243: xserver-xorg-video-intel: rendering errors with KDE desktop effects
On Wed, 2009-03-11 at 13:10 +0100, Marcus Better wrote: Michel Dänzer wrote: Does it happen without this option but with Option ExaOptimizeMigration off No, this seems to work too. I think I experience a slowdown though (not surprising perhaps). Yeah, it means the optimization helps. :) Unfortunately though, due to bugs like this, it should probably still be disabled by default in the xserver 1.6 branch. I brought this up upstream before the 1.6 release, but unfortunately, the release manager didn't seem interested in a serious discussion about it. -- Earthling Michel Dänzer |http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519210: xserver-xorg: doesnt read EDID from monitors
Am 2009-03-11 22:21:18, schrieb Da-Breegster: My old CRT monitor works fine. The problem also happens on another squeeze machine with the same card. WHen I googled, I found lots of people with this problem of the monitor not sending DDC/EDID info about resolutions/frequencies. Their solution was to somehow figure out the values. Here too. Under Windows (XP and Vista) the DDC/EDID is read correctly from my Lite On 15AAC and AsusTek VW161D and even under Sarge I get the rigth values but now under Lenny (I have no Etch installation anymore) it screw up. Since I have no clue about coding xserver I was not able to find the error in the sources... Thanks, Greetings and nice Day/Evening Michelle Konzack Systemadministrator 24V Electronic Engineer Tamay Dogan Network Debian GNU/Linux Consultant -- Linux-User #280138 with the Linux Counter, http://counter.li.org/ # Debian GNU/Linux Consultant # Michelle Konzack Apt. 917 ICQ #328449886 +49/177/935194750, rue de Soultz MSN LinuxMichi +33/6/61925193 67100 Strasbourg/France IRC #Debian (irc.icq.com) signature.pgp Description: Digital signature
libxi: Changes to 'upstream-unstable'
README | 25 +
configure.ac |2 +-
src/XGetDCtl.c |7 ---
src/XListDProp.c | 12 +---
4 files changed, 35 insertions(+), 11 deletions(-)
New commits:
commit 69422ae36ede8fd5d7975c1e2b74c32906ad8535
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Thu Feb 26 09:20:44 2009 +1000
libXi 1.2.1
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index aded614..6cef716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXi, 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+AC_INIT(libXi, 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit f63ea39a328ce0e5e6c980243e2ebea15634dc7d
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed Feb 25 17:00:16 2009 +1000
XGetDeviceControl: size the libXi structs, not the wire structs (#20293)
X.Org Bug 20293 http://bugs.freedesktop.org/show_bug.cgi?id=20293
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit cbdc33d903ec6f90a42ec3c31905eeaef9ecf0a2)
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index bdddfd7..2012ee8 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -122,17 +122,17 @@ XGetDeviceControl(dpy, dev, control)
}
case DEVICE_ABS_CALIB:
{
-size += sizeof(xDeviceAbsCalibState);
+size += sizeof(XDeviceAbsCalibState);
break;
}
case DEVICE_ABS_AREA:
{
-size += sizeof(xDeviceAbsAreaState);
+size += sizeof(XDeviceAbsAreaState);
break;
}
case DEVICE_CORE:
{
-size += sizeof(xDeviceCoreState);
+size += sizeof(XDeviceCoreState);
break;
}
default:
commit 6e65cf0776019b2eec6be4a06fef7838562e94a8
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed Feb 25 16:59:04 2009 +1000
XGetDeviceControl: Add a missing break leading to wrong length calculation.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 78f64722c57ff5ec5d0ae35da0c8f151598e6d6b)
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index 7689059..bdddfd7 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -133,6 +133,7 @@ XGetDeviceControl(dpy, dev, control)
case DEVICE_CORE:
{
size += sizeof(xDeviceCoreState);
+break;
}
default:
size += d-length;
commit 17df06d5aeceb4798caf487a1d57efe58fa7e3fa
Author: Alan Coopersmith alan.coopersm...@sun.com
Date: Mon Feb 2 20:34:34 2009 -0800
Add README with pointers to mailing list, bugzilla git repos
Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
(cherry picked from commit 6e1159a9059d762d6b5d24455237a088e839fe2c)
diff --git a/README b/README
index e69de29..44c705e 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+libXi - library for the X Input Extension
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+git://anongit.freedesktop.org/git/xorg/lib/libXi
+
+http://cgit.freedesktop.org/xorg/lib/libXi
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+http://wiki.x.org/wiki/GitPage
+
commit f2f92b1df861c1f571edc89eddbb8d72a228e2a8
Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
Date: Thu Jan 29 19:30:30 2009 -0200
Return NULL on error, and match LockDisplay with UnlockDisplay.
(cherry picked from commit ba2546a51d5f9087ec54fba7cae46ea1f210198a)
diff --git a/src/XListDProp.c b/src/XListDProp.c
index aee2737..66b9eca 100644
--- a/src/XListDProp.c
+++ b/src/XListDProp.c
@@ -49,33 +49,31 @@ XListDeviceProperties(Display* dpy, XDevice* dev, int
*nprops_return)
Atom*props = NULL;
LockDisplay(dpy);
+*nprops_return = 0;
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
+ goto cleanup;
GetReq(ListDeviceProperties, req);
req-reqType = info-codes-major_opcode;
req-ReqType = X_ListDeviceProperties;
req-deviceid = dev-device_id;
-if (!_XReply(dpy, (xReply*)rep, 0, xFalse)) {
-*nprops_return = 0;
+if (!_XReply(dpy, (xReply*)rep, 0, xFalse))
goto cleanup;
-}
-
-*nprops_return = rep.nAtoms;
if (rep.nAtoms) {
props =
libxi: Changes to 'refs/tags/libxi-2_1.2.1-1'
Tag 'libxi-2_1.2.1-1' created by Julien Cristau jcris...@debian.org at 2009-03-12 15:12 + Tagging upload of libxi 2:1.2.1-1 to unstable. Changes since libxi-2_1.2.0-2: Alan Coopersmith (1): Add README with pointers to mailing list, bugzilla git repos Julien Cristau (3): Merge tag 'libXi-1.2.1' into debian-unstable update changelogs Prepare changelog for upload Paulo Cesar Pereira de Andrade (1): Return NULL on error, and match LockDisplay with UnlockDisplay. Peter Hutterer (3): XGetDeviceControl: Add a missing break leading to wrong length calculation. XGetDeviceControl: size the libXi structs, not the wire structs (#20293) libXi 1.2.1 --- ChangeLog| 48 ++-- README | 25 + configure.ac |2 +- debian/changelog |6 ++ src/XGetDCtl.c |7 --- src/XListDProp.c | 12 +--- 6 files changed, 87 insertions(+), 13 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
libxi: Changes to 'debian-unstable'
ChangeLog| 48 ++-- README | 25 + configure.ac |2 +- debian/changelog |6 ++ src/XGetDCtl.c |7 --- src/XListDProp.c | 12 +--- 6 files changed, 87 insertions(+), 13 deletions(-) New commits: commit b115e074f632655741e046514c646dc08fc3e015 Author: Julien Cristau jcris...@debian.org Date: Thu Mar 12 16:06:05 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index eb530b8..c113eb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libxi (2:1.2.1-1) UNRELEASED; urgency=low +libxi (2:1.2.1-1) unstable; urgency=low * New upstream release. - -- Julien Cristau jcris...@debian.org Thu, 12 Mar 2009 15:44:27 +0100 + -- Julien Cristau jcris...@debian.org Thu, 12 Mar 2009 16:00:29 +0100 libxi (2:1.2.0-2) unstable; urgency=low commit b087dd09975518ad3ed93ca215e46fd106f6a1e1 Author: Julien Cristau jcris...@debian.org Date: Thu Mar 12 15:44:49 2009 +0100 update changelogs diff --git a/ChangeLog b/ChangeLog index 90418e0..d2973fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,47 @@ +commit 69422ae36ede8fd5d7975c1e2b74c32906ad8535 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Thu Feb 26 09:20:44 2009 +1000 + +libXi 1.2.1 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit f63ea39a328ce0e5e6c980243e2ebea15634dc7d +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed Feb 25 17:00:16 2009 +1000 + +XGetDeviceControl: size the libXi structs, not the wire structs (#20293) + +X.Org Bug 20293 http://bugs.freedesktop.org/show_bug.cgi?id=20293 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +(cherry picked from commit cbdc33d903ec6f90a42ec3c31905eeaef9ecf0a2) + +commit 6e65cf0776019b2eec6be4a06fef7838562e94a8 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed Feb 25 16:59:04 2009 +1000 + +XGetDeviceControl: Add a missing break leading to wrong length calculation. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +(cherry picked from commit 78f64722c57ff5ec5d0ae35da0c8f151598e6d6b) + +commit 17df06d5aeceb4798caf487a1d57efe58fa7e3fa +Author: Alan Coopersmith alan.coopersm...@sun.com +Date: Mon Feb 2 20:34:34 2009 -0800 + +Add README with pointers to mailing list, bugzilla git repos + +Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com +(cherry picked from commit 6e1159a9059d762d6b5d24455237a088e839fe2c) + +commit f2f92b1df861c1f571edc89eddbb8d72a228e2a8 +Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br +Date: Thu Jan 29 19:30:30 2009 -0200 + +Return NULL on error, and match LockDisplay with UnlockDisplay. +(cherry picked from commit ba2546a51d5f9087ec54fba7cae46ea1f210198a) + commit 2d586065649304b2864afddee6f6225a4a61a0c9 Author: Peter Hutterer peter.hutte...@redhat.com Date: Wed Dec 3 12:50:45 2008 +1000 @@ -233,14 +277,14 @@ Date: Sat Oct 14 23:56:20 2006 -0700 Add *.o to .gitignore. commit 6e08a76fd8e356f98d2d6913f0c1b1401090768d -Merge: ba84e84... 360ceac... +Merge: ba84e84 360ceac Author: Daniel Stone dan...@fooishbar.org Date: Sun Sep 24 20:02:24 2006 +0300 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libXi commit ba84e84575b4167b0c6298e86a860b0741e2d2a3 -Merge: 93d3c2c... 576c579... +Merge: 93d3c2c 576c579 Author: Daniel Stone dan...@fooishbar.org Date: Sun Sep 24 19:58:56 2006 +0300 diff --git a/debian/changelog b/debian/changelog index f0fc06c..eb530b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxi (2:1.2.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau jcris...@debian.org Thu, 12 Mar 2009 15:44:27 +0100 + libxi (2:1.2.0-2) unstable; urgency=low * Add symbols file. commit 69422ae36ede8fd5d7975c1e2b74c32906ad8535 Author: Peter Hutterer peter.hutte...@who-t.net Date: Thu Feb 26 09:20:44 2009 +1000 libXi 1.2.1 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net diff --git a/configure.ac b/configure.ac index aded614..6cef716 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libXi, 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi) +AC_INIT(libXi, 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit f63ea39a328ce0e5e6c980243e2ebea15634dc7d Author: Peter Hutterer peter.hutte...@who-t.net Date: Wed Feb 25 17:00:16 2009 +1000 XGetDeviceControl: size the libXi structs, not the wire structs (#20293) X.Org Bug 20293 http://bugs.freedesktop.org/show_bug.cgi?id=20293 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net (cherry picked from commit
Processing of libxi_1.2.1-1_amd64.changes
libxi_1.2.1-1_amd64.changes uploaded successfully to localhost along with the files: libxi_1.2.1-1.dsc libxi_1.2.1.orig.tar.gz libxi_1.2.1-1.diff.gz libxi6_1.2.1-1_amd64.deb libxi6-dbg_1.2.1-1_amd64.deb libxi-dev_1.2.1-1_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
libxi_1.2.1-1_amd64.changes ACCEPTED
Accepted: libxi-dev_1.2.1-1_amd64.deb to pool/main/libx/libxi/libxi-dev_1.2.1-1_amd64.deb libxi6-dbg_1.2.1-1_amd64.deb to pool/main/libx/libxi/libxi6-dbg_1.2.1-1_amd64.deb libxi6_1.2.1-1_amd64.deb to pool/main/libx/libxi/libxi6_1.2.1-1_amd64.deb libxi_1.2.1-1.diff.gz to pool/main/libx/libxi/libxi_1.2.1-1.diff.gz libxi_1.2.1-1.dsc to pool/main/libx/libxi/libxi_1.2.1-1.dsc libxi_1.2.1.orig.tar.gz to pool/main/libx/libxi/libxi_1.2.1.orig.tar.gz Override entries for your package: libxi-dev_1.2.1-1_amd64.deb - optional libdevel libxi6-dbg_1.2.1-1_amd64.deb - extra libdevel libxi6_1.2.1-1_amd64.deb - optional libs libxi_1.2.1-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
x11proto-randr: Changes to 'refs/tags/x11proto-randr-1.3.0-1'
Tag 'x11proto-randr-1.3.0-1' created by Julien Cristau jcris...@debian.org at 2009-03-12 15:46 + Tagging upload of x11proto-randr 1.3.0-1 to unstable. Changes since x11proto-randr-1.2.99.3-2: Adam Jackson (1): Zero reply from GetPanning means panning not supported. Julien Cristau (4): Merge tag 'randrproto-1.3.0' into debian-unstable update changelogs Add missing build-dep on xutils-dev. Prepare changelog for upload Maarten Maathuis (1): Fix typo in 83f3f29dd3ac5d3875b5edef5805d6adb6a02698. Matthias Hopf (5): Add description of standard properties. Should read EDID, not EdidData. Add standard property name defines. Bump to 1.2.99.4 Bump to 1.3.0 Paulo Cesar Pereira de Andrade (1): Janitor: Correct make distcheck and dont distribute autogen.sh --- .gitignore |3 ChangeLog| 58 - Makefile.am |4 - configure.ac |6 + debian/changelog |7 ++ debian/control |2 randr.h |8 ++ randrproto.txt | 178 +-- 8 files changed, 252 insertions(+), 14 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
x11proto-randr: Changes to 'upstream-unstable'
.gitignore |3 Makefile.am|4 - configure.ac |6 + randr.h|8 ++ randrproto.txt | 178 +++-- 5 files changed, 190 insertions(+), 9 deletions(-) New commits: commit 94e22fecc66590f81ca280517505c721a5f54497 Author: Matthias Hopf mh...@suse.de Date: Fri Mar 6 15:03:09 2009 +0100 Bump to 1.3.0 diff --git a/configure.ac b/configure.ac index 0ea6a83..320e560 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT([RandrProto], [1.2.99.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([RandrProto], [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG commit 5cc58adb620d37694a9d57cd26c40b4cb2d1de68 Author: Matthias Hopf mh...@suse.de Date: Wed Feb 25 17:08:45 2009 +0100 Bump to 1.2.99.4 diff --git a/configure.ac b/configure.ac index 4707389..0ea6a83 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT([RandrProto], [1.2.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([RandrProto], [1.2.99.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG commit 7bd01756e684bb841f32fa30832eb7980f92ac9c Author: Adam Jackson a...@redhat.com Date: Tue Feb 17 13:58:19 2009 -0500 Zero reply from GetPanning means panning not supported. Don't throw BadRRCrtc for this case, that's just mean. diff --git a/randrproto.txt b/randrproto.txt index be4285d..1af2090 100644 --- a/randrproto.txt +++ b/randrproto.txt @@ -1092,7 +1092,8 @@ dynamic changes in the display environment. Version 1.3 adds panning support again. If multiple crtcs are active the panning behavior can be defined per crtc individually. RRGetPanning returns information about the currently set panning - configuration for the specified crtc. + configuration for the specified crtc. If the CRTC does not support + panning, all fields (except timestamp) will be 0. 'timestamp' indicates when the configuration was last set. commit 1c7e20d115bc470479f32afd703ca7966754c54f Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br Date: Tue Jan 27 20:06:28 2009 -0200 Janitor: Correct make distcheck and dont distribute autogen.sh diff --git a/.gitignore b/.gitignore index c0562cd..2468418 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ configure install-sh missing randrproto.pc +randrproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 59e0378..ec0cf19 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ pkgconfig_DATA = randrproto.pc randrdocdir = $(datadir)/doc/$(PACKAGE) randrdoc_DATA = randrproto.txt -EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA) +EXTRA_DIST = randrproto.pc.in $(randrdoc_DATA) EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -17,6 +17,6 @@ MAINTAINERCLEANFILES = 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 5c0cc88..4707389 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,11 @@ AC_PREREQ([2.57]) AC_INIT([RandrProto], [1.2.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile randrproto.pc]) commit 1ff5e2cdfa2636317099a0917c9819ff4a81b025 Author: Maarten Maathuis madman2...@gmail.com Date: Tue Dec 16 23:35:49 2008 +0100 Fix typo in 83f3f29dd3ac5d3875b5edef5805d6adb6a02698. diff --git a/randr.h b/randr.h index 502ba7d..c624d96 100644 --- a/randr.h +++ b/randr.h @@ -153,7 +153,7 @@ typedef unsigned long XRandrModeFlags; #define RR_PROPERTY_RANDR_EDID EDID #define RR_PROPERTY_SIGNAL_FORMAT SignalFormat -#define RR_PROPERTY_SIGNAL_FORMAT SignalProperties +#define RR_PROPERTY_SIGNAL_PROPERTIES SignalProperties #define RR_PROPERTY_CONNECTOR_TYPE ConnectorType #define RR_PROPERTY_CONNECTOR_NUMBER ConnectorNumber #define RR_PROPERTY_COMPATIBILITY_LIST CompatibilityList commit 83f3f29dd3ac5d3875b5edef5805d6adb6a02698 Author: Matthias Hopf mh...@suse.de Date: Tue Dec 16 18:20:00 2008 +0100 Add standard property name
Processing of x11proto-randr_1.3.0-1_amd64.changes
x11proto-randr_1.3.0-1_amd64.changes uploaded successfully to localhost along with the files: x11proto-randr_1.3.0-1.dsc x11proto-randr_1.3.0.orig.tar.gz x11proto-randr_1.3.0-1.diff.gz x11proto-randr-dev_1.3.0-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
x11proto-randr_1.3.0-1_amd64.changes ACCEPTED
Accepted: x11proto-randr-dev_1.3.0-1_all.deb to pool/main/x/x11proto-randr/x11proto-randr-dev_1.3.0-1_all.deb x11proto-randr_1.3.0-1.diff.gz to pool/main/x/x11proto-randr/x11proto-randr_1.3.0-1.diff.gz x11proto-randr_1.3.0-1.dsc to pool/main/x/x11proto-randr/x11proto-randr_1.3.0-1.dsc x11proto-randr_1.3.0.orig.tar.gz to pool/main/x/x11proto-randr/x11proto-randr_1.3.0.orig.tar.gz Override entries for your package: x11proto-randr-dev_1.3.0-1_all.deb - optional x11 x11proto-randr_1.3.0-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
libxrandr: Changes to 'debian-unstable'
.gitignore |9 ChangeLog | 204 INSTALL | 237 Makefile.am |8 Makefile.in | 725 - README | 25 aclocal.m4 | 8207 --- config.guess| 1526 -- config.h.in | 64 config.sub | 1658 --- configure |21803 configure.ac| 15 debian/changelog| 34 debian/control | 15 debian/copyright| 25 debian/libxrandr2.shlibs|1 debian/libxrandr2.symbols |8 debian/rules| 24 depcomp | 589 - include/X11/extensions/Xrandr.h | 74 install-sh | 519 ltmain.sh | 6964 man/.gitignore |3 man/Makefile.in | 452 missing | 367 mkinstalldirs | 161 src/.gitignore |7 src/Makefile.am |6 src/Makefile.in | 534 src/Xrandr.c| 38 src/Xrandrint.h | 11 src/XrrConfig.c |2 src/XrrCrtc.c | 294 src/XrrMode.c |3 src/XrrOutput.c | 64 src/XrrProperty.c | 18 src/XrrScreen.c | 25 37 files changed, 821 insertions(+), 43898 deletions(-) New commits: commit f31d8d2d189cd6bd11ad6ccc05a354c01b2998b0 Author: Julien Cristau jcris...@debian.org Date: Thu Mar 12 17:12:59 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 32af7bd..6ec72b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libxrandr (2:1.3.0-1) UNRELEASED; urgency=low +libxrandr (2:1.3.0-1) unstable; urgency=low * New upstream release. * Bump randrproto build-dep to 1.3. * Bump shlibs. * Update debian/copyright. - -- Julien Cristau jcris...@debian.org Thu, 12 Mar 2009 16:53:01 +0100 + -- Julien Cristau jcris...@debian.org Thu, 12 Mar 2009 17:12:56 +0100 libxrandr (2:1.2.99.4-2) experimental; urgency=low commit 13f41a61cd8eb673ddcc5c7bb34d4bb717b95de4 Author: Julien Cristau jcris...@debian.org Date: Thu Mar 12 17:08:50 2009 +0100 Update debian/copyright. diff --git a/debian/changelog b/debian/changelog index 65dfcfc..32af7bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libxrandr (2:1.3.0-1) UNRELEASED; urgency=low * New upstream release. * Bump randrproto build-dep to 1.3. * Bump shlibs. + * Update debian/copyright. -- Julien Cristau jcris...@debian.org Thu, 12 Mar 2009 16:53:01 +0100 diff --git a/debian/copyright b/debian/copyright index 80fd1df..cfe695f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,9 @@ This package was downloaded from http://xorg.freedesktop.org/releases/individual/lib/ +Authors: Jim Gettys, HP Labs, HP. + Keith Packard, Intel Corporation. + Copyright © 2000, Compaq Computer Corporation, Copyright © 2002, Hewlett Packard, Inc. @@ -20,3 +23,25 @@ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 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 SOFTWARE. + +Copyright © 2006 Keith Packard +Copyright © 2008 Red Hat, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of the copyright holders not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holders make no representations +about the suitability of this software for any purpose. It is provided as +is without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES 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 SOFTWARE. + commit 939370c6299a29378bc160ac89b097d157b955a9 Author: Julien Cristau jcris...@debian.org Date: Thu Mar 12 16:58:06 2009 +0100 Bump shlibs. Set the shlibs version in the
libxrandr: Changes to 'refs/tags/libxrandr-2_1.3.0-1'
Tag 'libxrandr-2_1.3.0-1' created by Julien Cristau jcris...@debian.org at 2009-03-12 16:13 + Tagging upload of libxrandr 2:1.3.0-1 to unstable. Changes since libxrandr-2_1.2.99.4-2: Alan Coopersmith (1): Add README with pointers to mailing list, bugzilla git repos Julien Cristau (6): Merge tag 'libXrandr-1.3.0' into debian-unstable update changelogs Bump randrproto build-dep to 1.3. Bump shlibs. Update debian/copyright. Prepare changelog for upload Keith Packard (1): Send X_RRGetOutputPrimary when making an X_RRGetOutputPrimary request Matthias Hopf (1): Bump to 1.3.0 Paulo Cesar Pereira de Andrade (1): Janitor: make distcheck, compiler warnings, .gitignore --- .gitignore |9 ChangeLog| 52 ++- Makefile.am |8 +-- README | 25 ++ configure.ac | 15 +++-- debian/changelog |9 debian/control |2 - debian/copyright | 25 ++ debian/libxrandr2.shlibs |1 debian/rules |2 - man/.gitignore |3 -- src/.gitignore |7 -- src/Makefile.am |4 +-- src/Xrandr.c |2 - src/XrrConfig.c |2 - src/XrrCrtc.c| 12 ++ src/XrrMode.c|1 src/XrrOutput.c |6 - src/XrrProperty.c| 16 +++--- src/XrrScreen.c |2 - 20 files changed, 140 insertions(+), 63 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
libxrandr: Changes to 'upstream-unstable'
.gitignore |9 + Makefile.am |8 - README | 25 +++ configure.ac| 15 +- include/X11/extensions/Xrandr.h | 74 +- man/.gitignore |3 src/.gitignore |7 src/Makefile.am |6 src/Xrandr.c| 38 +++-- src/Xrandrint.h | 11 - src/XrrConfig.c |2 src/XrrCrtc.c | 294 +++- src/XrrMode.c |3 src/XrrOutput.c | 64 src/XrrProperty.c | 18 -- src/XrrScreen.c | 25 ++- 16 files changed, 525 insertions(+), 77 deletions(-) New commits: commit e3036766916d55d0c8ae72d5752fd1699ae7390d Author: Matthias Hopf mh...@suse.de Date: Fri Mar 6 15:13:56 2009 +0100 Bump to 1.3.0 diff --git a/configure.ac b/configure.ac index a8a4bfa..a018667 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ dnl try to keep these the same. Note that the library has an extra dnl digit in the version number to track changes which don't affect the dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n dnl -AC_INIT(libXrandr, 1.2.99.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr) +AC_INIT(libXrandr, 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit 6bf8648e7e408be7a869fd4c4527a4fd73fc687d Author: Alan Coopersmith alan.coopersm...@sun.com Date: Mon Feb 2 20:34:36 2009 -0800 Add README with pointers to mailing list, bugzilla git repos Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com diff --git a/README b/README index e69de29..b035b8b 100644 --- a/README +++ b/README @@ -0,0 +1,25 @@ +libXrandr - X Resize, Rotate and Reflection extension library + +All questions regarding this software should be directed at the +Xorg mailing list: + +http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + +https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + +git://anongit.freedesktop.org/git/xorg/lib/libXrandr + +http://cgit.freedesktop.org/xorg/lib/libXrandr + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + +http://wiki.x.org/wiki/GitPage + commit 70d641c6d170cda44856579dfdcb42d3bb1f8221 Author: Keith Packard kei...@keithp.com Date: Fri Jan 30 20:12:43 2009 -0800 Send X_RRGetOutputPrimary when making an X_RRGetOutputPrimary request Using X_RRGetOutputProperty does not yield success here. Signed-off-by: Keith Packard kei...@keithp.com diff --git a/src/XrrOutput.c b/src/XrrOutput.c index 0c39a31..18863bd 100644 --- a/src/XrrOutput.c +++ b/src/XrrOutput.c @@ -176,7 +176,7 @@ XRRGetOutputPrimary(Display *dpy, Window window) LockDisplay(dpy); GetReq (RRGetOutputPrimary, req); req-reqType = info-codes-major_opcode; -req-randrReqType = X_RRGetOutputProperty; +req-randrReqType = X_RRGetOutputPrimary; req-window= window; if (!_XReply (dpy, (xReply *) rep, 0, xFalse)) commit bf284b043d4c5688da2207647126b095f8c2b0cd Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br Date: Fri Jan 30 16:38:03 2009 -0200 Janitor: make distcheck, compiler warnings, .gitignore Warning corrections are either unused symbols or using an integer as a pointer (generated by sparse). diff --git a/.gitignore b/.gitignore index a8f6f22..dceb0f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -19,3 +21,10 @@ mkinstalldirs stamp-h1 xrandr.pc *~ +*.3 +*.o +*.la +*.lo +libXrandr-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index bef1d41..9dc4b53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,19 +21,15 @@ SUBDIRS = src man -AM_CFLAGS = $(RANDR_CFLAGS) $(X_CFLAGS) - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xrandr.pc -EXTRA_DIST = xrandr.pc.in autogen.sh - -EXTRA_DIST += ChangeLog +EXTRA_DIST = xrandr.pc.in ChangeLog MAINTAINERCLEANFILES = 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 d086cde..a8a4bfa 100644 --- a/configure.ac +++ b/configure.ac @@ -35,29 +35,30 @@ AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require
Processing of libxrandr_1.3.0-1_amd64.changes
libxrandr_1.3.0-1_amd64.changes uploaded successfully to localhost along with the files: libxrandr_1.3.0-1.dsc libxrandr_1.3.0.orig.tar.gz libxrandr_1.3.0-1.diff.gz libxrandr2_1.3.0-1_amd64.deb libxrandr2-dbg_1.3.0-1_amd64.deb libxrandr-dev_1.3.0-1_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
libxrandr_1.3.0-1_amd64.changes ACCEPTED
Accepted: libxrandr-dev_1.3.0-1_amd64.deb to pool/main/libx/libxrandr/libxrandr-dev_1.3.0-1_amd64.deb libxrandr2-dbg_1.3.0-1_amd64.deb to pool/main/libx/libxrandr/libxrandr2-dbg_1.3.0-1_amd64.deb libxrandr2_1.3.0-1_amd64.deb to pool/main/libx/libxrandr/libxrandr2_1.3.0-1_amd64.deb libxrandr_1.3.0-1.diff.gz to pool/main/libx/libxrandr/libxrandr_1.3.0-1.diff.gz libxrandr_1.3.0-1.dsc to pool/main/libx/libxrandr/libxrandr_1.3.0-1.dsc libxrandr_1.3.0.orig.tar.gz to pool/main/libx/libxrandr/libxrandr_1.3.0.orig.tar.gz Override entries for your package: libxrandr-dev_1.3.0-1_amd64.deb - optional libdevel libxrandr2-dbg_1.3.0-1_amd64.deb - extra libdevel libxrandr2_1.3.0-1_amd64.deb - optional libs libxrandr_1.3.0-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
xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py |6 -- debian/changelog |6 +- 2 files changed, 9 insertions(+), 3 deletions(-) New commits: commit a5db85b1f915443dee7112d4c8e74a873d69a30a Author: Bryce Harrington br...@bryceharrington.org Date: Thu Mar 12 10:44:48 2009 -0700 Patch from Tormod to call grep fglrx directly instead of shelling out. diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index 2266746..73e79ba 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -98,8 +98,10 @@ def add_info(report): pass try: -script = subprocess.Popen(['sh', '-c', 'grep fglrx /var/log/kern.log'], stdout=subprocess.PIPE) -report['fglrx-loaded'] = script.communicate()[0] +script = subprocess.Popen(['grep', 'fglrx', '/var/log/kern.log', '/proc/modules'], stdout=subprocess.PIPE) +matches = script.communicate()[0] +if (matches): +report['fglrx-loaded'] = matches except OSError: pass diff --git a/debian/changelog b/debian/changelog index c8f1cca..975baf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ xorg (1:7.4~5ubuntu16) UNRELEASED; urgency=low + [Tormod Volden] + * apport/source_xorg.py: Use grep directly instead of shelling out + + [Bryce Harrington] * x11-common.links: Add apport support for a several more packages. * local/Xsession.d/60x11-localhost: Also redirect stderr in an sh-safe fashion - -- Bryce Harrington br...@ubuntu.com Wed, 11 Mar 2009 09:43:37 -0700 + -- Bryce Harrington br...@ubuntu.com Thu, 12 Mar 2009 10:43:30 -0700 xorg (1:7.4~5ubuntu15) jaunty; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Processed: Re: [Pkg-xfce-devel] Bug#519198: xfce4-terminal: Window title bar and borders are present, but invisible
Processing commands for cont...@bugs.debian.org: reassign 519198 xserver-xorg-video-neomagic Bug#519198: xfce4-terminal: Window title bar and borders are present, but invisible Bug reassigned from package `xfce4-terminal' to `xserver-xorg-video-neomagic'. merge 519198 509030 Bug#509030: xfce4-terminal: Window decoration are not drawn even when enabled Bug#519198: xfce4-terminal: Window title bar and borders are present, but invisible Merged 509030 519198. thanks 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#517861: marked as done (openoffice.org: fails to start if SCIM is active)
Your message dated Thu, 12 Mar 2009 22:23:58 +0100 with message-id 20090312212357.ga5...@localhost.localdomain and subject line Re: Bug#517861: openoffice.org: fails to start if SCIM is active has caused the Debian Bug report #517861, regarding openoffice.org: fails to start if SCIM is active 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.) -- 517861: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=517861 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ---BeginMessage--- Package: openoffice.org Version: 1:3.0.1-4 Severity: important OO.o applications (oowriter, ooimpress) do not start if scim input method is used. When it is active, only splashscreen appears. Then progress bar stays at zero. ps gives: eugen31281 0.0 0.0 3884 564 pts/5S+ 16:58 0:00 /bin/sh /usr/bin/oowriter eugen31282 0.0 0.0 3884 608 pts/5S+ 16:58 0:00 /bin/sh /usr/lib/openoffice/program/soffice -writer eugen31292 0.0 0.1 137476 2752 pts/5Sl+ 16:58 0:00 /usr/lib/openoffice/program/oosplash.bin -writer eugen31294 0.3 0.6 315584 14184 pts/5S+ 16:58 0:00 /usr/lib/openoffice/program/soffice.bin -writer -splash-pipe=6 According to top, those processes do nothing. If i unset environment variable XMODIFIERS, applications start correctly. XMODIFIERS was set to @im=SCIM There are no problems with other apps, so I think this is bug in OO.o and not in scim. Also IIRC previous versions (2.x) of OO.o worked fine with scim. SCIM information: -- Package-specific info: Related packages: ii libscim8c2a 1.4.7-3 library for SCIM platform ii scim 1.4.7-3 smart common input method platform ii scim-anthy1.2.4-1.1 SCIM IMEngine module for Anthy ii scim-bridge-agent 0.4.14-2 IME server of scim-bridge communicate with SCIM ii scim-bridge-client-gtk0.4.14-2 IME server of scim-bridge communicate with SCIM ii scim-bridge-client-qt 0.4.14-2 IME server of scim-bridge communicate with SCIM ii scim-bridge-client-qt40.4.14-2 IME server of scim-bridge communicate with SCIM ii scim-chewing 0.3.3-1 Chewing IM engine module for SCIM ii scim-gtk2-immodule1.4.7-3 GTK+2 input method module with SCIM as backend ii scim-modules-socket 1.4.7-3 socket modules for SCIM platform ii scim-modules-table0.5.8-1 generic tables IM engine module for SCIM platform ii scim-pinyin 0.5.91-1 smart pinyin IM engine for SCIM platform ii scim-qtimm0.9.4-4 SCIM context plugin for qt-immodule ii scim-tables-ja0.5.8-1 Japanese input method data tables for SCIM platform ii scim-tables-zh0.5.8-1 Chinese input method data tables for SCIM platform Related environment variables: $xmodifie...@im=scim $GTK_IM_MODULE=scim-bridge $QT_IM_MODULE=scim-bridge -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.29-rc5 (SMP w/2 CPU cores; PREEMPT) Locale: LANG=uk_UA.UTF-8, LC_CTYPE=uk_UA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages openoffice.org depends on: pn liblucene2-java none (no description available) pn openoffice.org-base none (no description available) ii openoffice.org-calc 1:3.0.1-4 OpenOffice.org office suite - spre ii openoffice.org-core 1:3.0.1-4 OpenOffice.org office suite archit ii openoffice.org-draw 1:3.0.1-4 OpenOffice.org office suite - draw ii openoffice.org-filter-mobiled 1:3.0.1-4 Mobile Devices Filters for OpenOff ii openoffice.org-impress1:3.0.1-4 OpenOffice.org office suite - pres ii openoffice.org-java-common1:3.0.1-4 OpenOffice.org office suite Java s ii openoffice.org-math 1:3.0.1-4 OpenOffice.org office suite - equa pn openoffice.org-officebean none (no description available) pn openoffice.org-report-builder none (no description available) ii openoffice.org-writer 1:3.0.1-4 OpenOffice.org office suite - word ii openoffice.org-writer2latex 0.5.0.2-2 Writer/Calc
Bug#511063: marked as done (openoffice.org: does not start with XMODIFIERS=@im=nabi)
Your message dated Thu, 12 Mar 2009 22:23:58 +0100 with message-id 20090312212357.ga5...@localhost.localdomain and subject line Re: Bug#517861: openoffice.org: fails to start if SCIM is active has caused the Debian Bug report #517861, regarding openoffice.org: does not start with XMODIFIERS=@im=nabi 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.) -- 517861: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=517861 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ---BeginMessage--- Package: openoffice.org Version: 1:3.0.1~rc1-2 Severity: important Whenever I tried to run whatever program included in OpenOffice, it won't launch ever. No splash pops up, and no disk activity. I have installed packages from experimental. strace /usr/lib/openoffice/program/soffice: lots of texts futex(0xa746a0, FUTEX_WAIT_PRIVATE, 2, NULL) - freezes at here -- System Information: Debian Release: 5.0 APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores) Locale: LANG=ko_KR.UTF-8, LC_CTYPE=ko_KR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash p...@saebyuk:~/dev/kde/l10n-kde4-trunk/ko$ ---End Message--- ---BeginMessage--- Version: 2:1.2.1-1 This bug does not happen after upgrade of libxi6. Probably fixed. 2 березня 2009 о 17:47 +0100 Rene Engelhard написав(-ла): reassign 517861 libxi6 forcemerge 511063 517861 thanks Hi, Євгеній Мещеряков wrote: OO.o applications (oowriter, ooimpress) do not start if scim input method is used. When it is active, only splashscreen appears. Then progress bar stays at zero. ps gives: eugen31281 0.0 0.0 3884 564 pts/5S+ 16:58 0:00 /bin/sh /usr/bin/oowriter eugen31282 0.0 0.0 3884 608 pts/5S+ 16:58 0:00 /bin/sh /usr/lib/openoffice/program/soffice -writer eugen31292 0.0 0.1 137476 2752 pts/5Sl+ 16:58 0:00 /usr/lib/openoffice/program/oosplash.bin -writer eugen31294 0.3 0.6 315584 14184 pts/5S+ 16:58 0:00 /usr/lib/openoffice/program/soffice.bin -writer -splash-pipe=6 According to top, those processes do nothing. If i unset environment variable XMODIFIERS, applications start correctly. XMODIFIERS was set to @im=SCIM There are no problems with other apps, so I think this is bug in OO.o and not in scim. Also IIRC previous versions (2.x) of OO.o worked fine with scim. This sounds suspiciously like http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511063 Merging. (OTOH, the FUTEX_WAIT_PRIVATE in #511063 looks like 516478, but unfortunately the submitter of 511063 never answered to my question). What do you have for versions of libxi6 and/or libx11-6 installed? Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 signature.asc Description: Digital signature ---End Message---
xorg: Changes to 'ubuntu'
debian/changelog |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit fce5c10a4a68f0f35660b46102b18d2b3b1d3caf Author: Bryce Harrington br...@bryceharrington.org Date: Thu Mar 12 16:23:27 2009 -0700 Elaborating changelog diff --git a/debian/changelog b/debian/changelog index 975baf4..0ef1c26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,16 @@ xorg (1:7.4~5ubuntu16) UNRELEASED; urgency=low [Tormod Volden] - * apport/source_xorg.py: Use grep directly instead of shelling out + * apport/source_xorg.py: Use grep directly instead of shelling out, and +look in /proc/modules as well. Also only set 'fglrx-installed' if +there was a definite match. [Bryce Harrington] * x11-common.links: Add apport support for a several more packages. * local/Xsession.d/60x11-localhost: Also redirect stderr in an sh-safe fashion - -- Bryce Harrington br...@ubuntu.com Thu, 12 Mar 2009 10:43:30 -0700 + -- Bryce Harrington br...@ubuntu.com Thu, 12 Mar 2009 16:21:48 -0700 xorg (1:7.4~5ubuntu15) jaunty; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519474: libx11-data: somehow upgrade causes xterm not to start in UTF-8 mode
Package: libx11-data Version: 2:1.2-1 Severity: normal With version 2:1.1.5-2, xterm starts normally in UTF-8 mode. After upgrade to the present version, xterm starts in non-UTF-8 mode and I have to manually select the UTF-8 mode in the xterm menus. Downgrading back to 2:1.1.5-2 fixes the problem. -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.28.7-ibid-1 (SMP w/2 CPU cores; PREEMPT) Locale: LANG=fi_FI.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash -- no debconf information -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519198: [Pkg-xfce-devel] Bug#519198: xfce4-terminal: Window title bar and borders are present, but invisible
Yves-Alexis Perez wrote: Ok so compositing is enabled in Xorg. I seem to recall there was problem with neomagic driver. Could you try: 1) to remove compositing in xorg: Section Extensions Option Composite Enable EndSection 2) to use vesa driver instead of neomagic Do both things independently, and retry back. Cheers, I assume you meant Option Composite Disable That worked, ok, with the bit depth set to 16. I tried the vesa driver both with and without Composite Disable, which was OK, except that the right hand edge of the display appeared to be corrupted across the last 5/10 pixels. It also locked up my machine when the X server was closing down. Hard reboot! So is this the xfce4-terminal not playing with the Compositor, or a bug in the Compositor/X11 neomagic driver? network_noadle -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519451: /usr/bin/xmessage: fails when button do not fit on screen in a single line
Package: x11-utils Version: 7.3+2+nmu1 Severity: normal File: /usr/bin/xmessage Some scripts use xmessage as choice represented by the buttons. When there are too many options to choose from the buttons fall off the screen at the right. xmessage should wrap buttons into multiple lines when they do not fit. Thanks Michal -- System Information: Debian Release: 5.0 APT prefers stable APT policy: (900, 'stable'), (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.28-macmini (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages x11-utils depends on: ii cpp4:4.3.2-2 The GNU C preprocessor (cpp) ii libc6 2.9-4 GNU C Library: Shared libraries ii libfontconfig1 2.6.0-3 generic font configuration library ii libfontenc11:1.0.4-3 X11 font encoding library ii libfreetype6 2.3.7-2 FreeType 2 font engine, shared lib ii libgl1-mesa-glx [libgl 7.0.3-7 A free implementation of the OpenG ii libice62:1.0.4-1 X11 Inter-Client Exchange library ii libsm6 2:1.0.3-2 X11 Session Management library ii libx11-6 2:1.1.5-2 X11 client-side library ii libxaw72:1.0.4-2 X11 Athena Widget library ii libxext6 2:1.0.4-1 X11 miscellaneous extension librar ii libxft22.1.12-3 FreeType-based font drawing librar ii libxi6 2:1.1.4-1 X11 Input extension library ii libxinerama1 2:1.0.3-2 X11 Xinerama extension library ii libxmu62:1.0.4-1 X11 miscellaneous utility library ii libxmuu1 2:1.0.4-1 X11 miscellaneous micro-utility li ii libxrender11:0.9.4-2 X Rendering Extension client libra ii libxt6 1:1.0.5-3 X11 toolkit intrinsics library ii libxtst6 2:1.0.3-1 X11 Testing -- Resource extension ii libxv1 2:1.0.4-1 X11 Video extension library ii libxxf86dga1 2:1.0.2-1 X11 Direct Graphics Access extensi ii libxxf86vm11:1.0.2-1 X11 XFree86 video mode extension l ii x11-common 1:7.3+18 X Window System (X.Org) infrastruc ii zlib1g 1:1.2.3.3.dfsg-12 compression library - runtime x11-utils recommends no packages. Versions of packages x11-utils suggests: ii mesa-utils7.0.3-7Miscellaneous Mesa GL utilities -- no debconf information -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519490: FTBFS: compiler parser error
Package: mesa Version: 7.0.3-7 Severity: serious Justification: fails to build From my pbuilder build log: make[6]: Entering directory `/tmp/buildd/mesa-7.0.3/obj-x86_64-linux-gnu/debian-dri-amd64/src/mesa/drivers/dri/i965' gcc -c -I. -I../../../../../src/mesa/drivers/dri/common -Iserver -I../../../../../include -I../../../../../include/GL/internal -I../../../../../src/mesa -I../../../../../src/mesa/main -I../../../../../src/mesa/glapi -I../../../../../src/mesa/math -I../../../../../src/mesa/shader -I../../../../../src/mesa/swrast -I../../../../../src/mesa/swrast_setup -I../../../../../src/egl/main -I../../../../../src/egl/drivers/dri `pkg-config --cflags libdrm` -Wall -Wmissing-prototypes -std=c99 -ffast-math -O2 -g -fPIC -m64 -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN -DUSE_X86_64_ASM -fno-strict-aliasing -I../intel bufmgr_fake.c -o bufmgr_fake.o In file included from intel_screen.h:34, from intel_context.h:37, from bufmgr.h:31, from bufmgr_fake.c:36: server/i830_common.h:229: error: expected ':', ',', ';', '}' or '__attribute__' before '*' token make[6]: *** [bufmgr_fake.o] Error 1 make[6]: Leaving directory `/tmp/buildd/mesa-7.0.3/obj-x86_64-linux-gnu/debian-dri-amd64/src/mesa/drivers/dri/i965' make[5]: *** [subdirs] Error 1 make[5]: Leaving directory `/tmp/buildd/mesa-7.0.3/obj-x86_64-linux-gnu/debian-dri-amd64/src/mesa/drivers/dri' make[4]: *** [linux-solo] Error 2 make[4]: Leaving directory `/tmp/buildd/mesa-7.0.3/obj-x86_64-linux-gnu/debian-dri-amd64/src/mesa' make[3]: *** [default] Error 2 make[3]: Leaving directory `/tmp/buildd/mesa-7.0.3/obj-x86_64-linux-gnu/debian-dri-amd64/src/mesa' make[2]: *** [subdirs] Error 1 make[2]: Leaving directory `/tmp/buildd/mesa-7.0.3/obj-x86_64-linux-gnu/debian-dri-amd64/src' make[1]: *** [default] Error 1 make[1]: Leaving directory `/tmp/buildd/mesa-7.0.3/obj-x86_64-linux-gnu/debian-dri-amd64' make: *** [debian/stamp/x86_64-linux-gnu-build-debian-dri-amd64] Error 2 dpkg-buildpackage: failure: debian/rules build gave error exit status 2 -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.28-1-amd64 (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 -- Daniel Schepler -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519210: xserver-xorg: doesnt read EDID from monitors
Hi Julien, please ignore this message I am testing something with Don maybe I will get in some minutes an undesired reply. -- Linux-User #280138 with the Linux Counter, http://counter.li.org/ # Debian GNU/Linux Consultant # Michelle Konzack Apt. 917 ICQ #328449886 +49/177/935194750, rue de Soultz MSN LinuxMichi +33/6/61925193 67100 Strasbourg/France IRC #Debian (irc.icq.com) signature.pgp Description: Digital signature
mesa: Changes to 'ubuntu'
debian/changelog |7 +++
debian/patches/103_rs600_support.patch | 65 +
debian/patches/series |1
3 files changed, 73 insertions(+)
New commits:
commit a101fb7f514143f40e52db52e5947d6ddafadf3b
Author: Bryce Harrington br...@bryceharrington.org
Date: Thu Mar 12 19:11:59 2009 -0700
Add RS600 support
diff --git a/debian/changelog b/debian/changelog
index 839c4f7..7971869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.3-1ubuntu3) jaunty; urgency=low
+
+ * Add 103_rs600_support.patch: Adds support for the RS600 chip and sets
+the number of gb pipes properly for r3xx/r5xx cards.
+
+ -- Bryce Harrington br...@ubuntu.com Tue, 03 Mar 2009 00:26:59 -0800
+
mesa (7.3-1ubuntu2) jaunty; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/103_rs600_support.patch
b/debian/patches/103_rs600_support.patch
new file mode 100644
index 000..a208066
--- /dev/null
+++ b/debian/patches/103_rs600_support.patch
@@ -0,0 +1,65 @@
+From 69f080cefced8b3395cdf179c107303a1013d196 Mon Sep 17 00:00:00 2001
+From: Alex Deucher alexdeuc...@gmail.com
+Date: Wed, 25 Feb 2009 22:30:56 +
+Subject: R300: Add support for RS600 chips
+
+---
+diff --git a/src/mesa/drivers/dri/radeon/radeon_chipset.h
b/src/mesa/drivers/dri/radeon/radeon_chipset.h
+index 55a73ea..f6bd1eb 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_chipset.h
b/src/mesa/drivers/dri/radeon/radeon_chipset.h
+@@ -247,6 +247,9 @@
+ #define PCI_CHIP_RS350_7835 0x7835
+ #define PCI_CHIP_RS690_791E 0x791E
+ #define PCI_CHIP_RS690_791F 0x791F
++#define PCI_CHIP_RS600_793F 0x793F
++#define PCI_CHIP_RS600_7941 0x7941
++#define PCI_CHIP_RS600_7942 0x7942
+ #define PCI_CHIP_RS740_796C 0x796C
+ #define PCI_CHIP_RS740_796D 0x796D
+ #define PCI_CHIP_RS740_796E 0x796E
+@@ -270,6 +273,7 @@ enum {
+CHIP_FAMILY_R420,
+CHIP_FAMILY_RV410,
+CHIP_FAMILY_RS400,
++ CHIP_FAMILY_RS600,
+CHIP_FAMILY_RS690,
+CHIP_FAMILY_RS740,
+CHIP_FAMILY_RV515,
+diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c
b/src/mesa/drivers/dri/radeon/radeon_screen.c
+index 56c22fa..f7cba50 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
b/src/mesa/drivers/dri/radeon/radeon_screen.c
+@@ -685,6 +685,12 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+ screen-chip_family = CHIP_FAMILY_RS400;
+ break;
+
++ case PCI_CHIP_RS600_793F:
++ case PCI_CHIP_RS600_7941:
++ case PCI_CHIP_RS600_7942:
++ screen-chip_family = CHIP_FAMILY_RS600;
++ break;
++
+case PCI_CHIP_RS690_791E:
+case PCI_CHIP_RS690_791F:
+ screen-chip_family = CHIP_FAMILY_RS690;
+@@ -843,7 +849,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+ret = radeonGetParam( sPriv-fd, RADEON_PARAM_FB_LOCATION,
+ temp);
+if (ret) {
+- if (screen-chip_family CHIP_FAMILY_RS690)
++ if (screen-chip_family CHIP_FAMILY_RS600)
+ screen-fbLocation = ( INREG( RADEON_MC_FB_LOCATION ) 0x)
16;
+else {
+FREE( screen );
+@@ -854,7 +860,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+screen-fbLocation = (temp 0x) 16;
+}
+
+- if (screen-chip_family = CHIP_FAMILY_RV515) {
++ if (screen-chip_family = CHIP_FAMILY_R300) {
+ret = radeonGetParam( sPriv-fd, RADEON_PARAM_NUM_GB_PIPES,
+temp);
+if (ret) {
+--
+cgit v0.8.2
diff --git a/debian/patches/series b/debian/patches/series
index 7543d4c..40f7d3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
04_osmesa_version.diff
101_ubuntu_hidden_glname.patch
102_dont_vblank.diff
+103_rs600_support.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
mesa: Changes to 'ubuntu'
debian/changelog |9
debian/patches/110_fix_intel_965_atunnel_rendering_glitch.diff | 204
++
debian/patches/series |1
3 files changed, 214 insertions(+)
New commits:
commit 41730903cb66f975dd2332bc45ee665cf4872c8d
Author: Bryce Harrington br...@bryceharrington.org
Date: Thu Mar 12 19:26:05 2009 -0700
Patch from mnemo for atunnel screensaver
diff --git a/debian/changelog b/debian/changelog
index 7971869..bcecb10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.3-1ubuntu4) jaunty; urgency=low
+
+ * debian/patches/110_fix_intel_965_atunnel_rendering_glitch.diff: fix
rendering defects
+in atunnel screensaver (from rss-glx package). Patch originally comes from
+upstream mesa master at cgit.freedesktop.org (26th Feb by Haihao Xiang
+as commit 68915fd6fac44dd80298e3afb0669e8754aa). (LP: #330476)
+
+ -- Martin Olsson mar...@minimum.se Mon, 02 Mar 2009 13:30:47 +0100
+
mesa (7.3-1ubuntu3) jaunty; urgency=low
* Add 103_rs600_support.patch: Adds support for the RS600 chip and sets
diff --git a/debian/patches/110_fix_intel_965_atunnel_rendering_glitch.diff
b/debian/patches/110_fix_intel_965_atunnel_rendering_glitch.diff
new file mode 100644
index 000..7cf590c
--- /dev/null
+++ b/debian/patches/110_fix_intel_965_atunnel_rendering_glitch.diff
@@ -0,0 +1,204 @@
+Index: mesa-7.3/src/mesa/drivers/dri/i965/brw_clip_line.c
+===
+--- mesa-7.3.orig/src/mesa/drivers/dri/i965/brw_clip_line.c2009-03-02
13:29:37.0 +0100
mesa-7.3/src/mesa/drivers/dri/i965/brw_clip_line.c 2009-03-02
13:30:22.0 +0100
+@@ -181,34 +181,54 @@
+brw_DP4(p, vec4(c-reg.dp1), deref_4f(vtx1,
c-offset[VERT_RESULT_HPOS]), c-reg.plane_equation);
+is_negative = brw_IF(p, BRW_EXECUTE_1);
+{
+- brw_ADD(p, c-reg.t, c-reg.dp1, negate(c-reg.dp0));
+- brw_math_invert(p, c-reg.t, c-reg.t);
+- brw_MUL(p, c-reg.t, c-reg.t, c-reg.dp1);
+-
+- brw_CMP(p, vec1(brw_null_reg()), BRW_CONDITIONAL_G, c-reg.t,
c-reg.t1 );
+- brw_MOV(p, c-reg.t1, c-reg.t);
+- brw_set_predicate_control(p, BRW_PREDICATE_NONE);
++ /*
++ * Both can be negative on GM965/G965 due to RHW workaround
++ * if so, this object should be rejected.
++ */
++ if (!BRW_IS_G4X(p-brw)) {
++ brw_CMP(p, vec1(brw_null_reg()), BRW_CONDITIONAL_LE,
c-reg.dp0, brw_imm_f(0.0));
++ is_neg2 = brw_IF(p, BRW_EXECUTE_1);
++ {
++ brw_clip_kill_thread(c);
++ }
++ brw_ENDIF(p, is_neg2);
++ }
++
++ brw_ADD(p, c-reg.t, c-reg.dp1, negate(c-reg.dp0));
++ brw_math_invert(p, c-reg.t, c-reg.t);
++ brw_MUL(p, c-reg.t, c-reg.t, c-reg.dp1);
++
++ brw_CMP(p, vec1(brw_null_reg()), BRW_CONDITIONAL_G, c-reg.t,
c-reg.t1 );
++ brw_MOV(p, c-reg.t1, c-reg.t);
++ brw_set_predicate_control(p, BRW_PREDICATE_NONE);
+}
+is_negative = brw_ELSE(p, is_negative);
+{
+- /* Coming back in. We know that both cannot be negative
+- * because the line would have been culled in that case.
+- */
+-
+- /* If both are positive, do nothing */
+- brw_CMP(p, vec1(brw_null_reg()), BRW_CONDITIONAL_L, c-reg.dp0,
brw_imm_f(0.0));
+- is_neg2 = brw_IF(p, BRW_EXECUTE_1);
++ /* Coming back in. We know that both cannot be negative
++ * because the line would have been culled in that case.
++ */
++
++ /* If both are positive, do nothing */
++ /* Only on GM965/G965 */
++ if (!BRW_IS_G4X(p-brw)) {
++ brw_CMP(p, vec1(brw_null_reg()), BRW_CONDITIONAL_L,
c-reg.dp0, brw_imm_f(0.0));
++ is_neg2 = brw_IF(p, BRW_EXECUTE_1);
++ }
++
+ {
+- brw_ADD(p, c-reg.t, c-reg.dp0, negate(c-reg.dp1));
+- brw_math_invert(p, c-reg.t, c-reg.t);
+- brw_MUL(p, c-reg.t, c-reg.t, c-reg.dp0);
+-
+- brw_CMP(p, vec1(brw_null_reg()), BRW_CONDITIONAL_G, c-reg.t,
c-reg.t0 );
+- brw_MOV(p, c-reg.t0, c-reg.t);
+- brw_set_predicate_control(p, BRW_PREDICATE_NONE);
+- }
+- brw_ENDIF(p, is_neg2);
+- }
++ brw_ADD(p, c-reg.t, c-reg.dp0, negate(c-reg.dp1));
++ brw_math_invert(p, c-reg.t, c-reg.t);
++ brw_MUL(p, c-reg.t, c-reg.t, c-reg.dp0);
++
++ brw_CMP(p, vec1(brw_null_reg()), BRW_CONDITIONAL_G,
c-reg.t, c-reg.t0 );
++ brw_MOV(p, c-reg.t0, c-reg.t);
++ brw_set_predicate_control(p, BRW_PREDICATE_NONE);
++ }
