rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=119

Browse Source
This commit is contained in:
OBS User unknown 2009-03-11 18:34:39 +00:00 committed by Git OBS Bridge
parent 5263f800bf
commit 15f9491fba
3 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
commit-cadf65a.diff Normal file
View File

@ -0,0 +1,33 @@
commit cadf65a6e190a8952ad3cc216dc9ea55241de91a
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Mar 10 15:49:49 2009 +0100
randr: Nuke broken set_origin shortcut
Shortcut is impossible to implement this way, because we don't know for sure
whether the crtc of an output has changed or not.
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 7d6feaf..c6eed33 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -306,19 +306,6 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
} else
crtc->transformPresent = FALSE;
- if (crtc->funcs->set_origin &&
- memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 &&
- saved_rotation == rotation &&
- saved_transform_present == crtc->transformPresent &&
- (!crtc->transformPresent || RRTransformEqual(&saved_transform, &crtc->transform)))
- {
- if (!xf86CrtcRotate (crtc))
- goto done;
- crtc->funcs->set_origin (crtc, crtc->x, crtc->y);
- ret = TRUE;
- goto done;
- }
-
/* Pass our mode to the outputs and the CRTC to give them a chance to
* adjust it according to limitations or output properties, and also
* a chance to reject the mode entirely.

14
xorg-x11-server.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Mar 10 16:09:14 CET 2009 - sndirsch@suse.de
- commit-cadf65a.diff
* randr: Nuke broken set_origin shortcut. Shortcut is impossible
to implement this way, because we don't know for sure whether
the crtc of an output has changed or not. (bnc #482838)
-------------------------------------------------------------------
Mon Mar 9 21:24:16 CET 2009 - mmarek@suse.cz
- renamed modprobe config to /etc/modprobe.d/50-nvidia.conf
(required by new module-init-tools).
-------------------------------------------------------------------
Sun Mar 8 23:35:19 CET 2009 - sndirsch@suse.de

16
xorg-x11-server.spec
View File

@ -32,7 +32,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
Release: 31
Release: 32
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -107,6 +107,7 @@ Patch127: dpms_screensaver.diff
Patch128: pci-legacy-mem-fallback.diff
Patch129: bug474071-fix1.diff
Patch130: radeonhd.diff
Patch131: commit-cadf65a.diff
%description
This package contains the X.Org Server.
@ -223,6 +224,7 @@ pushd hw/xfree86/os-support/bus
popd
%patch130 -p1
cp $RPM_SOURCE_DIR/radeonhd.h hw/xfree86/common
%patch131 -p1
%build
pushd xorg-docs-*
@ -331,7 +333,7 @@ rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4
%endif
%if %suse_version > 1010
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nvidia
install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/50-nvidia.conf
%endif
%if %vnc
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
@ -456,7 +458,7 @@ exit 0
%defattr(-,root,root)
%if %suse_version > 1010
%dir /etc/modprobe.d
/etc/modprobe.d/nvidia
/etc/modprobe.d/50-nvidia.conf
%endif
%ifarch ppc64 x86_64
%dir /usr/%{_lib}/X11
@ -546,6 +548,14 @@ exit 0
%endif
%changelog
* Tue Mar 10 2009 sndirsch@suse.de
- commit-cadf65a.diff
* randr: Nuke broken set_origin shortcut. Shortcut is impossible
to implement this way, because we don't know for sure whether
the crtc of an output has changed or not. (bnc #482838)
* Mon Mar 09 2009 mmarek@suse.cz
- renamed modprobe config to /etc/modprobe.d/50-nvidia.conf
(required by new module-init-tools).
* Sun Mar 08 2009 sndirsch@suse.de
- radeonhd.diff/radeonhd.h:
* prefer radeonhd for autoconfig for ATI >= R500