Hello community, here is the log from the commit of package xf86-video-chips for openSUSE:Factory checked in at 2015-02-10 20:16:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-chips (Old) and /work/SRC/openSUSE:Factory/.xf86-video-chips.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-chips" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-chips/xf86-video-chips.changes 2013-08-23 11:09:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-chips.new/xf86-video-chips.changes 2015-02-10 20:16:21.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 6 11:20:55 UTC 2015 - [email protected] + +- U_Update-for-xserver-1.17.patch + * fixes build against xorg-server 1.17 + +------------------------------------------------------------------- New: ---- U_Update-for-xserver-1.17.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-chips.spec ++++++ --- /var/tmp/diff_new_pack.vC4WEB/_old 2015-02-10 20:16:22.000000000 +0100 +++ /var/tmp/diff_new_pack.vC4WEB/_new 2015-02-10 20:16:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-chips # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,7 @@ Source0: %{name}-%{version}_bde6593.tar.bz2 #PATCH-FIX-UPSTREAM U_mibstore.patch -- removes obsolete include Patch0: U_mibstore.patch +Patch1: U_Update-for-xserver-1.17.patch BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 @@ -59,6 +60,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure ++++++ U_Update-for-xserver-1.17.patch ++++++ >From 9187d76bd4f8d500fc3403b6d4a7bef55508bf2b Mon Sep 17 00:00:00 2001 From: Adam Jackson <[email protected]> Date: Fri, 17 Oct 2014 09:49:26 -0400 Subject: [PATCH] Update for xserver 1.17 Signed-off-by: Adam Jackson <[email protected]> --- src/ct_driver.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/src/ct_driver.c b/src/ct_driver.c index effbc60..378a23c 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -2098,13 +2098,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) pScrn->progClock = TRUE; cPtr->ClockType = HiQV_STYLE | TYPE_PROGRAMMABLE; - if (cPtr->pEnt->device->textClockFreq > 0) { - SaveClk->Clock = cPtr->pEnt->device->textClockFreq; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "Using textclock freq: %7.3f.\n", - SaveClk->Clock/1000.0); - } else - SaveClk->Clock = 0; + SaveClk->Clock = 0; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); @@ -2807,13 +2801,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags) if (cPtr->ClockType & TYPE_PROGRAMMABLE) { pScrn->numClocks = NoClocks; - if(cPtr->pEnt->device->textClockFreq > 0) { - SaveClk->Clock = cPtr->pEnt->device->textClockFreq; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "Using textclock freq: %7.3f.\n", - SaveClk->Clock/1000.0); - } else - SaveClk->Clock = CRT_TEXT_CLK_FREQ; + SaveClk->Clock = CRT_TEXT_CLK_FREQ; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); } else { /* TYPE_PROGRAMMABLE */ SaveClk->Clock = chipsGetHWClock(pScrn); @@ -3500,14 +3488,8 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags) if (cPtr->ClockType & TYPE_PROGRAMMABLE) { pScrn->numClocks = NoClocks; - if (cPtr->pEnt->device->textClockFreq > 0) { - SaveClk->Clock = cPtr->pEnt->device->textClockFreq; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "Using textclock freq: %7.3f.\n", - SaveClk->Clock/1000.0); - } else - SaveClk->Clock = ((cPtr->PanelType & ChipsLCDProbed) ? - LCD_TEXT_CLK_FREQ : CRT_TEXT_CLK_FREQ); + SaveClk->Clock = ((cPtr->PanelType & ChipsLCDProbed) ? + LCD_TEXT_CLK_FREQ : CRT_TEXT_CLK_FREQ); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); } else { /* TYPE_PROGRAMMABLE */ SaveClk->Clock = chipsGetHWClock(pScrn); -- 1.8.4.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
