Hello community, here is the log from the commit of package xf86-video-mga for openSUSE:Factory checked in at 2013-12-11 17:42:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-mga (Old) and /work/SRC/openSUSE:Factory/.xf86-video-mga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-mga" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-mga/xf86-video-mga.changes 2013-08-23 14:22:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-mga.new/xf86-video-mga.changes 2013-12-11 17:43:00.000000000 +0100 @@ -1,0 +2,19 @@ +Sat Dec 7 22:20:36 UTC 2013 - [email protected] + +- Update to version 1.6.3: + + mga: + - Fix XAA runtime. + - Use exaGetPixmapFirstPixel() instead of devPrivate.ptr. + + Remove mga_esc.c vestigal stub. + + Disable HW cursor by default on G200 server chips. + + Restructure code to make it more readable. + + Fix dual head crash without XAA (lp#1180986). + + Unbreak dual head (xinerama) (lp#18472, lp#292214, + gentoo#265100). + + Disable Linear Expansion on BE. + + Restrict kernel driver matching to g200 server chips + (deb#697532, bnc#823658). +- Drop U_Restrict-kernel-driver-matching-to-g200-server-chips.patch + and xf86-video-mga-g200se-swcursor.diff, fixed upstream. + +------------------------------------------------------------------- Old: ---- U_Restrict-kernel-driver-matching-to-g200-server-chips.patch xf86-video-mga-1.6.2.tar.bz2 xf86-video-mga-g200se-swcursor.diff New: ---- xf86-video-mga-1.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-mga.spec ++++++ --- /var/tmp/diff_new_pack.ZANdDE/_old 2013-12-11 17:43:01.000000000 +0100 +++ /var/tmp/diff_new_pack.ZANdDE/_new 2013-12-11 17:43:01.000000000 +0100 @@ -17,15 +17,13 @@ Name: xf86-video-mga -Version: 1.6.2 +Version: 1.6.3 Release: 0 Summary: Matrox 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: xf86-video-mga-g200se-swcursor.diff -Patch1: U_Restrict-kernel-driver-matching-to-g200-server-chips.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -64,8 +62,6 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p1 %build %configure ++++++ xf86-video-mga-1.6.2.tar.bz2 -> xf86-video-mga-1.6.3.tar.bz2 ++++++ ++++ 5165 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-mga-1.6.2/ChangeLog new/xf86-video-mga-1.6.3/ChangeLog --- old/xf86-video-mga-1.6.2/ChangeLog 2012-09-28 03:38:33.000000000 +0200 +++ new/xf86-video-mga-1.6.3/ChangeLog 2013-12-05 03:10:31.000000000 +0100 @@ -1,3 +1,125 @@ +commit f647727a2c1d4c2a9261c411cd3df71c3c9f0c06 +Author: Dave Airlie <[email protected]> +Date: Thu Dec 5 12:09:27 2013 +1000 + + mga: bump release to 1.6.3 + +commit 55525bdfc00b0b746401f6ea6ed289048e9d06eb +Author: Dave Airlie <[email protected]> +Date: Thu Dec 5 11:51:39 2013 +1000 + + mga: fix XAA runtime + + XAA->USE_XAA add USE_XAA. + + Tested-by: Avengence on #xorg-devel + Signed-off-by: Dave Airlie <[email protected]> + +commit 6aa94687233f55a8044efe83cac82b04ab19609f +Author: Alan Coopersmith <[email protected]> +Date: Sun Nov 17 10:27:42 2013 -0800 + + Remove mga_esc.c vestigal stub + + Previously contained MGA HAL code, was left an empty shell by the + removal of USEMGAHAL in commit 94bbeb132c7eda. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Ian Romanick <[email protected]> + +commit e9109a0b04695d6971c94abe271dda2dc1a5e886 +Author: Tormod Volden <[email protected]> +Date: Thu Oct 31 22:48:18 2013 +0100 + + mga: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr + + Signed-off-by: Tormod Volden <[email protected]> + +commit a77b9c5143591672fbe56f4428ced439c1f4d0f3 +Author: Egbert Eich <[email protected]> +Date: Mon Jul 29 13:02:21 2013 +0200 + + Disable HW cursor by default on G200 server chips + + Disable HW cursor by default on G200 server chips as these chips a + re often used with a remote graphics link which cannot display + the HW cursor. + This can be overridden by a config option. + Most desktops today use ARGB cursors anyhow which are not + supported by this driver anyhow. Thus the performance penalty + should be irrelevant. + + Signed-off-by: Egbert Eich <[email protected]> + +commit dba8778b9214dc3794198029fc6d59b3e97700d4 +Author: Egbert Eich <[email protected]> +Date: Mon Jul 29 13:01:45 2013 +0200 + + Restructure code to make it more readable + + With the previous structure it wasn't immediately clear when SecondCrtc + and HWCursor were set to which value. Make the code more readable. + + Signed-off-by: Egbert Eich <[email protected]> + +commit cbcee5de1ba02c8a58bae932a0cb98093dccefd9 +Author: Tormod Volden <[email protected]> +Date: Thu Oct 17 22:01:20 2013 +0200 + + Fix dual head crash without XAA + + https://launchpad.net/bugs/1180986 + + Signed-off-by: Tormod Volden <[email protected]> + Reviewed-by: Robert Jacobs <[email protected]> + Tested-by: Robert Jacobs <[email protected]> + +commit 15815c8612694a89d0d8593b3e603fdcdeacdd05 +Author: Andy MacLean <[email protected]> +Date: Thu Oct 17 19:51:36 2013 +0200 + + Unbreak dual head (xinerama) + + This patch has been used in Debian, Ubuntu and Gentoo for years. + + https://bugs.freedesktop.org/show_bug.cgi?id=18472 + https://launchpad.net/bugs/292214 + https://bugs.gentoo.org/show_bug.cgi?id=265100 + + Signed-off-by: Andy MacLean <[email protected]> + Reviewed-by: Cyril Brulebois <[email protected]> + Reviewed-by: Robert Jacobs <[email protected]> + Tested-by: Robert Jacobs <[email protected]> + +commit 12af175fee1d3f6f17f8391ec642d904deca3783 +Author: Egbert Eich <[email protected]> +Date: Tue Jun 7 19:31:16 2011 +0200 + + Disable Linear Expansion on BE + + Linear Expansion doesn't work on BE as the bit order in + a word is reversed. ScreenToScreenColorExpansion allows + to adjust the bit order in a byte, still the bytes have + the wrong order. + + Reviewed-by: <[email protected]> + Signed-off-by: Egbert Eich <[email protected]> + +commit 49381ff2c3aa98be5bb84494b2ad3f81a0d31bcc +Author: Julien Cristau <[email protected]> +Date: Mon Jan 7 23:04:36 2013 +0100 + + Restrict kernel driver matching to g200 server chips + + Otherwise we might catch devices handled by matroxfb, not the mgag200 + kms driver. + + Debian bug#697532 + + Reported-by: [email protected] + Reviewed-by: Dave Airlie <[email protected]> + Signed-off-by: Julien Cristau <[email protected]> + commit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d Author: Dave Airlie <[email protected]> Date: Fri Sep 28 11:36:44 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-mga-1.6.2/INSTALL new/xf86-video-mga-1.6.3/INSTALL --- old/xf86-video-mga-1.6.2/INSTALL 2012-09-28 03:38:33.000000000 +0200 +++ new/xf86-video-mga-1.6.3/INSTALL 2013-12-05 03:10:31.000000000 +0100 @@ -1,291 +0,0 @@ -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-mga-1.6.2/config.h.in new/xf86-video-mga-1.6.3/config.h.in --- old/xf86-video-mga-1.6.2/config.h.in 2012-09-28 03:37:37.000000000 +0200 +++ new/xf86-video-mga-1.6.3/config.h.in 2013-12-05 03:10:31.000000000 +0100 @@ -84,5 +84,8 @@ /* Build support for Exa */ #undef USE_EXA +/* Build support for XAA */ +#undef USE_XAA + /* Version number of package */ #undef 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-mga-1.6.2/configure.ac new/xf86-video-mga-1.6.3/configure.ac --- old/xf86-video-mga-1.6.2/configure.ac 2012-09-28 03:37:15.000000000 +0200 +++ new/xf86-video-mga-1.6.3/configure.ac 2013-12-05 03:08:37.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-mga], - [1.6.2], + [1.6.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-mga]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -144,6 +144,9 @@ AC_MSG_CHECKING([whether to include XAA support]) AM_CONDITIONAL(XAA, test "x$XAA" = xyes) AC_MSG_RESULT([$XAA]) +if test "x$XAA" = xyes; then + AC_DEFINE(USE_XAA, 1, [Build support for XAA]) +fi # Properly handle EXA. AC_MSG_CHECKING([whether to enable EXA support]) 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-mga-1.6.2/missing new/xf86-video-mga-1.6.3/missing --- old/xf86-video-mga-1.6.2/missing 2012-06-06 10:04:32.000000000 +0200 +++ new/xf86-video-mga-1.6.3/missing 2013-12-05 02:14:29.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.13; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1996-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 @@ -26,7 +25,7 @@ # 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 @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,20 +73,20 @@ --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' + 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 + 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 + 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] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -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,8 +98,8 @@ ;; -*) - 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 ;; @@ -127,7 +126,7 @@ 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 + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -139,27 +138,27 @@ 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 +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 +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 +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" @@ -176,9 +175,9 @@ 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. +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/' | @@ -187,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +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 + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -210,10 +209,10 @@ 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 +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." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then eval LASTARG=\${$#} @@ -240,10 +239,10 @@ 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 +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." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then eval LASTARG=\${$#} @@ -263,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +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." + 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"` @@ -281,12 +280,12 @@ 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 +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." + 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"` @@ -310,12 +309,12 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +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, + 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." + some other package would contain this missing '$1' program." exit 1 ;; esac 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-mga-1.6.2/src/Makefile.am new/xf86-video-mga-1.6.3/src/Makefile.am --- old/xf86-video-mga-1.6.2/src/Makefile.am 2012-09-28 03:37:15.000000000 +0200 +++ new/xf86-video-mga-1.6.3/src/Makefile.am 2013-12-05 02:14:14.000000000 +0100 @@ -39,7 +39,6 @@ mga_dga.c \ mga_dh.c \ mga_driver.c \ - mga_esc.c \ mga_g450pll.c \ mga.h \ mga_halmod.c \ 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-mga-1.6.2/src/mga.h new/xf86-video-mga-1.6.3/src/mga.h --- old/xf86-video-mga-1.6.2/src/mga.h 2012-07-17 07:21:15.000000000 +0200 +++ new/xf86-video-mga-1.6.3/src/mga.h 2013-12-05 02:16:12.000000000 +0100 @@ -343,6 +343,13 @@ int mastervideoRam; int slavevideoRam; Bool directRenderingEnabled; + + void * mappedIOBase; + int mappedIOUsage; + + void * mappedILOADBase; + int mappedILOADUsage; + ScrnInfoPtr pScrn_1; ScrnInfoPtr pScrn_2; } MGAEntRec, *MGAEntPtr; @@ -688,7 +695,12 @@ #define NICE_DASH_PATTERN 0x00000020 #define TWO_PASS_COLOR_EXPAND 0x00000040 #define MGA_NO_PLANEMASK 0x00000080 +/* linear expansion doesn't work on BE due to wrong byte order */ +#if X_BYTE_ORDER == X_BIG_ENDIAN +#define USE_LINEAR_EXPANSION 0x00000000 +#else #define USE_LINEAR_EXPANSION 0x00000100 +#endif #define LARGE_ADDRESSES 0x00000200 #define MGAIOMAPSIZE 0x00004000 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-mga-1.6.2/src/mga_dri.c new/xf86-video-mga-1.6.3/src/mga_dri.c --- old/xf86-video-mga-1.6.2/src/mga_dri.c 2012-09-28 03:37:15.000000000 +0200 +++ new/xf86-video-mga-1.6.3/src/mga_dri.c 2013-12-05 02:15:53.000000000 +0100 @@ -355,7 +355,7 @@ MGAWaitForIdleDMA( pScrn ); /* FIXME what about EXA? */ -#ifdef XAA +#ifdef USE_XAA if (!pMga->Exa && pMga->AccelInfoRec) { WAITFIFO( 11 ); OUTREG( MGAREG_MACCESS, pMga->MAccess ); 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-mga-1.6.2/src/mga_driver.c new/xf86-video-mga-1.6.3/src/mga_driver.c --- old/xf86-video-mga-1.6.2/src/mga_driver.c 2012-09-28 03:37:15.000000000 +0200 +++ new/xf86-video-mga-1.6.3/src/mga_driver.c 2013-12-05 02:15:53.000000000 +0100 @@ -87,7 +87,7 @@ #include "mga_macros.h" #include "mga_maven.h" -#ifdef XAA +#ifdef USE_XAA #include "xaa.h" #endif @@ -676,12 +676,22 @@ #endif if (pci_device_has_kernel_driver(dev)) { - xf86DrvMsg(0, X_ERROR, - "mga: The PCI device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n", - dev->device_id, dev->bus, dev->domain, dev->dev, dev->func); - xf86DrvMsg(0, X_ERROR, - "mga: This driver cannot operate until it has been unloaded.\n"); - return FALSE; + /* If it's a G200 server chip, it's probably on KMS, so bail; if not, + * it might be using matroxfb, which is ok. */ + switch (dev->device_id) { + case PCI_CHIP_MGAG200_SE_A_PCI: + case PCI_CHIP_MGAG200_SE_B_PCI: + case PCI_CHIP_MGAG200_EV_PCI: + case PCI_CHIP_MGAG200_ER_PCI: + case PCI_CHIP_MGAG200_WINBOND_PCI: + case PCI_CHIP_MGAG200_EH_PCI: + xf86DrvMsg(0, X_ERROR, + "mga: The PCI device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n", + dev->device_id, dev->bus, dev->domain, dev->dev, dev->func); + xf86DrvMsg(0, X_ERROR, + "mga: This driver cannot operate until it has been unloaded.\n"); + return FALSE; + } } /* Allocate a ScrnInfoRec and claim the slot */ @@ -1670,6 +1680,43 @@ } /* + * Disable HW cursor by default on G200 server chips as these + * chips are often used with a remote graphics link which cannot + * display the HW cursor. + */ + switch (pMga->Chipset) { + case PCI_CHIP_MGAG200_SE_A_PCI: + case PCI_CHIP_MGAG200_SE_B_PCI: + case PCI_CHIP_MGAG200_EV_PCI: + case PCI_CHIP_MGAG200_ER_PCI: + case PCI_CHIP_MGAG200_WINBOND_PCI: + case PCI_CHIP_MGAG200_EH_PCI: + pMga->HWCursor = FALSE; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "HW cursor is not supported with video redirection on" + "G200 server chips.\n If you don't intend to use video " + "redirection enable with Option \"HWCursor\" \"On\"\n"); + break; + default: + pMga->HWCursor = TRUE; + } + from = X_DEFAULT; + + /* + * The preferred method is to use the "hw cursor" option as a tri-state + * option, with the default set above. + */ + if (xf86GetOptValBool(pMga->Options, OPTION_HW_CURSOR, &pMga->HWCursor)) + from = X_CONFIG; + + /* For compatibility, accept this too (as an override) */ + if (xf86ReturnOptValBool(pMga->Options, OPTION_SW_CURSOR, FALSE)) { + from = X_CONFIG; + pMga->HWCursor = FALSE; + } + + pMga->SecondCrtc = FALSE; + /* * In case of DualHead, we need to determine if we are the 'master' head * or the 'slave' head. In order to do that, at the end of the first * initialisation, PrimInit is set as DONE to the shared entity. So that @@ -1681,13 +1728,12 @@ if (xf86IsEntityShared(pScrn->entityList[0])) { /* dual-head mode */ if (!xf86IsPrimInitDone(pScrn->entityList[0])) { /* Is it the first initialisation? */ /* First CRTC */ - pMga->SecondCrtc = FALSE; - pMga->HWCursor = TRUE; pMgaEnt->pScrn_1 = pScrn; } else if (pMga->DualHeadEnabled) { /* Second CRTC */ pMga->SecondCrtc = TRUE; pMga->HWCursor = FALSE; + from = X_DEFAULT; pMgaEnt->pScrn_2 = pScrn; pScrn->AdjustFrame = MGAAdjustFrameCrtc2; /* @@ -1706,14 +1752,15 @@ return FALSE; } } + xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n", + pMga->HWCursor ? "HW" : "SW"); + if (pMga->DualHeadEnabled) { #ifdef MGADRI pMga->GetQuiescence = MGAGetQuiescenceShared; #endif } else { /* single-head mode */ - pMga->SecondCrtc = FALSE; - pMga->HWCursor = TRUE; #ifdef MGADRI pMga->GetQuiescence = MGAGetQuiescence; #endif @@ -1977,24 +2024,6 @@ } #endif - from = X_DEFAULT; - - /* - * The preferred method is to use the "hw cursor" option as a tri-state - * option, with the default set above. - */ - if (xf86GetOptValBool(pMga->Options, OPTION_HW_CURSOR, &pMga->HWCursor)) { - from = X_CONFIG; - } - - /* For compatibility, accept this too (as an override) */ - if (xf86ReturnOptValBool(pMga->Options, OPTION_SW_CURSOR, FALSE)) { - from = X_CONFIG; - pMga->HWCursor = FALSE; - } - xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n", - pMga->HWCursor ? "HW" : "SW"); - if (xf86ReturnOptValBool(pMga->Options, OPTION_NOACCEL, FALSE)) { pMga->NoAccel = TRUE; xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n"); @@ -2115,7 +2144,7 @@ } } else { #endif -#ifdef XAA +#ifdef USE_XAA if (!xf86LoadSubModule(pScrn, "xaa")) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); @@ -2677,30 +2706,55 @@ #ifdef XSERVER_LIBPCIACCESS struct pci_device *const dev = pMga->PciInfo; struct pci_mem_region *region; - void **memory[2]; int i, err; #endif if (!pMga->FBDev) { #ifdef XSERVER_LIBPCIACCESS - memory[pMga->io_bar] = &pMga->IOBase; - memory[pMga->framebuffer_bar] = &pMga->FbBase; + pciaddr_t fbaddr = pMga->FbAddress; + pciaddr_t fbsize = pMga->FbMapSize; + err = pci_device_map_range(dev, + fbaddr, fbsize, + PCI_DEV_MAP_FLAG_WRITABLE, + (void **)&pMga->FbBase); + + if (err) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unable to map Framebuffer %08llX %llx. %s (%d)\n", + (long long)fbaddr, (long long)fbsize, + strerror(err), err); + return FALSE; + } + else + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "MAPPED Framebuffer %08llX %llx to %08llX.\n", + (long long)fbaddr, (long long)fbsize, + (long long)pMga->FbBase); + + if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedIOUsage == 0) { + region = &dev->regions[pMga->io_bar]; + err = pci_device_map_range(dev, + region->base_addr, region->size, + PCI_DEV_MAP_FLAG_WRITABLE, + &pMga->IOBase); + + if (err) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unable to map IO Region %i. %s (%d)\n", + pMga->io_bar, strerror(err), err); + return FALSE; + } - for (i = 0; i < 2; i++) { - region = &dev->regions[i]; - err = pci_device_map_range(dev, - region->base_addr, region->size, - PCI_DEV_MAP_FLAG_WRITABLE, - memory[i]); + if(pMga->entityPrivate != NULL) + pMga->entityPrivate->mappedIOBase = pMga->IOBase; + } + else + pMga->IOBase = pMga->entityPrivate->mappedIOBase; + + if(pMga->entityPrivate != NULL) + pMga->entityPrivate->mappedIOUsage ++; - if (err) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Unable to map BAR %i. %s (%d)\n", - i, strerror(err), err); - return FALSE; - } - } #else /* * For Alpha, we need to map SPARSE memory, since we need @@ -2751,16 +2805,27 @@ if (pMga->iload_bar != -1) { #ifdef XSERVER_LIBPCIACCESS region = &dev->regions[pMga->iload_bar]; - err = pci_device_map_range(dev, - region->base_addr, region->size, - PCI_DEV_MAP_FLAG_WRITABLE, - (void *) &pMga->ILOADBase); - if (err) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Unable to map BAR 2 (ILOAD region). %s (%d)\n", - strerror(err), err); - return FALSE; + + if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedILOADUsage == 0) { + err = pci_device_map_range(dev, + region->base_addr, region->size, + PCI_DEV_MAP_FLAG_WRITABLE, + (void *) &pMga->ILOADBase); + if (err) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unable to map BAR 2 (ILOAD region). %s (%d)\n", + strerror(err), err); + return FALSE; + } + + if(pMga->entityPrivate != NULL) + pMga->entityPrivate->mappedILOADBase = pMga->ILOADBase; } + else + pMga->ILOADBase = pMga->entityPrivate->mappedILOADBase; + + if(pMga->entityPrivate != NULL) + pMga->entityPrivate->mappedILOADUsage ++; #else pMga->ILOADBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO | VIDMEM_MMIO_32BIT | @@ -2790,10 +2855,20 @@ if (!pMga->FBDev) { #ifdef XSERVER_LIBPCIACCESS - pci_device_unmap_range(dev, pMga->IOBase, - dev->regions[pMga->io_bar].size); + if(pMga->entityPrivate != NULL) + pMga->entityPrivate->mappedIOUsage--; + + if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedIOUsage == 0) { + pci_device_unmap_range(dev, pMga->IOBase, + dev->regions[pMga->io_bar].size); + + if(pMga->entityPrivate != NULL) + pMga->entityPrivate->mappedIOBase = NULL; + } + + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "UNMAPPING framebuffer 0x%08llX, 0x%llX.\n", (long long)pMga->FbBase, (long long)pMga->FbMapSize); pci_device_unmap_range(dev, pMga->FbBase, - dev->regions[pMga->framebuffer_bar].size); + pMga->FbMapSize); #else xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->IOBase, 0x4000); xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->FbBase, pMga->FbMapSize); @@ -2806,8 +2881,17 @@ if ((pMga->iload_bar != -1) && (pMga->ILOADBase != NULL)) { #ifdef XSERVER_LIBPCIACCESS - pci_device_unmap_range(dev, pMga->ILOADBase, - dev->regions[pMga->iload_bar].size); + if(pMga->entityPrivate != NULL) + pMga->entityPrivate->mappedILOADUsage--; + + if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedILOADUsage == 0) { + pci_device_unmap_range(dev, pMga->ILOADBase, + dev->regions[pMga->iload_bar].size); + + if(pMga->entityPrivate != NULL) + pMga->entityPrivate->mappedILOADBase = NULL; + } + #else xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->ILOADBase, 0x800000); #endif @@ -3112,11 +3196,13 @@ (pScrn->bitsPerPixel >> 3) * pScrn->displayWidth * pScrn->virtualY); } else { xf86SetLastScrnFlag(pScrn->entityList[0], pScrn->scrnIndex); +#ifdef HAVE_XAA_H pMga->RestoreAccelState(pScrn); pMga->SetupForSolidFill(pScrn, 0, GXcopy, 0xFFFFFFFF); pMga->SubsequentSolidFillRect(pScrn, pScrn->virtualX, 0, pScrn->displayWidth - pScrn->virtualX, pScrn->virtualY); +#endif MGAStormSync(pScrn); } } @@ -3765,7 +3851,7 @@ pMgaEnt->refCount--; } -#ifdef XAA +#ifdef USE_XAA if (pMga->AccelInfoRec) XAADestroyInfoRec(pMga->AccelInfoRec); #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-mga-1.6.2/src/mga_esc.c new/xf86-video-mga-1.6.3/src/mga_esc.c --- old/xf86-video-mga-1.6.2/src/mga_esc.c 2012-06-06 10:23:51.000000000 +0200 +++ new/xf86-video-mga-1.6.3/src/mga_esc.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -/**************************************************************************** -* mga_esc.c -* -* ESC call implementation -* -* (C) Matrox Graphics, Inc. -*****************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -int mga_foo; 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-mga-1.6.2/src/mga_exa.c new/xf86-video-mga-1.6.3/src/mga_exa.c --- old/xf86-video-mga-1.6.2/src/mga_exa.c 2012-06-06 10:23:50.000000000 +0200 +++ new/xf86-video-mga-1.6.3/src/mga_exa.c 2013-12-05 02:14:14.000000000 +0100 @@ -729,7 +729,7 @@ { PMGA(pSrc); - char *src = pSrc->devPrivate.ptr; + char *src = (char *) exaGetPixmapFirstPixel(pSrc); int src_pitch = exaGetPixmapPitch(pSrc); int cpp = (pSrc->drawable.bitsPerPixel + 7) / 8; 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-mga-1.6.2/src/mga_storm.c new/xf86-video-mga-1.6.3/src/mga_storm.c --- old/xf86-video-mga-1.6.2/src/mga_storm.c 2012-09-28 03:37:15.000000000 +0200 +++ new/xf86-video-mga-1.6.3/src/mga_storm.c 2013-08-01 02:01:52.000000000 +0200 @@ -710,7 +710,11 @@ /* screen to screen color expansion */ if(pMga->AccelFlags & USE_LINEAR_EXPANSION) { infoPtr->ScreenToScreenColorExpandFillFlags = +#if X_BYTE_ORDER == X_BIG_ENDIAN + BIT_ORDER_IN_BYTE_MSBFIRST; +#else BIT_ORDER_IN_BYTE_LSBFIRST; +#endif infoPtr->SetupForScreenToScreenColorExpandFill = mgaSetupForScreenToScreenColorExpandFill; infoPtr->SubsequentScreenToScreenColorExpandFill = -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
