Date: Monday, September 28, 2015 @ 16:59:36 Author: andyrtr Revision: 247667
upgpkg: xf86-video-chips 1.2.6-1 upstream update 1.2.6 Modified: xf86-video-chips/trunk/PKGBUILD Deleted: xf86-video-chips/trunk/git-fix.diff xf86-video-chips/trunk/iopl.h --------------+ PKGBUILD | 18 ++----- git-fix.diff | 136 --------------------------------------------------------- iopl.h | 60 ------------------------- 3 files changed, 6 insertions(+), 208 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-09-28 13:38:40 UTC (rev 247666) +++ PKGBUILD 2015-09-28 14:59:36 UTC (rev 247667) @@ -3,8 +3,8 @@ # Contributor: Alexander Baldeck <[email protected]> pkgname=xf86-video-chips -pkgver=1.2.5 -pkgrel=6 +pkgver=1.2.6 +pkgrel=1 pkgdesc="X.org Chips and Technologies video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; @@ -12,17 +12,11 @@ depends=(glibc) makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19') conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff) -sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2' - 'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670' - '7c3f454b866ae479b5ab5d7cde4cb1e226b6f4fc070f77c6025864c2a1441ce1') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha256sums=('99aef5cf9f58391eefab5b4983814f417fd1cf2e4a0f93564de1e9bd75636b1c' + 'SKIP') +validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <[email protected]> -prepare() { - cd ${pkgname}-${pkgver} - cp ${srcdir}/iopl.h util/ - patch -Np1 -i ${srcdir}/git-fix.diff -} - build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr Deleted: git-fix.diff =================================================================== --- git-fix.diff 2015-09-28 13:38:40 UTC (rev 247666) +++ git-fix.diff 2015-09-28 14:59:36 UTC (rev 247667) @@ -1,136 +0,0 @@ -From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001 -From: Adam Jackson <[email protected]> -Date: Tue, 25 Sep 2012 12:54:34 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson <[email protected]> ---- -diff --git a/src/ct_driver.c b/src/ct_driver.c -index 6f3a5d4..effbc60 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -96,9 +96,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - /* All drivers using the mi banking wrapper need this */ - #ifdef HAVE_ISA - #include "mibank.h" -@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) - pBankInfo = NULL; - return FALSE; - } -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* Initialise cursor functions */ -@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) - } - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - #ifdef ENABLE_SILKEN_MOUSE - xf86SetSilkenMouse(pScreen); --- -cgit v0.9.0.2-2-gbebe -From bb03c06322f875e905dec956e06a99b9674e57aa Mon Sep 17 00:00:00 2001 -From: Adam Jackson <[email protected]> -Date: Wed, 21 May 2014 09:38:35 -0400 -Subject: ddc: Use own thunk function instead of vgaHWddc1SetSpeedWeak - -I plan to remove the Weak functions from future servers. - -Signed-off-by: Adam Jackson <[email protected]> - -diff --git a/src/ct_ddc.c b/src/ct_ddc.c -index 5e2346a..677d840 100644 ---- a/src/ct_ddc.c -+++ b/src/ct_ddc.c -@@ -33,6 +33,12 @@ chips_ddc1Read(ScrnInfoPtr pScrn) - return (tmp & ddc_mask); - } - -+static void -+chips_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) -+{ -+ vgaHWddc1SetSpeed(pScrn, speed); -+} -+ - void - chips_ddc1(ScrnInfoPtr pScrn) - { -@@ -93,7 +99,7 @@ chips_ddc1(ScrnInfoPtr pScrn) - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "DDC1 found\n"); - else return; - -- xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), vgaHWddc1SetSpeedWeak(), -+ xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), chips_ddc1SetSpeed, - chips_ddc1Read)); - - /* restore */ --- -cgit v0.10.2 -From 9187d76bd4f8d500fc3403b6d4a7bef55508bf2b Mon Sep 17 00:00:00 2001 -From: Adam Jackson <[email protected]> -Date: Fri, 17 Oct 2014 09:49:26 -0400 -Subject: Update for xserver 1.17 - -Signed-off-by: Adam Jackson <[email protected]> - -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); --- -cgit v0.10.2 Deleted: iopl.h =================================================================== --- iopl.h 2015-09-28 13:38:40 UTC (rev 247666) +++ iopl.h 2015-09-28 14:59:36 UTC (rev 247667) @@ -1,60 +0,0 @@ -#ifdef __NetBSD__ -# include <sys/types.h> -# include <machine/pio.h> -# include <machine/sysarch.h> -#else -# if defined(__linux__) -/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc - * # include <sys/io.h> - */ -int iopl(int level); -# endif -# if defined(SVR4) && defined(i386) -# include <sys/types.h> -# ifdef NCR - /* broken NCR <sys/sysi86.h> */ -# define __STDC -# include <sys/sysi86.h> -# undef __STDC -# else -# include <sys/sysi86.h> -# endif -# ifdef SVR4 -# if !defined(sun) -# include <sys/seg.h> -# endif -# endif -# include <sys/v86.h> -# if defined(sun) -# include <sys/psw.h> -# endif -# endif -# include "AsmMacros.h" -#endif /* NetBSD */ - -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> - -#ifdef __NetBSD__ -# define SET_IOPL() i386_iopl(3) -# define RESET_IOPL() i386_iopl(0) -#else -# if defined(SVR4) && defined(i386) -# ifndef SI86IOPL -# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) -# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) -# else -# define SET_IOPL() sysi86(SI86IOPL,3) -# define RESET_IOPL() sysi86(SI86IOPL,0) -# endif -# else -# ifdef linux -# define SET_IOPL() iopl(3) -# define RESET_IOPL() iopl(0) -# else -# define SET_IOPL() (void)0 -# define RESET_IOPL() (void)0 -# endif -# endif -#endif
