diff options
author | joerg <joerg@pkgsrc.org> | 2007-08-15 18:16:35 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2007-08-15 18:16:35 +0000 |
commit | 2d2331133b3bb802b51ff92aad771ba69b4202ff (patch) | |
tree | 51de2ab6ac3bd281bfb3e9e351323ca1dd97ff05 | |
parent | 318cadd052c8fb9624e1afcd0a40ad1aab4f4ea2 (diff) | |
download | pkgsrc-2d2331133b3bb802b51ff92aad771ba69b4202ff.tar.gz |
Change configure to check for DRI headers only, if it is not explicitly
enabled or disabled. Request DRI explicitly. Disable the SGML check.
-rw-r--r-- | x11/xf86-video-ati/Makefile | 4 | ||||
-rw-r--r-- | x11/xf86-video-ati/distinfo | 4 | ||||
-rw-r--r-- | x11/xf86-video-ati/patches/patch-ab | 13 | ||||
-rw-r--r-- | x11/xf86-video-ati/patches/patch-ac | 39 |
4 files changed, 58 insertions, 2 deletions
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile index 8a2f2cdebfa..bc8998aaf24 100644 --- a/x11/xf86-video-ati/Makefile +++ b/x11/xf86-video-ati/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/04/10 19:10:54 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2007/08/15 18:16:35 joerg Exp $ DISTNAME= xf86-video-ati-6.6.3 PKGREVISION= 1 @@ -11,6 +11,8 @@ COMMENT= Modular Xorg ATI video driver PKG_DESTDIR_SUPPORT= user-destdir +CONFIGURE_ARGS+= --enable-dri + USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake pkg-config diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo index e20f6ff3c9c..ac2c48fc7fb 100644 --- a/x11/xf86-video-ati/distinfo +++ b/x11/xf86-video-ati/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.2 2007/04/10 19:10:54 joerg Exp $ +$NetBSD: distinfo,v 1.3 2007/08/15 18:16:35 joerg Exp $ SHA1 (xf86-video-ati-6.6.3.tar.bz2) = b911df1f4b41ad37028c708e2c95e5a729a32ede RMD160 (xf86-video-ati-6.6.3.tar.bz2) = a1c24c13ea88fa38f34e3f0540b53082ab2ae129 Size (xf86-video-ati-6.6.3.tar.bz2) = 723083 bytes SHA1 (patch-aa) = 0f8a8514f58c0b535e8d7048025ebfaf097f53a0 +SHA1 (patch-ab) = 55cf92081fbeae3896d0621a5907ebfbfbdc4e84 +SHA1 (patch-ac) = be2ab226f2ad3cda36f8ff233d7e43b6f9260497 diff --git a/x11/xf86-video-ati/patches/patch-ab b/x11/xf86-video-ati/patches/patch-ab new file mode 100644 index 00000000000..8bf5a40a0bb --- /dev/null +++ b/x11/xf86-video-ati/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2007/08/15 18:16:35 joerg Exp $ + +--- configure.ac.orig 2007-08-15 20:12:28.000000000 +0200 ++++ configure.ac +@@ -84,7 +84,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 --git a/x11/xf86-video-ati/patches/patch-ac b/x11/xf86-video-ati/patches/patch-ac new file mode 100644 index 00000000000..cbd991be40a --- /dev/null +++ b/x11/xf86-video-ati/patches/patch-ac @@ -0,0 +1,39 @@ +$NetBSD: patch-ac,v 1.1 2007/08/15 18:16:35 joerg Exp $ + +--- configure.orig 2006-10-03 17:02:18.000000000 +0200 ++++ configure +@@ -20261,7 +20261,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 +@@ -20982,16 +20982,8 @@ echo $ECHO_N "checking for $prefix/share + if eval "test \"\${$as_ac_File+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 + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 + if test `eval echo '${'$as_ac_File'}'` = yes; then +@@ -21694,6 +21686,8 @@ do + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + ac_cs_recheck=: ;; + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; |