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

Accepting request 21450 from X11:XOrg

Browse Source 
Copy from X11:XOrg/xorg-x11-server based on submit request 21450 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/21450
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=144
This commit is contained in:
OBS User autobuild 2009-10-02 22:55:15 +00:00 committed by Git OBS Bridge
parent 1884b4cb34
commit 0ecf070810
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dga-removal-fix.diff
View File

@ -62,7 +62,7 @@ index 42b7c58..804fd37 100644
} }
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index c1e31e0..f274725 100644 index c1e31e0..506fbb9 100644
--- a/hw/xfree86/modes/xf86Crtc.c --- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c
@@ -806,7 +806,7 @@ xf86CrtcScreenInit (ScreenPtr screen) @@ -806,7 +806,7 @@ xf86CrtcScreenInit (ScreenPtr screen)
@ -70,7 +70,7 @@ index c1e31e0..f274725 100644
#ifdef XFreeXDGA #ifdef XFreeXDGA
- xf86DiDGAInit(screen, 0); - xf86DiDGAInit(screen, 0);
+ _xf86_di_dga_init_for_reals(screen); + _xf86_di_dga_init_internal(screen);
#endif #endif
#ifdef RANDR_13_INTERFACE #ifdef RANDR_13_INTERFACE
return RANDR_INTERFACE_VERSION; return RANDR_INTERFACE_VERSION;
@ -79,12 +79,12 @@ index c1e31e0..f274725 100644
#ifdef XFreeXDGA #ifdef XFreeXDGA
if (scrn->pScreen) if (scrn->pScreen)
- xf86DiDGAReInit(scrn->pScreen); - xf86DiDGAReInit(scrn->pScreen);
+ _xf86_di_dga_reinit_for_reals(scrn->pScreen); + _xf86_di_dga_reinit_internal(scrn->pScreen);
#endif #endif
} }
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index 69afaa5..edf84d8 100644 index 69afaa5..9baa956 100644
--- a/hw/xfree86/modes/xf86Crtc.h --- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h
@@ -833,6 +833,10 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus); @@ -833,6 +833,10 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
@ -93,7 +93,7 @@ index 69afaa5..edf84d8 100644
+/* this is the real function, used only internally */ +/* this is the real function, used only internally */
+_X_INTERNAL Bool +_X_INTERNAL Bool
+_xf86_di_dga_init_for_reals (ScreenPtr pScreen); +_xf86_di_dga_init_internal (ScreenPtr pScreen);
+ +
/** /**
* Re-initialize dga for this screen (as when the set of modes changes) * Re-initialize dga for this screen (as when the set of modes changes)
@ -104,13 +104,13 @@ index 69afaa5..edf84d8 100644
+/* This is the real function, used only internally */ +/* This is the real function, used only internally */
+_X_INTERNAL Bool +_X_INTERNAL Bool
+_xf86_di_dga_reinit_for_reals (ScreenPtr pScreen); +_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
+ +
/* /*
* Set the subpixel order reported for the screen using * Set the subpixel order reported for the screen using
* the information from the outputs * the information from the outputs
diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c
index 0f7b834..3df3754 100644 index 0f7b834..60fbdbf 100644
--- a/hw/xfree86/modes/xf86DiDGA.c --- a/hw/xfree86/modes/xf86DiDGA.c
+++ b/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c
@@ -175,6 +175,12 @@ static DGAFunctionRec xf86_dga_funcs = { @@ -175,6 +175,12 @@ static DGAFunctionRec xf86_dga_funcs = {
@ -120,8 +120,8 @@ index 0f7b834..3df3754 100644
+ return TRUE; + return TRUE;
+} +}
+ +
+_X_INTERNAL Bool +Bool
+_xf86_di_dga_reinit_for_reals (ScreenPtr pScreen) +_xf86_di_dga_reinit_internal (ScreenPtr pScreen)
+{ +{
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@ -133,8 +133,8 @@ index 0f7b834..3df3754 100644
+ return TRUE; + return TRUE;
+} +}
+ +
+_X_INTERNAL Bool +Bool
+_xf86_di_dga_init_for_reals (ScreenPtr pScreen) +_xf86_di_dga_init_internal (ScreenPtr pScreen)
+{ +{
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

8
xorg-x11-server.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 1 02:50:16 CEST 2009 - sndirsch@suse.de
- dga-removal-fix.diff
* Here's an updated patch -- removes the _X_INTERNAL from the .c
files, renames xf86DiDGAInit to _xf86_di_dga_init_internal,
and renames xf86DiDGAReInit to _xf86_di_dga_reinit_internal.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 29 19:43:23 CEST 2009 - sndirsch@suse.de Tue Sep 29 19:43:23 CEST 2009 - sndirsch@suse.de

2
xorg-x11-server.spec
View File

@ -33,7 +33,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: 56 Release: 57
License: GPL v2 or later ; MIT License (or similar) License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4