1
0
OBS User unknown 2008-10-11 22:34:21 +00:00 committed by Git OBS Bridge
parent 421cb83130
commit d1c1f439be
5 changed files with 48 additions and 48 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
size 5614990

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ff9a6a280aaa8fe887c538e6099c0fdcfa94cb9dac800bde3b584cc9f325dc0
size 5615666

View File

@ -1,41 +0,0 @@
commit 1feb69eb63e6739ff5db255ad529e84adf941a10
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 8 14:55:29 2008 +0200
DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
Fixes a segfault when trying to activate a DGA mode without checking
whether DGA modesetting is at all possible.
diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c
index 0736167..c66bca2 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga.c
@@ -93,7 +93,7 @@ ProcXF86DGADirectVideo(ClientPtr client)
REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq);
- if (!DGAAvailable(stuff->screen))
+ if (!DGAAvailable(stuff->screen))
return DGAErrorBase + XF86DGANoDirectVideoMode;
if (stuff->enable & XF86DGADirectGraphics) {
@@ -128,7 +128,7 @@ ProcXF86DGAGetViewPortSize(ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
- if (!DGAAvailable(stuff->screen))
+ if (!DGAAvailable(stuff->screen))
return (DGAErrorBase + XF86DGANoDirectVideoMode);
if(!(num = DGAGetOldDGAMode(stuff->screen)))
@@ -153,6 +153,9 @@ ProcXF86DGASetViewPort(ClientPtr client)
REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq);
+ if (!DGAAvailable(stuff->screen))
+ return (DGAErrorBase + XF86DGANoDirectVideoMode);
+
if (!DGAActive(stuff->screen))
{
int num;

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Sat Oct 11 23:42:48 CEST 2008 - sndirsch@suse.de
- xorg-server 1.5.2
* int10: Remove useless check.
* int10: Don't warn when scanning for devices we don't have.
* int10: Fix a nasty memory leak.
* Revert "Array-index based devPrivates implementation."
* EDID: Catch monitors that encode aspect ratio for physical
size.
* Remove usage of mfbChangeWindowAttributes missed in
e4d11e58c...
* only build dri2 when DRI2 is enabled
* Array-index based devPrivates implementation.
* Fix GKVE with key_code > 255
* xkb: fix use of uninitialized variable.
* DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
* xkb: fix core keyboard map generation. (bfo #14373)
* xkb: squash canonical types into explicit ones on core
reconstruction.
* Check nextEnabledOutput()'s return in bestModeForAspect()
- obsoletes xorg-server-commit-d1bb5e3.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 10 04:26:40 CEST 2008 - sndirsch@suse.de Fri Oct 10 04:26:40 CEST 2008 - sndirsch@suse.de

View File

@ -19,7 +19,7 @@
Name: xorg-x11-server Name: xorg-x11-server
%define dirsuffix 1.5.1 %define dirsuffix 1.5.2
%define fglrx_driver_hack 0 %define fglrx_driver_hack 0
%define vnc 1 %define vnc 1
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 7 Release: 8
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -98,7 +98,6 @@ Patch114: 64bit-portability-issue.diff
Patch116: ppc.diff Patch116: ppc.diff
Patch117: acpi-warning.diff Patch117: acpi-warning.diff
Patch118: exa-greedy.diff Patch118: exa-greedy.diff
Patch119: xorg-server-commit-d1bb5e3.diff
Patch120: dga_cleanup.diff Patch120: dga_cleanup.diff
%description %description
@ -218,7 +217,6 @@ popd
%endif %endif
%patch117 %patch117
%patch118 -p1 %patch118 -p1
%patch119 -p1
%patch120 -p1 %patch120 -p1
%build %build
@ -535,6 +533,26 @@ exit 0
%endif %endif
%changelog %changelog
* Sun Oct 12 2008 sndirsch@suse.de
- xorg-server 1.5.2
* int10: Remove useless check.
* int10: Don't warn when scanning for devices we don't have.
* int10: Fix a nasty memory leak.
* Revert "Array-index based devPrivates implementation."
* EDID: Catch monitors that encode aspect ratio for physical
size.
* Remove usage of mfbChangeWindowAttributes missed in
e4d11e58c...
* only build dri2 when DRI2 is enabled
* Array-index based devPrivates implementation.
* Fix GKVE with key_code > 255
* xkb: fix use of uninitialized variable.
* DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
* xkb: fix core keyboard map generation. (bfo #14373)
* xkb: squash canonical types into explicit ones on core
reconstruction.
* Check nextEnabledOutput()'s return in bestModeForAspect()
- obsoletes xorg-server-commit-d1bb5e3.diff
* Fri Oct 10 2008 sndirsch@suse.de * Fri Oct 10 2008 sndirsch@suse.de
- dga_cleanup.diff - dga_cleanup.diff
* DGA: Mash together xf86dga.c and xf86dga2.c for a client state * DGA: Mash together xf86dga.c and xf86dga2.c for a client state