From 4b87b23cc1b39f3e4aa6d782be384221315f1857 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 16 May 2013 06:02:58 +0000 Subject: update to xf86-video-ati-7.1.0 for modular-xorg-server-1.12.4 --- x11/xf86-video-ati/Makefile | 5 +- x11/xf86-video-ati/PLIST | 5 +- x11/xf86-video-ati/distinfo | 10 ++-- x11/xf86-video-ati/patches/patch-aa | 96 ------------------------------------- x11/xf86-video-ati/patches/patch-ac | 21 -------- 5 files changed, 7 insertions(+), 130 deletions(-) delete mode 100644 x11/xf86-video-ati/patches/patch-aa delete mode 100644 x11/xf86-video-ati/patches/patch-ac (limited to 'x11/xf86-video-ati') diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile index 7b4918139eb..dbe994b7b42 100644 --- a/x11/xf86-video-ati/Makefile +++ b/x11/xf86-video-ati/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2012/10/29 05:07:03 asau Exp $ +# $NetBSD: Makefile,v 1.21 2013/05/16 06:02:58 richard Exp $ -DISTNAME= xf86-video-ati-6.12.4 -PKGREVISION= 4 +DISTNAME= xf86-video-ati-7.1.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xf86-video-ati/PLIST b/x11/xf86-video-ati/PLIST index 7e69f4206c5..f6c83b86045 100644 --- a/x11/xf86-video-ati/PLIST +++ b/x11/xf86-video-ati/PLIST @@ -1,8 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:25:11 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2013/05/16 06:02:58 richard Exp $ lib/xorg/modules/drivers/ati_drv.la lib/xorg/modules/drivers/radeon_drv.la -lib/xorg/modules/multimedia/theatre200_drv.la -lib/xorg/modules/multimedia/theatre_detect_drv.la -lib/xorg/modules/multimedia/theatre_drv.la man/man4/ati.4 man/man4/radeon.4 diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo index 9d37f7ee762..fae53a605d5 100644 --- a/x11/xf86-video-ati/distinfo +++ b/x11/xf86-video-ati/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.13 2010/11/03 09:19:20 abs Exp $ +$NetBSD: distinfo,v 1.14 2013/05/16 06:02:58 richard Exp $ -SHA1 (xf86-video-ati-6.12.4.tar.bz2) = efd9b9392787251756bbce6afc9715c417dae68f -RMD160 (xf86-video-ati-6.12.4.tar.bz2) = c1d6700bfe52977c863eb05cc63dfad52d405c00 -Size (xf86-video-ati-6.12.4.tar.bz2) = 915124 bytes -SHA1 (patch-aa) = 6168528ab4e305063cc282b7e6c4b5bca0c22725 -SHA1 (patch-ac) = e8b4eb3f92ccb4f4741d9a1abf444eea01b74ca0 +SHA1 (xf86-video-ati-7.1.0.tar.bz2) = f94730e5ffc5f75fa3126579bed0222fe8330653 +RMD160 (xf86-video-ati-7.1.0.tar.bz2) = 2f54809e4d391eeeb13616369627aa49e82dff3d +Size (xf86-video-ati-7.1.0.tar.bz2) = 804531 bytes diff --git a/x11/xf86-video-ati/patches/patch-aa b/x11/xf86-video-ati/patches/patch-aa deleted file mode 100644 index a9fd7807c72..00000000000 --- a/x11/xf86-video-ati/patches/patch-aa +++ /dev/null @@ -1,96 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2010/10/27 16:48:26 jakllsch Exp $ - ---- src/radeon_driver.c.orig 2009-09-10 23:18:42.000000000 +0000 -+++ src/radeon_driver.c -@@ -4246,8 +4246,6 @@ static void RADEONSaveMemMapRegisters(Sc - } - } - -- --#if 0 - /* Read palette data */ - static void RADEONSavePalette(ScrnInfoPtr pScrn, RADEONSavePtr save) - { -@@ -4255,19 +4253,37 @@ static void RADEONSavePalette(ScrnInfoPt - unsigned char *RADEONMMIO = info->MMIO; - int i; - --#ifdef ENABLE_FLAT_PANEL -- /* Select palette 0 (main CRTC) if using FP-enabled chip */ -- /* if (info->Port1 == MT_DFP) PAL_SELECT(1); */ --#endif - PAL_SELECT(1); - INPAL_START(0); -- for (i = 0; i < 256; i++) save->palette2[i] = INPAL_NEXT(); -+ for (i = 0; i < 256; i++) { -+ save->palette2[i] = INREG(RADEON_PALETTE_30_DATA); -+ } -+ - PAL_SELECT(0); - INPAL_START(0); -- for (i = 0; i < 256; i++) save->palette[i] = INPAL_NEXT(); -- save->palette_valid = TRUE; -+ for (i = 0; i < 256; i++) { -+ save->palette[i] = INREG(RADEON_PALETTE_30_DATA); -+ } -+} -+ -+static void RADEONRestorePalette(ScrnInfoPtr pScrn, RADEONSavePtr restore) -+{ -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ unsigned char *RADEONMMIO = info->MMIO; -+ int i; -+ -+ PAL_SELECT(1); -+ OUTPAL_START(0); -+ for (i = 0; i < 256; i++) { -+ OUTREG(RADEON_PALETTE_30_DATA, restore->palette2[i]); -+ } -+ -+ PAL_SELECT(0); -+ OUTPAL_START(0); -+ for (i = 0; i < 256; i++) { -+ OUTREG(RADEON_PALETTE_30_DATA, restore->palette[i]); -+ } - } --#endif - - static void - avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save) -@@ -5134,6 +5150,8 @@ static void RADEONSave(ScrnInfoPtr pScrn - RADEONSaveCrtcRegisters(pScrn, save); - RADEONSaveFPRegisters(pScrn, save); - RADEONSaveDACRegisters(pScrn, save); -+ RADEONSavePalette(pScrn, save); -+ - if (pRADEONEnt->HasCRTC2) { - RADEONSaveCrtc2Registers(pScrn, save); - RADEONSavePLL2Registers(pScrn, save); -@@ -5252,24 +5270,15 @@ static void RADEONRestore(ScrnInfoPtr pS - if (IS_AVIVO_VARIANT) - avivo_restore_vga_regs(pScrn, restore); - -- if (!IS_AVIVO_VARIANT) -+ if (!IS_AVIVO_VARIANT) { -+ RADEONRestorePalette(pScrn, restore); - RADEONRestoreDACRegisters(pScrn, restore); -- -+ } - #if 0 - RADEONWaitForVerticalSync(pScrn); - #endif - } - --#if 0 --/* Define initial palette for requested video mode. This doesn't do -- * anything for XFree86 4.0. -- */ --static void RADEONInitPalette(RADEONSavePtr save) --{ -- save->palette_valid = FALSE; --} --#endif -- - static Bool RADEONSaveScreen(ScreenPtr pScreen, int mode) - { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; diff --git a/x11/xf86-video-ati/patches/patch-ac b/x11/xf86-video-ati/patches/patch-ac deleted file mode 100644 index 5375d4982e4..00000000000 --- a/x11/xf86-video-ati/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2009/09/11 06:38:36 hasso Exp $ - ---- configure.orig 2009-09-10 06:00:38 +0300 -+++ configure 2009-09-10 21:07:01 +0300 -@@ -23340,16 +23340,8 @@ $as_echo_n "checking for $XORG_SGML_PATH - if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- test "$cross_compiling" = yes && -- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 --$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -- { (exit 1); exit 1; }; } --if test -r "$XORG_SGML_PATH/X11/defs.ent"; then -- eval "$as_ac_File=yes" --else - eval "$as_ac_File=no" - fi --fi - ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -- cgit v1.2.3