pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xf86-video-i810 Change configure to check for DRI ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d59d23d6b441
branches: trunk
changeset: 532298:d59d23d6b441
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Aug 15 19:44:55 2007 +0000
description:
Change configure to check for DRI headers only if DRI is not explicitly
enabled or disabled. Request it for pkgsrc. Disable SGML check.
diffstat:
x11/xf86-video-i810/Makefile | 4 +++-
x11/xf86-video-i810/distinfo | 4 +++-
x11/xf86-video-i810/patches/patch-aa | 13 +++++++++++++
x11/xf86-video-i810/patches/patch-ab | 30 ++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+), 2 deletions(-)
diffs (81 lines):
diff -r 35ec01e48051 -r d59d23d6b441 x11/xf86-video-i810/Makefile
--- a/x11/xf86-video-i810/Makefile Wed Aug 15 19:41:30 2007 +0000
+++ b/x11/xf86-video-i810/Makefile Wed Aug 15 19:44:55 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/08/07 16:20:25 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/08/15 19:44:55 joerg Exp $
DISTNAME= xf86-video-i810-1.7.4
CATEGORIES= x11
@@ -12,6 +12,8 @@
PKG_DESTDIR_SUPPORT= user-destdir
+CONFIGURE_ARGS+= --enable-dri
+
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_TOOLS+= gmake pkg-config
diff -r 35ec01e48051 -r d59d23d6b441 x11/xf86-video-i810/distinfo
--- a/x11/xf86-video-i810/distinfo Wed Aug 15 19:41:30 2007 +0000
+++ b/x11/xf86-video-i810/distinfo Wed Aug 15 19:44:55 2007 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/02/26 18:14:06 drochner Exp $
+$NetBSD: distinfo,v 1.3 2007/08/15 19:44:55 joerg Exp $
SHA1 (xf86-video-i810-1.7.4.tar.bz2) = 3c2837283ec3e9d1aeec430bb2460178aec94a90
RMD160 (xf86-video-i810-1.7.4.tar.bz2) = cbb8ebd7e36d07513e00c232cbb1e0b12a0de3b2
Size (xf86-video-i810-1.7.4.tar.bz2) = 461513 bytes
+SHA1 (patch-aa) = 46216c0fd3f83bd584b1a392defcd9cf78bacc6e
+SHA1 (patch-ab) = 1839dd6d21360bbba938c3584edb388a3ae166f9
diff -r 35ec01e48051 -r d59d23d6b441 x11/xf86-video-i810/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-i810/patches/patch-aa Wed Aug 15 19:44:55 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/08/15 19:44:55 joerg Exp $
+
+--- configure.ac.orig 2007-08-15 21:31:11.000000000 +0200
++++ configure.ac
+@@ -87,7 +87,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
+ # Checks for header files.
+ AC_HEADER_STDC
+
+-if test "$DRI" != no; then
++if test "x$DRI" = xauto; then
+ AC_CHECK_FILE([${sdkdir}/dri.h],
+ [have_dri_h="yes"], [have_dri_h="no"])
+ AC_CHECK_FILE([${sdkdir}/sarea.h],
diff -r 35ec01e48051 -r d59d23d6b441 x11/xf86-video-i810/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-i810/patches/patch-ab Wed Aug 15 19:44:55 2007 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2007/08/15 19:44:55 joerg Exp $
+
+--- configure.orig 2007-08-15 21:33:41.000000000 +0200
++++ configure
+@@ -21022,7 +21022,7 @@ _ACEOF
+ fi
+
+
+-if test "$DRI" != no; then
++if test "x$DRI" = xauto; then
+ 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; }
+@@ -21407,16 +21407,8 @@ echo $ECHO_N "checking for $prefix/share
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- test "$cross_compiling" = yes &&
+- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+- { (exit 1); exit 1; }; }
+-if test -r "$prefix/share/X11/sgml/defs.ent"; then
+- eval "$as_ac_File=yes"
+-else
+ eval "$as_ac_File=no"
+ fi
+-fi
+ ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
Home |
Main Index |
Thread Index |
Old Index