Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Thu Oct 11 01:35:02 CEST 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-10-06 04:51:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-10-10 22:40:46.964321000 +0200 @@ -1,0 +2,8 @@ +Wed Oct 10 22:43:17 CEST 2007 - sndirsch@suse.de + +- xf86-video-ati-6.6.3-compile-cfb.patch + xf86-video-ati-6.6.3-if0.patch + xf86-video-ati-6.6.3-r128-xvideo.patch + * TV-in support for All in Wonder 128 (Bug #302196, X.Org #8811) + +------------------------------------------------------------------- New: ---- xf86-video-ati-6.6.3-compile-cfb.patch xf86-video-ati-6.6.3-if0.patch xf86-video-ati-6.6.3-r128-xvideo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.Rq1845/_old 2007-10-11 01:34:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Rq1845/_new 2007-10-11 01:34:42.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 4 +Release: 6 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -92,6 +92,9 @@ Patch42: xf86-video-ati-opma.diff Patch44: xf86-video-ati.radeonold.diff Patch46: xf86-video-ati-disable_rmx_dell_rn50.diff +Patch100: xf86-video-ati-6.6.3-r128-xvideo.patch +Patch101: xf86-video-ati-6.6.3-compile-cfb.patch +Patch102: xf86-video-ati-6.6.3-if0.patch %description This package contains X.Org video drivers. @@ -111,12 +114,22 @@ ln -snf mga.man xf86-video-mga-1.9.100/man/mgarandr12.man pushd xf86-video-ati-6.7.195 %patch28 -p1 +%ifnarch ppc ppc64 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%endif popd ln -snf ati.man xf86-video-ati-6.6.3/man/atiold.man ln -snf r128.man xf86-video-ati-6.6.3/man/r128old.man ln -snf radeon.man xf86-video-ati-6.6.3/man/radeonold.man pushd xf86-video-ati-6.6.3 %patch44 -p1 +%ifnarch ppc ppc64 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%endif popd pushd xf86-video-mga-1.9.100 %patch30 -p1 @@ -141,6 +154,11 @@ %patch39 -p1 %patch42 -p1 %patch46 -p1 +%ifnarch ppc ppc64 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%endif popd pushd xf86-video-nv-*/src %patch3 -p6 @@ -242,6 +260,11 @@ /usr/%{_lib}/xorg/modules/ %{_mandir}/man4/* %changelog +* Wed Oct 10 2007 - sndirsch@suse.de +- xf86-video-ati-6.6.3-compile-cfb.patch + xf86-video-ati-6.6.3-if0.patch + xf86-video-ati-6.6.3-r128-xvideo.patch + * TV-in support for All in Wonder 128 (Bug #302196, X.Org #8811) * Sat Oct 06 2007 - sndirsch@suse.de - xf86-video-ati 6.7.194 Another RC release. Once all the of the sub drivers are ported to ++++++ xf86-video-ati-6.6.3-compile-cfb.patch ++++++ --- xf86-video-ati-6.6.3/src/r128_driver.c 2007-06-11 22:50:29.000000000 +0200 +++ xf86-video-ati-6.6.3/src/r128_driver.c 2007-06-28 22:23:55.000000000 +0200 @@ -79,7 +79,7 @@ #include "r128_sarea.h" #endif -#define USE_FB /* not until overlays */ +#define USE_FB /* don't disable it: CFB code is broken */ #ifdef USE_FB #include "fb.h" #else @@ -89,9 +89,7 @@ #include "cfb.h" #undef PSZ #include "cfb16.h" -#include "cfb24.h" #include "cfb32.h" -#include "cfb24_32.h" #endif /* colormap initialization */ @@ -294,10 +292,6 @@ #else static const char *cfbSymbols[] = { "cfbScreenInit", - "cfb16ScreenInit", - "cfb24ScreenInit", - "cfb32ScreenInit", - "cfb24_32ScreenInit", NULL }; #endif @@ -1919,17 +1913,10 @@ #ifdef USE_FB mod = "fb"; #else - switch (pScrn->bitsPerPixel) { - case 8: mod = "cfb"; Sym = "cfbScreenInit"; break; - case 16: mod = "cfb16"; Sym = "cfb16ScreenInit"; break; - case 24: - if (info->pix24bpp == 24) { - mod = "cfb24"; Sym = "cfb24ScreenInit"; - } else { - mod = "xf24_32bpp"; Sym = "cfb24_32ScreenInit"; - } - break; - case 32: mod = "cfb32"; Sym = "cfb32ScreenInit"; break; + if (pScrn->bitsPerPixel == 32) { + mod = "cfb32"; Sym = "cfbScreenInit"; + } else { + mod = "cfb"; Sym = "cfbScreenInit"; } #endif if (mod && !xf86LoadSubModule(pScrn, mod)) return FALSE; @@ -2587,45 +2574,10 @@ pScrn->bitsPerPixel)) return FALSE; #else - switch (pScrn->bitsPerPixel) { - case 8: - if (!cfbScreenInit(pScreen, info->FB, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth)) - return FALSE; - break; - case 16: - if (!cfb16ScreenInit(pScreen, info->FB, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth)) - return FALSE; - break; - case 24: - if (info->pix24bpp == 24) { - if (!cfb24ScreenInit(pScreen, info->FB, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, - pScrn->displayWidth)) - return FALSE; - } else { - if (!cfb24_32ScreenInit(pScreen, info->FB, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, - pScrn->displayWidth)) - return FALSE; - } - break; - case 32: - if (!cfb32ScreenInit(pScreen, info->FB, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth)) - return FALSE; - break; - default: - xf86DrvMsg(scrnIndex, X_ERROR, - "Invalid bpp (%d)\n", pScrn->bitsPerPixel); + if (!cfbScreenInit(pScreen, info->FB, + pScrn->virtualX, pScrn->virtualY, + pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth)) return FALSE; - } #endif xf86SetBlackWhitePixels(pScreen); ++++++ xf86-video-ati-6.6.3-if0.patch ++++++ --- xf86-video-ati-6.6.3/src/r128_driver.c 2007-06-28 22:23:55.000000000 +0200 +++ xf86-video-ati-6.6.3/src/r128_driver.c 2007-06-28 22:53:12.000000000 +0200 @@ -4600,8 +4600,9 @@ info->DGAModes = NULL; #if 0 + /* This code causes server crash on exit freedesktop#8811#c12 */ if (info->adaptor) { - R128ShutdownVideo(pScrn, info->adaptor->pPortPrivates[0].ptr); + R128ShutdownVideo(pScrn); xfree(info->adaptor->pPortPrivates[0].ptr); xf86XVFreeVideoAdaptorRec(info->adaptor); info->adaptor = NULL; ++++++ xf86-video-ati-6.6.3-r128-xvideo.patch ++++++ ++++ 3196 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org