ubuntu xorg patches
Hi I've split the xorg ubuntu diff as patches: http://users.tkk.fi/~tjaalton/xorg72/patches note that they were mostly cut'n'pasted from the debdiff, so they don't necessarily apply as-is, but you get the idea.. Hopefully you'll find many of them useful :) t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xorg-server: Changes to 'refs/tags/xorg-server-2_1.1.1-20'
Tag 'xorg-server-2_1.1.1-20' created by Julien Cristau [EMAIL PROTECTED] at 2007-03-07 14:16 + Tagging upload of xorg-server 2:1.1.1-20 to unstable. Changes since xorg-server-2_1.1.1-19: Julien Cristau: kdrive/ephyr: free screen struct --- debian/changelog|7 + debian/patches/44_kdrive-ephyr-free-screen-struct.patch | 22 debian/patches/series |1 3 files changed, 30 insertions(+) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Processing of xorg-server_1.1.1-20_i386.changes
xorg-server_1.1.1-20_i386.changes uploaded successfully to localhost along with the files: xorg-server_1.1.1-20.dsc xorg-server_1.1.1-20.diff.gz xserver-xorg-core_1.1.1-20_i386.deb xserver-xorg-dev_1.1.1-20_i386.deb xdmx_1.1.1-20_i386.deb xdmx-tools_1.1.1-20_i386.deb xnest_1.1.1-20_i386.deb xvfb_1.1.1-20_i386.deb xserver-xephyr_1.1.1-20_i386.deb Greetings, Your Debian queue daemon -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xorg-server_1.1.1-20_i386.changes ACCEPTED
Accepted: xdmx-tools_1.1.1-20_i386.deb to pool/main/x/xorg-server/xdmx-tools_1.1.1-20_i386.deb xdmx_1.1.1-20_i386.deb to pool/main/x/xorg-server/xdmx_1.1.1-20_i386.deb xnest_1.1.1-20_i386.deb to pool/main/x/xorg-server/xnest_1.1.1-20_i386.deb xorg-server_1.1.1-20.diff.gz to pool/main/x/xorg-server/xorg-server_1.1.1-20.diff.gz xorg-server_1.1.1-20.dsc to pool/main/x/xorg-server/xorg-server_1.1.1-20.dsc xserver-xephyr_1.1.1-20_i386.deb to pool/main/x/xorg-server/xserver-xephyr_1.1.1-20_i386.deb xserver-xorg-core_1.1.1-20_i386.deb to pool/main/x/xorg-server/xserver-xorg-core_1.1.1-20_i386.deb xserver-xorg-dev_1.1.1-20_i386.deb to pool/main/x/xorg-server/xserver-xorg-dev_1.1.1-20_i386.deb xvfb_1.1.1-20_i386.deb to pool/main/x/xorg-server/xvfb_1.1.1-20_i386.deb Override entries for your package: xdmx-tools_1.1.1-20_i386.deb - optional x11 xdmx_1.1.1-20_i386.deb - optional x11 xnest_1.1.1-20_i386.deb - optional x11 xorg-server_1.1.1-20.dsc - source x11 xserver-xephyr_1.1.1-20_i386.deb - optional x11 xserver-xorg-core_1.1.1-20_i386.deb - optional x11 xserver-xorg-dev_1.1.1-20_i386.deb - optional x11 xvfb_1.1.1-20_i386.deb - optional x11 Announcing to debian-devel-changes@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#354713: xdm: sometimes hangs in malloc's futex
* Brice Goglin [EMAIL PROTECTED] [070301 21:28]: About a year ago, you reported a bug to the Debian BTS regarding xdm hanging in malloc's futex. Did you reproduce this problem recently? With Xorg/Etch? If not, I will close this bug in the next weeks. Until the computer having this problem got new hardware I had that problem. I'll try to take a look at the Xorg sources later if they still have the problematic part (I'm guessing a signal a malloc of a connect to X and the signal doing a longjump out) and if I can somehow force the timing without hardware triggering that so directly any more. Though I guess I most likely won't have the time before the end of the month. Hochachtungsvoll, Bernhard R. Link -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xbase-clients: Changes to 'debian-experimental'
debian/changelog |4 +++- debian/control |2 +- 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 18:00:22 2007 +0100 Build-depend on libxinerama-dev xdpyinfo needs to be built against libxinerama to support the corresponding extension. diff --git a/debian/changelog b/debian/changelog index 34dbfe6..c96a123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ xbase-clients (1:7.2.ds2-2) UNRELEASED; urgency=low * Autoreconf with patches applied. + * Add build-dep on libxinerama-dev, so xdpyinfo is built with support for +the xinerama extension. - -- Julien Cristau [EMAIL PROTECTED] Tue, 20 Feb 2007 08:27:34 +0100 + -- Julien Cristau [EMAIL PROTECTED] Wed, 7 Mar 2007 17:58:16 +0100 xbase-clients (1:7.2.ds2-1) experimental; urgency=low diff --git a/debian/control b/debian/control index c789a50..43af4c0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Julien Cristau [EMAIL PROTECTED] -Build-Depends: debhelper (= 5.0.0), pkg-config, libfs-dev (= 2:1.0.0-1), libpng12-dev, libx11-dev (= 2:1.0.0-1), libxaw7-dev (= 1:1.0.1-1), libxcursor-dev (= 1.1.5.2-1), libxext-dev (= 1:1.0.0-1), libxft-dev (= 2.1.8.2-6), libxi-dev (= 1:1.0.0-3), libxkbfile-dev (= 1:1.0.1-1), libxmuu-dev (= 1:1.0.1-1), libxrandr-dev (= 2:1.2.0-1), libxrender-dev (= 1:0.9.0.2-2), libxss-dev (= 1:1.0.1-1), libxt-dev (= 1:1.0.0-1), libxtrap-dev (= 1:1.0.0-1), libxtst-dev (= 1:1.0.1-1), libxxf86dga-dev (= 1:1.0.1-1), libxv-dev (= 1:1.0.1-1), libxxf86vm-dev (= 1:1.0.0-1), x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt, openssh-client | ssh, x11proto-input-dev (= 1.4) +Build-Depends: debhelper (= 5.0.0), pkg-config, libfs-dev (= 2:1.0.0-1), libpng12-dev, libx11-dev (= 2:1.0.0-1), libxaw7-dev (= 1:1.0.1-1), libxcursor-dev (= 1.1.5.2-1), libxext-dev (= 1:1.0.0-1), libxft-dev (= 2.1.8.2-6), libxi-dev (= 1:1.0.0-3), libxkbfile-dev (= 1:1.0.1-1), libxmuu-dev (= 1:1.0.1-1), libxrandr-dev (= 2:1.2.0-1), libxrender-dev (= 1:0.9.0.2-2), libxss-dev (= 1:1.0.1-1), libxt-dev (= 1:1.0.0-1), libxtrap-dev (= 1:1.0.0-1), libxtst-dev (= 1:1.0.1-1), libxxf86dga-dev (= 1:1.0.1-1), libxv-dev (= 1:1.0.1-1), libxxf86vm-dev (= 1:1.0.0-1), x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt, openssh-client | ssh, x11proto-input-dev (= 1.4), libxinerama-dev (= 1:1.1.0-1) Standards-Version: 3.7.2.0 Package: xbase-clients -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xorg-server: Changes to 'upstream-experimental'
Rebased ref, commits from common ancestor:
commit 3f5cedf00a82f08a433c95ffbb7f8ac69dcf6a50
Author: Keith Packard [EMAIL PROTECTED]
Date: Mon Mar 5 23:49:35 2007 -0800
Allow relative positions to use output names or monitor identifiers.
Previous version used monitor identifiers if present, otherwise output
names. That caused existing working configurations to break when additional
information was added to the configuration file.
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index c38da62..46515fd 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -879,13 +879,17 @@ xf86InitialOutputPositions (ScrnInfoPtr
{
xf86OutputPtr out_rel = config-output[or];
XF86ConfMonitorPtr rel_mon = out_rel-conf_monitor;
- char*name;
if (rel_mon)
- name = rel_mon-mon_identifier;
- else
- name = out_rel-name;
- if (!strcmp (relative_name, name))
+ {
+ if (xf86nameCompare (rel_mon-mon_identifier,
+ relative_name) == 0)
+ {
+ relative = config-output[or];
+ break;
+ }
+ }
+ if (strcmp (out_rel-name, relative_name) == 0)
{
relative = config-output[or];
break;
commit 843077f23a1b49bd712d931421753e3a09d4008c
Author: Keith Packard [EMAIL PROTECTED]
Date: Mon Mar 5 23:36:00 2007 -0800
Use EDID data to set screen physical size at server startup.
Screen physical size is set to a random value before the RandR code gets
control, override that and reset it to a value based on the compat_output
physical size (if available). If that output has no physical size, just use
96dpi as the default resolution and set the physical size as appropriate.
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 1a349ef..4213fea 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -422,8 +422,28 @@ #endif
}
else
{
- mmWidth = pScreen-mmWidth;
- mmHeight = pScreen-mmHeight;
+ xf86OutputPtr output = config-output[config-compat_output];
+ xf86CrtcPtr crtc = output-crtc;
+
+ if (crtc crtc-mode.HDisplay
+ output-mm_width output-mm_height)
+ {
+ /*
+* If the output has a mode and a declared size, use that
+* to scale the screen size
+*/
+ DisplayModePtr mode = crtc-mode;
+ mmWidth = output-mm_width * width / mode-HDisplay;
+ mmHeight = output-mm_height * height / mode-VDisplay;
+ }
+ else
+ {
+ /*
+* Otherwise, just set the screen to 96dpi
+*/
+ mmWidth = width * 25.4 / 96;
+ mmHeight = height * 25.4 / 96;
+ }
}
xf86DrvMsg(pScrn-scrnIndex, X_INFO,
Setting screen physical size to %d x %d\n,
commit bcade98ccaa18298d844a606cb44271f0254c185
Author: Keith Packard [EMAIL PROTECTED]
Date: Mon Mar 5 22:07:01 2007 -0800
Add xf86SetDesiredModes to apply desired modes to crtcs.
xf86SetDesiredModes applies the desired modes to each crtc (as selected by
xf86InitialConfiguration initially and modified by successful mode settings
afterwards). For crtcs without a desired mode, pScrn-currentMode is used to
select something workable.
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 3d28293..c38da62 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1542,6 +1542,63 @@ xf86InitialConfiguration (ScrnInfoPtr sc
return TRUE;
}
+/*
+ * Using the desired mode information in each crtc, set
+ * modes (used in EnterVT functions, or at server startup)
+ */
+
+Bool
+xf86SetDesiredModes (ScrnInfoPtr scrn)
+{
+xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+intc;
+
+for (c = 0; c config-num_crtc; c++)
+{
+ xf86CrtcPtr crtc = config-crtc[c];
+ xf86OutputPtr output = NULL;
+ int o;
+
+ if (config-output[config-compat_output]-crtc == crtc)
+ output = config-output[config-compat_output];
+ else
+ {
+ for (o = 0; o config-num_output; o++)
+ if (config-output[o]-crtc == crtc)
+ {
+ output = config-output[o];
+ break;
+ }
+ }
+ /*
+* Skip disabled crtcs
+*/
+ if (!output)
+
xorg-server: Changes to 'refs/tags/xorg-server-2_1.2.99.901-1'
Tag 'xorg-server-2_1.2.99.901-1' created by Julien Cristau [EMAIL PROTECTED] at 2007-03-07 19:02 + Tagging upload of xorg-server 2:1.2.99.901-1 to experimental. Changes since xorg-server-2_1.2.0-6: Aaron Plattner: Add an RDTSC implementation to the x86 emulator. Return BadMatch if a client tries to clone non-cloneable outputs. Don't crash setting a NULL mode with a randr classic DDX. Also remember to update the screen size during modesets. Add a screen resize hook to xf86CrtcConfigRec. Add a canGrow argument to xf86InitialConfiguration. Adam Jackson: Don't install libi2c.a Alan Coopersmith: Make xf1bpp build correctly with compilers that don't support -include Plug memory leak in doLoadModule() Fix bus error on startup in 64-bit Xephyr Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server Check for __sparc as well as __sparc__ for compatibility with Sun cc Sun bug 6529003: Xorg should not be including sys/immu.h on Solaris Carl Switzky: Add ast driver/device info to Xorg server config utilities Daniel Stone: os: fix client privates leak kdrive/ephyr: free screen struct Dave Airlie: modes: add commit/prepare hooks add a standard connector type and name for us as an output property Drew Parsons: Support for Hurd and other non-linux GNU systems. Xprint: fix font symlinks Eric Anholt: Don't bump the refcnt if the new mode is NULL. Keep track of how many visuals we set up for GLcore, to avoid an invalid free. Track rename of DamagePost - DamageAdd. Don't forget to add the property we configure to the properties list. When changing a non-pending property, call the screen rrOutputSetProperty hook. Account for CRTC rotation in the cursor containment code. Really fix optimized render cases being hit when they shouldn't. Fix the size expectations of xRRSetCrtcGamma. Provide option to report damage after operation is complete. Merge EXA updates up to commit cf5b29d75dad7c74543f49f010c817623a3df747. Set the Damage version supported in the server, instead of using damageproto. Mark sync when UploadToScreen succeeds in exaGlyphs(). Add missing dirty marking in a couple of fallback cases in the exaGlyphs path. George Sapountzis: dmx: drop leftover __GLXdrawablePrivateRec struct. Julien Cristau: Merge remote branch 'upstream/server-1.3-branch' into debian-experimental Update to latest server-1.3-branch. autoreconf Prepare changelog for upload. Keith Packard: Preliminary RandR 1.2 work RandR: New data structure, old API. At least it compiles now Successful legacy RandR API/Protocol emulation for query. Start moving to new randr 1.2 definition Split RandR implementation into separate files. Split out RandR dispatch code from randr.c to rr*dispatch.c. RandR working with old clients and old API. RRGetScreenResources and RRGetOutputInfo are working now. Split out 1.0-style info and new property routines to their own files. Avoid calling xalloc(0). Change rrScreenSizeSet to rrScreenSetSize. When setting output state, leave output unchanged when setting to current. typo RRSetCrtcConfig status fix. RRGetScreenResources timestamp fix. Steal Xinerama code from SiS driver. Add missing files. When no mode is specified, don't validate mode-specific parameters. Add mode origins and output options. Fix memmoves in resource free funcs. Add preferred modes for each output. Round vrefresh. Deliver crtc events. Limit pointer to valid crtc areas. Add event swapping. Fix change tracking. Byte swap RRSelectInput enable flags. Merge master back in and clean up some unfinished code (closes 8745) Move physical size from mode to output. Allow RandR objects to be created before the associated ScreenRec. Add RRInit function to create resource types for RR objects. Remove RandR output options. Reduce calls to RRGetInfo. Add mipmap.c to GL/mesa/main/Makefile to build with mesa master Change RandR property datatype to include pending/valid values. Allocate correct size for RRPropertyRec (oops). Ensure RandR resource types are registered before resources are created. Destroying RandR crtc or output overwrites memory. Merge branch 'server-1.2' into randr-1.2-for-server-1.2 RandR ListOutputProperties has nAtoms element, not nProperties Merge branch 'server-1.2-branch' into randr-1.2-for-server-1.2 RandR mode list needs both output and crtc modes. RandR: config time updates when hardware config changes. RandR 1.0 refresh rates unscrambled. SetScreenConfig uses RRCrtcSet right. RandR 1.2 rotation code must adjust width/height. Merge branch
xorg-server: Changes to 'debian-experimental'
debian/changelog |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 08521838cd542fdf70f182146f7b44bb864fb6a2 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 20:02:53 2007 +0100 Prepare changelog for upload. diff --git a/debian/changelog b/debian/changelog index 6f3fae9..21122a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.2.99.901-1) UNRELEASED; urgency=low +xorg-server (2:1.2.99.901-1) experimental; urgency=low * New upstream release candidate. + Remove patches 24 (hurd support), 35 (randr byteswap) and 43 (set damage @@ -6,7 +6,7 @@ xorg-server (2:1.2.99.901-1) UNRELEASED; + Bump build-dep on x11proto-randr-dev to = 1.2, and on x11proto-damage-dev to = 1.1. - -- Julien Cristau [EMAIL PROTECTED] Wed, 7 Mar 2007 16:04:38 +0100 + -- Julien Cristau [EMAIL PROTECTED] Wed, 7 Mar 2007 19:58:53 +0100 xorg-server (2:1.2.0-6) experimental; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Processing of xorg-server_1.2.99.901-1_i386.changes
xorg-server_1.2.99.901-1_i386.changes uploaded successfully to localhost along with the files: xorg-server_1.2.99.901-1.dsc xorg-server_1.2.99.901.orig.tar.gz xorg-server_1.2.99.901-1.diff.gz xserver-xorg-core_1.2.99.901-1_i386.deb xserver-xorg-dev_1.2.99.901-1_i386.deb xdmx_1.2.99.901-1_i386.deb xdmx-tools_1.2.99.901-1_i386.deb xnest_1.2.99.901-1_i386.deb xvfb_1.2.99.901-1_i386.deb xserver-xephyr_1.2.99.901-1_i386.deb Greetings, Your Debian queue daemon -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xorg-server_1.2.99.901-1_i386.changes ACCEPTED
Accepted: xdmx-tools_1.2.99.901-1_i386.deb to pool/main/x/xorg-server/xdmx-tools_1.2.99.901-1_i386.deb xdmx_1.2.99.901-1_i386.deb to pool/main/x/xorg-server/xdmx_1.2.99.901-1_i386.deb xnest_1.2.99.901-1_i386.deb to pool/main/x/xorg-server/xnest_1.2.99.901-1_i386.deb xorg-server_1.2.99.901-1.diff.gz to pool/main/x/xorg-server/xorg-server_1.2.99.901-1.diff.gz xorg-server_1.2.99.901-1.dsc to pool/main/x/xorg-server/xorg-server_1.2.99.901-1.dsc xorg-server_1.2.99.901.orig.tar.gz to pool/main/x/xorg-server/xorg-server_1.2.99.901.orig.tar.gz xserver-xephyr_1.2.99.901-1_i386.deb to pool/main/x/xorg-server/xserver-xephyr_1.2.99.901-1_i386.deb xserver-xorg-core_1.2.99.901-1_i386.deb to pool/main/x/xorg-server/xserver-xorg-core_1.2.99.901-1_i386.deb xserver-xorg-dev_1.2.99.901-1_i386.deb to pool/main/x/xorg-server/xserver-xorg-dev_1.2.99.901-1_i386.deb xvfb_1.2.99.901-1_i386.deb to pool/main/x/xorg-server/xvfb_1.2.99.901-1_i386.deb Override entries for your package: xdmx-tools_1.2.99.901-1_i386.deb - optional x11 xdmx_1.2.99.901-1_i386.deb - optional x11 xnest_1.2.99.901-1_i386.deb - optional x11 xorg-server_1.2.99.901-1.dsc - source x11 xserver-xephyr_1.2.99.901-1_i386.deb - optional x11 xserver-xorg-core_1.2.99.901-1_i386.deb - optional x11 xserver-xorg-dev_1.2.99.901-1_i386.deb - optional x11 xvfb_1.2.99.901-1_i386.deb - optional x11 Announcing to debian-devel-changes@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
