qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge xf86-video-nv 2.1.5

Browse Source
This commit is contained in:
matthieu 2007-09-30 14:24:14 +00:00
parent a4146607a6
commit 8b96042c3c
8 changed files with 566 additions and 446 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
driver/xf86-video-nv/Makefile.in
View File

@ -104,6 +104,8 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_XMODES_FALSE = @BUILD_XMODES_FALSE@
BUILD_XMODES_TRUE = @BUILD_XMODES_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -155,14 +157,15 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
SUPPORT_G80_FALSE = @SUPPORT_G80_FALSE@
SUPPORT_G80_TRUE = @SUPPORT_G80_TRUE@
VERSION = @VERSION@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
ac_ct_AR = @ac_ct_AR@
@ -202,8 +205,10 @@ libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
modes_dir = @modes_dir@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
parser_dir = @parser_dir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
@ -211,7 +216,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
SUBDIRS = src man compat
EXTRA_DIST = README.NV1 README.G80 ChangeLog
CLEANFILES = ChangeLog
all: config.h

96
driver/xf86-video-nv/compat/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -13,11 +13,15 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -37,7 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
@ -46,6 +50,8 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@ -54,6 +60,8 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_XMODES_FALSE = @BUILD_XMODES_FALSE@
BUILD_XMODES_TRUE = @BUILD_XMODES_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -79,8 +87,6 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -94,10 +100,11 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -110,7 +117,6 @@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@ -118,13 +124,17 @@ VERSION = @VERSION@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -136,24 +146,18 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
@ -161,17 +165,12 @@ modes_dir = @modes_dir@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
parser_dir = @parser_dir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
parser/xf86Parser.h \
parser/xf86Optrec.h \
@ -226,6 +225,10 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
-rm -f libtool
uninstall-info-am:
tags: TAGS
TAGS:
@ -234,21 +237,23 @@ CTAGS:
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
$(mkdir_p) $(distdir)/modes $(distdir)/parser
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -293,7 +298,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-generic
distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
@ -307,20 +312,12 @@ info-am:
install-data-am:
install-dvi: install-dvi-am
install-exec-am:
install-html: install-html-am
install-info: install-info-am
install-man:
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -339,20 +336,17 @@ ps: ps-am
ps-am:
uninstall-am:
.MAKE: install-am install-strip
uninstall-am: uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

