commit f27723e4c33a08154f990bb52612b29a0133fee4 Author: Tilman Sauerbeck <tilman@crux.nu> Date: Fri Jul 20 19:47:11 2007 +0200 xorg-server: applied ramdac symbols patch. diff --git a/xorg-server/.md5sum b/xorg-server/.md5sum index 3ee1a50..29d2c88 100644 --- a/xorg-server/.md5sum +++ b/xorg-server/.md5sum @@ -1,3 +1,3 @@ e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 a51a7d482e3c689394755bb17bda8526 xorg-server-1.3.0.0.tar.bz2 -75c7265107d9c31227491eb5195f35a9 xorg-server.diff +c1b4d235d5eb77afc005cbcee404a729 xorg-server.diff diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index bb9f9b0..8accda2 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -5,7 +5,7 @@ name=xorg-server version=1.3.0.0 -release=2 +release=3 source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.b... \ http://dl.sourceforge.net/mesa3d/MesaLib-6.5.2.tar.bz2 \ $name.diff) diff --git a/xorg-server/xorg-server.diff b/xorg-server/xorg-server.diff index f2553a6..95ce61c 100644 --- a/xorg-server/xorg-server.diff +++ b/xorg-server/xorg-server.diff @@ -33,3 +33,84 @@ index 1db27f1..2a57e4e 100644 -- 1.5.2 +From bbb3db4eeb66ea7dcbafcf3f73e7c753a6db4ac2 Mon Sep 17 00:00:00 2001 +From: Julien Cristau <jcristau@debian.org> +Date: Thu, 10 May 2007 17:26:49 +0200 +Subject: [PATCH] Export ramdac symbols + +The former ramdac module is now built into the server, so its symbols need to +be explicitly exported to drivers (Debian #423129). +--- + hw/xfree86/loader/xf86sym.c | 51 +++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 51 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c +index 5175f01..6535e4c 100644 +--- 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) + }; +-- +1.5.1.4 +