diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8d86346..1d330d3 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -9,7 +9,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.3.0.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -32,6 +32,7 @@ Patch19: xserver-1.3.0-xnest-exposures.patch Patch20: xserver-1.3.0-x86emu-imul-int64.patch Patch21: xserver-1.3.0-xkb-and-loathing.patch Patch22: xserver-1.3.0-fbdevhw-magic-numbers.patch +Patch23: xserver-1.3.0-ramdac-export.patch # OpenGL compositing manager feature/optimization patches. Patch100: xorg-x11-server-1.1.0-no-move-damage.patch @@ -282,6 +283,7 @@ Xserver source code needed to build VNC server (Xvnc) %patch20 -p1 -b .x86emu-imul %patch21 -p1 -b .xkb-signal-loathing %patch22 -p1 -b .magic-numbers +%patch23 -p1 -b .ramdac %patch100 -p0 -b .no-move-damage %patch101 -p0 -b .dont-backfill-bg-none @@ -575,6 +577,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 06 2007 Adam Jackson 1.3.0.0-8 +- xserver-1.3.0-ramdac-export.patch: Make sure the old ramdac symbols are + exported, since they're in-server now. (#242800) + * Mon Jun 04 2007 Adam Jackson 1.3.0.0-7 - xserver-1.3.0-randrama-no-zero-screens.patch: For RANDR 1.2's fake Xinerama info, don't report Xinerama as being active if there are no diff --git a/xserver-1.3.0-ramdac-export.patch b/xserver-1.3.0-ramdac-export.patch new file mode 100644 index 0000000..486312d --- /dev/null +++ b/xserver-1.3.0-ramdac-export.patch @@ -0,0 +1,76 @@ +From: Julien Cristau +Date: Wed, 30 May 2007 02:01:30 +0000 (-0400) +Subject: Make sure that the ramdac symbols are present in the server +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=3c6f1428489c1f71acd41066ea73ef4ae7c60f17 + +Make sure that the ramdac symbols are present in the server + +The former ramdac module is now built into the server, so its symbols need to +be explicitly exported to drivers (Debian #423129). +--- + +--- a/hw/xfree86/loader/xf86sym.c ++++ b/hw/xfree86/loader/xf86sym.c +@@ -96,6 +96,11 @@ + #endif + #include "xf86DDC.h" + #include "edid.h" ++#include "xf86Cursor.h" ++#include "xf86RamDac.h" ++#include "BT.h" ++#include "IBM.h" ++#include "TI.h" + + #ifndef HAS_GLIBC_SIGSETJMP + #if defined(setjmp) && defined(__GNU_LIBRARY__) && \ +@@ -1255,4 +1260,50 @@ _X_HIDDEN void *xfree86LookupTab[] = { + SYMFUNC(xf86I2CWriteRead) + SYMFUNC(xf86I2CWriteVec) + SYMFUNC(xf86I2CWriteWord) ++ ++ /* ramdac/xf86RamDac.c */ ++ SYMFUNC(RamDacCreateInfoRec) ++ SYMFUNC(RamDacHelperCreateInfoRec) ++ SYMFUNC(RamDacDestroyInfoRec) ++ SYMFUNC(RamDacHelperDestroyInfoRec) ++ SYMFUNC(RamDacInit) ++ SYMFUNC(RamDacHandleColormaps) ++ SYMFUNC(RamDacFreeRec) ++ SYMFUNC(RamDacGetHWIndex) ++ SYMVAR(RamDacHWPrivateIndex) ++ SYMVAR(RamDacScreenPrivateIndex) ++ ++ /* ramdac/xf86Cursor.c */ ++ SYMFUNC(xf86InitCursor) ++ SYMFUNC(xf86CreateCursorInfoRec) ++ SYMFUNC(xf86DestroyCursorInfoRec) ++ SYMFUNC(xf86ForceHWCursor) ++ ++ /* ramdac/BT.c */ ++ SYMFUNC(BTramdacProbe) ++ SYMFUNC(BTramdacSave) ++ SYMFUNC(BTramdacRestore) ++ SYMFUNC(BTramdacSetBpp) ++ ++ /* ramdac/IBM.c */ ++ SYMFUNC(IBMramdacProbe) ++ SYMFUNC(IBMramdacSave) ++ SYMFUNC(IBMramdacRestore) ++ SYMFUNC(IBMramdac526SetBpp) ++ SYMFUNC(IBMramdac640SetBpp) ++ SYMFUNC(IBMramdac526CalculateMNPCForClock) ++ SYMFUNC(IBMramdac640CalculateMNPCForClock) ++ SYMFUNC(IBMramdac526HWCursorInit) ++ SYMFUNC(IBMramdac640HWCursorInit) ++ SYMFUNC(IBMramdac526SetBppWeak) ++ ++ /* ramdac/TI.c */ ++ SYMFUNC(TIramdacCalculateMNPForClock) ++ SYMFUNC(TIramdacProbe) ++ SYMFUNC(TIramdacSave) ++ SYMFUNC(TIramdacRestore) ++ SYMFUNC(TIramdac3026SetBpp) ++ SYMFUNC(TIramdac3030SetBpp) ++ SYMFUNC(TIramdacHWCursorInit) ++ SYMFUNC(TIramdacLoadPalette) + };