xf86-video-rendision 4.2.0

driver/xf86-video-rendition/ChangeLog

@@ -1,3 +1,85 @@
+commit e943057ef844a7a3153b6158f3dd26ae02296e98
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 14:45:52 2008 -0400
+
+    Fix includes to silence a warning.
+    
+    Patch from opensuse, although it has no attribution there.
+
+commit 34db3fdcff85f151843fcae7d0aa307697291d5e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 14:41:58 2008 -0400
+
+    Death to RCS tags.
+
+commit cfff99db2648d49e9c3af3cb9d965ea5f306b1f7
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sat Mar 8 23:45:25 2008 +0100
+
+    Makefile.am: nuke RCS Id
+
+commit 99011b4380991cd56987f75a6d48ee609d931b2a
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed Feb 27 13:29:57 2008 +1000
+
+    pciaccess: do unmap path
+
+commit 7e343a778d302474fef1d177006b54743ce0a394
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed Feb 27 12:50:43 2008 +1000
+
+    pciaccess: make auto-detect work
+
+commit 41cba91bc5572a66e8b6f09c9cf4c4c173b29f8f
+Author: Brice Goglin <bgoglin@debian.org>
+Date:   Tue Aug 7 12:10:15 2007 +0200
+
+    RENDITION_VERSION* using PACKAGE_VERSION_*
+
+commit 73c1f290c1ed767a8c9340ca1404f89baace762e
+Author: Ian Romanick <idr@us.ibm.com>
+Date:   Tue Mar 6 09:22:44 2007 -0800
+
+    Port driver to PCI-rework interfaces.
+    
+    Quick and dirty port to the PCI-rework interfaces.  Test on a V2100
+    cards.  This is the only Rendition hardware to which I have access.
+    V1000 and / or V2200 may be broken, but I doubt it.
+    
+    Comments in the source claim that acceleration is buggy, and it is
+    disabled by default.  I *did not* do any testing with acceleration.
+
+commit 1a2a9e76aa9b8fbd821c41fd67646a7c35180b48
+Author: Ian Romanick <idr@us.ibm.com>
+Date:   Tue Mar 6 09:16:44 2007 -0800
+
+    Move renditionTypes, renditionChipsets, and renditionPCIchipsets earlier in file.
+
+commit 5338846d8d76081c39402324c12cfec382ac2742
+Author: Ian Romanick <idr@us.ibm.com>
+Date:   Tue Mar 6 09:14:43 2007 -0800
+
+    Add prototype for renditionGetRec.
+
+commit 6d3e26e8311cf46a8c9ceb81debe5d8e97bf28bf
+Merge: 77647fe... ef00c3e...
+Author: Ian Romanick <idr@us.ibm.com>
+Date:   Fri Mar 2 20:48:05 2007 -0800
+
+    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-rendition
+
+commit 77647fed6e448cc0a46970c79e28062c6f5625bd
+Author: Ian Romanick <idr@us.ibm.com>
+Date:   Fri Mar 2 20:47:42 2007 -0800
+
+    Supply NULL driverFunc pointer in DriverRec.
+
+commit ef00c3eb3e558da02080ed30274f1fa8b6d8b8eb
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Feb 27 10:38:53 2007 -0800
+
+    Man page updates - replace references to XFree86 & changes for XF86 4.0
+
 commit b3872c3317fe560d47a0a621d7a9bd6f81d3573a
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Dec 16 01:54:57 2006 +0200

driver/xf86-video-rendition/Makefile.in

@@ -123,6 +123,7 @@ DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -156,6 +157,7 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -164,19 +166,26 @@ 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@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
+XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

driver/xf86-video-rendition/config.h.in

@@ -38,6 +38,12 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Have 1bpp support */
+#undef HAVE_XF1BPP
+
+/* Have 4bpp support */
+#undef HAVE_XF4BPP
+
 /* Name of package */
 #undef PACKAGE
 

driver/xf86-video-rendition/configure.ac

@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-rendition],
-        4.1.3,
+        4.2.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-rendition)
 
@@ -57,6 +57,20 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
 # Checks for header files.
 AC_HEADER_STDC

driver/xf86-video-rendition/ltmain.sh

