From 64fd99168436e02a321bee6d9f4809070d251266 Mon Sep 17 00:00:00 2001
From: tnn <tnn@pkgsrc.org>
Date: Sat, 9 Aug 2008 16:10:10 +0000
Subject: Update to xf86-video-sis-0.10.0.

0.10.0:
  Death to RCS tags.
  Fix distcheck
  sis 0.10.0
  inital SiS pci access patch
  fix warnings in build
  fix thinko between open/fopen
  another open/fopen confusion
  fixup type punning
  convert all hostbridge read/writes to accessor functions
  finish off read/write long conversion
  switch bios reading over
  use map domain memory with pciinfo
  fixup unmap memory
  fix some thinkos in the pciaccess patch, this now works on real hardware
  Require pciaccess >= 0.10.0 for pci_device_map_range()
  fixup pciaccess version detect
  Makefile.am: nuke RCS Id
  switch vga over to pciaccess
0.9.4:
  bump Xv image height up from 1080 to 1088 for 315 chips
  Define SIS_*_VERSION using PACKAGE_VERSION*
  Convert callers of LookupWindow() to dixLookupWindow().
  Revert "Convert callers of LookupWindow() to dixLookupWindow()."
  Rename .cvsignore to .gitignore
  Add *~ to .gitignore to skip patch/emacs droppings
  Fix xserver version detection.
  Get rid of the XFree86Server macro.
  Bump to 0.9.4.
---
 x11/xf86-video-sis/Makefile         |  4 ++--
 x11/xf86-video-sis/distinfo         | 10 +++++-----
 x11/xf86-video-sis/patches/patch-aa | 21 ++++-----------------
 3 files changed, 11 insertions(+), 24 deletions(-)

(limited to 'x11')

diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index e37f2a8af86..7e8ec83449a 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/08/09 16:10:10 tnn Exp $
 #
 
-DISTNAME=	xf86-video-sis-0.9.3
+DISTNAME=	xf86-video-sis-0.10.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-sis/distinfo b/x11/xf86-video-sis/distinfo
index 2f14abd97bf..3ec988dca52 100644
--- a/x11/xf86-video-sis/distinfo
+++ b/x11/xf86-video-sis/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/08/15 18:03:32 joerg Exp $
+$NetBSD: distinfo,v 1.4 2008/08/09 16:10:10 tnn Exp $
 
-SHA1 (xf86-video-sis-0.9.3.tar.bz2) = fb386185a91bbc6764445ef251d4a0216ec9b9d0
-RMD160 (xf86-video-sis-0.9.3.tar.bz2) = 797104eab78486411a876def8e87870946fbe273
-Size (xf86-video-sis-0.9.3.tar.bz2) = 617592 bytes
-SHA1 (patch-aa) = 068952660754a35ce2662bdb8513b59b81eb65d4
+SHA1 (xf86-video-sis-0.10.0.tar.bz2) = ec3fc258186d7de221ad875d7762c91f598b8c57
+RMD160 (xf86-video-sis-0.10.0.tar.bz2) = 5f84d17770f5a86bdedf5987e47ccf49cede8278
+Size (xf86-video-sis-0.10.0.tar.bz2) = 630049 bytes
+SHA1 (patch-aa) = bee0ac9a5e853efed0a111fd2ab94f63e1d88b2f
 SHA1 (patch-ab) = 72557e7a7ff406549471bc59570f0fa5074df2a8
 SHA1 (patch-ac) = 6ce332ff427b33c40a25efb86101038510c532ed
diff --git a/x11/xf86-video-sis/patches/patch-aa b/x11/xf86-video-sis/patches/patch-aa
index 540bf746247..9cfb396fd1a 100644
--- a/x11/xf86-video-sis/patches/patch-aa
+++ b/x11/xf86-video-sis/patches/patch-aa
@@ -1,21 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2007/08/15 18:03:32 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2008/08/09 16:10:10 tnn Exp $
 
---- configure.orig	2006-11-30 18:58:33.000000000 +0100
+--- configure.orig	2008-03-19 20:28:37.000000000 +0100
 +++ configure
-@@ -2283,10 +2283,10 @@ AMSHOWCMDSAT=''
- AMDEPSHOWCMDSAT=''
- AMPRETTYECHO=true
- AMCMDECHO=echo
--if test "x$enable_pretty_cmds" == xyes;
-+if test "x$enable_pretty_cmds" = xyes;
- then
-   AMSHOWCMDSAT='@'
--  test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@'
-+  test x$enable_dependency_tracking = xno && AMDEPSHOWCMDSAT='@'
-   AMPRETTYECHO=echo
-   AMCMDECHO=true
-   LT_QUIET='--quiet'
-@@ -21618,7 +21618,7 @@ _ACEOF
+@@ -21085,7 +21085,7 @@ _ACEOF
  fi
  
  
@@ -24,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2007/08/15 18:03:32 joerg Exp $
          as_ac_File=`echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
  echo $ECHO_N "checking for ${sdkdir}/dri.h... $ECHO_C" >&6; }
-@@ -21956,16 +21956,8 @@ echo $ECHO_N "checking for $XORG_SGML_PA
+@@ -21633,16 +21633,8 @@ echo $ECHO_N "checking for $XORG_SGML_PA
  if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-- 
cgit v1.2.3