Update to xf86-video-sis 0.10.2
This commit is contained in:
matthieu
parent
61ff9ac41f
commit
a8596e56ea
@ -139,6 +139,8 @@ FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -183,6 +185,8 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
|
||||
@ -32,6 +32,9 @@
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* xextproto 7.1 available */
|
||||
#undef HAVE_XEXTPROTO_71
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
|
||||
166
driver/xf86-video-sis/configure
vendored
166
driver/xf86-video-sis/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.62 for xf86-video-sis 0.10.1.
|
||||
# Generated by GNU Autoconf 2.62 for xf86-video-sis 0.10.2.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xf86-video-sis'
|
||||
PACKAGE_TARNAME='xf86-video-sis'
|
||||
PACKAGE_VERSION='0.10.1'
|
||||
PACKAGE_STRING='xf86-video-sis 0.10.1'
|
||||
PACKAGE_VERSION='0.10.2'
|
||||
PACKAGE_STRING='xf86-video-sis 0.10.2'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
ac_unique_file="Makefile.am"
|
||||
@ -902,6 +902,10 @@ RAWCPPFLAGS
|
||||
PKG_CONFIG
|
||||
XORG_CFLAGS
|
||||
XORG_LIBS
|
||||
XEXT_CFLAGS
|
||||
XEXT_LIBS
|
||||
HAVE_XEXTPROTO_71_TRUE
|
||||
HAVE_XEXTPROTO_71_FALSE
|
||||
DRI_TRUE
|
||||
DRI_FALSE
|
||||
DRI_CFLAGS
|
||||
@ -970,6 +974,8 @@ FFLAGS
|
||||
PKG_CONFIG
|
||||
XORG_CFLAGS
|
||||
XORG_LIBS
|
||||
XEXT_CFLAGS
|
||||
XEXT_LIBS
|
||||
DRI_CFLAGS
|
||||
DRI_LIBS
|
||||
PCIACCESS_CFLAGS
|
||||
@ -1526,7 +1532,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures xf86-video-sis 0.10.1 to adapt to many kinds of systems.
|
||||
\`configure' configures xf86-video-sis 0.10.2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1596,7 +1602,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xf86-video-sis 0.10.1:";;
|
||||
short | recursive ) echo "Configuration of xf86-video-sis 0.10.2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1645,6 +1651,8 @@ Some influential environment variables:
|
||||
PKG_CONFIG path to pkg-config utility
|
||||
XORG_CFLAGS C compiler flags for XORG, overriding pkg-config
|
||||
XORG_LIBS linker flags for XORG, overriding pkg-config
|
||||
XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
|
||||
XEXT_LIBS linker flags for XEXT, overriding pkg-config
|
||||
DRI_CFLAGS C compiler flags for DRI, overriding pkg-config
|
||||
DRI_LIBS linker flags for DRI, overriding pkg-config
|
||||
PCIACCESS_CFLAGS
|
||||
@ -1718,7 +1726,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xf86-video-sis configure 0.10.1
|
||||
xf86-video-sis configure 0.10.2
|
||||
generated by GNU Autoconf 2.62
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
@ -1732,7 +1740,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by xf86-video-sis $as_me 0.10.1, which was
|
||||
It was created by xf86-video-sis $as_me 0.10.2, which was
|
||||
generated by GNU Autoconf 2.62. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2386,7 +2394,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xf86-video-sis'
|
||||
VERSION='0.10.1'
|
||||
VERSION='0.10.2'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -4445,7 +4453,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4448 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4456 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -7553,11 +7561,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7556: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7564: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7560: \$? = $ac_status" >&5
|
||||
echo "$as_me:7568: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7843,11 +7851,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7846: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7854: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7850: \$? = $ac_status" >&5
|
||||
echo "$as_me:7858: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7947,11 +7955,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7950: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7958: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7954: \$? = $ac_status" >&5
|
||||
echo "$as_me:7962: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -10347,7 +10355,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10350 "configure"
|
||||
#line 10358 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10447,7 +10455,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10450 "configure"
|
||||
#line 10458 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12856,11 +12864,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12859: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12867: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12863: \$? = $ac_status" >&5
|
||||
echo "$as_me:12871: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -12960,11 +12968,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12963: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12971: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:12967: \$? = $ac_status" >&5
|
||||
echo "$as_me:12975: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -14543,11 +14551,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14546: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14554: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14550: \$? = $ac_status" >&5
|
||||
echo "$as_me:14558: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -14647,11 +14655,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14650: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14658: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14654: \$? = $ac_status" >&5
|
||||
echo "$as_me:14662: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -16862,11 +16870,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16865: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16873: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16869: \$? = $ac_status" >&5
|
||||
echo "$as_me:16877: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -17152,11 +17160,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17155: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17163: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17159: \$? = $ac_status" >&5
|
||||
echo "$as_me:17167: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -17256,11 +17264,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17259: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17267: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17263: \$? = $ac_status" >&5
|
||||
echo "$as_me:17271: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -21390,6 +21398,91 @@ else
|
||||
$as_echo "yes" >&6; }
|
||||
:
|
||||
fi
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:$LINENO: checking for XEXT" >&5
|
||||
$as_echo_n "checking for XEXT... " >&6; }
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XEXT_CFLAGS"; then
|
||||
pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xextproto >= 7.0.99.1\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xextproto >= 7.0.99.1") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XEXT_CFLAGS=`$PKG_CONFIG --cflags "xextproto >= 7.0.99.1" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XEXT_LIBS"; then
|
||||
pkg_cv_XEXT_LIBS="$XEXT_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xextproto >= 7.0.99.1\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xextproto >= 7.0.99.1") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XEXT_LIBS=`$PKG_CONFIG --libs "xextproto >= 7.0.99.1" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xextproto >= 7.0.99.1"`
|
||||
else
|
||||
XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xextproto >= 7.0.99.1"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XEXT_PKG_ERRORS" >&5
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
HAVE_XEXTPROTO_71="no"
|
||||
elif test $pkg_failed = untried; then
|
||||
HAVE_XEXTPROTO_71="no"
|
||||
else
|
||||
XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
|
||||
XEXT_LIBS=$pkg_cv_XEXT_LIBS
|
||||
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
HAVE_XEXTPROTO_71="yes";
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_XEXTPROTO_71 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test "$HAVE_XEXTPROTO_71" = "yes" ; then
|
||||
HAVE_XEXTPROTO_71_TRUE=
|
||||
HAVE_XEXTPROTO_71_FALSE='#'
|
||||
else
|
||||
HAVE_XEXTPROTO_71_TRUE='#'
|
||||
HAVE_XEXTPROTO_71_FALSE=
|
||||
fi
|
||||
|
||||
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
|
||||
|
||||
# Checks for libraries.
|
||||
@ -22428,6 +22521,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${HAVE_XEXTPROTO_71_TRUE}" && test -z "${HAVE_XEXTPROTO_71_FALSE}"; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XEXTPROTO_71\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
$as_echo "$as_me: error: conditional \"HAVE_XEXTPROTO_71\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${DRI_TRUE}" && test -z "${DRI_FALSE}"; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: conditional \"DRI\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
@ -22778,7 +22878,7 @@ exec 6>&1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by xf86-video-sis $as_me 0.10.1, which was
|
||||
This file was extended by xf86-video-sis $as_me 0.10.2, which was
|
||||
generated by GNU Autoconf 2.62. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -22831,7 +22931,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_version="\\
|
||||
xf86-video-sis config.status 0.10.1
|
||||
xf86-video-sis config.status 0.10.2
|
||||
configured by $0, generated by GNU Autoconf 2.62,
|
||||
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT([xf86-video-sis],
|
||||
0.10.1,
|
||||
0.10.2,
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
xf86-video-sis)
|
||||
|
||||
@ -62,6 +62,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
|
||||
|
||||
# Checks for pkg-config packages
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
|
||||
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
|
||||
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
|
||||
HAVE_XEXTPROTO_71="no")
|
||||
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
|
||||
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
|
||||
|
||||
# Checks for libraries.
|
||||
|
||||
@ -131,6 +131,8 @@ FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -175,6 +177,8 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
|
||||
@ -429,7 +429,7 @@ The amount is to be specified in megabyte, the default is 8.
|
||||
none.
|
||||
.SH "SEE ALSO"
|
||||
#ifdef __xservername__
|
||||
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
|
||||
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
|
||||
#else
|
||||
XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
|
||||
#endif
|
||||
|
||||
@ -159,6 +159,8 @@ FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -203,6 +205,8 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
|
||||
@ -77,7 +77,9 @@
|
||||
#include "xf86Pci.h"
|
||||
#include "xf86Priv.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86Resources.h"
|
||||
#endif
|
||||
#include "xf86.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Cursor.h"
|
||||
@ -747,7 +749,7 @@ typedef struct {
|
||||
UChar sisRegsGR[10];
|
||||
UChar sisDAC[768];
|
||||
UChar sisRegs3C4[0x80];
|
||||
UChar sisRegs3D4[0xff];
|
||||
UChar sisRegs3D4[0x100];
|
||||
UChar sisRegs3C2;
|
||||
UChar sisCapt[0x60];
|
||||
UChar sisVid[0x50];
|
||||
|
||||
@ -49,7 +49,9 @@
|
||||
|
||||
#include "sis.h"
|
||||
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86RAC.h"
|
||||
#endif
|
||||
#include "dixstruct.h"
|
||||
#include "shadowfb.h"
|
||||
#include "fb.h"
|
||||
@ -78,8 +80,13 @@
|
||||
|
||||
#include "globals.h"
|
||||
|
||||
#ifdef HAVE_XEXTPROTO_71
|
||||
#include <X11/extensions/dpmsconst.h>
|
||||
#else
|
||||
#define DPMS_SERVER
|
||||
#include <X11/extensions/dpms.h>
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef XF86DRI
|
||||
#include "dri.h"
|
||||
@ -191,127 +198,6 @@ static PciChipsets XGIPciChipsets[] = {
|
||||
{ -1, -1, RES_UNDEFINED }
|
||||
};
|
||||
|
||||
#ifdef SIS_USE_XAA
|
||||
static const char *xaaSymbols[] = {
|
||||
"XAACreateInfoRec",
|
||||
"XAADestroyInfoRec",
|
||||
"XAAHelpPatternROP",
|
||||
"XAAInit",
|
||||
NULL
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef SIS_USE_EXA
|
||||
static const char *exaSymbols[] = {
|
||||
"exaDriverAccel",
|
||||
"exaDriverInit",
|
||||
"exaDriverFini",
|
||||
"exaOffscreenAlloc",
|
||||
"exaOffscreenFree",
|
||||
NULL
|
||||
};
|
||||
#endif
|
||||
|
||||
static const char *fbSymbols[] = {
|
||||
"fbPictureInit",
|
||||
"fbScreenInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *shadowSymbols[] = {
|
||||
"ShadowFBInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *ramdacSymbols[] = {
|
||||
"xf86CreateCursorInfoRec",
|
||||
"xf86DestroyCursorInfoRec",
|
||||
"xf86InitCursor",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *ddcSymbols[] = {
|
||||
"xf86PrintEDID",
|
||||
"xf86SetDDCproperties",
|
||||
"xf86InterpretEDID",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *int10Symbols[] = {
|
||||
"xf86FreeInt10",
|
||||
"xf86InitInt10",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *vbeSymbols[] = {
|
||||
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
|
||||
"VBEInit",
|
||||
#else
|
||||
"VBEExtendedInit",
|
||||
#endif
|
||||
"vbeDoEDID",
|
||||
"vbeFree",
|
||||
"VBEGetVBEInfo",
|
||||
"VBEFreeVBEInfo",
|
||||
"VBEGetModeInfo",
|
||||
"VBEFreeModeInfo",
|
||||
"VBESaveRestore",
|
||||
"VBESetVBEMode",
|
||||
"VBEGetVBEMode",
|
||||
"VBESetDisplayStart",
|
||||
"VBESetGetLogicalScanlineLength",
|
||||
NULL
|
||||
};
|
||||
|
||||
#ifdef XF86DRI
|
||||
static const char *drmSymbols[] = {
|
||||
"drmAddMap",
|
||||
"drmAgpAcquire",
|
||||
"drmAgpRelease",
|
||||
"drmAgpAlloc",
|
||||
"drmAgpFree",
|
||||
"drmAgpBase",
|
||||
"drmAgpBind",
|
||||
"drmAgpUnbind",
|
||||
"drmAgpEnable",
|
||||
"drmAgpGetMode",
|
||||
"drmCtlInstHandler",
|
||||
"drmCtlUninstHandler",
|
||||
"drmGetInterruptFromBusID",
|
||||
#ifndef SISHAVEDRMWRITE
|
||||
"drmSiSAgpInit",
|
||||
#else
|
||||
"drmCommandWrite",
|
||||
#endif
|
||||
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
|
||||
"drmGetVersion",
|
||||
"drmFreeVersion",
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *driSymbols[] = {
|
||||
"DRICreateInfoRec",
|
||||
"DRIScreenInit",
|
||||
"DRIFinishScreenInit",
|
||||
"DRIDestroyInfoRec",
|
||||
"DRICloseScreen",
|
||||
"DRIGetSAREAPrivate",
|
||||
"DRILock",
|
||||
"DRIUnlock",
|
||||
"DRIQueryVersion",
|
||||
"GlxSetVisualConfigs",
|
||||
NULL
|
||||
};
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
static const char *driRefSymbols[] = {
|
||||
"DRICreatePCIBusID", /* not REQUIRED, but eventually referenced */
|
||||
NULL
|
||||
};
|
||||
#endif
|
||||
#endif /* XF86DRI */
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
|
||||
static MODULESETUPPROTO(sisSetup);
|
||||
@ -347,19 +233,6 @@ sisSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
if(!setupDone) {
|
||||
setupDone = TRUE;
|
||||
xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs);
|
||||
LoaderRefSymLists(fbSymbols,
|
||||
#ifdef SIS_USE_XAA
|
||||
xaaSymbols,
|
||||
#endif
|
||||
#ifdef SIS_USE_EXA
|
||||
exaSymbols,
|
||||
#endif
|
||||
shadowSymbols, ramdacSymbols,
|
||||
vbeSymbols, int10Symbols,
|
||||
#ifdef XF86DRI
|
||||
drmSymbols, driSymbols, driRefSymbols,
|
||||
#endif
|
||||
NULL);
|
||||
return (pointer)TRUE;
|
||||
}
|
||||
|
||||
@ -2949,7 +2822,6 @@ SiS_LoadInitVBE(ScrnInfoPtr pScrn)
|
||||
if(pSiS->pVbe) return;
|
||||
|
||||
if(xf86LoadSubModule(pScrn, "vbe")) {
|
||||
xf86LoaderReqSymLists(vbeSymbols, NULL);
|
||||
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
|
||||
pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index);
|
||||
#else
|
||||
@ -3628,7 +3500,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||
"Initializing adapter through int10\n");
|
||||
if(xf86LoadSubModule(pScrn, "int10")) {
|
||||
xf86LoaderReqSymLists(int10Symbols, NULL);
|
||||
pSiS->pInt = xf86InitInt10(pSiS->pEnt->index);
|
||||
} else {
|
||||
SISErrorLog(pScrn, "Failed to load int10 module\n");
|
||||
@ -3683,6 +3554,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
SiS_MapVGAMem(pScrn);
|
||||
#endif
|
||||
|
||||
#ifndef XSERVER_LIBPCIACCESS
|
||||
/* Set operating state */
|
||||
|
||||
/* 1. memory */
|
||||
@ -3712,14 +3584,14 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
/* Operations for which I/O access is required */
|
||||
pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
|
||||
|
||||
#endif
|
||||
|
||||
/* Load ramdac module */
|
||||
if(!xf86LoadSubModule(pScrn, "ramdac")) {
|
||||
SISErrorLog(pScrn, "Could not load ramdac module\n");
|
||||
goto my_error_1;
|
||||
}
|
||||
|
||||
xf86LoaderReqSymLists(ramdacSymbols, NULL);
|
||||
|
||||
/* Set pScrn->monitor */
|
||||
pScrn->monitor = pScrn->confScreen->monitor;
|
||||
|
||||
@ -4557,6 +4429,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n",
|
||||
(ULong)pSiS->IOAddress, pSiS->mmioSize);
|
||||
|
||||
#ifndef XSERVER_LIBPCIACCESS
|
||||
/* Register the PCI-assigned resources */
|
||||
if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) {
|
||||
SISErrorLog(pScrn, "PCI resource conflicts detected\n");
|
||||
@ -4568,6 +4441,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
SISFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
from = X_PROBED;
|
||||
if(pSiS->pEnt->device->videoRam != 0) {
|
||||
@ -6086,7 +5960,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) {
|
||||
if(xf86LoadSubModule(pScrn, "ddc")) {
|
||||
int crtnum = 0;
|
||||
xf86LoaderReqSymLists(ddcSymbols, NULL);
|
||||
if((pMonitor = SiSDoPrivateDDC(pScrn, &crtnum))) {
|
||||
didddc2 = TRUE;
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, ddcsstr, crtnum);
|
||||
@ -6119,8 +5992,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
|
||||
if(xf86LoadSubModule(pScrn, "ddc")) {
|
||||
|
||||
xf86LoaderReqSymLists(ddcSymbols, NULL);
|
||||
|
||||
/* Now load and initialize VBE module. */
|
||||
SiS_LoadInitVBE(pScrn);
|
||||
|
||||
@ -6957,18 +6828,15 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n", pScrn->bitsPerPixel);
|
||||
goto my_error_1;
|
||||
}
|
||||
xf86LoaderReqSymLists(fbSymbols, NULL);
|
||||
|
||||
/* Load XAA/EXA (if needed) */
|
||||
if(!pSiS->NoAccel) {
|
||||
const char **symNames = NULL;
|
||||
#ifdef SIS_USE_XAA
|
||||
if(!pSiS->useEXA) {
|
||||
if (!xf86LoadSubModule(pScrn, "xaa")) {
|
||||
SISErrorLog(pScrn, "Could not load xaa module\n");
|
||||
goto my_error_1;
|
||||
}
|
||||
symNames = xaaSymbols;
|
||||
}
|
||||
#endif
|
||||
#ifdef SIS_USE_EXA
|
||||
@ -6984,14 +6852,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
LoaderErrorMsg(NULL, "exa", errmaj, errmin);
|
||||
goto my_error_1;
|
||||
}
|
||||
symNames = exaSymbols;
|
||||
}
|
||||
#endif
|
||||
if(symNames) {
|
||||
xf86LoaderReqSymLists(symNames, NULL);
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
|
||||
}
|
||||
}
|
||||
|
||||
/* Load shadowfb (if needed) */
|
||||
if(pSiS->ShadowFB) {
|
||||
@ -6999,7 +6863,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
SISErrorLog(pScrn, "Could not load shadowfb module\n");
|
||||
goto my_error_1;
|
||||
}
|
||||
xf86LoaderReqSymLists(shadowSymbols, NULL);
|
||||
}
|
||||
|
||||
/* Load the dri and glx modules if requested. */
|
||||
@ -7008,9 +6871,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
|
||||
if(xf86LoadSubModule(pScrn, "dri")) {
|
||||
if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) {
|
||||
if(xf86LoadSubModule(pScrn, "glx")) {
|
||||
xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
|
||||
} else {
|
||||
if(!xf86LoadSubModule(pScrn, "glx")) {
|
||||
SISErrorLog(pScrn, "Failed to load glx module\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -4174,7 +4174,7 @@ SISStopVideoBlit(ScrnInfoPtr pScrn, ULong index, Bool shutdown)
|
||||
* adapt->flags but we provide it anyway.
|
||||
*/
|
||||
|
||||
if(index > NUM_BLIT_PORTS) return;
|
||||
if(index >= NUM_BLIT_PORTS) return;
|
||||
|
||||
REGION_EMPTY(pScrn->pScreen, &pPriv->blitClip[index]);
|
||||
|
||||
@ -4214,7 +4214,7 @@ SISPutImageBlit(
|
||||
SiS_Packet12_YUV MyPacket;
|
||||
Bool first;
|
||||
|
||||
if(index > NUM_BLIT_PORTS) return BadMatch;
|
||||
if(index >= NUM_BLIT_PORTS) return BadMatch;
|
||||
|
||||
if(!height || !width) return Success;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user