@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# Free Software Foundation, Inc.
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION=1.5.26
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
-# See if we are running on zsh, and set the options which allow our
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-if test -n "${ZSH_VERSION+set}" ; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -105,11 +113,19 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
+lt_env=
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-fi
+do
-if test "${LANG+set}" = set; then
+  eval "if test \"\${$lt_var+set}\" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
+	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
+
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
 fi
 
 # Make sure IFS has a sensible default
@@ -136,6 +152,8 @@ duplicate_deps=no
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -196,7 +214,13 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -327,7 +351,17 @@ func_extract_archives ()
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -454,11 +488,12 @@ do
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    echo "\
-    $echo
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+
-    $echo "This is free software; see the source for copying conditions.  There is NO"
+Copyright (C) 2008  Free Software Foundation, Inc.
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -755,9 +790,11 @@ if test -z "$show_help"; then
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -926,7 +963,7 @@ EOF
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
 	exit $EXIT_FAILURE
@@ -998,7 +1035,7 @@ EOF
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	$run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1131,6 +1168,7 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1138,8 +1176,9 @@ EOF
     for arg
     do
       case $arg in
-      -all-static | -static)
+      -all-static | -static | -static-libtool-libs)
-	if test "X$arg" = "X-all-static"; then
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1186,20 @@ EOF
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
 	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1600,7 +1647,7 @@ EOF
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
@@ -1608,6 +1655,11 @@ EOF
 	continue
 	;;
 
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -1621,10 +1673,11 @@ EOF
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|@*)
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1652,9 +1705,9 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -1713,7 +1766,7 @@ EOF
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2106,7 +2159,7 @@ EOF
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2122,7 +2175,12 @@ EOF
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2503,7 +2561,9 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -2916,12 +2976,18 @@ EOF
 		  # we do not want to link against static libs,
 		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
 		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
@@ -3069,9 +3135,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
+      case " $deplibs" in
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+      *\ -l* | *\ -L*)
-      fi
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -3199,7 +3266,7 @@ EOF
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3210,9 +3277,10 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3271,7 +3339,8 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3285,8 +3354,11 @@ EOF
 	  ;;
 
 	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
 	    major=`expr $current - $age + 1`
