Hello community, here is the log from the commit of package xf86-video-tdfx for openSUSE:Factory checked in at 2015-02-24 13:02:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-tdfx (Old) and /work/SRC/openSUSE:Factory/.xf86-video-tdfx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-tdfx" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-tdfx/xf86-video-tdfx.changes 2015-02-10 20:17:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-tdfx.new/xf86-video-tdfx.changes 2015-02-24 13:06:57.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 23 13:36:49 UTC 2015 - [email protected] + +- Update to version 1.4.6: + * Remove mibstore.h + * dri: Stop (uselessly) initializing the ValidateTree hooks + * Define local PCI IDs instead of using xf86PciInfo.h + * Rename XSERVER_PCIACCESS to XSERVER_LIBPCIACCESS + * Use new pci_device_(un)map_range functions instead of deprecated ones + * Remove unreachable breaks after return statements + * Use the PCI ID macros instead of hardcoded values + * Unmap MMIO ranges for all chips + * Add more PCI IDs for supported chips +- supersedes U_Remove-mibstore.h.patch, + U_Rename-XSERVER_PCIACCESS-to-XSERVER_LIBPCIACCESS.patch, + U_dri-Stop-uselessly-initializing-the-ValidateTree-hoo.patch + +------------------------------------------------------------------- Old: ---- U_Remove-mibstore.h.patch U_Rename-XSERVER_PCIACCESS-to-XSERVER_LIBPCIACCESS.patch U_dri-Stop-uselessly-initializing-the-ValidateTree-hoo.patch xf86-video-tdfx-1.4.5.tar.bz2 New: ---- xf86-video-tdfx-1.4.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-tdfx.spec ++++++ --- /var/tmp/diff_new_pack.r2dq4D/_old 2015-02-24 13:06:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2dq4D/_new 2015-02-24 13:06:58.000000000 +0100 @@ -17,16 +17,13 @@ Name: xf86-video-tdfx -Version: 1.4.5 +Version: 1.4.6 Release: 0 Summary: 3Dfx video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 -Patch0: U_Remove-mibstore.h.patch -Patch1: U_Rename-XSERVER_PCIACCESS-to-XSERVER_LIBPCIACCESS.patch -Patch2: U_dri-Stop-uselessly-initializing-the-ValidateTree-hoo.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -52,9 +49,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure ++++++ xf86-video-tdfx-1.4.5.tar.bz2 -> xf86-video-tdfx-1.4.6.tar.bz2 ++++++ ++++ 26863 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/ChangeLog new/xf86-video-tdfx-1.4.6/ChangeLog --- old/xf86-video-tdfx-1.4.5/ChangeLog 2012-07-17 08:30:49.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/ChangeLog 2015-02-22 22:28:47.000000000 +0100 @@ -1,3 +1,102 @@ +commit 278042ff4c469f24ab7bc28e517e8a78e2821ddc +Author: Matt Turner <[email protected]> +Date: Sun Feb 22 13:26:24 2015 -0800 + + xf86-video-tdfx 1.4.6 + + Signed-off-by: Matt Turner <[email protected]> + +commit 2f71b05e29ae13a0fb6fbc74f4f76c78b6ddb0d7 +Author: Adam Jackson <[email protected]> +Date: Tue Jul 29 09:15:49 2014 -0400 + + dri: Stop (uselessly) initializing the ValidateTree hooks + + Signed-off-by: Adam Jackson <[email protected]> + +commit d8873445199bf1d229503ff1d12c6a2f3f23c863 +Author: Guillem Jover <[email protected]> +Date: Thu Oct 3 15:35:05 2013 +0200 + + Add more PCI IDs for supported chips + + Add support for Velocity and Voodoo4 chips. + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit b15c1e8ef9858c85ead44ded22c7d48bd8ffa501 +Author: Guillem Jover <[email protected]> +Date: Thu Oct 3 14:25:45 2013 +0200 + + Unmap MMIO ranges for all chips + + This is relevant on SLI setups, where each chip has their own MMIO + range. + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 828c151064083e4488a4cb3854f8dcb23265e5cb +Author: Guillem Jover <[email protected]> +Date: Wed Oct 2 21:22:33 2013 +0200 + + Use the PCI ID macros instead of hardcoded values + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 58b2ac6dd1487580f49869f582a8852b003a34fa +Author: Guillem Jover <[email protected]> +Date: Tue Oct 1 05:36:34 2013 +0200 + + Remove unreachable breaks after return statements + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 774461a4ac92c39c3b3ec975a887540dfa791eae +Author: Guillem Jover <[email protected]> +Date: Fri Sep 27 19:20:11 2013 +0200 + + Use new pci_device_(un)map_range functions instead of deprecated ones + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 646137de571a9df950d3a3edb454803268fd5f98 +Author: Guillem Jover <[email protected]> +Date: Fri Sep 27 19:06:31 2013 +0200 + + Rename XSERVER_PCIACCESS to XSERVER_LIBPCIACCESS + + Using the wrong macro name means that the code uses an obsolete typedef + that issues warnings. + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 457bd576a4895f0d3a65e550dbe2470177bf650d +Author: Guillem Jover <[email protected]> +Date: Fri Sep 27 18:52:01 2013 +0200 + + Define local PCI IDs instead of using xf86PciInfo.h + + The header file is deprecated and issues a warning now. Stop using + it, and move the definitions to the local tree as recommended by the + warning. + + Signed-off-by: Guillem Jover <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 10498d2730c651eb7a1890eb9e728269732e9dad +Author: Adam Jackson <[email protected]> +Date: Tue Sep 25 08:54:59 2012 -0400 + + Remove mibstore.h + + Signed-off-by: Adam Jackson <[email protected]> + commit a1037f73cf5da0ee3fec1867a5f20305d9267e63 Author: Dave Airlie <[email protected]> Date: Tue Jul 17 16:05:09 2012 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/INSTALL new/xf86-video-tdfx-1.4.6/INSTALL --- old/xf86-video-tdfx-1.4.5/INSTALL 2012-07-17 08:30:49.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/INSTALL 2015-02-22 22:28:47.000000000 +0100 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/config.h.in new/xf86-video-tdfx-1.4.6/config.h.in --- old/xf86-video-tdfx-1.4.5/config.h.in 2012-07-17 08:30:49.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/config.h.in 2015-02-22 22:28:42.000000000 +0100 @@ -35,8 +35,7 @@ /* Define to 1 if you have the <xaa.h> header file. */ #undef HAVE_XAA_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/configure.ac new/xf86-video-tdfx-1.4.6/configure.ac --- old/xf86-video-tdfx-1.4.5/configure.ac 2012-07-17 08:00:16.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/configure.ac 2015-02-22 22:26:22.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-tdfx], - [1.4.5], + [1.4.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-tdfx]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/missing new/xf86-video-tdfx-1.4.6/missing --- old/xf86-video-tdfx-1.4.5/missing 2012-06-06 13:47:33.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/missing 2015-02-22 22:28:43.000000000 +0100 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/src/tdfx.h new/xf86-video-tdfx-1.4.6/src/tdfx.h --- old/xf86-video-tdfx-1.4.5/src/tdfx.h 2012-07-17 07:21:16.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/src/tdfx.h 2015-02-22 22:25:54.000000000 +0100 @@ -12,7 +12,6 @@ #include <string.h> #include <stdio.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86DDC.h" #include "xf86xv.h" @@ -73,6 +72,19 @@ (p)->memBase[region] #endif +#define PCI_VENDOR_3DFX 0x121A + +#define PCI_CHIP_VOODOO_GRAPHICS 0x0001 +#define PCI_CHIP_VOODOO2 0x0002 +#define PCI_CHIP_BANSHEE 0x0003 +#define PCI_CHIP_VELOCITY 0x0004 +#define PCI_CHIP_VOODOO3 0x0005 +#define PCI_CHIP_VOODOO4 0x0007 +#define PCI_CHIP_VOODOO5 0x0009 + +#define PCI_CARD_VOODOO3_2000 0x0036 +#define PCI_CARD_VOODOO3_3000 0x003A + struct _TDFXRec; typedef struct _TDFXRec *TDFXPtr; @@ -216,7 +228,7 @@ unsigned long MMIOAddr[MAXCHIPS]; EntityInfoPtr pEnt; int numChips; -#ifndef XSERVER_PCIACCESS +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag[MAXCHIPS]; #endif Bool Primary; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/src/tdfx_accel.c new/xf86-video-tdfx-1.4.6/src/tdfx_accel.c --- old/xf86-video-tdfx-1.4.5/src/tdfx_accel.c 2012-07-17 07:21:16.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/src/tdfx_accel.c 2015-02-22 22:25:54.000000000 +0100 @@ -11,9 +11,6 @@ /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that use XAA need this */ #ifdef HAVE_XAA_H #include "xaalocal.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/src/tdfx_dri.c new/xf86-video-tdfx-1.4.6/src/tdfx_dri.c --- old/xf86-video-tdfx-1.4.5/src/tdfx_dri.c 2012-07-17 07:21:16.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/src/tdfx_dri.c 2015-02-22 22:25:54.000000000 +0100 @@ -5,7 +5,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "fb.h" #include "miline.h" @@ -362,8 +361,6 @@ pDRIInfo->frameBufferStride = pTDFX->stride; pDRIInfo->ddxDrawableTableEntry = TDFX_MAX_DRAWABLES; - pDRIInfo->wrap.ValidateTree = 0; - pDRIInfo->wrap.PostValidateTree = 0; pTDFX->coreBlockHandler = pDRIInfo->wrap.BlockHandler; pDRIInfo->wrap.BlockHandler = TDFXDoBlockHandler; pTDFX->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.5/src/tdfx_driver.c new/xf86-video-tdfx-1.4.6/src/tdfx_driver.c --- old/xf86-video-tdfx-1.4.5/src/tdfx_driver.c 2012-07-17 07:21:16.000000000 +0200 +++ new/xf86-video-tdfx-1.4.6/src/tdfx_driver.c 2015-02-22 22:25:54.000000000 +0100 @@ -62,10 +62,6 @@ #include "compiler.h" -/* Drivers using the mi implementation of backing store need: */ - -#include "mibstore.h" - /* All drivers using the vgahw module need this */ /* This driver needs to be modified to not use vgaHW for multihead operation */ #include "vgaHW.h" @@ -153,17 +149,20 @@ #ifdef XSERVER_LIBPCIACCESS #define TDFX_DEVICE_MATCH(d, sub, i) \ - { 0x121A, (d), PCI_MATCH_ANY, (sub), 0, 0, (i) } + { PCI_VENDOR_3DFX, (d), PCI_MATCH_ANY, (sub), 0, 0, (i) } static const struct pci_id_match tdfx_device_match[] = { TDFX_DEVICE_MATCH(PCI_CHIP_BANSHEE, PCI_MATCH_ANY, Banshee), + TDFX_DEVICE_MATCH(PCI_CHIP_VELOCITY, PCI_MATCH_ANY, Voodoo3_Unknown), + /* There are *many* missing PCI IDs here. */ - TDFX_DEVICE_MATCH(PCI_CHIP_VOODOO3, 0x0036, Voodoo3_2000), - TDFX_DEVICE_MATCH(PCI_CHIP_VOODOO3, 0x003A, Voodoo3_3000), + TDFX_DEVICE_MATCH(PCI_CHIP_VOODOO3, PCI_CARD_VOODOO3_2000, Voodoo3_2000), + TDFX_DEVICE_MATCH(PCI_CHIP_VOODOO3, PCI_CARD_VOODOO3_3000, Voodoo3_3000), TDFX_DEVICE_MATCH(PCI_CHIP_VOODOO3, PCI_MATCH_ANY, Voodoo3_Unknown), + TDFX_DEVICE_MATCH(PCI_CHIP_VOODOO4, PCI_MATCH_ANY, Voodoo5), TDFX_DEVICE_MATCH(PCI_CHIP_VOODOO5, PCI_MATCH_ANY, Voodoo5), { 0, 0, 0 } }; @@ -202,7 +201,9 @@ /* Chipsets */ static SymTabRec TDFXChipsets[] = { { PCI_CHIP_BANSHEE, "3dfx Banshee"}, + { PCI_CHIP_VELOCITY, "3dfx Velocity"}, { PCI_CHIP_VOODOO3, "3dfx Voodoo3"}, + { PCI_CHIP_VOODOO4, "3dfx Voodoo4"}, { PCI_CHIP_VOODOO5, "3dfx Voodoo5"}, { -1, NULL } }; @@ -210,7 +211,9 @@ #ifndef XSERVER_LIBPCIACCESS static PciChipsets TDFXPciChipsets[] = { { PCI_CHIP_BANSHEE, PCI_CHIP_BANSHEE, RES_SHARED_VGA }, + { PCI_CHIP_VELOCITY, PCI_CHIP_VELOCITY, RES_SHARED_VGA }, { PCI_CHIP_VOODOO3, PCI_CHIP_VOODOO3, RES_SHARED_VGA }, + { PCI_CHIP_VOODOO4, PCI_CHIP_VOODOO4, RES_SHARED_VGA }, { PCI_CHIP_VOODOO5, PCI_CHIP_VOODOO5, RES_SHARED_VGA }, { -1, -1, RES_UNDEFINED } }; @@ -1054,6 +1057,7 @@ case PCI_CHIP_BANSHEE: pTDFX->MaxClock = 270000; break; + case PCI_CHIP_VELOCITY: case PCI_CHIP_VOODOO3: switch(match->subsysCard) { case PCI_CARD_VOODOO3_2000: @@ -1067,6 +1071,7 @@ break; } break; + case PCI_CHIP_VOODOO4: case PCI_CHIP_VOODOO5: pTDFX->MaxClock = 350000; break; @@ -1082,7 +1087,9 @@ case PCI_CHIP_BANSHEE: clockRanges->interlaceAllowed = FALSE; break; + case PCI_CHIP_VELOCITY: case PCI_CHIP_VOODOO3: + case PCI_CHIP_VOODOO4: case PCI_CHIP_VOODOO5: clockRanges->interlaceAllowed = TRUE; break; @@ -1257,11 +1264,11 @@ * FIXME: don't have any such hardware to test. */ for (i = 0; i < pTDFX->numChips; i++) { - err = pci_device_map_memory_range(pTDFX->PciInfo[i], - pTDFX->MMIOAddr[i], - TDFXIOMAPSIZE, - TRUE, - & pTDFX->MMIOBase[i]); + err = pci_device_map_range(pTDFX->PciInfo[i], + pTDFX->MMIOAddr[i], + TDFXIOMAPSIZE, + PCI_DEV_MAP_FLAG_WRITABLE, + & pTDFX->MMIOBase[i]); if (err) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to map MMIO region for card %u (%d).\n", @@ -1271,11 +1278,11 @@ } - err = pci_device_map_memory_range(pTDFX->PciInfo[0], - pTDFX->LinearAddr[0], - pTDFX->FbMapSize, - TRUE, - & pTDFX->FbBase); + err = pci_device_map_range(pTDFX->PciInfo[0], + pTDFX->LinearAddr[0], + pTDFX->FbMapSize, + PCI_DEV_MAP_FLAG_WRITABLE, + & pTDFX->FbBase); if (err) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to map framebuffer (%d).\n", err); @@ -1311,8 +1318,15 @@ pTDFX = TDFXPTR(pScrn); #ifdef XSERVER_LIBPCIACCESS - pci_device_unmap_region(pTDFX->PciInfo[0], 0); - pci_device_unmap_region(pTDFX->PciInfo[0], 1); + pci_device_unmap_range(pTDFX->PciInfo[0], + pTDFX->FbBase, + pTDFX->FbMapSize); + + for (i = 0; i < pTDFX->numChips; i++) { + pci_device_unmap_range(pTDFX->PciInfo[i], + pTDFX->MMIOBase[i], + TDFXIOMAPSIZE); + } (void) memset(pTDFX->MMIOBase, 0, sizeof(pTDFX->MMIOBase)); pTDFX->FbBase = NULL; @@ -2264,7 +2278,7 @@ } scanlines = (pTDFX->backOffset - pTDFX->fbOffset) / pTDFX->stride; - if(pTDFX->ChipType < PCI_CHIP_VOODOO5) { + if(pTDFX->ChipType < PCI_CHIP_VOODOO4) { if (scanlines > 2047) scanlines = 2047; } else { @@ -2373,7 +2387,6 @@ } } - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); @@ -2586,14 +2599,13 @@ switch (pTDFX->ChipType) { case PCI_CHIP_BANSHEE: return MODE_BAD; - break; + case PCI_CHIP_VELOCITY: case PCI_CHIP_VOODOO3: + case PCI_CHIP_VOODOO4: case PCI_CHIP_VOODOO5: return MODE_OK; - break; default: return MODE_BAD; - break; } } /* In clock doubled mode widths must be divisible by 16 instead of 8 */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
