Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Thu Mar 1 20:11:59 CET 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-02-22 23:15:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-01 19:00:52.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 1 19:00:06 CET 2007 - sndirsch@suse.de + +- xf86-video-ati-mergedfb-dpi.diff: + * fixes DPI values for mergedfb configs (Bug #239033) + +------------------------------------------------------------------- New: ---- xf86-video-ati-mergedfb-dpi.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.En8820/_old 2007-03-01 20:10:15.000000000 +0100 +++ /var/tmp/diff_new_pack.En8820/_new 2007-03-01 20:10:15.000000000 +0100 @@ -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.2 -Release: 56 +Release: 58 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -83,6 +83,7 @@ Patch24: xf86-video-intel.modesetting.diff Patch25: xf86-video-intel.modesetting-sdvo-stuffing.diff Patch26: rn50_pixel_clock_limit.patch +Patch27: xf86-video-ati-mergedfb-dpi.diff %description This package contains X.Org video drivers. @@ -98,6 +99,7 @@ %patch2 -p0 %patch18 -p1 %patch26 -p2 +%patch27 -p0 popd pushd xf86-video-nv-*/src %patch3 -p6 @@ -262,6 +264,9 @@ %{_mandir}/man4/* %changelog +* Thu Mar 01 2007 - sndirsch@suse.de +- xf86-video-ati-mergedfb-dpi.diff: + * fixes DPI values for mergedfb configs (Bug #239033) * Thu Feb 22 2007 - sndirsch@suse.de - added blacklist for kernel fb modules (Bug #239194) * Tue Feb 13 2007 - sndirsch@suse.de ++++++ xf86-video-ati-mergedfb-dpi.diff ++++++ diff -u -r ../xf86-video-ati-6.6.3.orig/src/radeon_mergedfb.c ./src/radeon_mergedfb.c --- ../xf86-video-ati-6.6.3.orig/src/radeon_mergedfb.c 2007-03-01 18:26:38.000000000 +0100 +++ radeon_mergedfb.c 2007-03-01 18:40:21.000000000 +0100 @@ -1797,10 +1797,18 @@ /* Set values calculated from given DisplaySize */ from = X_CONFIG; if(pScrn1->widthmm > 0) { - pScrn1->xDpi = (int)((double)pScrn1->virtualX * 25.4 / pScrn1->widthmm); + if (pScrn1->modes && pScrn1->modes->CrtcHDisplay > 0) { + pScrn1->xDpi = (int)((double)pScrn1->modes->CrtcHDisplay * 25.4 / pScrn1->widthmm); + } else { + pScrn1->xDpi = (int)((double)pScrn1->virtualX * 25.4 / pScrn1->widthmm); + } } if(pScrn1->heightmm > 0) { - pScrn1->yDpi = (int)((double)pScrn1->virtualY * 25.4 / pScrn1->heightmm); + if (pScrn1->modes && pScrn1->modes->CrtcVDisplay > 0) { + pScrn1->yDpi = (int)((double)pScrn1->modes->CrtcVDisplay * 25.4 / pScrn1->heightmm); + } else { + pScrn1->yDpi = (int)((double)pScrn1->virtualY * 25.4 / pScrn1->heightmm); + } } if(!quiet) { xf86DrvMsg(pScrn1->scrnIndex, from, dsstr, pScrn1->widthmm, pScrn1->heightmm); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org