Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Fri Jan 7 12:40:49 CET 2011.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-12-21 04:18:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-01-05 02:51:25.000000000 +0100
@@ -1,0 +2,22 @@
+Wed Jan 5 01:38:15 UTC 2011 - sndirsch@novell.com
+
+- xf86-video-intel 2.13.903
+ * configure: updated m4 macro check in configure.ac
+ * Remove the deprecated function 'XNFprintf'
+ * i830: amalgamate consecutive composites into a single primitive
+ * dri: Differentiate identical "get vblank failed" messages with line no
+ * Don't replace the scanout bo through PutImage
+ * dri: Protect against using dri with an non-gem pixmap
+ * dri: Fix the use of the uninitialised bo for flink
+ * dri: Don't wait upon a NULL current mode
+ * dri: Only issue a warning for an "impossible" flip return 5 times
+ * xv: Fix interlace computation
+ * dri2: Fix interlace computation
+ * If the crtc is not enabled, then it can't be on
+ * configure: suggest upstream to find macros in case they're missing.
+ * NEWS: Add entry for 2.13.903
+ * configure: version bump for 2.13.903 snapshot
+- xf86-video-intel-i965-Fix-off-by-one-in-assert.patch
+ * i965: Fix off-by-one in assert
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-video-intel-2.13.902-20101220-1ac2e04.tar.bz2
New:
----
xf86-video-intel-2.13.903.tar.bz2
xf86-video-intel-i965-Fix-off-by-one-in-assert.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.JakadM/_old 2011-01-07 12:39:15.000000000 +0100
+++ /var/tmp/diff_new_pack.JakadM/_new 2011-01-07 12:39:15.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-driver-video (Version 7.6)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.6
-Release: 1
+Release: 2
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -66,7 +66,7 @@
Source41: xf86-video-vmware-11.0.3.tar.bz2
Source42: xf86-video-voodoo-1.2.4.tar.bz2
Source44: HALlib-4.1.tar.gz
-Source45: xf86-video-intel-2.13.902-20101220-1ac2e04.tar.bz2
+Source45: xf86-video-intel-2.13.903.tar.bz2
Source46: xf86-video-ati-6.13.2.tar.bz2
Source51: xf86-video-geode-2.11.10.tar.bz2
Source54: xf86-video-mach64-6.8.2.tar.bz2
@@ -101,6 +101,7 @@
Patch141: xf86-video-ati-theatre.patch
Patch142: xf86-video-ati-theatre-pciaccess.patch
Patch143: xf86-video-xgi-buildfix.diff
+Patch144: xf86-video-intel-i965-Fix-off-by-one-in-assert.patch
%description
This package contains X.Org video drivers.
@@ -154,6 +155,7 @@
pushd xf86-video-intel-*
#%patch112 -p1
%patch130 -p0
+%patch144 -p1
popd
pushd xf86-video-nv-*
%patch132 -p1
++++++ xf86-video-intel-2.13.902-20101220-1ac2e04.tar.bz2 -> xf86-video-intel-2.13.903.tar.bz2 ++++++
++++ 2438 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-intel-2.13.902-20101220-1ac2e04/ChangeLog new/xf86-video-intel-2.13.903/ChangeLog
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/ChangeLog 2010-12-20 14:25:31.000000000 +0100
+++ new/xf86-video-intel-2.13.903/ChangeLog 2011-01-04 11:54:26.000000000 +0100
@@ -1,3 +1,191 @@
+commit a7c7a9108f76aa312f3d5efa466052b914c81484
+Author: Chris Wilson
+Date: Tue Jan 4 10:53:30 2011 +0000
+
+ configure: version bump for 2.13.903 snapshot
+
+ Signed-off-by: Chris Wilson
+
+commit 3fbecf34630c3588618900afdfbd9a4266856178
+Author: Chris Wilson
+Date: Tue Jan 4 10:52:44 2011 +0000
+
+ NEWS: Add entry for 2.13.903
+
+ Signed-off-by: Chris Wilson
+
+commit 90538ecfff9c324d61419f451d41d26ab026f232
+Author: U. Artie Eoff
+Date: Tue Dec 21 17:42:38 2010 -0700
+
+ configure: suggest upstream to find macros in case they're missing.
+
+ added upstream suggestion to error message in case xorg macros or
+ xserver macros are missing. removed package manager references in
+ suggestion since these are 'user' and/or 'distribution' preferences.
+
+ Signed-off-by: Chris Wilson
+
+commit 6d50f5a140dbefdf86eb25d18d08473aa7e42acc
+Author: Chris Wilson
+Date: Mon Jan 3 23:06:14 2011 +0000
+
+ If the crtc is not enabled, then it can't be on
+
+ Signed-off-by: Chris Wilson
+
+commit 145c42a101c3150fb1e2cae8a1780b26e8b56f42
+Author: Adam Jackson
+Date: Mon Jan 3 17:52:27 2011 -0500
+
+ dri2: Fix interlace computation
+
+ scrn->currentMode is a hack for xf86vidmode and in general is wrong for
+ RANDRful drivers. Use the mode on the associated CRTC instead.
+
+ Signed-off-by: Adam Jackson
+ [ickle: crtc->mode is a ModeRec not Ptr]
+ Signed-off-by: Chris Wilson
+
+commit b0d10ff04a24a951256a79710ba22b325b549ba4
+Author: Adam Jackson
+Date: Mon Jan 3 17:52:26 2011 -0500
+
+ xv: Fix interlace computation
+
+ scrn->currentMode is a hack for xf86vidmode and in general is wrong for
+ RANDRful drivers. Use the mode on the associated CRTC instead.
+
+ Signed-off-by: Adam Jackson
+ [ickle: crtc->mode is a ModeRec]
+ Signed-off-by: Chris Wilson
+
+commit 0ad6d6e1a678de7d8c2d4cd7c734887e1deb2f9b
+Author: Chris Wilson
+Date: Mon Jan 3 16:52:07 2011 +0000
+
+ dri: Only issue a warning for an "impossible" flip return 5 times
+
+ As it appears that some kernels do indeed return the "wrong" value,
+ issuing a warning 60 times a second is a cruel and unusual punishment.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32680
+ Signed-off-by: Chris Wilson
+
+commit d729ef02f2955f7476df4c65403bc1f8e705b780
+Author: Chris Wilson
+Date: Sun Jan 2 09:11:10 2011 +0000
+
+ dri: Don't wait upon a NULL current mode
+
+ There is a race condition between the dri swapbuffers code and
+ hotplugging whereby we might attempt to execute a wait upon a
+ non-existent output. This causes a NULL dereference and a loud crash.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32770
+ Signed-off-by: Chris Wilson
+
+commit 537fa55ed2449e91f3dd1e04abc720c6818d7227
+Author: Chris Wilson
+Date: Sun Jan 2 09:06:28 2011 +0000
+
+ dri: Fix the use of the uninitialised bo for flink
+
+ Reported-by: Jeff Chua
+ Signed-off-by: Chris Wilson
+
+commit dbc542b9d38ff9781efcdf1d5308e97f04499138
+Author: Chris Wilson
+Date: Fri Dec 31 23:29:05 2010 +0000
+
+ dri: Protect against using dri with an non-gem pixmap
+
+ Reported-by: Jeff Chua
+ Signed-off-by: Chris Wilson
+
+commit 53fbc9f1760ee481cba1f6dceb9e7c97282a2976
+Author: Chris Wilson
+Date: Thu Dec 30 15:32:40 2010 +0000
+
+ Don't replace the scanout bo through PutImage
+
+ As the bo may be pinned for either use by the scanout or through sharing
+ with another application, under those circumstances we cannot replace
+ the bo itself but must force the blit for PutImage.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31367
+ Reported-and-tested-by: Bjørn Mork
+ Signed-off-by: Chris Wilson
+
+commit 7667ad8432c032aec3a2aa004fc4dfc1877971b3
+Author: Chris Wilson
+Date: Fri Dec 24 09:42:29 2010 +0000
+
+ dri: Differentiate identical "get vblank failed" messages with line no
+
+ Signed-off-by: Chris Wilson
+
+commit 875d4828352c501ec5d0169735fb078807e76f2e
+Author: Chris Wilson
+Date: Thu Dec 23 19:36:12 2010 +0000
+
+ i830: amalgamate consecutive composites into a single primitive
+
+ Improve aa10text on i845 from 218kglyphs/s to 234kglyphs/s
+
+ Signed-off-by: Chris Wilson
+
+commit 58d9912e447cf6e29b20747b5ed6ee595687ce8d
+Author: Chris Wilson
+Date: Wed Dec 22 13:50:53 2010 +0000
+
+ Remove the deprecated function 'XNFprintf'
+
+ As we know the maximum length of the string, we can replace our single
+ usage of XNFprintf with snprintf.
+
+ Signed-off-by: Chris Wilson
+
+commit e8db77e019e19ace48592b2f6d96af6baa9a228e
+Author: Chris Wilson
+Date: Tue Dec 21 23:03:21 2010 +0000
+
+ Revert "Suggest where to find xorg-macros in case it's missing"
+
+ I failed my reading comprehension and didn't spot that the help strings
+ pointed to two separate downstream packages.
+
+ Thanks to Carl Worth for pointing out my mistake.
+
+ This reverts commit ebb7aca66785730737bc739624006e55d43dfe1b.
+
+commit ebb7aca66785730737bc739624006e55d43dfe1b
+Author: Chris Wilson
+Date: Tue Dec 21 22:23:24 2010 +0000
+
+ Suggest where to find xorg-macros in case it's missing
+
+ [Modified version of U. Artie Eoff's commit to remove the duplicated
+ string. The paraphrased commit message is repeated below for clarity.]
+
+ xorg-macros is often package under an unusual name, so provide some
+ clues as to what name to try on the user's distribution. Installing
+ build-deps would be just too easy...
+
+ Also include a check for the existence of the XORG_DRIVER_CHECK_EXT
+ macro, otherwise configure might continue in spite of the missing macro
+ and cause obtuse syntax errors.
+
+ Signed-off-by: Chris Wilson
+
+commit 90576f95f35e528fa2c667df162c5dc7ec98975d
+Author: U. Artie Eoff
+Date: Tue Dec 21 15:10:41 2010 -0700
+
+ configure: updated m4 macro check in configure.ac
+
+ Added m4 check for XORG_DRIVER_CHECK_EXT macro definition. Updated m4 fatal messages to give better hint on how to resolve error when xorg macros are missing. Previously, configure would continue in spite of the missing macros and the build would fail for syntax errors.
+
commit 1ac2e04023f84dbf1f3db2ecad1cadd159aa614d
Author: Chris Wilson
Date: Mon Dec 20 10:55:11 2010 +0000
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-intel-2.13.902-20101220-1ac2e04/compile new/xf86-video-intel-2.13.903/compile
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-intel-2.13.903/compile 2009-09-08 03:30:02.000000000 +0200
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
+# Foundation, Inc.
+# Written by Tom Tromey .
+#
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
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-intel-2.13.902-20101220-1ac2e04/configure.ac new/xf86-video-intel-2.13.903/configure.ac
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/configure.ac 2010-12-11 21:52:05.000000000 +0100
+++ new/xf86-video-intel-2.13.903/configure.ac 2011-01-04 11:53:28.000000000 +0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-intel],
- [2.13.902],
+ [2.13.903],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-intel])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -36,10 +36,19 @@
# 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.8 or later before running autoconf/autogen])])
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen.
+ Hint: either install from source, git://anongit.freedesktop.org/xorg/util/macros or,
+ depending on you distribution, try package 'xutils-dev' or 'xorg-x11-util-macros'])])
+
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
+# Require X.Org server macros (i.e. XORG_DRIVER_CHECK_EXT) to check for required modules
+m4_ifndef([XORG_DRIVER_CHECK_EXT],
+ [m4_fatal([must install xorg-server macros before running autoconf/autogen.
+ Hint: either install from source, git://anongit.freedesktop.org/xorg/xserver or,
+ depending on your distribution, try package 'xserver-xorg-dev' or 'xorg-x11-server-devel'])])
+
# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
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-intel-2.13.902-20101220-1ac2e04/INSTALL new/xf86-video-intel-2.13.903/INSTALL
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/INSTALL 2010-12-20 14:25:31.000000000 +0100
+++ new/xf86-video-intel-2.13.903/INSTALL 2011-01-04 11:54:27.000000000 +0100
@@ -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 `' 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-intel-2.13.902-20101220-1ac2e04/NEWS new/xf86-video-intel-2.13.903/NEWS
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/NEWS 2010-12-11 21:52:05.000000000 +0100
+++ new/xf86-video-intel-2.13.903/NEWS 2011-01-04 11:52:41.000000000 +0100
@@ -1,3 +1,26 @@
+Snapshot 2.13.903 (2010-01-04)
+==============================
+This is the second release candidate in preparation for the upcoming
+2.14.0 release, and if no showstoppers turn up in wider testing will
+become the next release. Besides the usual bug fixes, we've included
+patches by Mario Kleiner to improve vblank handing which both improve the
+timing accuracy and remove a few potential races -- provided you also
+have the corresponding fixes in the kernel.
+
+Bug fixes
+---------
+
+ * Crash on hot-unpluging with an active fullscreen GL application, e.g. a
+ compositing WM or video player
+ https://bugs.freedesktop.org/show_bug.cgi?id=32770
+
+ * Freeze upon maximising client-side software renderers, e.g. flash.
+ https://bugs.freedesktop.org/show_bug.cgi?id=31367
+
+ * Fix confusion over G35 generation
+ https://bugs.freedesktop.org/show_bug.cgi?id=32478
+
+
Snapshot 2.13.902 (2010-12-10)
==============================
This is the first release candidate in preparation for the upcoming
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-intel-2.13.902-20101220-1ac2e04/src/i830_render.c new/xf86-video-intel-2.13.903/src/i830_render.c
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/src/i830_render.c 2010-12-04 06:31:03.000000000 +0100
+++ new/xf86-video-intel-2.13.903/src/i830_render.c 2010-12-23 20:35:29.000000000 +0100
@@ -669,7 +669,7 @@
ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
Bool is_affine_src, is_affine_mask = TRUE;
- int per_vertex, num_floats;
+ int per_vertex;
float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
per_vertex = 2; /* dest x/y */
@@ -786,9 +786,10 @@
}
}
- num_floats = 3 * per_vertex;
-
- OUT_BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST | (num_floats - 1));
+ if (intel->vertex_count == 0) {
+ intel->vertex_index = intel->batch_used;
+ OUT_BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST);
+ }
OUT_BATCH_F(dstX + w);
OUT_BATCH_F(dstY + h);
OUT_BATCH_F(src_x[2] / intel->scale_units[0][0]);
@@ -833,6 +834,17 @@
OUT_BATCH_F(mask_w[0]);
}
}
+
+ intel->vertex_count += 3 * per_vertex;
+
+}
+
+void i830_vertex_flush(intel_screen_private *intel)
+{
+ if (intel->vertex_count) {
+ intel->batch_ptr[intel->vertex_index] |= intel->vertex_count - 1;
+ intel->vertex_count = 0;
+ }
}
/**
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-intel-2.13.902-20101220-1ac2e04/src/intel_dri.c new/xf86-video-intel-2.13.903/src/intel_dri.c
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/src/intel_dri.c 2010-12-17 03:51:18.000000000 +0100
+++ new/xf86-video-intel-2.13.903/src/intel_dri.c 2011-01-04 00:03:59.000000000 +0100
@@ -73,6 +73,21 @@
unsigned int attachment;
} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
+static uint32_t pixmap_flink(PixmapPtr pixmap)
+{
+ struct intel_pixmap *priv = intel_get_pixmap_private(pixmap);
+ uint32_t name;
+
+ if (priv == NULL || priv->bo == NULL)
+ return 0;
+
+ if (dri_bo_flink(priv->bo, &name) != 0)
+ return 0;
+
+ priv->pinned = 1;
+ return name;
+}
+
static PixmapPtr get_front_buffer(DrawablePtr drawable)
{
ScreenPtr screen = drawable->pScreen;
@@ -179,10 +194,9 @@
ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2BufferPtr buffers;
- dri_bo *bo;
- int i;
I830DRI2BufferPrivatePtr privates;
PixmapPtr pixmap, pDepthPixmap;
+ int i;
buffers = calloc(count, sizeof *buffers);
if (buffers == NULL)
@@ -251,8 +265,7 @@
privates[i].pixmap = pixmap;
privates[i].attachment = attachments[i];
- bo = intel_get_pixmap_bo(pixmap);
- if (bo == NULL || dri_bo_flink(bo, &buffers[i].name) != 0) {
+ if ((buffers[i].name = pixmap_flink(pixmap)) == 0) {
/* failed to name buffer */
screen->DestroyPixmap(pixmap);
goto unwind;
@@ -297,7 +310,6 @@
ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2Buffer2Ptr buffer;
- dri_bo *bo;
I830DRI2BufferPrivatePtr privates;
PixmapPtr pixmap;
@@ -358,8 +370,7 @@
privates->pixmap = pixmap;
privates->attachment = attachment;
- bo = intel_get_pixmap_bo(pixmap);
- if (bo == NULL || dri_bo_flink(bo, &buffer->name) != 0) {
+ if ((buffer->name = pixmap_flink(pixmap)) == 0) {
/* failed to name buffer */
screen->DestroyPixmap(pixmap);
free(privates);
@@ -421,8 +432,8 @@
ValidateGC(dst, gc);
/* Wait for the scanline to be outside the region to be copied */
- if (pixmap_is_scanout(get_drawable_pixmap(dst))
- && intel->swapbuffers_wait) {
+ if (pixmap_is_scanout(get_drawable_pixmap(dst)) &&
+ intel->swapbuffers_wait) {
BoxPtr box;
BoxRec crtcbox;
int y1, y2;
@@ -473,7 +484,7 @@
event = MI_WAIT_FOR_PIPEB_SVBLANK;
}
- if (scrn->currentMode->Flags & V_INTERLACE) {
+ if (crtc->mode.Flags & V_INTERLACE) {
/* DSL count field lines */
y1 /= 2;
y2 /= 2;
@@ -790,10 +801,19 @@
* causing wrong (msc, ust) return values and possible visual corruption.
*/
if ((frame < flip->frame) && (flip->frame - frame < 5)) {
- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "%s: Pageflip completion has impossible msc %d < target_msc %d\n",
- __func__, frame, flip->frame);
- /* All-Zero values signal failure of timestamping to client. */
+ static int limit = 5;
+
+ /* XXX we are currently hitting this path with older
+ * kernels, so make it quieter.
+ */
+ if (limit) {
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+ "%s: Pageflip completion has impossible msc %d < target_msc %d\n",
+ __func__, frame, flip->frame);
+ limit--;
+ }
+
+ /* All-0 values signal timestamping failure. */
frame = tv_sec = tv_usec = 0;
}
@@ -1038,7 +1058,9 @@
ret = drmWaitVBlank(intel->drmSubFD, &vbl);
if (ret) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "get vblank counter failed: %s\n", strerror(errno));
+ "%s:%d get vblank counter failed: %s\n",
+ __FUNCTION__, __LINE__,
+ strerror(errno));
return FALSE;
}
@@ -1092,7 +1114,9 @@
ret = drmWaitVBlank(intel->drmSubFD, &vbl);
if (ret) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "get vblank counter failed: %s\n", strerror(errno));
+ "%s:%d get vblank counter failed: %s\n",
+ __FUNCTION__, __LINE__,
+ strerror(errno));
goto out_complete;
}
@@ -1120,7 +1144,9 @@
ret = drmWaitVBlank(intel->drmSubFD, &vbl);
if (ret) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "get vblank counter failed: %s\n", strerror(errno));
+ "%s:%d get vblank counter failed: %s\n",
+ __FUNCTION__, __LINE__,
+ strerror(errno));
goto out_complete;
}
@@ -1153,7 +1179,9 @@
ret = drmWaitVBlank(intel->drmSubFD, &vbl);
if (ret) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "get vblank counter failed: %s\n", strerror(errno));
+ "%s:%d get vblank counter failed: %s\n",
+ __FUNCTION__, __LINE__,
+ strerror(errno));
goto out_complete;
}
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-intel-2.13.902-20101220-1ac2e04/src/intel_driver.c new/xf86-video-intel-2.13.903/src/intel_driver.c
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/src/intel_driver.c 2010-12-20 14:21:42.000000000 +0100
+++ new/xf86-video-intel-2.13.903/src/intel_driver.c 2011-01-04 00:06:09.000000000 +0100
@@ -354,26 +354,22 @@
{
intel_screen_private *intel = intel_get_screen_private(scrn);
struct pci_device *dev = intel->PciInfo;
- char *busid;
drmSetVersion sv;
struct drm_i915_getparam gp;
int err, has_gem;
+ char busid[20];
- /* We wish we had asprintf, but all we get is XNFprintf. */
- busid = XNFprintf("pci:%04x:%02x:%02x.%d",
- dev->domain, dev->bus, dev->dev, dev->func);
+ snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
+ dev->domain, dev->bus, dev->dev, dev->func);
intel->drmSubFD = drmOpen("i915", busid);
if (intel->drmSubFD == -1) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] Failed to open DRM device for %s: %s\n",
busid, strerror(errno));
- free(busid);
return FALSE;
}
- free(busid);
-
/* Check that what we opened was a master or a master-capable FD,
* by setting the version of the interface we'll use to talk to it.
* (see DRIOpenDRMMaster() in DRI1)
@@ -815,6 +811,9 @@
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
int i, active_outputs = 0;
+ if (!crtc->enabled)
+ return FALSE;
+
/* Kernel manages CRTC status based out output config */
for (i = 0; i < xf86_config->num_output; i++) {
xf86OutputPtr output = xf86_config->output[i];
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-intel-2.13.902-20101220-1ac2e04/src/intel.h new/xf86-video-intel-2.13.903/src/intel.h
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/src/intel.h 2010-12-17 03:51:18.000000000 +0100
+++ new/xf86-video-intel-2.13.903/src/intel.h 2010-12-30 16:23:40.000000000 +0100
@@ -184,6 +184,7 @@
int8_t busy :2;
int8_t batch_write :1;
int8_t offscreen :1;
+ int8_t pinned :1;
};
#if HAS_DEVPRIVATEKEYREC
@@ -570,9 +571,10 @@
Bool i830_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
PicturePtr dest, PixmapPtr sourcecPixmap,
PixmapPtr maskPixmap, PixmapPtr destPixmap);
-
void i830_composite(PixmapPtr dest, int srcX, int srcY,
int maskX, int maskY, int dstX, int dstY, int w, int h);
+void i830_vertex_flush(intel_screen_private *intel);
+
/* i915_render.c */
Bool i915_check_composite(int op,
PicturePtr sourcec, PicturePtr mask, PicturePtr dest,
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-intel-2.13.902-20101220-1ac2e04/src/intel_uxa.c new/xf86-video-intel-2.13.903/src/intel_uxa.c
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/src/intel_uxa.c 2010-12-07 22:08:25.000000000 +0100
+++ new/xf86-video-intel-2.13.903/src/intel_uxa.c 2010-12-30 16:24:48.000000000 +0100
@@ -770,7 +770,8 @@
} else {
ScreenPtr screen = pixmap->drawable.pScreen;
- if (x == 0 && y == 0 &&
+ if (!priv->pinned &&
+ x == 0 && y == 0 &&
w == pixmap->drawable.width &&
h == pixmap->drawable.height)
{
@@ -1101,7 +1102,7 @@
} else {
PixmapPtr pixmap = screen->GetScreenPixmap(screen);
intel_set_pixmap_bo(pixmap, bo);
- intel_get_pixmap_private(pixmap)->busy = 1;
+ intel_get_pixmap_private(pixmap)->pinned = 1;
screen->ModifyPixmapHeader(pixmap,
scrn->virtualX,
scrn->virtualY,
@@ -1220,6 +1221,7 @@
intel->uxa_driver->composite = i830_composite;
intel->uxa_driver->done_composite = i830_done_composite;
+ intel->vertex_flush = i830_vertex_flush;
intel->batch_commit_notify = i830_batch_commit_notify;
} else if (IS_GEN3(intel)) {
intel->uxa_driver->check_composite = i915_check_composite;
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-intel-2.13.902-20101220-1ac2e04/src/intel_video.c new/xf86-video-intel-2.13.903/src/intel_video.c
--- old/xf86-video-intel-2.13.902-20101220-1ac2e04/src/intel_video.c 2010-11-02 00:31:47.000000000 +0100
+++ new/xf86-video-intel-2.13.903/src/intel_video.c 2011-01-04 00:01:40.000000000 +0100
@@ -1348,7 +1348,7 @@
event = MI_WAIT_FOR_PIPEB_SVBLANK;
}
- if (scrn->currentMode->Flags & V_INTERLACE) {
+ if (crtc->mode.Flags & V_INTERLACE) {
/* DSL count field lines */
y1 /= 2;
y2 /= 2;
++++++ xf86-video-intel-i965-Fix-off-by-one-in-assert.patch ++++++
From 22d7b61791c382088a6c0df5dce3a15405d6c495 Mon Sep 17 00:00:00 2001
From: Chris Wilson
Date: Tue, 4 Jan 2011 12:32:01 +0000
Subject: [PATCH] i965: Fix off-by-one in assert
Signed-off-by: Chris Wilson
---
src/i965_render.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/i965_render.c b/src/i965_render.c
index ca5e6b6..b1ac6ba 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1730,8 +1730,7 @@ static void i965_bind_surfaces(struct intel_screen_private *intel)
{
uint32_t *binding_table;
- assert(intel->surface_used + 4 * sizeof(struct brw_surface_state_padded) <
- sizeof(intel->surface_data));
+ assert(intel->surface_used + 4 * sizeof(struct brw_surface_state_padded) <= sizeof(intel->surface_data));
binding_table = (uint32_t*) (intel->surface_data + intel->surface_used);
intel->surface_table = intel->surface_used;
--
1.7.3.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org