Hello community, here is the log from the commit of package xf86-video-voodoo for openSUSE:Factory checked in at 2012-09-18 14:03:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-voodoo (Old) and /work/SRC/openSUSE:Factory/.xf86-video-voodoo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-voodoo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-voodoo/xf86-video-voodoo.changes 2012-05-08 12:05:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-voodoo.new/xf86-video-voodoo.changes 2012-09-18 14:03:12.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Sep 2 19:26:08 UTC 2012 - [email protected] + +- Update to version 1.2.5: + + Fix build against older X servers. + + Fix build against XAA-less server. + + Drop useless vgaHW include. + + Fall back to shadowfb if XAA is unavailable. + +------------------------------------------------------------------- Old: ---- xf86-video-voodoo-1.2.4.tar.bz2 New: ---- xf86-video-voodoo-1.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-voodoo.spec ++++++ --- /var/tmp/diff_new_pack.JJwaKi/_old 2012-09-18 14:03:13.000000000 +0200 +++ /var/tmp/diff_new_pack.JJwaKi/_new 2012-09-18 14:03:13.000000000 +0200 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xf86-video-voodoo -Version: 1.2.4 +Version: 1.2.5 Release: 0 -License: MIT Summary: Voodoo video driver for the Xorg X server -Url: http://xorg.freedesktop.org/ +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 BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -30,7 +31,7 @@ BuildRequires: pkgconfig(renderproto) BuildRequires: pkgconfig(xextproto) BuildRequires: pkgconfig(xf86dgaproto) -BuildRequires: pkgconfig(xorg-macros) >= 1.3 +BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-server) >= 1.0.99.901 BuildRequires: pkgconfig(xproto) Supplements: xorg-x11-server ++++++ xf86-video-voodoo-1.2.4.tar.bz2 -> xf86-video-voodoo-1.2.5.tar.bz2 ++++++ ++++ 46504 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-voodoo-1.2.4/ChangeLog new/xf86-video-voodoo-1.2.5/ChangeLog --- old/xf86-video-voodoo-1.2.4/ChangeLog 2010-07-05 06:39:45.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/ChangeLog 2012-07-17 08:33:51.000000000 +0200 @@ -1,3 +1,185 @@ +commit e505d6b24873046285b18446df43ef505b650663 +Author: Dave Airlie <[email protected]> +Date: Tue Jul 17 16:05:09 2012 +1000 + + xf86-video-voodoo: bump to version 1.2.5 + + Signed-off-by: Dave Airlie <[email protected]> + +commit 7dd9360b9d9cdd76fed73323cc5cd8f6cc6c4adc +Author: Dave Airlie <[email protected]> +Date: Tue Jul 17 15:39:50 2012 +1000 + + voodoo: fix build against older X servers. + + Signed-off-by: Dave Airlie <[email protected]> + +commit f9e303905639ba84cb4eea909faa942d515c1968 +Author: Dave Airlie <[email protected]> +Date: Mon Jul 16 18:52:50 2012 +1000 + + voodoo: fix build against XAA-less server. + + Signed-off-by: Dave Airlie <[email protected]> + +commit a5a9f9d7f69f812ef81557a50451efaa2f577cfb +Author: Dave Airlie <[email protected]> +Date: Wed Jun 6 12:39:10 2012 +0100 + + voodoo: add compat API. + + Signed-off-by: Dave Airlie <[email protected]> + +commit 8c1121725c4dc1a81dd1af74b83405a1cb69562e +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 17:40:16 2011 -0500 + + Drop useless vgaHW include + + Signed-off-by: Adam Jackson <[email protected]> + +commit b835f5083cfef2aad6575277fb168a60bbb76af4 +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 17:39:44 2011 -0500 + + Fall back to shadowfb if XAA is unavailable + + Signed-off-by: Adam Jackson <[email protected]> + +commit d2f109c4179c13c3367b08f1ee4f4baa3a2a68ad +Author: Jeremy Huddleston <[email protected]> +Date: Sat Oct 29 19:02:46 2011 -0700 + + Fix implicit declaration warning + + voodoo_driver.c:898:7: warning: implicit declaration of function 'VoodooRestorePassThrough' [-Wimplicit-function-declaration] + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit 614ccdf6a5dcc496d254aa361cc06ef70f2792f5 +Author: Trevor Woerner <[email protected]> +Date: Fri Oct 22 14:51:16 2010 -0400 + + Update xf86dgastr.h include. + + To xf86dgaproto.h. + + Signed-off-by: Trevor Woerner <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit ae5f55acea3753ae83bd3b78bba86137f9b4b7f3 +Author: Trevor Woerner <[email protected]> +Date: Fri Oct 22 14:51:01 2010 -0400 + + Convert x+m/calloc/free to m/calloc/free. + + Signed-off-by: Trevor Woerner <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit db25d980b71396430c1a93f61687bbb971b02f7b +Author: Jesse Adkins <[email protected]> +Date: Tue Sep 28 13:29:52 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 83be53038fc95cfceb3dec53d68e52fd82026998 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 16:49:04 2010 -0400 + + config: add comments for main statements + +commit 1f0d72b11e212eb250c3614b2b799b84bd4e021b +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 16:07:00 2010 -0400 + + config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit dfa89c2014813e080a34aac5a650d475d31479db +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 14:37:42 2010 -0400 + + config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 54a332ac745af89d60ca4b3c5907e592a40a37d6 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 14:05:23 2010 -0400 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit a3dcd95353834098f7a64ada7062288f2667587f +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 09:27:42 2010 -0400 + + config: complete AC_INIT m4 quoting + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit beb44a9dbdbe8376738f5476333405e727ce17e6 +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 21:44:58 2010 -0400 + + config: remove unrequired AC_SUBST([XORG_CFLAGS]) + + This macro is called by PKG_CHECK_MODULES + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 3e43d913b90e2bd3930c3a22951f9a248c746941 +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 20:24:42 2010 -0400 + + config: remove unrequired AC_HEADER_STDC + + Autoconf says: + "This macro is obsolescent, as current systems have conforming + header files. New programs need not use this macro". + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit d251e3bbec7ca5feae7480dd60ea4e4814feaaf9 +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 19:41:31 2010 -0400 + + config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 + + XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls + AC_PROG_C_C99. This sets gcc with -std=gnu99. + If AC_PROG_CC macro is called afterwards, it resets CC to gcc. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1b4cf228ef6c9c8bb28447f3e61eb523b22b309b +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 18:45:19 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 494fd2ae23a845efd722cdf8b8c26d9a8dd4bbce +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 16:15:30 2010 -0400 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + commit e58d315815dca51b6fcecdeceb267fc8a7cb19e1 Author: Dave Airlie <[email protected]> Date: Mon Jul 5 14:39:03 2010 +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-voodoo-1.2.4/INSTALL new/xf86-video-voodoo-1.2.5/INSTALL --- old/xf86-video-voodoo-1.2.4/INSTALL 2010-07-05 06:39:45.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/INSTALL 2012-07-17 08:33:51.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + 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. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +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. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. 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 + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + 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. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +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 `..'. + + 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 +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + 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'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + 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. + + 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 +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + 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 +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + 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 +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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-voodoo-1.2.4/config.h.in new/xf86-video-voodoo-1.2.5/config.h.in --- old/xf86-video-voodoo-1.2.4/config.h.in 2010-07-05 06:39:35.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/config.h.in 2012-07-17 08:33:51.000000000 +0200 @@ -32,6 +32,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the <xaa.h> header file. */ +#undef HAVE_XAA_H + /* xextproto 7.1 available */ #undef HAVE_XEXTPROTO_71 @@ -60,6 +63,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION 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-voodoo-1.2.4/configure.ac new/xf86-video-voodoo-1.2.5/configure.ac --- old/xf86-video-voodoo-1.2.4/configure.ac 2010-07-05 06:39:00.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/configure.ac 2012-07-17 08:00:16.000000000 +0200 @@ -20,45 +20,45 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ(2.57) +# Initialize Autoconf +AC_PREREQ([2.60]) AC_INIT([xf86-video-voodoo], - 1.2.4, + [1.2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - xf86-video-voodoo) - + [xf86-video-voodoo]) AC_CONFIG_SRCDIR([Makefile.am]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(.) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -# Checks for programs. +# Initialize libtool AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_PROG_CC AH_TOP([#include "xorg-server.h"]) +# Define a configure option for an alternate module directory AC_ARG_WITH(xorg-module-dir, - AC_HELP_STRING([--with-xorg-module-dir=DIR], + AS_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) -# Checks for extensions +# Store the list of server defined optional extensions in REQUIRED_MODULES XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) -# Checks for pkg-config packages +# Obtain compiler/linker options for the driver dependencies PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), @@ -67,7 +67,6 @@ # Checks for libraries. -# Checks for header files. SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" AC_CHECK_DECL(XSERVER_LIBPCIACCESS, @@ -83,16 +82,33 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) -AC_HEADER_STDC -AC_SUBST([XORG_CFLAGS]) +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +AC_MSG_CHECKING([whether to include XAA support]) +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) +AC_MSG_RESULT([$XAA]) + AC_SUBST([moduledir]) DRIVER_NAME=voodoo AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([ - Makefile - src/Makefile - man/Makefile +AC_CONFIG_FILES([ + Makefile + src/Makefile + man/Makefile ]) +AC_OUTPUT 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-voodoo-1.2.4/man/Makefile.am new/xf86-video-voodoo-1.2.5/man/Makefile.am --- old/xf86-video-voodoo-1.2.4/man/Makefile.am 2010-07-05 06:38:33.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/man/Makefile.am 2012-06-06 13:34:03.000000000 +0200 @@ -31,25 +31,11 @@ CLEANFILES = $(driverman_DATA) -SED = sed -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure + SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man .man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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-voodoo-1.2.4/man/voodoo.man new/xf86-video-voodoo-1.2.5/man/voodoo.man --- old/xf86-video-voodoo-1.2.4/man/voodoo.man 2010-07-05 06:38:33.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/man/voodoo.man 2012-06-06 13:34:03.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/voodoo/voodoo.man,v 1.0 2004/02/11 23:10:13 alan Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH VOODOO __drivermansuffix__ __vendorversion__ 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-voodoo-1.2.4/missing new/xf86-video-voodoo-1.2.5/missing --- old/xf86-video-voodoo-1.2.4/missing 2010-07-05 06:39:36.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/missing 2012-06-06 13:35:56.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. 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-voodoo-1.2.4/src/Makefile.am new/xf86-video-voodoo-1.2.5/src/Makefile.am --- old/xf86-video-voodoo-1.2.4/src/Makefile.am 2010-07-05 06:38:33.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/src/Makefile.am 2012-06-06 13:35:34.000000000 +0200 @@ -29,6 +29,7 @@ voodoo_drv_ladir = @moduledir@/drivers voodoo_drv_la_SOURCES = \ + compat-api.h \ voodoo_dga.c \ voodoo_driver.c \ voodoo.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-voodoo-1.2.4/src/compat-api.h new/xf86-video-voodoo-1.2.5/src/compat-api.h --- old/xf86-video-voodoo-1.2.4/src/compat-api.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-voodoo-1.2.5/src/compat-api.h 2012-06-06 13:37:27.000000000 +0200 @@ -0,0 +1,99 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Dave Airlie <[email protected]> + */ + +/* this file provides API compat between server post 1.13 and pre it, + it should be reused inside as many drivers as possible */ +#ifndef COMPAT_API_H +#define COMPAT_API_H + +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +#endif + +#ifndef XF86_HAS_SCRN_CONV +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] +#endif + +#ifndef XF86_SCRN_INTERFACE + +#define SCRN_ARG_TYPE int +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] + +#define SCREEN_ARG_TYPE int +#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] + +#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen + +#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags +#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 + +#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags +#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 + +#define FREE_SCREEN_ARGS_DECL int arg, int flags + +#define VT_FUNC_ARGS_DECL int arg, int flags +#define VT_FUNC_ARGS pScrn->scrnIndex, 0 + +#define XF86_SCRN_ARG(x) ((x)->scrnIndex) +#else +#define SCRN_ARG_TYPE ScrnInfoPtr +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) + +#define SCREEN_ARG_TYPE ScreenPtr +#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) + +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS pScreen + +#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y +#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y + +#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode +#define SWITCH_MODE_ARGS(arg, m) arg, m + +#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg + +#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg +#define VT_FUNC_ARGS pScrn + +#define XF86_SCRN_ARG(x) (x) + +#endif + +#endif 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-voodoo-1.2.4/src/voodoo.h new/xf86-video-voodoo-1.2.5/src/voodoo.h --- old/xf86-video-voodoo-1.2.4/src/voodoo.h 2010-07-05 06:38:33.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/src/voodoo.h 2012-07-17 07:21:17.000000000 +0200 @@ -1,6 +1,8 @@ #include "voodoo_pcirename.h" #include <string.h> +#include "compat-api.h" + typedef struct { CARD32 m; CARD32 n; @@ -11,7 +13,9 @@ CARD8 * ShadowPtr; /* Shadow buffer */ CARD32 ShadowPitch; CloseScreenProcPtr CloseScreen; /* Wrapped Close */ +#ifdef HAVE_XAA_H XAAInfoRecPtr AccelInfoRec; /* Cached Accel rec for close */ +#endif Bool Blanked; Bool PassThrough; /* Set to restore pass through on exit */ EntityInfoPtr pEnt; @@ -102,7 +106,7 @@ extern void VoodooSync(ScrnInfoPtr pScrn); extern void VoodooReadBank(ScreenPtr pScreen, int bank); extern void VoodooWriteBank(ScreenPtr pScreen, int bank); -extern void VoodooReadBank(ScreenPtr pScreen, int bank); +extern void VoodooRestorePassThrough(VoodooPtr pVoo); /* * DGA 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-voodoo-1.2.4/src/voodoo_dga.c new/xf86-video-voodoo-1.2.5/src/voodoo_dga.c --- old/xf86-video-voodoo-1.2.4/src/voodoo_dga.c 2010-07-05 06:38:33.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/src/voodoo_dga.c 2012-07-17 07:38:51.000000000 +0200 @@ -47,13 +47,14 @@ #include "shadowfb.h" #include "vgaHW.h" #include "compiler.h" -#include "xaa.h" #include "dgaproc.h" - +#ifdef HAVE_XAA_H +#include "xaa.h" +#endif #include "voodoo.h" #define _XF86DGA_SERVER_ -#include <X11/extensions/xf86dgastr.h> +#include <X11/extensions/xf86dgaproto.h> #include "opaque.h" #ifdef HAVE_XEXTPROTO_71 @@ -105,7 +106,7 @@ frameY0 = pScrn->frameY0; } - if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0)) + if (!(*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pMode))) return FALSE; return TRUE; } @@ -136,7 +137,7 @@ DGAModePtr pDGAMode; do { - pDGAMode = xrealloc(pVoo->pDGAMode, + pDGAMode = realloc(pVoo->pDGAMode, (pVoo->nDGAMode + 1) * sizeof(DGAModeRec)); if (!pDGAMode) break; 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-voodoo-1.2.4/src/voodoo_driver.c new/xf86-video-voodoo-1.2.5/src/voodoo_driver.c --- old/xf86-video-voodoo-1.2.4/src/voodoo_driver.c 2010-07-05 06:38:33.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/src/voodoo_driver.c 2012-07-17 07:39:07.000000000 +0200 @@ -54,18 +54,18 @@ #include "xf86Pci.h" #include "xf86cmap.h" #include "shadowfb.h" -#include "vgaHW.h" #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #include "xf86Resources.h" #endif #include "compiler.h" +#ifdef HAVE_XAA_H #include "xaa.h" - +#endif #include "voodoo.h" #define _XF86DGA_SERVER_ -#include <X11/extensions/xf86dgastr.h> +#include <X11/extensions/xf86dgaproto.h> #include "opaque.h" #ifdef HAVE_XEXTPROTO_71 @@ -80,15 +80,15 @@ static void VoodooIdentify(int flags); static Bool VoodooProbe(DriverPtr drv, int flags); static Bool VoodooPreInit(ScrnInfoPtr pScrn, int flags); -static Bool VoodooScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv); -static Bool VoodooEnterVT(int scrnIndex, int flags); -static void VoodooLeaveVT(int scrnIndex, int flags); -static Bool VoodooCloseScreen(int scrnIndex, ScreenPtr pScreen); +static Bool VoodooScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool VoodooEnterVT(VT_FUNC_ARGS_DECL); +static void VoodooLeaveVT(VT_FUNC_ARGS_DECL); +static Bool VoodooCloseScreen(CLOSE_SCREEN_ARGS_DECL); static Bool VoodooSaveScreen(ScreenPtr pScreen, int mode); -static void VoodooFreeScreen(int scrnIndex, int flags); +static void VoodooFreeScreen(FREE_SCREEN_ARGS_DECL); static void VoodooRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox); static void VoodooRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox); -static Bool VoodooSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +static Bool VoodooSwitchMode(SWITCH_MODE_ARGS_DECL); static Bool VoodooModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); static void VoodooRestore(ScrnInfoPtr pScrn, Bool Closing); @@ -195,7 +195,7 @@ { if (pScrn->driverPrivate == NULL) return; - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; } @@ -278,10 +278,10 @@ } pEnt = xf86GetEntityInfo(usedChips[i]); } - xfree(usedChips); + free(usedChips); } } - xfree(devSections); + free(devSections); return foundScreen; } @@ -389,7 +389,7 @@ xf86CollectOptions(pScrn, NULL); /* Process the options */ - if (!(pVoo->Options = xalloc(sizeof(VoodooOptions)))) + if (!(pVoo->Options = malloc(sizeof(VoodooOptions)))) return FALSE; memcpy(pVoo->Options, VoodooOptions, sizeof(VoodooOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pVoo->Options); @@ -561,8 +561,9 @@ } if (!xf86LoadSubModule(pScrn, "xaa")) { - VoodooFreeRec(pScrn); - return FALSE; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); + pVoo->Accel = 0; + pVoo->ShadowFB = 1; } if(pVoo->ShadowFB) @@ -580,7 +581,7 @@ /* Mandatory */ /* This gets called at the start of each server generation */ static Bool -VoodooScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +VoodooScreenInit(SCREEN_INIT_ARGS_DECL) { ScrnInfoPtr pScrn; VoodooPtr pVoo; @@ -592,7 +593,7 @@ /* * First get the ScrnInfoRec */ - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pVoo = VoodooPTR(pScrn); @@ -730,9 +731,9 @@ /* Mandatory */ static Bool -VoodooEnterVT(int scrnIndex, int flags) +VoodooEnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); return VoodooModeInit(pScrn, pScrn->currentMode); } @@ -745,9 +746,9 @@ /* Mandatory */ static void -VoodooLeaveVT(int scrnIndex, int flags) +VoodooLeaveVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); VoodooRestore(pScrn, FALSE); } @@ -760,19 +761,21 @@ /* Mandatory */ static Bool -VoodooCloseScreen(int scrnIndex, ScreenPtr pScreen) +VoodooCloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); if (pScrn->vtSema) VoodooRestore(pScrn, TRUE); if(pVoo->ShadowPtr) - xfree(pVoo->ShadowPtr); + free(pVoo->ShadowPtr); +#ifdef HAVE_XAA_H if(pVoo->AccelInfoRec) - xfree(pVoo->AccelInfoRec); + free(pVoo->AccelInfoRec); +#endif if (pVoo->pDGAMode) { - xfree(pVoo->pDGAMode); + free(pVoo->pDGAMode); pVoo->pDGAMode = NULL; pVoo->nDGAMode = 0; } @@ -780,7 +783,7 @@ pScrn->vtSema = FALSE; pScreen->CloseScreen = pVoo->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } @@ -788,17 +791,17 @@ /* Optional */ static void -VoodooFreeScreen(int scrnIndex, int flags) +VoodooFreeScreen(FREE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); VoodooPtr pVoo = VoodooPTR(pScrn); /* * This only gets called when a screen is being deleted. It does not * get called routinely at the end of a server generation. */ if (pVoo && pVoo->ShadowPtr) - xfree(pVoo->ShadowPtr); - VoodooFreeRec(xf86Screens[scrnIndex]); + free(pVoo->ShadowPtr); + VoodooFreeRec(pScrn); } @@ -814,7 +817,7 @@ unblank = xf86IsUnblank(mode); if(pScreen != NULL) { - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pVoo = VoodooPTR(pScrn); if(pScrn->vtSema && (unblank == pVoo->Blanked)) @@ -878,11 +881,11 @@ * this is needed but it does no harm. */ -static Bool VoodooSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +static Bool VoodooSwitchMode(SWITCH_MODE_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); VoodooSync(pScrn); - return VoodooModeInit(xf86Screens[scrnIndex], mode); + return VoodooModeInit(pScrn, mode); } static void 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-voodoo-1.2.4/src/voodoo_hardware.c new/xf86-video-voodoo-1.2.5/src/voodoo_hardware.c --- old/xf86-video-voodoo-1.2.4/src/voodoo_hardware.c 2010-07-05 06:38:33.000000000 +0200 +++ new/xf86-video-voodoo-1.2.5/src/voodoo_hardware.c 2012-07-17 07:39:45.000000000 +0200 @@ -47,12 +47,15 @@ #include "xf86cmap.h" #include "shadowfb.h" #include "vgaHW.h" -#include "xaa.h" #include "compiler.h" +#ifdef HAVE_XAA_H +#include "xaa.h" +#endif + #include "voodoo.h" -#include <X11/extensions/xf86dgastr.h> +#include <X11/extensions/xf86dgaproto.h> #include "opaque.h" #ifdef HAVE_XEXTPROTO_71 @@ -67,7 +70,7 @@ #include <unistd.h> - +#ifdef HAVE_XAA_H #if 0 static void VoodooReadWriteBank(ScreenPtr pScreen, int bank); #endif @@ -82,7 +85,7 @@ static void VoodooSubsequentCPUToScreenTexture(ScrnInfoPtr pScrn, int dstx, int dsty, int srcx, int srcy, int width, int height); - +#endif static int debug = 0; /* @@ -811,7 +814,7 @@ void VoodooReadBank(ScreenPtr pScreen, int bank) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); if(bank) { @@ -828,7 +831,7 @@ void VoodooWriteBank(ScreenPtr pScreen, int bank) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); if(bank) { @@ -846,7 +849,7 @@ #if 0 static void VoodooReadWriteBank(ScreenPtr pScreen, int bank) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); if(bank) { @@ -920,6 +923,7 @@ mmio32_w(pVoo, 0x10C, 0); /* Maybe flag this */ } +#ifdef HAVE_XAA_H static void Voodoo2Setup2D(VoodooPtr pVoo) { wait_idle(pVoo); @@ -1386,10 +1390,12 @@ CARD32 VoodooTextureFormats[3] = {PICT_a8r8g8b8, PICT_x8r8g8b8, 0}; #endif +#endif void Voodoo2XAAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; +#ifdef HAVE_XAA_H + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); XAAInfoRecPtr pAccel = XAACreateInfoRec(); BoxRec cacheArea; @@ -1472,4 +1478,5 @@ ErrorF("Unable to set up acceleration.\n"); Voodoo2DisableClipping(pScrn); +#endif } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
