Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Fri Mar 26 02:12:58 CET 2010.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-03-17 08:33:36.000000000 +0100
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-03-25 01:45:54.000000000 +0100
@@ -1,0 +2,17 @@
+Thu Mar 25 01:35:56 CET 2010 - sndirsch@suse.de
+
+- disabled build of xgi driver due to the driver apparently no
+ longer providing a xgiModuleData data object - which is required
+ for being loaded
+- xf86-video-newport-commit-48f48e5.diff
+ * newport: stop using obsolete loader functions. The loader
+ symbol list functions have been removed from the server in 1.7.
+
+-------------------------------------------------------------------
+Thu Mar 18 12:43:37 CET 2010 - ro@suse.de
+
+- fix xf86-video-siliconmotion-1.7.3 to build with xserver-1.8
+ (struct ClockRanges was removed)
+- change VIDEO_ABI_VERSION to 7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
xf86-video-newport-commit-48f48e5.diff
xf86-video-siliconmotion-1.7.3.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.X8WOAZ/_old 2010-03-26 02:11:44.000000000 +0100
+++ /var/tmp/diff_new_pack.X8WOAZ/_new 2010-03-26 02:11:45.000000000 +0100
@@ -23,13 +23,13 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 1
+Release: 2
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
Provides: xorg-x11-driver-video-nvidia 855resolution 915resolution
Provides: intel-i810-xorg-x11 xorg-x11-driver-video-intel
-Requires: VIDEO_ABI_VERSION = 6
+Requires: VIDEO_ABI_VERSION = 7
Obsoletes: xorg-x11-driver-video-nvidia 855resolution 915resolution
Obsoletes: intel-i810-xorg-x11 xorg-x11-driver-video-intel
Supplements: xorg-x11-server
@@ -84,6 +84,7 @@
Patch14: xf86-video-rendition.diff
Patch16: xf86-video-nsc.diff
Patch17: xf86-video-nsc-noasm.diff
+Patch23: xf86-video-siliconmotion-1.7.3.dif
Patch30: xf86-video-mga.randr12.diff
Patch35: xf86-video-trident-1.3.3.dif
Patch41: xf86-video-xgi.diff
@@ -109,6 +110,7 @@
Patch134: xf86-video-nv-commit-e6b0463.diff
Patch135: xf86-video-nv-commit-347625b.diff
Patch136: xf86-video-nv-commit-250a3a7.diff
+Patch137: xf86-video-newport-commit-48f48e5.diff
%description
This package contains X.Org video drivers.
@@ -153,6 +155,9 @@
%patch16 -p1
%patch17 -p0
popd
+pushd xf86-video-siliconmotion-*
+%patch23 -p0
+popd
pushd xf86-video-xgi-*
%patch41
popd
@@ -196,6 +201,9 @@
pushd xf86-video-sis-*
%patch133 -p1
popd
+pushd xf86-video-newport-*
+%patch137 -p1
+popd
# xgi driver doesn't build on ppc/ppc64 due to endianess
%ifarch ppc ppc64
rm -rf xf86-video-xgi-*
@@ -209,6 +217,7 @@
-e xf86-video-mga-1.9.100 \
-e xf86-video-ati-6.12 \
-e xf86-video-xgixp \
+ -e xf86-video-xgi \
-e xf86-video-vga \
-e xf86-video-nsc \
) intel-gpu-tools-*; do
@@ -235,6 +244,7 @@
-e xf86-video-mga-1.9.100 \
-e xf86-video-ati-6.12 \
-e xf86-video-xgixp \
+ -e xf86-video-xgi \
-e xf86-video-vga \
-e xf86-video-nsc \
) intel-gpu-tools-*; do
++++++ xf86-video-newport-commit-48f48e5.diff ++++++
commit 48f48e585bf542be48d7d34dc66d430d6843268f
Author: Julien Cristau
Date: Sat Jan 23 14:46:46 2010 +0100
newport: stop using obsolete loader functions
The loader symbol list functions have been removed from the server in
1.7.
Reported-and-tested-by: Bernhard R. Link
Signed-off-by: Julien Cristau
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 64b643a..6bd7c9f 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -102,36 +102,6 @@ static SymTabRec NewportChipsets[] = {
{-1, NULL }
};
-/* List of Symbols from other modules that this module references */
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetFallbackOps",
- "XAAInit",
- NULL
-};
-
-
-#ifdef XFree86LOADER
-
static MODULESETUPPROTO(newportSetup);
static XF86ModuleVersionInfo newportVersRec =
@@ -172,14 +142,6 @@ newportSetup(pointer module, pointer opts, int *errmaj, int *errmin)
xf86AddDriver(&NEWPORT, module, 0);
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- *
- */
- LoaderRefSymLists( fbSymbols, ramdacSymbols, shadowSymbols, xaaSymbols, NULL);
-
-
- /*
* The return value must be non-NULL on success even though
* there is no TearDownProc.
*/
@@ -190,8 +152,6 @@ newportSetup(pointer module, pointer opts, int *errmaj, int *errmin)
}
}
-#endif /* XFree86LOADER */
-
typedef enum {
OPTION_BITPLANES,
OPTION_BUS_ID,
@@ -486,7 +446,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists( fbSymbols, NULL);
/* Load ramdac modules */
if (pNewport->hwCursor) {
@@ -494,7 +453,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load ShadowFB module */
@@ -502,7 +460,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
return TRUE;
}
@@ -596,8 +553,6 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
if (!pNewport->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa"))
pNewport->NoAccel = TRUE;
- else
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
#if 0
if (pScrn->bitsPerPixel < 24)
++++++ xf86-video-siliconmotion-1.7.3.dif ++++++
--- src/smi.h
+++ src/smi.h 2010/03/18 11:05:11
@@ -147,7 +147,13 @@
int Bpp; /* Bytes per pixel */
int MCLK; /* Memory Clock */
int MXCLK; /* MSOC Clock for local sdram */
- ClockRanges clockRange; /* Allowed pixel clock range */
+ /* ClockRanges clockRange; */ /* Allowed pixel clock range */
+ /* ClockRanges was removed with xserver-1.8 */
+ int minClock;
+ int maxClock;
+ Bool interlaceAllowed;
+ Bool doubleScanAllowed;
+ /* end ClockRanges replacement */
CloseScreenProcPtr CloseScreen; /* Pointer used to save wrapped
CloseScreen function */
--- src/smi_driver.c
+++ src/smi_driver.c 2010/03/18 11:10:23
@@ -807,18 +807,16 @@
* Setup the ClockRanges, which describe what clock ranges are available,
* and what sort of modes they can be used for.
*/
- pSmi->clockRange.next = NULL;
- pSmi->clockRange.minClock = 20000;
+ pSmi->minClock = 20000;
if (SMI_LYNXM_SERIES(pSmi->Chipset) ||
IS_MSOC(pSmi))
- pSmi->clockRange.maxClock = 200000;
+ pSmi->maxClock = 200000;
else
- pSmi->clockRange.maxClock = 135000;
+ pSmi->maxClock = 135000;
- pSmi->clockRange.clockIndex = -1;
- pSmi->clockRange.interlaceAllowed = FALSE;
- pSmi->clockRange.doubleScanAllowed = FALSE;
+ pSmi->interlaceAllowed = FALSE;
+ pSmi->doubleScanAllowed = FALSE;
if(!SMI_CrtcPreInit(pScrn))
LEAVE(FALSE);
--- src/smi_output.c
+++ src/smi_output.c 2010/03/18 11:06:00
@@ -71,10 +71,10 @@
if (mode->HDisplay & 15)
LEAVE(MODE_BAD_WIDTH);
- if((mode->Clock < pSmi->clockRange.minClock) ||
- (mode->Clock > pSmi->clockRange.maxClock) ||
- ((mode->Flags & V_INTERLACE) && !pSmi->clockRange.interlaceAllowed) ||
- ((mode->Flags & V_DBLSCAN) && (mode->VScan > 1) && !pSmi->clockRange.doubleScanAllowed)){
+ if((mode->Clock < pSmi->minClock) ||
+ (mode->Clock > pSmi->maxClock) ||
+ ((mode->Flags & V_INTERLACE) && !pSmi->interlaceAllowed) ||
+ ((mode->Flags & V_DBLSCAN) && (mode->VScan > 1) && !pSmi->doubleScanAllowed)){
LEAVE(MODE_CLOCK_RANGE);
}
--- src/smilynx_crtc.c
+++ src/smilynx_crtc.c 2010/03/18 11:06:32
@@ -284,14 +284,14 @@
if (SMI_LYNX_SERIES(pSmi->Chipset)) {
SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
1, 1, 63, 0, 3,
- pSmi->clockRange.minClock,
- pSmi->clockRange.maxClock,
+ pSmi->minClock,
+ pSmi->maxClock,
®->SR6C, ®->SR6D);
} else {
SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
1, 1, 63, 0, 1,
- pSmi->clockRange.minClock,
- pSmi->clockRange.maxClock,
+ pSmi->minClock,
+ pSmi->maxClock,
®->SR6C, ®->SR6D);
}
@@ -378,14 +378,14 @@
if (SMI_LYNX_SERIES(pSmi->Chipset)) {
SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
1, 1, 63, 0, 3,
- pSmi->clockRange.minClock,
- pSmi->clockRange.maxClock,
+ pSmi->minClock,
+ pSmi->maxClock,
®->SR6C, ®->SR6D);
} else {
SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
1, 1, 63, 0, 1,
- pSmi->clockRange.minClock,
- pSmi->clockRange.maxClock,
+ pSmi->minClock,
+ pSmi->maxClock,
®->SR6C, ®->SR6D);
}
@@ -487,14 +487,14 @@
if (SMI_LYNX_SERIES(pSmi->Chipset)) {
SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
1, 1, 63, 0, 0,
- pSmi->clockRange.minClock,
- pSmi->clockRange.maxClock,
+ pSmi->minClock,
+ pSmi->maxClock,
®->SR6E, ®->SR6F);
} else {
SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
1, 1, 63, 0, 1,
- pSmi->clockRange.minClock,
- pSmi->clockRange.maxClock,
+ pSmi->minClock,
+ pSmi->maxClock,
®->SR6E, ®->SR6F);
}
--- src/smilynx_hw.c
+++ src/smilynx_hw.c 2010/03/18 11:05:40
@@ -66,8 +66,8 @@
if (pSmi->MCLK > 0)
SMI_CommonCalcClock(pScrn->scrnIndex, pSmi->MCLK,
1, 1, 63, 0, 0,
- pSmi->clockRange.minClock,
- pSmi->clockRange.maxClock,
+ pSmi->minClock,
+ pSmi->maxClock,
&mode->SR6A, &mode->SR6B);
if(!pSmi->useBIOS) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org