Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Wed Feb 2 01:49:37 CET 2011. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-01-22 11:51:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-01-28 12:45:55.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 28 11:33:07 UTC 2011 - sndirsch@novell.com + +- xf86-video-xgi-symbols.diff, xf86-video-xgixp-symbols.diff + * (xf86)LoaderReqSymLists no longer supported/required; fixes + "X -configure" run (bnc #667877) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-video-xgi-symbols.diff xf86-video-xgixp-symbols.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.fgmj5a/_old 2011-02-02 01:49:09.000000000 +0100 +++ /var/tmp/diff_new_pack.fgmj5a/_new 2011-02-02 01:49:09.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 4 +Release: 5 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -101,6 +101,8 @@ Patch141: xf86-video-ati-theatre.patch Patch142: xf86-video-ati-theatre-pciaccess.patch Patch143: xf86-video-xgi-buildfix.diff +Patch144: xf86-video-xgi-symbols.diff +Patch145: xf86-video-xgixp-symbols.diff %description This package contains X.Org video drivers. @@ -169,6 +171,10 @@ popd pushd xf86-video-xgi-* %patch143 -p1 +%patch144 -p1 +popd +pushd xf86-video-xgixp-* +%patch145 -p1 popd %build ++++++ xf86-video-xgi-symbols.diff ++++++ diff -u -r -p ../xf86-video-xgi-1.6.0.orig//src/xgi_driver.c ./src/xgi_driver.c --- ../xf86-video-xgi-1.6.0.orig//src/xgi_driver.c 2011-01-28 11:09:59.000000000 +0000 +++ ./src/xgi_driver.c 2011-01-28 11:15:48.000000000 +0000 @@ -224,136 +224,6 @@ static PciChipsets XGIPciChipsets[] = { {-1, -1, RES_UNDEFINED} }; -static const char *xaaSymbols[] = { - "XAACopyROP", - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAFillMono8x8PatternRects", - "XAAPatternROP", - "XAAHelpPatternROP", - "XAAInit", - NULL -}; - -#ifdef XGI_USE_EXA -static const char *exaSymbols[] = { - "exaGetVersion", - "exaDriverInit", - "exaDriverFini", - "exaOffscreenAlloc", - "exaOffscreenFree", - NULL -}; -#endif - -static const char *vgahwSymbols[] = { - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIOBase", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWLock", - "vgaHWMapMem", - "vgaHWUnmapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreen", - "vgaHWUnlock", - NULL -}; - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - - -static const char *ddcSymbols[] = { - "xf86PrintEDID", - "xf86SetDDCproperties", - "xf86InterpretEDID", - NULL -}; - - -/* static const char *i2cSymbols[] = { - "xf86I2CBusInit", - "xf86CreateI2CBusRec", - NULL -}; */ - -static const char *int10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", - "xf86ExecX86int10", - NULL -}; - -static const char *vbeSymbols[] = { - "VBEExtendedInit", - "vbeDoEDID", - "vbeFree", - "VBEGetVBEInfo", - "VBEFreeVBEInfo", - "VBEGetModeInfo", - "VBEFreeModeInfo", - "VBESaveRestore", - "VBESetVBEMode", - "VBEGetVBEMode", - "VBESetDisplayStart", - "VBESetGetLogicalScanlineLength", - NULL -}; - -#ifdef XF86DRI -static const char *drmSymbols[] = { - "drmAddMap", - "drmAgpAcquire", - "drmAgpAlloc", - "drmAgpBase", - "drmAgpBind", - "drmAgpEnable", - "drmAgpFree", - "drmAgpGetMode", - "drmAgpRelease", - "drmCtlInstHandler", - "drmGetInterruptFromBusID", - "drmXGIAgpInit", - NULL -}; - -static const char *driSymbols[] = { - "DRICloseScreen", - "DRICreateInfoRec", - "DRIDestroyInfoRec", - "DRIFinishScreenInit", - "DRIGetSAREAPrivate", - "DRILock", - "DRIQueryVersion", - "DRIScreenInit", - "DRIUnlock", -#ifdef XGINEWDRI2 - "GlxSetVisualConfigs", - "DRICreatePCIBusID", -#endif - NULL -}; -#endif - static MODULESETUPPROTO(xgiSetup); static XF86ModuleVersionInfo xgiVersRec = { @@ -500,13 +370,6 @@ xgiSetup(pointer module, pointer opts, i xf86AddDriver(&XGI, module, 0); #endif - LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, - shadowSymbols, ramdacSymbols, ddcSymbols, - vbeSymbols, int10Symbols, -#ifdef XF86DRI - drmSymbols, driSymbols, -#endif - NULL); return (pointer) TRUE; } @@ -1615,7 +1478,6 @@ XGIInternalDDC(ScrnInfoPtr pScrn, int cr ErrorF("get EDID with VBIOS call...\n"); if (xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols, NULL); pInt = xf86InitInt10(pXGI->pEnt->index); if (pInt == NULL) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, @@ -1677,8 +1539,6 @@ XGIInternalDDC(ScrnInfoPtr pScrn, int cr g_DVI_I_SignalType = (buffer[20] & 0x80) >> 7; ErrorF("DVI-I : %s signal ...\n", (g_DVI_I_SignalType == 0x01) ? "DVI" : "CRT" ); - xf86LoaderReqSymLists(ddcSymbols, NULL); - /* Jong 09/04/2007; Alan fixed abnormal EDID data */ /* pMonitor = xf86InterpretEDID(pScrn->scrnIndex, buffer) ; */ if ( (buffer[0]==0) && (buffer[7]==0) ) @@ -2219,8 +2079,6 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) if (xf86LoadSubModule(pScrn, "ddc")) { - xf86LoaderReqSymLists(ddcSymbols, NULL); - if (pXGI->xgi_HwDevExt.jChipType == XG27) { ErrorF("Getting CRT EDID (DAC1-CRT1)...\n"); @@ -2685,8 +2543,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(vgahwSymbols, NULL); - /* Due to the liberal license terms this is needed for * keeping the copyright notice readable and intact in * binary distributions. Removing this is a copyright @@ -2798,7 +2654,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) "Initializing display adapter through int10\n"); if (xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols, NULL); pXGI->pInt = xf86InitInt10(pXGI->pEnt->index); } else { @@ -2830,8 +2685,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); - /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -3695,7 +3548,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) #if !defined(__powerpc__) /* Now load and initialize VBE module. */ if (xf86LoadSubModule(pScrn, "vbe")) { - xf86LoaderReqSymLists(vbeSymbols, NULL); pXGI->pVbe = VBEExtendedInit(pXGI->pInt, pXGI->pEnt->index, SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH); if (!pXGI->pVbe) { @@ -4117,7 +3969,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) XGIFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(fbSymbols, NULL); /* Load XAA if needed */ if (!pXGI->NoAccel) @@ -4139,7 +3990,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) XGIFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); } #endif @@ -4150,7 +4000,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) XGIErrorLog(pScrn, "Could not load exa module\n"); return FALSE; } - xf86LoaderReqSymLists(exaSymbols, NULL); } #endif } @@ -4169,16 +4018,12 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) XGIFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } /* Load the dri module if requested. */ #ifdef XF86DRI if(pXGI->loadDRI) { - if (xf86LoadSubModule(pScrn, "dri")) { - xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL); - } - else { + if (!xf86LoadSubModule(pScrn, "dri")) { if (!IS_DUAL_HEAD(pXGI)) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Remove >Load \"dri\"< from the Module section of your XF86Config file\n"); @@ -4771,7 +4616,6 @@ XGIScreenInit(int scrnIndex, ScreenPtr p #if !defined(__powerpc__) if (!IS_DUAL_HEAD(pXGI) || !IS_SECOND_HEAD(pXGI)) { if (xf86LoadSubModule(pScrn, "vbe")) { - xf86LoaderReqSymLists(vbeSymbols, NULL); pXGI->pVbe = VBEExtendedInit(NULL, pXGI->pEnt->index, SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH); ++++++ xf86-video-xgixp-symbols.diff ++++++ diff -u -r -p ../xf86-video-xgixp-1.8.0.orig//src/xgi_driver.c ./src/xgi_driver.c --- ../xf86-video-xgixp-1.8.0.orig//src/xgi_driver.c 2011-01-28 11:22:23.000000000 +0000 +++ ./src/xgi_driver.c 2011-01-28 11:24:48.000000000 +0000 @@ -151,149 +151,6 @@ static void xg47_setup_fb_wrap(ReadMemor WriteMemoryProcPtr *write_ptr, DrawablePtr pDraw); static void xg47_finish_fb_wrap(DrawablePtr pDraw); - -static const char *vgahwSymbols[] = { - "vgaHWBlankScreen", - "vgaHWddc1SetSpeedWeak", - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIOBase", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWLock", - "vgaHWMapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreen", - "vgaHWSetMmioFuncs", - "vgaHWUnlock", - NULL -}; - -static const char *ddcSymbols[] = { - "xf86DoEDID_DDC1", - "xf86DoEDID_DDC2", - "xf86PrintEDID", - "xf86SetDDCproperties", - NULL -}; - -static const char *i2cSymbols[] = { - "xf86CreateI2CBusRec", - "xf86I2CBusInit", - NULL -}; - -static const char *fbSymbols[] = { -#if X_BYTE_ORDER == X_BIG_ENDIAN - "wfbPictureInit", - "wfbScreenInit", -#else - "fbPictureInit", - "fbScreenInit", -#endif - NULL -}; - -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAFillSolidRects", - "XAAGetCopyROP", - "XAAGetPatternROP", - "XAAInit", - "XAAScreenIndex", - "XAAStippleScanlineFuncLSBFirst", - "XAAOverlayFBfuncs", - "XAACachePlanarMonoStipple", - "XAAHelpPatternROP", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -static const char *drmSymbols[] = { - "drmGetInterruptFromBusID", - "drmCtlInstHandler", - "drmCtlUninstHandler", - "drmCommandNone", - "drmCommandRead", - "drmCommandWrite", - "drmCommandWriteRead", - "drmFreeVersion", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", - "drmUnmap", - NULL -}; - -static const char *driSymbols[] = { - "DRICloseScreen", - "DRICreateInfoRec", - "DRIDestroyInfoRec", - "DRIFinishScreenInit", - "DRIGetContext", - "DRIGetDeviceInfo", - "DRIGetSAREAPrivate", - "DRILock", - "DRIQueryVersion", - "DRIScreenInit", - "DRIUnlock", - "DRICreatePCIBusID", - NULL -}; - -static const char *vbeSymbols[] = { - "VBEInit", - "VBEDPMSSet", - "vbeDoEDID", - "vbeFree", - NULL -}; - -static const char *int10Symbols[] = { - "xf86ExecX86int10", - "xf86FreeInt10", - "xf86InitInt10", - NULL -}; - -static const char *shadowSymbols[] = { - "shadowInit", - NULL -}; - -static const char *fbdevHWSymbols[] = { - "fbdevHWInit", - "fbdevHWUseBuildinMode", - "fbdevHWGetLineLength", - "fbdevHWGetVidmem", - "fbdevHWDPMSSet", - /* colormap */ - "fbdevHWLoadPaletteWeak", - /* ScrnInfo hooks */ - "fbdevHWAdjustFrameWeak", - "fbdevHWEnterVT", - "fbdevHWLeaveVT", - "fbdevHWModeInit", - "fbdevHWRestore", - "fbdevHWSave", - "fbdevHWSwitchModeWeak", - "fbdevHWValidModeWeak", - "fbdevHWMapMMIO", - "fbdevHWMapVidmem", - "fbdevHWUnmapMMIO", - "fbdevHWUnmapVidmem", - NULL -}; - #ifdef XSERVER_LIBPCIACCESS #define XGI_DEVICE_MATCH(d, i) \ { 0x18ca, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) } @@ -430,13 +287,6 @@ static pointer XGISetup(pointer module, return NULL; } - LoaderReqSymLists(vgahwSymbols, fbSymbols, driSymbols, drmSymbols, - NULL); - - - LoaderRefSymLists(i2cSymbols, ramdacSymbols, - xaaSymbols, shadowSymbols, fbdevHWSymbols, NULL); - /* * The return value must be non-NULL on success even though * there is no TearDownProc. @@ -1017,8 +867,6 @@ static Bool XGIPreInitInt10(ScrnInfoPtr return FALSE; } - xf86LoaderReqSymLists(vbeSymbols, int10Symbols, NULL); - #if DBG_FLOW xf86DrvMsg(pScrn->scrnIndex, X_INFO, "-- Leave %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); #endif @@ -1287,7 +1135,6 @@ static Bool XGIPreInitCursor(ScrnInfoPtr if (!xf86ReturnOptValBool(pXGI->pOptionInfo, OPTION_SW_CURSOR, FALSE)) { if (!xf86LoadSubModule(pScrn, "ramdac")) return FALSE; - xf86LoaderReqSymLists(ramdacSymbols, NULL); } #if DBG_FLOW @@ -1314,8 +1161,6 @@ static Bool XGIPreInitAccel(ScrnInfoPtr */ if (!g_DualViewMode || pXGI->FirstView) if (!xf86LoadSubModule(pScrn, "xaa")) return FALSE; - - xf86LoaderReqSymLists(xaaSymbols, NULL); } #if DBG_FLOW @@ -1476,7 +1321,6 @@ static Bool XGIPreInitShadow(ScrnInfoPtr XGIFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } #if DBG_FLOW @@ -1493,7 +1337,6 @@ xf86MonPtr get_configured_monitor(ScrnIn if (xf86LoadSubModule(pScrn, "i2c")) { - xf86LoaderReqSymLists(i2cSymbols, NULL); if (!xg47_InitI2C(pScrn)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I2C initialization failed!\n"); @@ -1508,9 +1351,6 @@ xf86MonPtr get_configured_monitor(ScrnIn return NULL; } - xf86LoaderReqSymLists(ddcSymbols, NULL); - - if (pXGI->pI2C != NULL) { pMon = xf86DoEDID_DDC2(pScrn->scrnIndex, pXGI->pI2C); } @@ -1650,7 +1490,6 @@ Bool XGIPreInit(ScrnInfoPtr pScrn, int f /* Jong 07/07/2006; has error - _dl_catch_error() from /lib/ld-linux.so.2 ???? */ if (!xf86LoadSubModule(pScrn, "fbdevhw")) return FALSE; - xf86LoaderReqSymLists(fbdevHWSymbols, NULL); /* check for linux framebuffer device */ if (!fbdevHWInit(pScrn, pXGI->pPciInfo, NULL)) return FALSE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org