head	1.3;
access;
symbols
	pkgsrc-2013Q3:1.2.0.6
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.2
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.1.0.30
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.28
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.26
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.24
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.22
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.20
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.18
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.16
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.14
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.12
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.10
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.8
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.6
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.4
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.2
	pkgsrc-2009Q2-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2013.09.30.17.00.16;	author wiz;	state dead;
branches;
next	1.2;
commitid	hSXq6uK5v9oo3u7x;

1.2
date	2013.01.22.09.34.19;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2009.06.09.08.18.39;	author hasso;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove xf86-video-vga, desupported since xorg-server-1.5.
@
text
@$NetBSD: patch-aa,v 1.2 2013/01/22 09:34:19 wiz Exp $

First chunk: automake-1.13 compat
Rest:
http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=97e2d125
http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=a0d4a475

--- configure.ac.orig	2006-04-07 21:48:23.000000000 +0000
+++ configure.ac
@@@@ -27,7 +27,7 @@@@ AC_INIT([xf86-video-vga],
         xf86-video-vga)
 
 AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
 AM_INIT_AUTOMAKE([dist-bzip2])
@@@@ -57,6 +57,30 @@@@ PKG_CHECK_MODULES(XORG, [xorg-server >= 
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+	      [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+	      [],
+	      [#include "xf86.h"])
+CFLAGS="$SAVE_CFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
+# Checks for libraries.
 
 # Checks for header files.
 AC_HEADER_STDC
@


1.2
log
@automake-1.13 compat.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2009/06/09 08:18:39 hasso Exp $
@


1.1
log
@Pull in two patches from upstream git to make it build with new xserver:

* Add libpciaccess and remove xf1bpp and xf4bpp support.
* Make ISA support optional.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
d8 11
a18 2
--- configure.ac.orig	2006-04-08 00:48:23 +0300
+++ configure.ac	2009-06-09 10:27:54 +0300
@