494
driver/xf86-video-nv/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for xf86-video-nv 2.0.2.
# Generated by GNU Autoconf 2.59 for xf86-video-nv 2.1.5.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-nv'
PACKAGE_TARNAME='xf86-video-nv'
PACKAGE_VERSION='2.0.2'
PACKAGE_STRING='xf86-video-nv 2.0.2'
PACKAGE_VERSION='2.1.5'
PACKAGE_STRING='xf86-video-nv 2.1.5'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@ -465,7 +465,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS SUPPORT_G80_TRUE SUPPORT_G80_FALSE moduledir DRIVER_NAME APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS PCIACCESS_CFLAGS PCIACCESS_LIBS BUILD_XMODES_TRUE BUILD_XMODES_FALSE XMODES_CFLAGS parser_dir modes_dir moduledir DRIVER_NAME APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -958,6 +958,14 @@ ac_env_XORG_LIBS_set=${XORG_LIBS+set}
ac_env_XORG_LIBS_value=$XORG_LIBS
ac_cv_env_XORG_LIBS_set=${XORG_LIBS+set}
ac_cv_env_XORG_LIBS_value=$XORG_LIBS
ac_env_PCIACCESS_CFLAGS_set=${PCIACCESS_CFLAGS+set}
ac_env_PCIACCESS_CFLAGS_value=$PCIACCESS_CFLAGS
ac_cv_env_PCIACCESS_CFLAGS_set=${PCIACCESS_CFLAGS+set}
ac_cv_env_PCIACCESS_CFLAGS_value=$PCIACCESS_CFLAGS
ac_env_PCIACCESS_LIBS_set=${PCIACCESS_LIBS+set}
ac_env_PCIACCESS_LIBS_value=$PCIACCESS_LIBS
ac_cv_env_PCIACCESS_LIBS_set=${PCIACCESS_LIBS+set}
ac_cv_env_PCIACCESS_LIBS_value=$PCIACCESS_LIBS
#
# Report the --help message.
@ -966,7 +974,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-nv 2.0.2 to adapt to many kinds of systems.
\`configure' configures xf86-video-nv 2.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1032,7 +1040,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xf86-video-nv 2.0.2:";;
short | recursive ) echo "Configuration of xf86-video-nv 2.1.5:";;
esac
cat <<\_ACEOF
@ -1050,7 +1058,6 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-g80 Disable G80 support [default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -1063,6 +1070,8 @@ Optional Packages:
--with-xorg-module-dir=DIR
Default xorg module directory
[default=$libdir/xorg/modules]
--with-xserver-source=XSERVER_SOURCE
Path to X server source tree
--with-release-version=STRING
Use release version string in package name
@ -1082,6 +1091,10 @@ 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
PCIACCESS_CFLAGS
C compiler flags for PCIACCESS, overriding pkg-config
PCIACCESS_LIBS
linker flags for PCIACCESS, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@ -1182,7 +1195,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
xf86-video-nv configure 2.0.2
xf86-video-nv configure 2.1.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -1196,7 +1209,7 @@ cat >&5 <<_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-nv $as_me 2.0.2, which was
It was created by xf86-video-nv $as_me 2.1.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1844,7 +1857,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-nv'
VERSION='2.0.2'
VERSION='2.1.5'
cat >>confdefs.h <<_ACEOF
@ -3726,7 +3739,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 3729 "configure"' > conftest.$ac_ext
echo '#line 3742 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -5325,7 +5338,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:5328:" \
echo "$as_me:5341:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@ -6388,11 +6401,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:6391: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6404: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:6395: \$? = $ac_status" >&5
echo "$as_me:6408: \$? = $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.
@ -6656,11 +6669,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:6659: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6672: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:6663: \$? = $ac_status" >&5
echo "$as_me:6676: \$? = $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.
@ -6760,11 +6773,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:6763: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6776: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:6767: \$? = $ac_status" >&5
echo "$as_me:6780: \$? = $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
@ -9109,7 +9122,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 9112 "configure"
#line 9125 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -9209,7 +9222,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 9212 "configure"
#line 9225 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11553,11 +11566,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:11556: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11569: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:11560: \$? = $ac_status" >&5
echo "$as_me:11573: \$? = $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.
@ -11657,11 +11670,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:11660: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11673: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:11664: \$? = $ac_status" >&5
echo "$as_me:11677: \$? = $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
@ -13227,11 +13240,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:13230: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13243: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:13234: \$? = $ac_status" >&5
echo "$as_me:13247: \$? = $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.
@ -13331,11 +13344,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:13334: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13347: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:13338: \$? = $ac_status" >&5
echo "$as_me:13351: \$? = $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
@ -15538,11 +15551,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:15541: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15554: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:15545: \$? = $ac_status" >&5
echo "$as_me:15558: \$? = $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.
@ -15806,11 +15819,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:15809: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15822: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:15813: \$? = $ac_status" >&5
echo "$as_me:15826: \$? = $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.
@ -15910,11 +15923,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:15913: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15926: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:15917: \$? = $ac_status" >&5
echo "$as_me:15930: \$? = $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
@ -19423,6 +19436,7 @@ fi
# Options
# Check whether --with-xorg-module-dir or --without-xorg-module-dir was given.
if test "${with_xorg_module_dir+set}" = set; then
@ -19432,6 +19446,15 @@ else
moduledir="$libdir/xorg/modules"
fi;
# Check whether --with-xserver-source or --without-xserver-source was given.
if test "${with_xserver_source+set}" = set; then
withval="$with_xserver_source"
XSERVER_SOURCE="$withval"
else
XSERVER_SOURCE=""
fi;
# Checks for extensions
SAVE_CFLAGS="$CFLAGS"
@ -19682,8 +19705,7 @@ echo "${ECHO_T}$_EXT_CHECK" >&6
fi
# Determine whether XV PutImage takes a DrawablePtr and whether or not to use
# the libcwrapper.
# Checks for pkg-config packages
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@ -19789,39 +19811,6 @@ echo "${ECHO_T}no" >&6
fi
fi
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901\"") >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_XV_DRAWABLE 1
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
#define USE_LIBC_WRAPPER 1
_ACEOF
fi
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.1.99.901\"") >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.1.99.901") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
cat >>confdefs.h <<\_ACEOF
#define USE_CVTMODE_FUNC 1
_ACEOF
fi
# Checks for pkg-config packages
pkg_failed=no
echo "$as_me:$LINENO: checking for XORG" >&5
@ -19832,12 +19821,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.2 xproto fontsproto \$REQUIRED_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@ -19850,12 +19839,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XORG_LIBS="$XORG_LIBS"
else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.2 xproto fontsproto \$REQUIRED_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@ -19874,14 +19863,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES"`
else
XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XORG_PKG_ERRORS" >&5
{ { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met:
{ { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@ -19892,7 +19881,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met:
echo "$as_me: error: Package requirements (xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@ -19935,33 +19924,6 @@ echo "${ECHO_T}yes" >&6
fi
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Check for optional compile-time support
# Check whether --enable-g80 or --disable-g80 was given.
if test "${enable_g80+set}" = set; then
enableval="$enable_g80"
SUPPORT_G80="$enableval"
else
SUPPORT_G80=yes
fi;
if test x$SUPPORT_G80 = xyes; then
SUPPORT_G80_TRUE=
SUPPORT_G80_FALSE='#'
else
SUPPORT_G80_TRUE='#'
SUPPORT_G80_FALSE=
fi
if test "$SUPPORT_G80" = yes; then
cat >>confdefs.h <<\_ACEOF
#define SUPPORT_G80 1
_ACEOF
echo "Enabling G80 support"
fi
# Checks for libraries.
# Checks for header files.
@ -20132,6 +20094,304 @@ _ACEOF
fi
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
# RandR 1.2
echo "$as_me:$LINENO: checking for xf86Modes.h" >&5
echo $ECHO_N "checking for xf86Modes.h... $ECHO_C" >&6
if test "${ac_cv_header_xf86Modes_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include "xorg-server.h"
#include <xf86Modes.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 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_objext'
{ (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
ac_cv_header_xf86Modes_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_xf86Modes_h=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_header_xf86Modes_h" >&5
echo "${ECHO_T}$ac_cv_header_xf86Modes_h" >&6
if test $ac_cv_header_xf86Modes_h = yes; then
BUILD_XMODES=no
else
BUILD_XMODES=yes
fi
# PCI rework
echo "$as_me:$LINENO: checking whether XSERVER_LIBPCIACCESS is declared" >&5
echo $ECHO_N "checking whether XSERVER_LIBPCIACCESS is declared... $ECHO_C" >&6
if test "${ac_cv_have_decl_XSERVER_LIBPCIACCESS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include "xorg-server.h"
int
main ()
{
#ifndef XSERVER_LIBPCIACCESS
char *p = (char *) XSERVER_LIBPCIACCESS;
#endif
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 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_objext'
{ (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
ac_cv_have_decl_XSERVER_LIBPCIACCESS=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_XSERVER_LIBPCIACCESS=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&5
echo "${ECHO_T}$ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&6
if test $ac_cv_have_decl_XSERVER_LIBPCIACCESS = yes; then
XSERVER_LIBPCIACCESS=yes
else
XSERVER_LIBPCIACCESS=no
fi
if test "x$XSERVER_LIBPCIACCESS" = "xyes"; then
pkg_failed=no
echo "$as_me:$LINENO: checking for PCIACCESS" >&5
echo $ECHO_N "checking for PCIACCESS... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
if test -n "$PCIACCESS_CFLAGS"; then
pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.8.0\"") >&5
($PKG_CONFIG --exists --print-errors "pciaccess >= 0.8.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.8.0" 2>/dev/null`
else
pkg_failed=yes
fi
fi
else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
if test -n "$PCIACCESS_LIBS"; then
pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.8.0\"") >&5
($PKG_CONFIG --exists --print-errors "pciaccess >= 0.8.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.8.0" 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
PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.8.0"`
else
PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.8.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$PCIACCESS_PKG_ERRORS" >&5
{ { echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.8.0) were not met:
$PCIACCESS_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
echo "$as_me: error: Package requirements (pciaccess >= 0.8.0) were not met:
$PCIACCESS_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
:
fi
fi
CFLAGS="$save_CFLAGS"
if test "x$BUILD_XMODES" = xyes; then
BUILD_XMODES_TRUE=
BUILD_XMODES_FALSE='#'
else
BUILD_XMODES_TRUE='#'
BUILD_XMODES_FALSE=
fi
if test "x$XSERVER_SOURCE" != x; then
if test -d "$XSERVER_SOURCE"; then
XSERVER_SOURCE=`cd "$XSERVER_SOURCE" && pwd`
if test -f "$XSERVER_SOURCE/hw/xfree86/modes/xf86Modes.h" -a -f "$XSERVER_SOURCE/hw/xfree86/parser/xf86Parser.h"; then
:
else
{ { echo "$as_me:$LINENO: error: Server source at $XSERVER_SOURCE doesn't have the new mode code" >&5
echo "$as_me: error: Server source at $XSERVER_SOURCE doesn't have the new mode code" >&2;}
{ (exit 1); exit 1; }; }
fi
else
{ { echo "$as_me:$LINENO: error: Can't find xserver-source path $XSERVER_SOURCE" >&5
echo "$as_me: error: Can't find xserver-source path $XSERVER_SOURCE" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
if test "x$BUILD_XMODES" = xno; then
{ echo "$as_me:$LINENO: X server has new mode code" >&5
echo "$as_me: X server has new mode code" >&6;}
XMODES_CFLAGS=
parser_dir=
modes_dir=
else
if test "x$XSERVER_SOURCE" = x; then
{ echo "$as_me:$LINENO: X server is missing new mode code and --with-xserver-source not specified, using local copy" >&5
echo "$as_me: X server is missing new mode code and --with-xserver-source not specified, using local copy" >&6;}
{ echo "$as_me:$LINENO: If you're building from git, please read compat/README" >&5
echo "$as_me: If you're building from git, please read compat/README" >&6;}
parser_dir='$(top_srcdir)/compat/parser'
modes_dir='$(top_srcdir)/compat/modes'
else
{ echo "$as_me:$LINENO: Using mode code from $XSERVER_SOURCE" >&5
echo "$as_me: Using mode code from $XSERVER_SOURCE" >&6;}
parser_dir="$XSERVER_SOURCE/hw/xfree86/parser"
modes_dir="$XSERVER_SOURCE/hw/xfree86/modes"
fi
XMODES_CFLAGS="-DXF86_MODES_RENAME -I\"$modes_dir\" -I\"$parser_dir\""
cat >>confdefs.h <<\_ACEOF
#define BUILD_XMODES 1
_ACEOF
fi
# Substitutions
@ -20249,7 +20509,7 @@ _ACEOF
ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile"
ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile compat/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@ -20376,10 +20636,10 @@ 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 "${SUPPORT_G80_TRUE}" && test -z "${SUPPORT_G80_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"SUPPORT_G80\" was never defined.
if test -z "${BUILD_XMODES_TRUE}" && test -z "${BUILD_XMODES_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_XMODES\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"SUPPORT_G80\" was never defined.
echo "$as_me: error: conditional \"BUILD_XMODES\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@ -20654,7 +20914,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by xf86-video-nv $as_me 2.0.2, which was
This file was extended by xf86-video-nv $as_me 2.1.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -20717,7 +20977,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
xf86-video-nv config.status 2.0.2
xf86-video-nv config.status 2.1.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@ -20830,6 +21090,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES compat/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@ -20989,8 +21250,13 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@XORG_CFLAGS@,$XORG_CFLAGS,;t t
s,@XORG_LIBS@,$XORG_LIBS,;t t
s,@SUPPORT_G80_TRUE@,$SUPPORT_G80_TRUE,;t t
s,@SUPPORT_G80_FALSE@,$SUPPORT_G80_FALSE,;t t
s,@PCIACCESS_CFLAGS@,$PCIACCESS_CFLAGS,;t t
s,@PCIACCESS_LIBS@,$PCIACCESS_LIBS,;t t
s,@BUILD_XMODES_TRUE@,$BUILD_XMODES_TRUE,;t t
s,@BUILD_XMODES_FALSE@,$BUILD_XMODES_FALSE,;t t
s,@XMODES_CFLAGS@,$XMODES_CFLAGS,;t t
s,@parser_dir@,$parser_dir,;t t
s,@modes_dir@,$modes_dir,;t t
s,@moduledir@,$moduledir,;t t
s,@DRIVER_NAME@,$DRIVER_NAME,;t t
s,@APP_MAN_SUFFIX@,$APP_MAN_SUFFIX,;t t

9
driver/xf86-video-nv/man/Makefile.am
View File

@ -40,12 +40,6 @@ SED = sed
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
if SUPPORT_G80
MAN_SUPPORT_G80 = 1
else
MAN_SUPPORT_G80 = 0
endif
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@ -56,8 +50,7 @@ MAN_SUBSTS = \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
-e 's|__support_g80__|$(MAN_SUPPORT_G80)|g'
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man

14
driver/xf86-video-nv/man/Makefile.in
View File

@ -96,6 +96,8 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_XMODES_FALSE = @BUILD_XMODES_FALSE@
BUILD_XMODES_TRUE = @BUILD_XMODES_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -147,14 +149,15 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
SUPPORT_G80_FALSE = @SUPPORT_G80_FALSE@
SUPPORT_G80_TRUE = @SUPPORT_G80_TRUE@
VERSION = @VERSION@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
ac_ct_AR = @ac_ct_AR@
@ -194,8 +197,10 @@ libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
modes_dir = @modes_dir@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
parser_dir = @parser_dir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
@ -212,8 +217,6 @@ SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@SUPPORT_G80_FALSE@MAN_SUPPORT_G80 = 0
@SUPPORT_G80_TRUE@MAN_SUPPORT_G80 = 1
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@ -224,8 +227,7 @@ MAN_SUBSTS = \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
-e 's|__support_g80__|$(MAN_SUPPORT_G80)|g'
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
all: all-am

155
driver/xf86-video-nv/src/Makefile.in
View File

@ -75,25 +75,20 @@ am__installdirs = "$(DESTDIR)$(nv_drv_ladir)"
nv_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(nv_drv_la_LTLIBRARIES)
nv_drv_la_LIBADD =
am__nv_drv_la_SOURCES_DIST = nv_const.h nv_cursor.c nv_dac.c nv_dga.c \
nv_dma.h nv_driver.c nv_hw.c nv_include.h nv_local.h \
nv_proto.h nvreg.h nv_setup.c nv_shadow.c nv_type.h nvvga.h \
nv_video.c nv_xaa.c riva_const.h riva_cursor.c riva_dac.c \
riva_dga.c riva_driver.c riva_hw.c riva_hw.h riva_include.h \
riva_local.h riva_proto.h riva_setup.c riva_shadow.c \
riva_tbl.h riva_type.h riva_xaa.c g80_cursor.c g80_cursor.h \
g80_ddc.c g80_ddc.h g80_display.c g80_display.h g80_dma.c \
g80_dma.h g80_driver.c g80_type.h g80_xaa.c g80_xaa.h
am__objects_1 = nv_cursor.lo nv_dac.lo nv_dga.lo nv_driver.lo nv_hw.lo \
nv_setup.lo nv_shadow.lo nv_video.lo nv_xaa.lo
am__objects_2 = riva_cursor.lo riva_dac.lo riva_dga.lo riva_driver.lo \
riva_hw.lo riva_setup.lo riva_shadow.lo riva_xaa.lo
@SUPPORT_G80_TRUE@am__objects_3 = g80_cursor.lo g80_ddc.lo \
@SUPPORT_G80_TRUE@ g80_display.lo g80_dma.lo g80_driver.lo \
@SUPPORT_G80_TRUE@ g80_xaa.lo
am__objects_3 = g80_cursor.lo g80_dac.lo g80_display.lo g80_dma.lo \
g80_driver.lo g80_exa.lo g80_output.lo g80_sor.lo g80_xaa.lo
am_nv_drv_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
nv_drv_la_OBJECTS = $(am_nv_drv_la_OBJECTS)
am__EXTRA_nv_drv_la_SOURCES_DIST = local_xf86Rename.h
am__objects_4 = xf86Modes.lo xf86cvt.lo xf86Crtc.lo xf86Cursors.lo \
xf86EdidModes.lo xf86RandR12.lo xf86Rotate.lo xf86DiDGA.lo
@BUILD_XMODES_TRUE@nodist_nv_drv_la_OBJECTS = $(am__objects_4)
nv_drv_la_OBJECTS = $(am_nv_drv_la_OBJECTS) \
$(nodist_nv_drv_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -105,8 +100,10 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(nv_drv_la_SOURCES)
DIST_SOURCES = $(am__nv_drv_la_SOURCES_DIST)
SOURCES = $(nv_drv_la_SOURCES) $(EXTRA_nv_drv_la_SOURCES) \
$(nodist_nv_drv_la_SOURCES)
DIST_SOURCES = $(nv_drv_la_SOURCES) \
$(am__EXTRA_nv_drv_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -123,6 +120,8 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_XMODES_FALSE = @BUILD_XMODES_FALSE@
BUILD_XMODES_TRUE = @BUILD_XMODES_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -174,14 +173,15 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
SUPPORT_G80_FALSE = @SUPPORT_G80_FALSE@
SUPPORT_G80_TRUE = @SUPPORT_G80_TRUE@
VERSION = @VERSION@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
ac_ct_AR = @ac_ct_AR@
@ -221,8 +221,10 @@ libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
modes_dir = @modes_dir@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
parser_dir = @parser_dir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
@ -235,7 +237,7 @@ target_alias = @target_alias@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XORG_CFLAGS@
AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@
nv_drv_la_LTLIBRARIES = nv_drv.la
nv_drv_la_LDFLAGS = -module -avoid-version
nv_drv_ladir = @moduledir@/drivers
@ -276,20 +278,42 @@ riva_sources = \
riva_type.h \
riva_xaa.c
@SUPPORT_G80_TRUE@g80_sources = \
@SUPPORT_G80_TRUE@ g80_cursor.c \
@SUPPORT_G80_TRUE@ g80_cursor.h \
@SUPPORT_G80_TRUE@ g80_ddc.c \
@SUPPORT_G80_TRUE@ g80_ddc.h \
@SUPPORT_G80_TRUE@ g80_display.c \
@SUPPORT_G80_TRUE@ g80_display.h \
@SUPPORT_G80_TRUE@ g80_dma.c \
@SUPPORT_G80_TRUE@ g80_dma.h \
@SUPPORT_G80_TRUE@ g80_driver.c \
@SUPPORT_G80_TRUE@ g80_type.h \
@SUPPORT_G80_TRUE@ g80_xaa.c \
@SUPPORT_G80_TRUE@ g80_xaa.h
g80_sources = \
g80_cursor.c \
g80_cursor.h \
g80_dac.c \
g80_display.c \
g80_display.h \
g80_dma.c \
g80_dma.h \
g80_driver.c \
g80_exa.c \
g80_exa.h \
g80_output.c \
g80_output.h \
g80_sor.c \
g80_type.h \
g80_xaa.c \
g80_xaa.h
xmode_sources = \
@parser_dir@/xf86Parser.h \
@parser_dir@/xf86Optrec.h \
@modes_dir@/xf86Modes.h \
@modes_dir@/xf86Modes.c \
@modes_dir@/xf86cvt.c \
@modes_dir@/xf86Crtc.h \
@modes_dir@/xf86Crtc.c \
@modes_dir@/xf86Cursors.c \
@modes_dir@/xf86EdidModes.c \
@modes_dir@/xf86RandR12.c \
@modes_dir@/xf86RandR12.h \
@modes_dir@/xf86Rename.h \
@modes_dir@/xf86Rotate.c \
@modes_dir@/xf86DiDGA.c
@BUILD_XMODES_TRUE@EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
@BUILD_XMODES_TRUE@nodist_nv_drv_la_SOURCES = $(xmode_sources)
all: all-am
.SUFFIXES:
@ -360,10 +384,13 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_cursor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_ddc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_dac.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_display.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_dma.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_driver.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_exa.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_output.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_sor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_xaa.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nv_cursor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nv_dac.Plo@am__quote@
@ -382,6 +409,14 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/riva_setup.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/riva_shadow.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/riva_xaa.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86Crtc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86Cursors.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86DiDGA.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86EdidModes.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86Modes.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86RandR12.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86Rotate.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86cvt.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -404,6 +439,62 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
xf86Modes.lo: @modes_dir@/xf86Modes.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86Modes.lo -MD -MP -MF "$(DEPDIR)/xf86Modes.Tpo" -c -o xf86Modes.lo `test -f '@modes_dir@/xf86Modes.c' || echo '$(srcdir)/'`@modes_dir@/xf86Modes.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86Modes.Tpo" "$(DEPDIR)/xf86Modes.Plo"; else rm -f "$(DEPDIR)/xf86Modes.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@modes_dir@/xf86Modes.c' object='xf86Modes.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Modes.lo `test -f '@modes_dir@/xf86Modes.c' || echo '$(srcdir)/'`@modes_dir@/xf86Modes.c
xf86cvt.lo: @modes_dir@/xf86cvt.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86cvt.lo -MD -MP -MF "$(DEPDIR)/xf86cvt.Tpo" -c -o xf86cvt.lo `test -f '@modes_dir@/xf86cvt.c' || echo '$(srcdir)/'`@modes_dir@/xf86cvt.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86cvt.Tpo" "$(DEPDIR)/xf86cvt.Plo"; else rm -f "$(DEPDIR)/xf86cvt.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@modes_dir@/xf86cvt.c' object='xf86cvt.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86cvt.lo `test -f '@modes_dir@/xf86cvt.c' || echo '$(srcdir)/'`@modes_dir@/xf86cvt.c
xf86Crtc.lo: @modes_dir@/xf86Crtc.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86Crtc.lo -MD -MP -MF "$(DEPDIR)/xf86Crtc.Tpo" -c -o xf86Crtc.lo `test -f '@modes_dir@/xf86Crtc.c' || echo '$(srcdir)/'`@modes_dir@/xf86Crtc.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86Crtc.Tpo" "$(DEPDIR)/xf86Crtc.Plo"; else rm -f "$(DEPDIR)/xf86Crtc.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@modes_dir@/xf86Crtc.c' object='xf86Crtc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Crtc.lo `test -f '@modes_dir@/xf86Crtc.c' || echo '$(srcdir)/'`@modes_dir@/xf86Crtc.c
xf86Cursors.lo: @modes_dir@/xf86Cursors.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86Cursors.lo -MD -MP -MF "$(DEPDIR)/xf86Cursors.Tpo" -c -o xf86Cursors.lo `test -f '@modes_dir@/xf86Cursors.c' || echo '$(srcdir)/'`@modes_dir@/xf86Cursors.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86Cursors.Tpo" "$(DEPDIR)/xf86Cursors.Plo"; else rm -f "$(DEPDIR)/xf86Cursors.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@modes_dir@/xf86Cursors.c' object='xf86Cursors.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Cursors.lo `test -f '@modes_dir@/xf86Cursors.c' || echo '$(srcdir)/'`@modes_dir@/xf86Cursors.c
xf86EdidModes.lo: @modes_dir@/xf86EdidModes.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86EdidModes.lo -MD -MP -MF "$(DEPDIR)/xf86EdidModes.Tpo" -c -o xf86EdidModes.lo `test -f '@modes_dir@/xf86EdidModes.c' || echo '$(srcdir)/'`@modes_dir@/xf86EdidModes.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86EdidModes.Tpo" "$(DEPDIR)/xf86EdidModes.Plo"; else rm -f "$(DEPDIR)/xf86EdidModes.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@modes_dir@/xf86EdidModes.c' object='xf86EdidModes.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86EdidModes.lo `test -f '@modes_dir@/xf86EdidModes.c' || echo '$(srcdir)/'`@modes_dir@/xf86EdidModes.c
xf86RandR12.lo: @modes_dir@/xf86RandR12.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86RandR12.lo -MD -MP -MF "$(DEPDIR)/xf86RandR12.Tpo" -c -o xf86RandR12.lo `test -f '@modes_dir@/xf86RandR12.c' || echo '$(srcdir)/'`@modes_dir@/xf86RandR12.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86RandR12.Tpo" "$(DEPDIR)/xf86RandR12.Plo"; else rm -f "$(DEPDIR)/xf86RandR12.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@modes_dir@/xf86RandR12.c' object='xf86RandR12.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86RandR12.lo `test -f '@modes_dir@/xf86RandR12.c' || echo '$(srcdir)/'`@modes_dir@/xf86RandR12.c
xf86Rotate.lo: @modes_dir@/xf86Rotate.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86Rotate.lo -MD -MP -MF "$(DEPDIR)/xf86Rotate.Tpo" -c -o xf86Rotate.lo `test -f '@modes_dir@/xf86Rotate.c' || echo '$(srcdir)/'`@modes_dir@/xf86Rotate.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86Rotate.Tpo" "$(DEPDIR)/xf86Rotate.Plo"; else rm -f "$(DEPDIR)/xf86Rotate.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@modes_dir@/xf86Rotate.c' object='xf86Rotate.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Rotate.lo `test -f '@modes_dir@/xf86Rotate.c' || echo '$(srcdir)/'`@modes_dir@/xf86Rotate.c
xf86DiDGA.lo: @modes_dir@/xf86DiDGA.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86DiDGA.lo -MD -MP -MF "$(DEPDIR)/xf86DiDGA.Tpo" -c -o xf86DiDGA.lo `test -f '@modes_dir@/xf86DiDGA.c' || echo '$(srcdir)/'`@modes_dir@/xf86DiDGA.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86DiDGA.Tpo" "$(DEPDIR)/xf86DiDGA.Plo"; else rm -f "$(DEPDIR)/xf86DiDGA.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@modes_dir@/xf86DiDGA.c' object='xf86DiDGA.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86DiDGA.lo `test -f '@modes_dir@/xf86DiDGA.c' || echo '$(srcdir)/'`@modes_dir@/xf86DiDGA.c
mostlyclean-libtool:
-rm -f *.lo

230
driver/xf86-video-nv/src/g80_ddc.c
View File

@ -1,230 +0,0 @@
/*
* Copyright (c) 2007 NVIDIA, Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <strings.h>
#include <xf86DDC.h>
#include "g80_type.h"
#include "g80_ddc.h"
#include "g80_display.h"
static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
{
unsigned char *table2;
unsigned char headerSize, entries;
int i;
CARD16 a;
CARD32 b;
/* Clear the i2c map to invalid */
for(i = 0; i < 4; i++)
pNv->i2cMap[i].dac = pNv->i2cMap[i].sor = -1;
if(*(CARD16*)pNv->table1 != 0xaa55) goto fail;
a = *(CARD16*)(pNv->table1 + 0x36);
table2 = (unsigned char*)pNv->table1 + a;
if(table2[0] != 0x40) goto fail;
b = *(CARD32*)(table2 + 6);
if(b != 0x4edcbdcb) goto fail;
headerSize = table2[1];
entries = table2[2];
for(i = 0; i < entries; i++) {
int type, port;
ORNum or;
b = *(CARD32*)&table2[headerSize + 8*i];
type = b & 0xf;
port = (b >> 4) & 0xf;
or = ffs((b >> 24) & 0xf) - 1;
if(type < 4 && port != 0xf) {
switch(type) {
case 0: /* CRT */
case 1: /* TV */
if(pNv->i2cMap[port].dac != -1) {
xf86DrvMsg(scrnIndex, X_WARNING,
"DDC routing table corrupt! DAC %i -> %i "
"for port %i\n",
or, pNv->i2cMap[port].dac, port);
}
pNv->i2cMap[port].dac = or;
break;
case 2: /* TMDS */
case 3: /* LVDS */
if(pNv->i2cMap[port].sor != -1)
xf86DrvMsg(scrnIndex, X_WARNING,
"DDC routing table corrupt! SOR %i -> %i "
"for port %i\n",
or, pNv->i2cMap[port].sor, port);
pNv->i2cMap[port].sor = or;
break;
}
}
}
xf86DrvMsg(scrnIndex, X_PROBED, "I2C map:\n");
for(i = 0; i < 4; i++) {
if(pNv->i2cMap[i].dac != -1)
xf86DrvMsg(scrnIndex, X_PROBED, " Bus %i -> DAC%i\n", i, pNv->i2cMap[i].dac);
if(pNv->i2cMap[i].sor != -1)
xf86DrvMsg(scrnIndex, X_PROBED, " Bus %i -> SOR%i\n", i, pNv->i2cMap[i].sor);
}
return TRUE;
fail:
xf86DrvMsg(scrnIndex, X_ERROR, "Couldn't find the DDC routing table. "
"Mode setting will probably fail!\n");
return FALSE;
}
static void G80_I2CPutBits(I2CBusPtr b, int clock, int data)
{
G80Ptr pNv = G80PTR(xf86Screens[b->scrnIndex]);
const int off = b->DriverPrivate.val;
pNv->reg[(0x0000E138+off)/4] = 4 | clock | data << 1;
}
static void G80_I2CGetBits(I2CBusPtr b, int *clock, int *data)
{
G80Ptr pNv = G80PTR(xf86Screens[b->scrnIndex]);
const int off = b->DriverPrivate.val;
unsigned char val;
val = pNv->reg[(0x0000E138+off)/4];
*clock = !!(val & 1);
*data = !!(val & 2);
}
static xf86MonPtr G80ProbeDDCBus(ScrnInfoPtr pScrn, int bus)
{
G80Ptr pNv = G80PTR(pScrn);
I2CBusPtr i2c;
xf86MonPtr monInfo = NULL;
const int off = bus * 0x18;
/* Allocate the I2C bus structure */
i2c = xf86CreateI2CBusRec();
if(!i2c) return NULL;
i2c->BusName = "DDC";
i2c->scrnIndex = pScrn->scrnIndex;
i2c->I2CPutBits = G80_I2CPutBits;
i2c->I2CGetBits = G80_I2CGetBits;
i2c->ByteTimeout = 2200; /* VESA DDC spec 3 p. 43 (+10 %) */
i2c->StartTimeout = 550;
i2c->BitTimeout = 40;
i2c->ByteTimeout = 40;
i2c->AcknTimeout = 40;
i2c->DriverPrivate.val = off;
if(!xf86I2CBusInit(i2c)) goto done;
pNv->reg[(0x0000E138+off)/4] = 7;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Probing for EDID on I2C bus %i...\n", bus);
monInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, i2c);
pNv->reg[(0x0000E138+off)/4] = 3;
if(monInfo) {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"DDC detected a %s:\n", monInfo->features.input_type ?
"DFP" : "CRT");
xf86PrintEDID(monInfo);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, " ... none found\n");
}
done:
xf86DestroyI2CBusRec(i2c, TRUE, TRUE);
return monInfo;
}
/*
* Try DDC on each bus until we find one that works.
*/
Bool G80ProbeDDC(ScrnInfoPtr pScrn)
{
G80Ptr pNv = G80PTR(pScrn);
xf86MonPtr monInfo;
int port;
Bool flatPanel;
if(!G80ReadPortMapping(pScrn->scrnIndex, pNv))
return FALSE;
for(port = 0; port < 4; port++) {
if(pNv->i2cMap[port].dac == -1 && pNv->i2cMap[port].sor == -1)
/* No outputs on this port. Skip it. */
continue;
monInfo = G80ProbeDDCBus(pScrn, port);
if(!monInfo)
/* No EDID on this port. */
continue;
flatPanel = (monInfo->features.input_type == 1);
if(pNv->i2cMap[port].dac != -1 &&
G80DispDetectLoad(pScrn, pNv->i2cMap[port].dac)) {
pNv->orType = DAC;
pNv->or = pNv->i2cMap[port].dac;
} else if(pNv->i2cMap[port].sor != -1) {
pNv->orType = SOR;
pNv->or = pNv->i2cMap[port].sor;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Saw an EDID on I2C port %i but no DAC load was "
"detected and no SOR is connected to this port. Using "
"DAC%i.\n", port,
pNv->or);
pNv->orType = DAC;
pNv->or = pNv->i2cMap[port].dac;
}
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Found a %s on I2C port %i, assigning %s%i\n",
flatPanel ? "flat panel" : "CRT",
port, pNv->orType == SOR ? "SOR" : "DAC", pNv->or);
pScrn->monitor->DDC = monInfo;
xf86SetDDCproperties(pScrn, monInfo);
return TRUE;
}
return FALSE;
}

1
driver/xf86-video-nv/src/g80_ddc.h
View File

@ -1 +0,0 @@
Bool G80ProbeDDC(ScrnInfoPtr pScrn);