Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Sat Oct 3 00:55:10 CEST 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-09-29 19:54:05.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2009-10-01 02:58:31.000000000 +0200 @@ -1,0 +2,8 @@ +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. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.roTBki/_old 2009-10-03 00:51:37.000000000 +0200 +++ /var/tmp/diff_new_pack.roTBki/_new 2009-10-03 00:51:37.000000000 +0200 @@ -33,7 +33,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 56 +Release: 57 License: GPL v2 or later ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 ++++++ dga-removal-fix.diff ++++++ --- /var/tmp/diff_new_pack.roTBki/_old 2009-10-03 00:51:38.000000000 +0200 +++ /var/tmp/diff_new_pack.roTBki/_new 2009-10-03 00:51:38.000000000 +0200 @@ -62,7 +62,7 @@ } 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 +++ b/hw/xfree86/modes/xf86Crtc.c @@ -806,7 +806,7 @@ xf86CrtcScreenInit (ScreenPtr screen) @@ -70,7 +70,7 @@ #ifdef XFreeXDGA - xf86DiDGAInit(screen, 0); -+ _xf86_di_dga_init_for_reals(screen); ++ _xf86_di_dga_init_internal(screen); #endif #ifdef RANDR_13_INTERFACE return RANDR_INTERFACE_VERSION; @@ -79,12 +79,12 @@ #ifdef XFreeXDGA if (scrn->pScreen) - xf86DiDGAReInit(scrn->pScreen); -+ _xf86_di_dga_reinit_for_reals(scrn->pScreen); ++ _xf86_di_dga_reinit_internal(scrn->pScreen); #endif } 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 +++ b/hw/xfree86/modes/xf86Crtc.h @@ -833,6 +833,10 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus); @@ -93,7 +93,7 @@ +/* this is the real function, used only internally */ +_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) @@ -104,13 +104,13 @@ +/* This is the real function, used only internally */ +_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 * the information from the outputs 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 +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -175,6 +175,12 @@ static DGAFunctionRec xf86_dga_funcs = { @@ -120,8 +120,8 @@ + return TRUE; +} + -+_X_INTERNAL Bool -+_xf86_di_dga_reinit_for_reals (ScreenPtr pScreen) ++Bool ++_xf86_di_dga_reinit_internal (ScreenPtr pScreen) +{ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); @@ -133,8 +133,8 @@ + return TRUE; +} + -+_X_INTERNAL Bool -+_xf86_di_dga_init_for_reals (ScreenPtr pScreen) ++Bool ++_xf86_di_dga_init_internal (ScreenPtr pScreen) +{ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org