-
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3437,11 +3509,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
+      #for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3542,13 +3614,12 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3587,9 +3658,7 @@ EOF
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		# Did it work?
-		if test "$?" -eq 0 ; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3907,7 +3976,10 @@ EOF
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4217,9 +4289,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
+      case " $deplibs" in
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+      *\ -l* | *\ -L*)
-      fi
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -4266,12 +4339,14 @@ EOF
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4719,16 +4794,16 @@ static const void *lt_preloaded_setup() {
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4743,13 +4818,13 @@ static const void *lt_preloaded_setup() {
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4836,7 +4911,7 @@ static const void *lt_preloaded_setup() {
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4873,7 +4948,7 @@ static const void *lt_preloaded_setup() {
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5280,6 +5355,20 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5422,7 +5511,7 @@ else
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5608,7 +5697,7 @@ fi\
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5957,9 +6046,9 @@ relink_command=\"$relink_command\""
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6168,7 +6257,7 @@ relink_command=\"$relink_command\""
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6345,9 +6434,11 @@ relink_command=\"$relink_command\""
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
+	  if test ! -f "$dir/$dlname"; then
 	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
 	    exit $EXIT_FAILURE
 	  fi
+	fi
 	;;
 
       *.lo)
@@ -6410,12 +6501,12 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-	LC_ALL="$save_LC_ALL"; export LC_ALL
+      do
-      fi
+	eval "if test \"\${save_$lt_var+set}\" = set; then
-      if test "${save_LANG+set}" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
-	LANG="$save_LANG"; export LANG
+	      fi"
-      fi
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6788,7 +6879,9 @@ The following components of LINK-COMMAND are treated specially:
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
 

driver/xf86-video-rendition/man/Makefile.in

@@ -115,6 +115,7 @@ DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -148,6 +149,7 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -156,19 +158,26 @@ 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@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
+XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -215,7 +224,6 @@ driverman_PRE = @DRIVER_NAME@.man
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 EXTRA_DIST = @DRIVER_NAME@.man
 CLEANFILES = $(driverman_DATA)
-SED = sed
 
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@

driver/xf86-video-rendition/man/rendition.man

@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ 
+.\" $__xservername__: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH RENDITION __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ rendition \- Rendition video driver
 .fi
 .SH DESCRIPTION
 .B rendition 
-is an XFree86 driver for Rendition/Micron based video cards.  The driver
+is an __xservername__ driver for Rendition/Micron based video cards.  The driver
 supports following framebuffer depths: 8, 15 (Verite V1000 only), 16
 and 24. Acceleration and multi-head configurations are
 not supported yet, but are work in progress.
@@ -32,7 +32,7 @@ Verite V2100 based cards. Diamond Stealth II S220 is the only known such card.
 .B V2200
 Verite V2200 based cards.
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -79,8 +79,8 @@ Default: Disabled for V1000, enabled for V2100/V2200.
 .TP
 .BI "Option \*qNoDDC\*q \*q" boolean \*q
 Disable probing of DDC-information from your monitor. This information is not
-used yet and is only there for informational purposes. This might change
+used yet and is only there for informational purposes. 
-before final XFree86 4.0 release. Safe to disable if you experience problems
+Safe to disable if you experience problems
 during startup of X-server.
 Default: Probe DDC.
 .TP
@@ -107,6 +107,6 @@ as there has been indications of problems with it. Use
 .B "Option \*qMTRR\*q"
 to let the driver request write-combining of memory access on the video board.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Marc Langenbach, Dejan Ilic

driver/xf86-video-rendition/src/Makefile.in

@@ -132,6 +132,7 @@ DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -165,6 +166,7 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -173,19 +175,26 @@ 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@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
+XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

driver/xf86-video-rendition/src/accel.h

@@ -3,7 +3,6 @@
  *
  * header file for accel.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accel.h,v 1.3 1999/11/19 13:54:44 hohndel Exp $ */
 
 #ifndef __ACCEL_H__
 #define __ACCEL_H__

driver/xf86-video-rendition/src/accelX.c

@@ -3,7 +3,6 @@
  *
  * accelerator functions for X
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c,v 1.10 2001/06/15 21:22:54 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

driver/xf86-video-rendition/src/cmd2d.h

@@ -4,7 +4,6 @@
 /*
  * commands the 2d microcode offers
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cmd2d.h,v 1.2 1999/10/14 04:43:14 dawes Exp $ */
 
 #define CMD_SETUP					32
 #define CMD_SET_PIX_REG				2

driver/xf86-video-rendition/src/commonregs.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/commonregs.h,v 1.1 1999/11/19 13:54:44 hohndel Exp $ */
 
 #ifndef __COMMONREGS_H__
 #define __COMMONREGS_H__

driver/xf86-video-rendition/src/cscode.h

@@ -1,7 +1,6 @@
 /****************************************************************************\ 
  *       NOTE: This file generated automatically. Do not edit by hand!      *
 \****************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cscode.h,v 1.3 1999/10/13 04:21:19 dawes Exp $ */
 
 #ifndef __CSCODE_H__
 #define __CSCODE_H__

driver/xf86-video-rendition/src/hwcursor.c

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c,v 1.6 2000/02/25 21:03:00 dawes Exp $ */
 /*
  * includes
  */

driver/xf86-video-rendition/src/hwcursor.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.h,v 1.4 1999/11/19 13:54:45 hohndel Exp $ */
 /*
  * file hwcursor.h
  */

driver/xf86-video-rendition/src/rendition.c

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c,v 1.58 2003/11/03 05:11:26 tsi Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -64,6 +63,14 @@
 #include "rendition_shadow.h"
 #include "vbe.h"
 
+#ifdef XSERVER_LIBPCIACCESS
+# include <pciaccess.h>
+# define DEVICE_ID(p)  (p)->device_id
+#else
+# define DEVICE_ID(p)  (p)->chipType
+#endif
+
+
 /*
  * defines
  */
@@ -72,10 +79,10 @@
 
 #define RENDITION_NAME            "RENDITION"
 #define RENDITION_DRIVER_NAME     "rendition"
-#define RENDITION_VERSION_NAME    "4.1.0"
+#define RENDITION_VERSION_NAME    PACKAGE_VERSION
-#define RENDITION_VERSION_MAJOR   4
+#define RENDITION_VERSION_MAJOR   PACKAGE_VERSION_MAJOR
-#define RENDITION_VERSION_MINOR   1
+#define RENDITION_VERSION_MINOR   PACKAGE_VERSION_MINOR
-#define RENDITION_PATCHLEVEL      0
+#define RENDITION_PATCHLEVEL      PACKAGE_VERSION_PATCHLEVEL
 #define RENDITION_VERSION_CURRENT ((RENDITION_VERSION_MAJOR << 24) | \
                  (RENDITION_VERSION_MINOR << 16) | RENDITION_PATCHLEVEL)
 
@@ -101,7 +108,12 @@ static const int MAX_VTOTAL   = 2184;
 
 static const OptionInfoRec * renditionAvailableOptions(int, int);
 static void       renditionIdentify(int);
+#ifdef XSERVER_LIBPCIACCESS
+static Bool renditionPciProbe(DriverPtr drv, int entity_num,
+    struct pci_device *dev, intptr_t match_data);
+#else
 static Bool       renditionProbe(DriverPtr, int);
+#endif
 static Bool       renditionPreInit(ScrnInfoPtr, int);
 static Bool       renditionScreenInit(int, ScreenPtr, int, char **);
 static Bool       renditionSwitchMode(int, DisplayModePtr, int);
@@ -120,6 +132,7 @@ static unsigned int renditionDDC1Read (ScrnInfoPtr pScreenInfo);
 static xf86MonPtr renditionProbeDDC(ScrnInfoPtr pScrn, int index);
 
 static void renditionLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
+static renditionPtr renditionGetRec(ScrnInfoPtr pScreenInfo);
 
 
 /* 
@@ -137,14 +150,54 @@ OptionInfoRec const renditionOptions[]={
     { -1,                NULL,      OPTV_NONE,    {0}, FALSE }
 };
 
+enum renditionTypes {
+    CHIP_RENDITION_V1000,
+    CHIP_RENDITION_V2x00
+};
+
+/* supported chipsets */
+static SymTabRec renditionChipsets[] = {
+    {CHIP_RENDITION_V1000, "V1000"},
+    {CHIP_RENDITION_V2x00, "V2x00"},
+    {-1,                   NULL}
+};
+
+#ifdef XSERVER_LIBPCIACCESS
+#define RENDITION_DEVICE_MATCH(d, i) \
+    { 0x1163, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
+
+static const struct pci_id_match rendition_device_match[] = {
+    RENDITION_DEVICE_MATCH(PCI_CHIP_V1000, CHIP_RENDITION_V1000),
+    RENDITION_DEVICE_MATCH(PCI_CHIP_V2x00, CHIP_RENDITION_V2x00),
+
+    { 0, 0, 0 }
+};
+#else
+static PciChipsets renditionPCIchipsets[] = {
+  { CHIP_RENDITION_V1000, PCI_CHIP_V1000, RES_SHARED_VGA },
+  { CHIP_RENDITION_V2x00, PCI_CHIP_V2x00, RES_SHARED_VGA },
+  { -1,                   -1,             RES_UNDEFINED }
+};
+#endif
+
 _X_EXPORT DriverRec RENDITION={
     RENDITION_VERSION_CURRENT,
     "rendition",
     renditionIdentify,
+#ifdef XSERVER_LIBPCIACCESS
+    NULL,
+#else
     renditionProbe,
+#endif
     renditionAvailableOptions,
     NULL,
-    0
+    0,
+    NULL,
+
+#ifdef XSERVER_LIBPCIACCESS
+    rendition_device_match,
+    renditionPciProbe
+#endif
 };
 
 static const char *vgahwSymbols[]={
@@ -243,7 +296,7 @@ renditionSetup(pointer Module, pointer Options, int *ErrorMajor,
 
     if (!Initialised) {
         Initialised = TRUE;
-        xf86AddDriver(&RENDITION, Module, 0);
+        xf86AddDriver(&RENDITION, Module, 1);
         LoaderRefSymLists(vgahwSymbols, ramdacSymbols,
 			  fbSymbols, xaaSymbols, ddcSymbols, int10Symbols,
 			  shadowfbSymbols, vbeSymbols, NULL);
@@ -259,24 +312,6 @@ renditionSetup(pointer Module, pointer Options, int *ErrorMajor,
 #endif
 
 
-enum renditionTypes {
-    CHIP_RENDITION_V1000,
-    CHIP_RENDITION_V2x00
-};
-
-/* supported chipsets */
-static SymTabRec renditionChipsets[] = {
-    {CHIP_RENDITION_V1000, "V1000"},
-    {CHIP_RENDITION_V2x00, "V2x00"},
-    {-1,                   NULL}
-};
-
-static PciChipsets renditionPCIchipsets[] = {
-  { CHIP_RENDITION_V1000, PCI_CHIP_V1000, RES_SHARED_VGA },
-  { CHIP_RENDITION_V2x00, PCI_CHIP_V2x00, RES_SHARED_VGA },
-  { -1,                   -1,             RES_UNDEFINED }
-};
-
 /*
  * functions
  */
@@ -297,6 +332,49 @@ renditionIdentify(int flags)
 
 
 
+#ifdef XSERVER_LIBPCIACCESS
+static Bool
+renditionPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
+		  intptr_t match_data)
+{
+    ScrnInfoPtr pScrn;
+
+
+    /* Allocate a ScrnInfoRec and claim the slot */
+    pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, RES_SHARED_VGA,
+				NULL, NULL, NULL, NULL);
+    if (pScrn != NULL) {
+	renditionPtr pRendition;
+
+
+	pScrn->driverVersion = RENDITION_VERSION_CURRENT;
+	pScrn->driverName    = RENDITION_DRIVER_NAME;
+	pScrn->name          = RENDITION_NAME;
+	pScrn->Probe         = NULL;
+	pScrn->PreInit       = renditionPreInit;
+	pScrn->ScreenInit    = renditionScreenInit;
+	pScrn->SwitchMode    = renditionSwitchMode;
+	pScrn->AdjustFrame   = renditionAdjustFrame;
+	pScrn->EnterVT       = renditionEnterVT;
+	pScrn->LeaveVT       = renditionLeaveVT;
+	pScrn->FreeScreen    = renditionFreeScreen;
+	pScrn->ValidMode     = renditionValidMode;
+
+	/* allocate driver private structure */
+	pRendition = renditionGetRec(pScrn);
+	if (pRendition == NULL) {
+	    return FALSE;
+	}
+
+	pRendition->pEnt = xf86GetEntityInfo(entity_num);
+	pRendition->PciInfo = dev;
+    }
+
+    return (pScrn != NULL);
+}
+
+#else
+
 /*
  * This function is called once, at the start of the first server generation to
  * do a minimal probe for supported hardware.
@@ -354,7 +432,7 @@ renditionProbe(DriverPtr drv, int flags)
     }
     return foundScreen;
 }
-
+#endif
 
 #if 0
 static Bool
@@ -491,16 +569,20 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     if (pScreenInfo->numEntities != 1)
 	return FALSE;
 
+#ifndef XSERVER_LIBPCIACCESS
     /* allocate driver private structure */
     if (!renditionGetRec(pScreenInfo))
         return FALSE;
+#endif
 
     pRendition=RENDITIONPTR(pScreenInfo);
 
+#ifndef XSERVER_LIBPCIACCESS
     /* Get the entity, and make sure it is PCI. */
     pRendition->pEnt = xf86GetEntityInfo(pScreenInfo->entityList[0]);
     if (pRendition->pEnt->location.type != BUS_PCI)
 	return FALSE;
+#endif
 
     if (flags & PROBE_DETECT) {
         ConfiguredMonitor = 
@@ -522,10 +604,12 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
         xf86FreeInt10(pInt);
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     /* Find the PCI info for this screen */
     pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index);
     pRendition->pcitag= pciTag(pRendition->PciInfo->bus,
                pRendition->PciInfo->device, pRendition->PciInfo->func);
+#endif
 
     /*
      * XXX This could be refined if some VGA memory resources are not
@@ -557,7 +641,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
 
         case 15:
         {
-            if (PCI_CHIP_V1000 != pRendition->PciInfo->chipType) {
+            if (PCI_CHIP_V1000 == DEVICE_ID(pRendition->PciInfo)) {
                 xf86DrvMsg( pScreenInfo->scrnIndex, X_ERROR,
                         "Given depth (%d) is not supported by this chipset.\n",
                         pScreenInfo->depth);
@@ -631,7 +715,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     /* set various fields according to the given options */
     /* to be filled in <ml> */
 
-    if (PCI_CHIP_V1000==pRendition->PciInfo->chipType){
+    if (PCI_CHIP_V1000 == DEVICE_ID(pRendition->PciInfo)) {
       pRendition->board.chip=V1000_DEVICE;
     }
     else {
@@ -654,12 +738,19 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
 
     pRendition->board.accel=0;
     pRendition->board.vgaio_base = pvgaHW->PIOOffset;
-    pRendition->board.io_base =
+    pRendition->board.io_base = pRendition->board.vgaio_base 
-	pRendition->board.vgaio_base + pRendition->PciInfo->ioBase[1];
+#ifdef XSERVER_LIBPCIACCESS
+	+ pRendition->PciInfo->regions[1].base_addr;
+#else
+	+ pRendition->PciInfo->ioBase[1]
+#endif
+	;
     pRendition->board.mmio_base=0;
     pRendition->board.vmmio_base=0;
     pRendition->board.mem_size=0;
+#ifndef XSERVER_LIBPCIACCESS
     pRendition->board.mem_base=(vu8 *)pRendition->PciInfo->memBase[0];
+#endif
     pRendition->board.vmem_base=NULL;
     pRendition->board.init=0;
 
@@ -677,8 +768,14 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
 	       "Rendition %s @ %lx/%lx\n",
 	       renditionChipsets[pRendition->board.chip==V1000_DEVICE ? 0:1]
 	       .name,
+#ifdef XSERVER_LIBPCIACCESS
+	       pRendition->PciInfo->regions[1].base_addr,
+	       pRendition->PciInfo->regions[0].base_addr
+#else
 	       pRendition->PciInfo->ioBase[1],
-	       pRendition->PciInfo->memBase[0]);
+	       pRendition->PciInfo->memBase[0]
+#endif
+	       );
 
     /* First of all get a "clean" starting state */
     verite_resetboard(pScreenInfo);
@@ -1363,12 +1460,17 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
     Bool WriteCombine;
     int mapOption;
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+#ifdef XSERVER_LIBPCIACCESS
+    int err;
+#endif
 
 #ifdef DEBUG
     ErrorF("Mapping ...\n");
+#ifndef XSERVER_LIBPCIACCESS
     ErrorF("%d %d %d %x %d\n", pScreenInfo->scrnIndex, VIDMEM_FRAMEBUFFER, 
 	   pRendition->pcitag,
 	   pRendition->board.mem_base, pScreenInfo->videoRam * 1024);
+#endif
 #endif
 
     if (pRendition->board.chip == V1000_DEVICE){
@@ -1392,12 +1494,19 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
 	mapOption = VIDMEM_MMIO;
     }
 
+#ifdef XSERVER_LIBPCIACCESS
+    err = pci_device_map_region(pRendition->PciInfo, 0, TRUE);
+    pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory;
+
+    return (err == 0);
+#else
     pRendition->board.vmem_base=
         xf86MapPciMem(pScreenInfo->scrnIndex, mapOption,
 		      pRendition->pcitag,
 		      (unsigned long)pRendition->board.mem_base,
 		      pScreenInfo->videoRam * 1024);
     return TRUE;
+#endif
     
 #ifdef DEBUG0
     ErrorF("Done\n");
@@ -1407,12 +1516,20 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
 static Bool
 renditionUnmapMem(ScrnInfoPtr pScreenInfo)
 {
+  renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
 #ifdef DEBUG
   ErrorF("Unmapping ...\n");
 #endif
+
+#ifndef XSERVER_LIBPCIACCESS
     xf86UnMapVidMem(pScreenInfo->scrnIndex,
-        RENDITIONPTR(pScreenInfo)->board.vmem_base, 
+        pRendition->board.vmem_base, 
 		    pScreenInfo->videoRam * 1024);
+#else
+    pci_device_unmap_range(pRendition->PciInfo, 
+			   pRendition->board.vmem_base,
+			   pScreenInfo->videoRam * 1024);
+#endif
     return TRUE;
 #ifdef DEBUG0
     ErrorF("Done\n");

driver/xf86-video-rendition/src/rendition.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.5 2000/02/25 21:03:02 dawes Exp $ */
 
 #ifndef __RENDITION_H__
 #define __RENDITION_H__

driver/xf86-video-rendition/src/rendition_options.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_options.h,v 1.5 2001/05/04 19:05:42 dawes Exp $ */
 
 #ifndef __RENDITION_OPTION_H__
 #define __RENDITION_OPTION_H__

driver/xf86-video-rendition/src/rendition_shadow.c

@@ -4,7 +4,6 @@
  * The functions used by ShadowFB
  * Based on code written by Mark Vojkovich <markv@valinux.com>
  */
-/* $XFree86$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

driver/xf86-video-rendition/src/rendition_shadow.h

@@ -3,7 +3,6 @@
  *
  * headfile for rendition_shadow.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_shadow.h,v 1.1 2000/03/01 00:25:25 dawes Exp $ */
 
 #ifndef __RENDITION_SHADOW_H__
 #define __RENDITION_SHADOW_H__

driver/xf86-video-rendition/src/v1kregs.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1kregs.h,v 1.4 1999/11/19 13:54:45 hohndel Exp $ */
 
 #ifndef __V1KREGS_H__
 #define __V1KREGS_H__

driver/xf86-video-rendition/src/v1krisc.c

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c,v 1.6 2000/03/31 20:13:25 dawes Exp $ */
 /*
  *
  */

driver/xf86-video-rendition/src/v1krisc.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.h,v 1.3 1999/10/13 04:21:21 dawes Exp $ */
 /*
  * file v1krisc.h
  *

driver/xf86-video-rendition/src/v2kregs.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v2kregs.h,v 1.4 1999/11/19 13:54:46 hohndel Exp $ */
 #ifndef __V2KREGS_H__
 #define __V2KREGS_H__
 

driver/xf86-video-rendition/src/vboard.c

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.18tsi Exp $ */
 /*
  * includes
  */

driver/xf86-video-rendition/src/vboard.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h,v 1.6 2000/03/31 20:13:26 dawes Exp $ */
 
 /*
  * vboard.h

driver/xf86-video-rendition/src/vloaduc.c

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.13tsi Exp $ */
 /*
  * includes
  */
@@ -17,6 +16,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <unistd.h>
 #ifdef HAVE_ELF_H
 #include <elf.h>
 #endif

driver/xf86-video-rendition/src/vloaduc.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
 
 /*
  * file vloaduc.h

driver/xf86-video-rendition/src/vmisc.c

@@ -1,5 +1,4 @@
 /* Misc routines used elsewhere in driver */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c,v 1.3 2000/02/25 21:03:05 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

driver/xf86-video-rendition/src/vmisc.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h,v 1.3 2000/03/31 20:13:27 dawes Exp $ */
 
 #ifndef __VMISC_H__
 #define __VMISC_H__

driver/xf86-video-rendition/src/vmodes.c

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c,v 1.13 2002/12/11 17:23:33 dawes Exp $ */
 /*
  * file vmodes.c
  *

driver/xf86-video-rendition/src/vmodes.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h,v 1.5 2002/04/04 14:05:45 eich Exp $ */
 /*
  * file vmodes.h
  *

driver/xf86-video-rendition/src/vos.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h,v 1.9 2002/01/25 21:56:07 tsi Exp $ */
 /*
  * file vos.h
  *

driver/xf86-video-rendition/src/vramdac.c

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c,v 1.18 2002/12/11 17:23:33 dawes Exp $ */
 /*
  * includes
  */

driver/xf86-video-rendition/src/vramdac.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h,v 1.6 2002/04/04 14:05:45 eich Exp $ */
 /*
  * file vramdac.h
  *

driver/xf86-video-rendition/src/vtypes.h

@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h,v 1.8 2001/10/28 03:33:44 tsi Exp $ */
 #ifndef _VTYPES_H_
 #define _VTYPES_H_
 
@@ -11,6 +10,9 @@
 #include <X11/Xmd.h>
 #include "xf86Pci.h"
 
+#ifdef XSERVER_LIBPCIACCESS
+#include <pciaccess.h>
+#endif
 
 /*
  * defines
@@ -177,8 +179,12 @@ typedef struct _renditionRec
 {
     struct verite_board_t board;        /* information on the board */
     struct verite_modeinfo_t mode;      /* information on the mode */
+#ifdef XSERVER_LIBPCIACCESS
+    struct pci_device * PciInfo;
+#else
     PCITAG pcitag;                      /* tag for the PCI config space */
     pciVideoPtr PciInfo;                /* PCI config data */
+#endif
     EntityInfoPtr pEnt;                 /* entity information */
     CloseScreenProcPtr CloseScreen;     /* wrap CloseScreen */
     xf86CursorInfoPtr CursorInfoRec;    /* Cursor data */