Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Wed Mar 11 16:59:26 CET 2009. -------- --- xorg-x11/xorg-x11.changes 2009-02-26 04:32:08.000000000 +0100 +++ xorg-x11/xorg-x11.changes 2009-03-10 02:51:21.004581868 +0100 @@ -1,0 +2,14 @@ +Tue Mar 10 02:47:42 CET 2009 - sndirsch@suse.de + +- xrandr-commit-39a1678.diff + * Revert "Move outputs among crtcs as necessary. Fixes 14570" + This reverts commit 4dcc8ae1a6903434def1a2706f7c68ff9e2a17c4. + The commit broke uncloning completely again. + +------------------------------------------------------------------- +Mon Mar 9 22:46:55 CET 2009 - sndirsch@suse.de + +- xinitrc.common: no longer apply xkbcomp workaround, which should + be obsolete with xorg-server 1.6 (bnc #483651) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xrandr-commit-39a1678.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.x31575/_old 2009-03-11 16:58:09.000000000 +0100 +++ /var/tmp/diff_new_pack.x31575/_new 2009-03-11 16:58:09.000000000 +0100 @@ -26,7 +26,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 14 +Release: 15 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -161,6 +161,7 @@ Patch24: xauth-1.0.2.diff Patch46: xfd.diff Patch47: xfs-no_config_file.diff +Patch48: xrandr-commit-39a1678.diff %description This package contains the X.Org core and sample applications. @@ -280,6 +281,7 @@ patch -d scripts-* -p0 -s < %PATCH19 patch -d xvidtune-* -p0 -s < %PATCH21 patch -d xfs-* -p0 -s < %PATCH47 +patch -d xrandr-* -p1 -s < %PATCH48 %build @@ -534,6 +536,14 @@ %{_mandir}/man1/xauth.1* %changelog +* Tue Mar 10 2009 sndirsch@suse.de +- xrandr-commit-39a1678.diff + * Revert "Move outputs among crtcs as necessary. Fixes 14570" + This reverts commit 4dcc8ae1a6903434def1a2706f7c68ff9e2a17c4. + The commit broke uncloning completely again. +* Mon Mar 09 2009 sndirsch@suse.de +- xinitrc.common: no longer apply xkbcomp workaround, which should + be obsolete with xorg-server 1.6 (bnc #483651) * Thu Feb 26 2009 sndirsch@suse.de - xinput 1.4.0 - xrandr 1.2.99.4 ++++++ xinit.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xinit/xinitrc.common new/etc/X11/xinit/xinitrc.common --- old/etc/X11/xinit/xinitrc.common 2008-10-13 18:11:01.000000000 +0200 +++ new/etc/X11/xinit/xinitrc.common 2009-03-09 22:43:24.000000000 +0100 @@ -98,12 +98,6 @@ fi # -# Fix keyboard layout on newer Xservers (Bug #368673, Bug #433983) -# -xdpyinfo | grep -q "X.Org version: 6.9.0" || \ - setxkbmap -print | xkbcomp - $DISPLAY - -# # Handle the the users Xmodmap or Xkbmap. # Note that xkb and xmodmap should not be mixed. # ++++++ xrandr-commit-39a1678.diff ++++++ commit 39a16783a3d1c0c722b4b18fab60a91b9f6ed578 Author: Matthias Hopf <mhopf@suse.de> Date: Fri Mar 6 14:49:43 2009 +0100 Revert "Move outputs among crtcs as necessary. Fixes 14570" This reverts commit 4dcc8ae1a6903434def1a2706f7c68ff9e2a17c4. The commit broke uncloning completely again. Conflicts: xrandr.c diff --git a/xrandr.c b/xrandr.c index 5630a1a..2b6a555 100644 --- a/xrandr.c +++ b/xrandr.c @@ -1620,8 +1620,8 @@ mark_changing_crtcs (void) /* * Test whether 'crtc' can be used for 'output' */ -static Bool -check_crtc_for_output (crtc_t *crtc, output_t *output, Bool ignore_state) +Bool +check_crtc_for_output (crtc_t *crtc, output_t *output) { int c; int l; @@ -1652,9 +1652,6 @@ check_crtc_for_output (crtc_t *crtc, output_t *output, Bool ignore_state) return False; } - if (ignore_state) - return True; - if (crtc->noutput) { /* make sure the state matches */ @@ -1698,7 +1695,7 @@ find_crtc_for_output (output_t *output) crtc = find_crtc_by_xid (output->output_info->crtcs[c]); if (!crtc) fatal ("cannot find crtc 0x%x\n", output->output_info->crtcs[c]); - if (check_crtc_for_output (crtc, output, False)) + if (check_crtc_for_output (crtc, output)) return crtc; } return NULL; @@ -1918,7 +1915,7 @@ pick_crtcs_score (output_t *outputs) /* reset crtc allocation for following outputs */ disable_outputs (outputs); - if (!check_crtc_for_output (crtc, output, True)) + if (!check_crtc_for_output (crtc, output)) continue; my_score = 1000; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org