summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-08-09 15:21:07 +0000
committertnn <tnn@pkgsrc.org>2008-08-09 15:21:07 +0000
commitbeb59327a2cd47dec333317e91c2e9fe769b863b (patch)
tree71ef0337d7d0cd90fce7a963b090a8f2c59eaf9a /x11
parent37adbba3d9450522c05138ec5cf898b751f7557f (diff)
downloadpkgsrc-beb59327a2cd47dec333317e91c2e9fe769b863b.tar.gz
Update to xf86-video-chips-1.2.0.
Death to RCS tags. Fix distcheck chips 1.2.0 Define CHIPS_*_VERSION* using PACKAGE_VERSION_* chips: pciaccess conversion add another missing rename file chips: remove ALLOCATE_LOCAL chips: optionalise 1/4bpp support Rename .cvsignore to .gitignore Add *~ to .gitignore to skip patch/emacs droppings Makefile.am: nuke RCS Id Fix Xv with scaling
Diffstat (limited to 'x11')
-rw-r--r--x11/xf86-video-chips/Makefile4
-rw-r--r--x11/xf86-video-chips/distinfo10
-rw-r--r--x11/xf86-video-chips/patches/patch-aa67
3 files changed, 38 insertions, 43 deletions
diff --git a/x11/xf86-video-chips/Makefile b/x11/xf86-video-chips/Makefile
index 8025e02eb26..fe3dfef1bea 100644
--- a/x11/xf86-video-chips/Makefile
+++ b/x11/xf86-video-chips/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/09 15:21:07 tnn Exp $
#
-DISTNAME= xf86-video-chips-1.1.1
+DISTNAME= xf86-video-chips-1.2.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xf86-video-chips/distinfo b/x11/xf86-video-chips/distinfo
index 030a38bcfca..930208436ea 100644
--- a/x11/xf86-video-chips/distinfo
+++ b/x11/xf86-video-chips/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/08/15 18:19:06 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/08/09 15:21:07 tnn Exp $
-SHA1 (xf86-video-chips-1.1.1.tar.bz2) = 0df4bd2545b6b9db5670a7e512f24562fb1b7a03
-RMD160 (xf86-video-chips-1.1.1.tar.bz2) = add8ff2e344ed99db5723497516f8c969975820c
-Size (xf86-video-chips-1.1.1.tar.bz2) = 324093 bytes
-SHA1 (patch-aa) = dd4ac968a65eed53f070af9c78ba51dfac537498
+SHA1 (xf86-video-chips-1.2.0.tar.bz2) = 6a668d55502e128b1419397e62e23ec7219d56d4
+RMD160 (xf86-video-chips-1.2.0.tar.bz2) = 16cfee1ec167fcaa48555bd866f8b9eb8d1cc9c0
+Size (xf86-video-chips-1.2.0.tar.bz2) = 337850 bytes
+SHA1 (patch-aa) = 74021d783917e744b60f405c7148df6486d6c78b
diff --git a/x11/xf86-video-chips/patches/patch-aa b/x11/xf86-video-chips/patches/patch-aa
index 4b7b66f3b9b..c8c0a5c663a 100644
--- a/x11/xf86-video-chips/patches/patch-aa
+++ b/x11/xf86-video-chips/patches/patch-aa
@@ -1,15 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2007/08/15 18:19:07 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2008/08/09 15:21:07 tnn Exp $
---- configure.orig 2006-04-08 03:21:31.000000000 +0200
+--- configure.orig 2008-03-19 18:35:58.000000000 +0100
+++ configure
-@@ -20137,59 +20137,7 @@ _ACEOF
-
+@@ -21319,54 +21319,8 @@ _ACEOF
fi
--
+
-# Checks for functions (often defined as inlines in compiler.h)
--echo "$as_me:$LINENO: checking for inb" >&5
--echo $ECHO_N "checking for inb... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for inb" >&5
+-echo $ECHO_N "checking for inb... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -26,56 +25,52 @@ $NetBSD: patch-aa,v 1.2 2007/08/15 18:19:07 joerg Exp $
-
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext &&
+- $as_test_x conftest$ac_exeext; then
- HAVE_INB=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- HAVE_INB=no
+ HAVE_INB=no
-fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $HAVE_INB" >&5
--echo "${ECHO_T}$HAVE_INB" >&6
--
- if test x$HAVE_INB = xyes; then
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $HAVE_INB" >&5
+-echo "${ECHO_T}$HAVE_INB" >&6; }
+ if test x$HAVE_INB = xyes; then
BUILD_UTILS_TRUE=
-@@ -20329,16 +20277,8 @@ echo $ECHO_N "checking for $prefix/share
- if eval "test \"\${$as_ac_File+set}\" = set"; then
+ BUILD_UTILS_FALSE='#'
+@@ -21506,16 +21460,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
- 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
+-if test -r "$XORG_SGML_PATH/X11/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
+ ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }