main/xf86-video-chips: upgrade to 1.2.6

3 files changed, 6 insertions, 212 deletions

diff --git a/main/xf86-video-chips/APKBUILD b/main/xf86-video-chips/APKBUILD
index 93766f837e..62cb2fe49e 100644
--- a/main/xf86-video-chips/APKBUILD
+++ b/main/xf86-video-chips/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-chips
-pkgver=1.2.5
-pkgrel=6
+pkgver=1.2.6
+pkgrel=0
 pkgdesc="Chips and Technologies video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,19 +11,15 @@ depends=
 makedepends="xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	xorg-1.17-fix.patch
-	iopl.h"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	! [ -e util/iopl.h ] && cp "$srcdir"/iopl.h util/
 }
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -41,12 +37,6 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="56be62612f98a0cf469a2a78c0a14ed5  xf86-video-chips-1.2.5.tar.bz2
-3fecef23896589fdcf6aa271a6ca30ea  xorg-1.17-fix.patch
-e4a7c922ab37bb4c8f44f731c9bec911  iopl.h"
-sha256sums="8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2  xf86-video-chips-1.2.5.tar.bz2
-7c3f454b866ae479b5ab5d7cde4cb1e226b6f4fc070f77c6025864c2a1441ce1  xorg-1.17-fix.patch
-d04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670  iopl.h"
-sha512sums="3468d453fb3bc01b115d0a4a9f10bebe43b89c9cd997e2991d459a40a2f8a0e3ed2cb40bfcb2b80fae853af8c9ea6a94c82d73d16a27fe9612c8a1f2a6fbd3d4  xf86-video-chips-1.2.5.tar.bz2
-67d7a35d1c5d008d614b3bffbc9ffce5a42734bcd03c226a6d6e5afd039f92fdd053772ece12bbbe50d7c6d3f3a17e06d59c0c911a5ce85fbf2d615e6644518e  xorg-1.17-fix.patch
-9fc3dbf8325425b755b08e9478225872468cacda5c97a2eb0c987bf0c726ca89d559d8db9d00ac372c52b8bd55912a9fa20f60eb4bdd2a2df093857a0023714c  iopl.h"
+md5sums="7c3ac8a7338367b05d9315d65ef91226  xf86-video-chips-1.2.6.tar.bz2"
+sha256sums="99aef5cf9f58391eefab5b4983814f417fd1cf2e4a0f93564de1e9bd75636b1c  xf86-video-chips-1.2.6.tar.bz2"
+sha512sums="7844852fe514281f5613e6bc3254a207d6028663895228976edd77fc3b214e2fb344929eca238b632218f730ef30503ff14500b84289bc7ab3108888078e72f5  xf86-video-chips-1.2.6.tar.bz2"
diff --git a/main/xf86-video-chips/iopl.h b/main/xf86-video-chips/iopl.h
deleted file mode 100644
index e08207c7f2..0000000000
--- a/main/xf86-video-chips/iopl.h
+++ /dev/null
@@ -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
diff --git a/main/xf86-video-chips/xorg-1.17-fix.patch b/main/xf86-video-chips/xorg-1.17-fix.patch
deleted file mode 100644
index c796a80aaa..0000000000
--- a/main/xf86-video-chips/xorg-1.17-fix.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:54:34 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-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 <ajax@redhat.com>
-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 <ajax@redhat.com>
-
-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 <ajax@redhat.com>
-Date: Fri, 17 Oct 2014 09:49:26 -0400
-Subject: Update for xserver 1.17
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-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