Attachment 14770 Details for Bug 14781 – 0008-Export-symbols-required-by-new-compiling-modules.patch

[patch] 0008-Export-symbols-required-by-new-compiling-modules.patch

0008-Export-symbols-required-by-new-compiling-modules.patch (text/plain), 7.51 KB, created by Paulo César Pereira de Andrade on 2008-03-02 10:14:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-03-02 10:14:19 UTC

Size: 7.51 KB

patch

obsolete

>From 5af437235bb4a9e683874609c0b8c7f0d1af0804 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Sun, 2 Mar 2008 15:10:34 -0300
>Subject: [PATCH] Export symbols required by new compiling modules.
>
>tdfx:
>	XAAReverseBitOrder
>	vgaHWEnable
>trident:
>	vgaHWProtectWeak
>	vgaHWBlankScreenWeak
>tga:
>	RamDacDestroyInfoRec
>	RamDacGetHWIndex
>	RamDacCreateInfoRec
>	BTramdacProbe
>	RamDacFreeRec
>	RamDacHandleColormaps
>	XAAGetGCKey
>	RamDacInit
>neomagic:
>	xaaSetupWrapper
>	vgaHWSaveScreenWeak
>	xxSetup
>chips:
>	xf86I2CFindBus
>	vgaHWAllocDefaultRegs
>	XAAInitDualFramebufferOverlay
>	XAAGetStippleScanlineFuncMSBFirst
>
>Drivers compiling, but still broken, requiring symbol xf86GetPciVideoInfo:
>	neomagic
>	nsc
>	voodoo
>
>voodoo driver also requires missing symbols:
>	pciReadLong
>	pciWriteLong
>
>  The proper fix would be to export everything in the sdk, i.e.
>/usr/include/xorg. But I believe it is a good idea to, at first,
>know when a new dependency appears, but for a release, where compiling
>with hidden symbols would be enabled, the entire sdk should be made
>available.
>---
> fb/fbpseudocolor.c                 |    2 +-
> hw/xfree86/i2c/xf86i2c.c           |    2 +-
> hw/xfree86/ramdac/BT.c             |    2 +-
> hw/xfree86/ramdac/xf86RamDac.c     |   14 +++++++-------
> hw/xfree86/ramdac/xf86RamDacCmap.c |    2 +-
> hw/xfree86/vgahw/vgaHW.c           |   10 +++++-----
> hw/xfree86/xaa/xaaBitOrder.c       |    3 ++-
> hw/xfree86/xaa/xaaInit.c           |    2 +-
> hw/xfree86/xaa/xaaOverlayDF.c      |    2 +-
> hw/xfree86/xaa/xaaStipple.c        |    2 +-
> hw/xfree86/xaa/xaaWrapper.c        |    2 +-
> 11 files changed, 22 insertions(+), 21 deletions(-)
>
>diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
>index 06cf159..372ad6b 100644
>--- a/fb/fbpseudocolor.c
>+++ b/fb/fbpseudocolor.c
>@@ -1012,7 +1012,7 @@ xxWakeupHandler (pointer data, int i, pointer LastSelectMask)
> {
> }
> 
>-Bool
>+_X_EXPORT Bool
> xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sync)
> {
>     xxScrPrivPtr	pScrPriv;
>diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
>index 34576c1..80f45e8 100644
>--- a/hw/xfree86/i2c/xf86i2c.c
>+++ b/hw/xfree86/i2c/xf86i2c.c
>@@ -846,7 +846,7 @@ xf86I2CBusInit(I2CBusPtr b)
>     return TRUE;
> }
> 
>-I2CBusPtr
>+_X_EXPORT I2CBusPtr
> xf86I2CFindBus(int scrnIndex, char *name) 
> {
>     I2CBusPtr p;
>diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c
>index 5aa27a1..dc1bcd5 100644
>--- a/hw/xfree86/ramdac/BT.c
>+++ b/hw/xfree86/ramdac/BT.c
>@@ -65,7 +65,7 @@ BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
> 	    ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i);
> }
> 
>-RamDacHelperRecPtr
>+_X_EXPORT RamDacHelperRecPtr
> BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecPtr ramdacPtr*/)
> {
>     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
>diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c
>index 1dd3daf..7ed7ac2 100644
>--- a/hw/xfree86/ramdac/xf86RamDac.c
>+++ b/hw/xfree86/ramdac/xf86RamDac.c
>@@ -36,8 +36,8 @@
> int RamDacHWPrivateIndex = -1;
> int RamDacScreenPrivateIndex = -1;
> 
>-RamDacRecPtr
>-RamDacCreateInfoRec()
>+_X_EXPORT RamDacRecPtr
>+RamDacCreateInfoRec(void)
> {
>     RamDacRecPtr infoRec;
> 
>@@ -56,7 +56,7 @@ RamDacHelperCreateInfoRec()
>     return infoRec;
> }
> 
>-void 
>+_X_EXPORT void 
> RamDacDestroyInfoRec(RamDacRecPtr infoRec)
> {
>     xfree(infoRec);
>@@ -68,7 +68,7 @@ RamDacHelperDestroyInfoRec(RamDacHelperRecPtr infoRec)
>     xfree(infoRec);
> }
> 
>-Bool
>+_X_EXPORT Bool
> RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)
> {
>     RamDacScreenRecPtr ramdacScrPtr;
>@@ -116,7 +116,7 @@ RamDacGetRec(ScrnInfoPtr scrp)
>     return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> RamDacFreeRec(ScrnInfoPtr pScrn)
> {
>     RamDacHWRecPtr ramdacHWPtr;
>@@ -141,8 +141,8 @@ RamDacFreeRec(ScrnInfoPtr pScrn)
>     ramdacScrPtr = NULL;
> }
> 
>-int
>-RamDacGetHWIndex()
>+_X_EXPORT int
>+RamDacGetHWIndex(void)
> {
>     return RamDacHWPrivateIndex;
> }
>diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c
>index 600fe3f..f4fdb18 100644
>--- a/hw/xfree86/ramdac/xf86RamDacCmap.c
>+++ b/hw/xfree86/ramdac/xf86RamDacCmap.c
>@@ -58,7 +58,7 @@ RamDacLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
>     }
> }
> 
>-Bool
>+_X_EXPORT Bool
> RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits,
> 		      unsigned int flags)
> {
>diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
>index 428aa1e..c28e118 100644
>--- a/hw/xfree86/vgahw/vgaHW.c
>+++ b/hw/xfree86/vgahw/vgaHW.c
>@@ -604,7 +604,7 @@ vgaHWProtect(ScrnInfoPtr pScrn, Bool on)
>   }
> }
> 
>-vgaHWProtectProc *vgaHWProtectWeak(void) {
>+_X_EXPORT vgaHWProtectProc *vgaHWProtectWeak(void) {
>   return vgaHWProtect;
> }
> 
>@@ -631,7 +631,7 @@ vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on)
>   vgaHWSeqReset(hwp, FALSE);
> }
> 
>-vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
>+_X_EXPORT vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
>   return vgaHWBlankScreen;
> }  
> 
>@@ -1532,7 +1532,7 @@ vgaHWAllocRegs(vgaRegPtr regp)
> }
> 
> 
>-Bool
>+_X_EXPORT Bool
> vgaHWAllocDefaultRegs(vgaRegPtr regp)
> {
>     regp->numCRTC = VGA_NUM_CRTC;
>@@ -1830,7 +1830,7 @@ vgaHWUnlock(vgaHWPtr hwp)
> }
> 
> 
>-void
>+_X_EXPORT void
> vgaHWEnable(vgaHWPtr hwp)
> {
>     hwp->writeEnable(hwp, hwp->readEnable(hwp) | 0x01);
>@@ -2001,4 +2001,4 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
> 
> _X_EXPORT DDC1SetSpeedProc  vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; }
> 
>-SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; }
>+_X_EXPORT SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; }
>diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c
>index 9dbd00f..6b04579 100644
>--- a/hw/xfree86/xaa/xaaBitOrder.c
>+++ b/hw/xfree86/xaa/xaaBitOrder.c
>@@ -3,10 +3,11 @@
> #include <xorg-config.h>
> #endif
> 
>+#include "misc.h"
> #include <X11/Xmd.h>
> CARD32 XAAReverseBitOrder(CARD32 v);
> 
>-CARD32
>+_X_EXPORT CARD32
> XAAReverseBitOrder(CARD32 v)
> {
>  return (((0x01010101 & v) << 7) | ((0x02020202 & v) << 5) | 
>diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
>index 01f17fe..e76247b 100644
>--- a/hw/xfree86/xaa/xaaInit.c
>+++ b/hw/xfree86/xaa/xaaInit.c
>@@ -47,7 +47,7 @@ _X_EXPORT DevPrivateKey XAAGetScreenKey(void) {
>     return XAAScreenKey;
> }
> 
>-DevPrivateKey XAAGetGCKey(void) {
>+_X_EXPORT DevPrivateKey XAAGetGCKey(void) {
>     return XAAGCKey;
> }
> 
>diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
>index 64ca998..46c712d 100644
>--- a/hw/xfree86/xaa/xaaOverlayDF.c
>+++ b/hw/xfree86/xaa/xaaOverlayDF.c
>@@ -163,7 +163,7 @@ static DevPrivateKey XAAOverlayKey = &XAAOverlayKey;
>    }
> 
> 
>-Bool
>+_X_EXPORT Bool
> XAAInitDualFramebufferOverlay(
>     ScreenPtr pScreen, 
>     DepthChangeFuncPtr callback
>diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c
>index 0dd8e9f..4735f78 100644
>--- a/hw/xfree86/xaa/xaaStipple.c
>+++ b/hw/xfree86/xaa/xaaStipple.c
>@@ -32,7 +32,7 @@ StippleScanlineProcPtr stipple_scanline_func[6] = {
>    StippleOver32_Inverted
> };
> 
>-StippleScanlineProcPtr *stipple_get_scanline_func(void) {
>+_X_EXPORT StippleScanlineProcPtr *stipple_get_scanline_func(void) {
>    return stipple_scanline_func;
> }
> 
>diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c
>index 5d6ea05..996ad15 100644
>--- a/hw/xfree86/xaa/xaaWrapper.c
>+++ b/hw/xfree86/xaa/xaaWrapper.c
>@@ -263,7 +263,7 @@ xaaWrapperListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIds)
>     return n;
> }
> 
>-Bool
>+_X_EXPORT Bool
> xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *func)
> {
>     Bool ret;
>-- 
>1.5.3.2
>

Actions: View | Splinter Review

Attachments on bug 14781: 14768 | 14770

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.