ChangeLog | 1995 ++++++++++++++++++++++---
Makefile.in | 2
aclocal.m4 | 2
config.h.in | 12
configure | 549 ++++++
configure.ac | 57
debian/changelog | 49
debian/control | 2
debian/patches/01_gen_pci_ids.diff | 8
debian/xserver-xorg-video-intel.install | 1
ltmain.sh | 2
man/Makefile.am | 1
man/Makefile.in | 3
man/intel.man | 135 +
src/Makefile.am | 118 -
src/Makefile.in | 168 +-
src/bios_reader/Makefile.am | 3
src/bios_reader/Makefile.in | 29
src/bios_reader/bios_dumper.c | 1
src/bios_reader/bios_reader.c | 4
src/brw_defines.h | 26
src/brw_structs.h | 107 +
src/ch7017/Makefile.am | 3
src/ch7017/Makefile.in | 6
src/ch7017/ch7017.c | 41
src/ch7xxx/Makefile.am | 3
src/ch7xxx/Makefile.in | 6
src/ch7xxx/ch7xxx.c | 17
src/common.h | 107 -
src/exa_sf.g4a | 78
src/exa_sf.g4b | 15
src/exa_sf_mask.g4a | 105 -
src/exa_sf_mask.g4b | 15
src/exa_sf_mask_prog.h | 25
src/exa_sf_prog.h | 17
src/exa_sf_rotation.g4a | 55
src/exa_sf_rotation_prog.h | 20
src/exa_wm.g4i | 140 +
src/exa_wm_affine.g4i | 44
src/exa_wm_ca.g4a | 38
src/exa_wm_ca.g4b | 4
src/exa_wm_ca_srcalpha.g4a | 37
src/exa_wm_ca_srcalpha.g4b | 4
src/exa_wm_mask_affine.g4a | 41
src/exa_wm_mask_affine.g4b | 8
src/exa_wm_mask_projective.g4a | 53
src/exa_wm_mask_projective.g4b | 16
src/exa_wm_mask_sample_a.g4a | 48
src/exa_wm_mask_sample_a.g4b | 2
src/exa_wm_mask_sample_argb.g4a | 48
src/exa_wm_mask_sample_argb.g4b | 2
src/exa_wm_maskca.g4a | 228 --
src/exa_wm_maskca_prog.h | 95 -
src/exa_wm_maskca_srcalpha.g4a | 228 --
src/exa_wm_maskca_srcalpha_prog.h | 95 -
src/exa_wm_masknoca.g4a | 228 --
src/exa_wm_masknoca_prog.h | 95 -
src/exa_wm_noca.g4a | 38
src/exa_wm_noca.g4b | 4
src/exa_wm_nomask.g4a | 96 -
src/exa_wm_nomask_prog.h | 70
src/exa_wm_projective.g4i | 51
src/exa_wm_rotation.g4a | 184 --
src/exa_wm_rotation_prog.h | 70
src/exa_wm_src_affine.g4a | 45
src/exa_wm_src_affine.g4b | 8
src/exa_wm_src_projective.g4a | 49
src/exa_wm_src_projective.g4b | 16
src/exa_wm_src_sample_a.g4a | 47
src/exa_wm_src_sample_a.g4b | 2
src/exa_wm_src_sample_argb.g4a | 47
src/exa_wm_src_sample_argb.g4b | 2
src/exa_wm_write.g4a | 74
src/exa_wm_write.g4b | 18
src/exa_wm_xy.g4a | 52
src/exa_wm_xy.g4b | 4
src/i810.h | 13
src/i810_cursor.c | 6
src/i810_driver.c | 8
src/i810_io.c | 24
src/i810_memory.c | 4
src/i810_reg.h | 71
src/i810_ring.h | 90 +
src/i810_video.c | 70
src/i830.h | 217 +-
src/i830_3d.c | 322 ++--
src/i830_accel.c | 19
src/i830_bios.c | 10
src/i830_bios.h | 135 -
src/i830_crt.c | 43
src/i830_cursor.c | 14
src/i830_debug.c | 170 +-
src/i830_display.c | 162 +-
src/i830_dri.c | 26
src/i830_driver.c | 931 ++++++-----
src/i830_dvo.c | 23
src/i830_exa.c | 190 +-
src/i830_hwmc.c | 154 +
src/i830_hwmc.h | 106 +
src/i830_i2c.c | 21
src/i830_lvds.c | 441 ++++-
src/i830_memory.c | 115 -
src/i830_quirks.c | 46
src/i830_render.c | 468 +++--
src/i830_ring.h | 113 +
src/i830_sdvo.c | 123 -
src/i830_sdvo_regs.h | 54
src/i830_tv.c | 117 -
src/i830_video.c | 444 +++--
src/i830_video.h | 29
src/i830_xaa.c | 140 -
src/i915_3d.c | 66
src/i915_3d.h | 13
src/i915_hwmc.c | 876 +++++++++++
src/i915_hwmc.h | 61
src/i915_reg.h | 10
src/i915_render.c | 177 +-
src/i915_video.c | 297 ++-
src/i965_render.c | 620 ++++---
src/i965_video.c | 239 +--
src/ivch/Makefile.am | 3
src/ivch/Makefile.in | 6
src/ivch/ivch.c | 35
src/packed_yuv_sf.g4b | 17
src/packed_yuv_wm.g4a | 144 +
src/packed_yuv_wm.g4b | 79
src/reg_dumper/.gitignore | 2
src/reg_dumper/Makefile.am | 16
src/reg_dumper/Makefile.in | 105 -
src/reg_dumper/idle.c | 180 ++
src/reg_dumper/reg_dumper.h | 1
src/reg_dumper/stepping.c | 137 +
src/sf_prog.h | 17
src/sil164/Makefile.am | 3
src/sil164/Makefile.in | 6
src/sil164/sil164.c | 25
src/sil164/sil164_reg.h | 15
src/tfp410/Makefile.am | 3
src/tfp410/Makefile.in | 6
src/tfp410/tfp410.c | 23
src/tfp410/tfp410_reg.h | 15
src/wm_prog.h | 82 -
src/xvmc/Makefile.am | 22
src/xvmc/Makefile.in | 103 +
src/xvmc/driDrawable.c | 174 ++
src/xvmc/driDrawable.h | 64
src/xvmc/i915_program.h | 276 +++
src/xvmc/i915_structs.h | 973 ++++++++++++
src/xvmc/i915_xvmc.c | 2540 ++++++++++++++++++++++++++++++++
src/xvmc/i915_xvmc.h | 117 +
src/xvmc/intel_batchbuffer.c | 272 +++
src/xvmc/intel_batchbuffer.h | 42
src/xvmc/intel_xvmc.c | 1069 +++++++++++++
src/xvmc/intel_xvmc.h | 253 +++
src/xvmc/xf86dri.c | 566 +++++++
src/xvmc/xf86dri.h | 118 +
src/xvmc/xf86dristr.h | 390 ++++
157 files changed, 16616 insertions(+), 4679 deletions(-)
New commits:
commit 792eb9f4877b5436408a2c6db14a1d288dbb5166
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Mon May 12 03:43:47 2008 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index d9c4da2..7ec3b7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,159 @@
+commit f5ad42f0ceef78f6fac490bcc40d56d0ce8c9e2e
+Author: Zhenyu Wang <[EMAIL PROTECTED]>
+Date: Mon May 12 09:01:21 2008 +0800
+
+ Bump version 2.3.1
+
+commit 6fd31f94a481c3193a04d9714dfde030a00f1dcc
+Author: Zhenyu Wang <[EMAIL PROTECTED]>
+Date: Mon May 12 08:57:56 2008 +0800
+
+ Revert last HP 965GM pipe A quirk
+
+ Seems not resolve the issue (fdo bug #15885).
+ (cherry picked from commit f280c50dd5d29c5717adc6da2368363cb3d0adbb)
+
+commit 89dc0d922d6ec0035632a70647981636ab6c8d57
+Author: Bryce Harrington <[EMAIL PROTECTED]>
+Date: Sat May 10 07:58:59 2008 +0800
+
+ More Pipe A force quirks
+ (cherry picked from commit d91d9e6a2f2ba18b35cb6fd7bc3fe8bc617eb44f)
+
+commit 7fb914a529b16759f082f068cd0f15099d10167c
+Author: Mike Isely <[EMAIL PROTECTED]>
+Date: Thu May 8 10:00:17 2008 +0800
+
+ Implement option to ignore external fixed mode settings
+
+ The Intel xorg driver tries mightily to determine the native fixed
+ panel mode settings for the LVDS output. It does this through various
+ means, including scanning video BIOS tables, and noticing if the pipe
+ in question has already been set up by somebody else (and adopting
+ those timings). This strategy works well for say a laptop where the
+ LCD panel is an integral part of the machine. But for other
+ applications where the display is unrelated to the system's BIOS or
+ other software, then the BIOS will likely have no clue how to
+ configure the LVDS output. Worse still, the BIOS can simply "get it
+ wrong", leaving the pipe misconfigured. Unfortunately the Intel
+ driver can potentially notice this, adopt the same settings, leaving a
+ messed up display.
+
+ All of this complexity normally happens independently, behind the
+ scenes, from the mode timings that might otherwise be specified by the
+ user. This driver has a concept of fixed, i.e. "native" mode, and
+ then user-specified mode. If the corresponding resolutions between
+ those concepts don't match, then the driver in theory will arrange for
+ scaling to take place while adhering to the actual native mode of the
+ panel. Said another way, if the user says 800x600 but the driver
+ mistakenly (see above) thinks the native mode is 640x480, then 640x480
+ is the mode set with scaling to an 800x600 frame buffer. If the
+ driver gets the wrong native mode, then the result is a miserable mess
+ with no way for the user to override what the driver thinks is right.
+
+ This patch provides a means to override the driver. This implements a
+ new driver option, "LVDSFixedMode" which defaults to true (the normal,
+ probe-what-I-need behavior). However when set to false, then all the
+ guessing is skipped and the driver will assume no fixed, i.e. "native"
+ mode for the display device. Instead with this option set to false,
+ the driver will directly set the timings specified by the user,
+ providing an escape hatch for situations where the driver can't
+ correctly figure out the right mode.
+
+ Under most scenarios of course, this option should not be needed. But
+ in situations where the Intel video BIOS is hopelessly fouled up
+ related to the LVDS output, this option provides the escape hatch for
+ the user to get a working display in spite of the BIOS situation.
+
+ Signed-off-by: Mike Isely <[EMAIL PROTECTED]>
+ (cherry picked from commit 9f324860431ff8199a78d19bbaa74046e1476b89)
+
+commit 3b8804d82266ffc01ac1573624387b0d1f9dfb94
+Author: Jesse Barnes <[EMAIL PROTECTED]>
+Date: Wed May 7 14:46:52 2008 -0700
+
+ Save/restore cursor registers
+
+ There are lots of good reasons for doing this, one of them is fdo bug
#11305.
+ (cherry picked from commit 33f033cbf346c13a687e469e8879579fcd5bb2fb)
+
+commit 0ab5cbc5310c2a60c10fd611fcf9a4791379f42b
+Author: Zhenyu Wang <[EMAIL PROTECTED]>
+Date: Wed May 7 14:21:59 2008 +0800
+
+ Use I830FALLBACK when check pitch for debug
+ (cherry picked from commit a7188b1f2dd9a69fa7daefe478d283735226f9f3)
+
+commit 5749983fc6bae0a845bff0dbdd79c87420dffcf4
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Tue May 6 18:48:20 2008 -0700
+
+ Bug #15807: Fix use of the ring while VT-switched, hit by fast user
switching.
+
+ The fix for flushing at blockhandler with no DRI on 965 was broken and
would
+ try to flush the chip even when the driver wasn't in control of the VT.
+ Hilarity ensued.
+ (cherry picked from commit 36ec93300926084fb2951d69b001e4c67bc6ff79)
+
+commit ab0aa8e16c6bec2785006cee09dc1ae93a1988da
+Author: Jesse Barnes <[EMAIL PROTECTED]>
+Date: Tue May 6 14:38:48 2008 -0700
+
+ Add FIFO watermark regs to register dumper
+ (cherry picked from commit 0c00a638ef57aa9d6a3047176b0bfad733f781f0)
+
+commit ad02b795f5aa01d1e5b85f3661ae574e898fe41e
+Author: Zhenyu Wang <[EMAIL PROTECTED]>
+Date: Tue May 6 13:52:22 2008 +0800
+
+ Only check xvmc lib when xvmc is enabled.
+
+ Don't check xvmc lib if user has already wanted to disable it.
+ Fix fdo bug #15762.
+ (cherry picked from commit c81a4687fca80bf7367d7f0e9a00a6a09737c5bb)
+
+commit 8103c3c404500fa21079bd04530fd8ee836474f4
+Author: Bryce Harrington <[EMAIL PROTECTED]>
+Date: Tue May 6 13:51:46 2008 +0800
+
+ More quirks from ubuntu/dell
+ (cherry picked from commit be746a90a87d7a9807fa4243493e7e4d48f7f1c0)
+
+commit 9c5785c2f4faaac4a0d7dab774123389ed595fc0
+Author: Jesse Barnes <[EMAIL PROTECTED]>
+Date: Tue Apr 29 13:19:02 2008 -0700
+
+ Add a new quirk for BIOSes that reprogram regs at lid close/open time
+
+ Dell Latitude D500s seem to have this problem. At lid close/open, the
DSPABASE
+ reg gets reset to 0, so we either need to keep the framebuffer at offset 0
or
+ make sure we reprogram the CRTCs after the lid opens again. Since we can't
+ make sure the former is always true (buffer resize, etc.), this patch adds
a
+ quirk to reset the modes at lid open time.
+
+ Fixes FDO bug #14890.
+ (cherry picked from commit a0ced923bb793aa22e6bfbeeec0888d3b42ce176)
+
+commit f83960f3edb8a8be12ce9dc46a9b9a292de816d6
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date: Tue Apr 29 10:32:14 2008 -0700
+
+ Use new xf86RotateFreeShadow function to clean up shadow buffers.
+
+ This simply moves code from the driver up into the X server; use it where
+ available.
+ (cherry picked from commit fff17b9d1b58cb53032d153094826dd306836d59)
+
+commit 1df4fd9f1e7f1c6abea4ea134fbc1b3755988817
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date: Wed Apr 23 11:08:38 2008 -0700
+
+ Overlay video doesn't require that the target pixmap be in video memory.
+
+ I830PutImage was checking to make sure the target pixmap resided in video
+ memory, but this isn't necessary when using the overlay. Test
+ (cherry picked from commit 1d467a8038946a37844795e8860be113d43219ac)
+
commit 259ad818f2b7ac63fb84516e8a49e264840af107
Author: Zhenyu Wang <[EMAIL PROTECTED]>
Date: Wed Apr 23 13:42:24 2008 +0800
diff --git a/Makefile.in b/Makefile.in
index aaf2dfa..a5c4e7f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,6 +178,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/aclocal.m4 b/aclocal.m4
index d2f0323..7fc77ac 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package,
typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/config.h.in b/config.h.in
index 09bed03..b812abe 100644
--- a/config.h.in
+++ b/config.h.in
@@ -11,6 +11,9 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+/* have new FreeShadow API */
+#undef HAVE_FREE_SHADOW
+
/* Have drm_i915_flip_t and related definitions */
#undef HAVE_I915_FLIP
diff --git a/configure b/configure
index 9597427..3774018 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.3.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.3.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-intel'
PACKAGE_TARNAME='xf86-video-intel'
-PACKAGE_VERSION='2.3.0'
-PACKAGE_STRING='xf86-video-intel 2.3.0'
+PACKAGE_VERSION='2.3.1'
+PACKAGE_STRING='xf86-video-intel 2.3.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -899,6 +899,8 @@ DRI_MM_CFLAGS
DRI_MM_LIBS
VIDEO_DEBUG_TRUE
VIDEO_DEBUG_FALSE
+XVMCLIB_CFLAGS
+XVMCLIB_LIBS
XVMC_TRUE
XVMC_FALSE
WARN_CFLAGS
@@ -952,7 +954,9 @@ PCIACCESS_LIBS
DRI_CFLAGS
DRI_LIBS
DRI_MM_CFLAGS
-DRI_MM_LIBS'
+DRI_MM_LIBS
+XVMCLIB_CFLAGS
+XVMCLIB_LIBS'
# Initialize some variables set by options.
@@ -1455,7 +1459,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-intel 2.3.0 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-intel 2.3.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1525,7 +1529,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-intel 2.3.0:";;
+ short | recursive ) echo "Configuration of xf86-video-intel 2.3.1:";;
esac
cat <<\_ACEOF
@@ -1586,6 +1590,10 @@ Some influential environment variables:
DRI_MM_CFLAGS
C compiler flags for DRI_MM, overriding pkg-config
DRI_MM_LIBS linker flags for DRI_MM, overriding pkg-config
+ XVMCLIB_CFLAGS
+ C compiler flags for XVMCLIB, overriding pkg-config
+ XVMCLIB_LIBS
+ linker flags for XVMCLIB, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1651,7 +1659,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-intel configure 2.3.0
+xf86-video-intel configure 2.3.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1665,7 +1673,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-intel $as_me 2.3.0, which was
+It was created by xf86-video-intel $as_me 2.3.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2360,7 +2368,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-intel'
- VERSION='2.3.0'
+ VERSION='2.3.1'
cat >>confdefs.h <<_ACEOF
@@ -4429,7 +4437,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4432 "configure"' > conftest.$ac_ext
+ echo '#line 4440 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7486,11 +7494,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7489: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7497: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7493: \$? = $ac_status" >&5
+ echo "$as_me:7501: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7776,11 +7784,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7779: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7787: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7783: \$? = $ac_status" >&5
+ echo "$as_me:7791: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7880,11 +7888,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7883: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7887: \$? = $ac_status" >&5
+ echo "$as_me:7895: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10257,7 +10265,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10260 "configure"
+#line 10268 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10357,7 +10365,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10360 "configure"
+#line 10368 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12758,11 +12766,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12761: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12769: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12765: \$? = $ac_status" >&5
+ echo "$as_me:12773: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12862,11 +12870,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12865: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12873: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12869: \$? = $ac_status" >&5
+ echo "$as_me:12877: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14460,11 +14468,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14463: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14471: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14467: \$? = $ac_status" >&5
+ echo "$as_me:14475: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14564,11 +14572,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14567: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14575: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14571: \$? = $ac_status" >&5
+ echo "$as_me:14579: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16784,11 +16792,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16787: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16795: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16791: \$? = $ac_status" >&5
+ echo "$as_me:16799: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17074,11 +17082,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17077: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17085: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17081: \$? = $ac_status" >&5
+ echo "$as_me:17089: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17178,11 +17186,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17181: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17189: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17185: \$? = $ac_status" >&5
+ echo "$as_me:17193: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21534,12 +21542,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"xorg-server xproto xvmc fontsproto \$REQUIRED_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server xproto xvmc fontsproto
$REQUIRED_MODULES") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto
$REQUIRED_MODULES") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto xvmc fontsproto
$REQUIRED_MODULES" 2>/dev/null`
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto fontsproto
$REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21552,12 +21560,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XORG_LIBS="$XORG_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"xorg-server xproto xvmc fontsproto \$REQUIRED_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server xproto xvmc fontsproto
$REQUIRED_MODULES") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto
$REQUIRED_MODULES") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto xvmc fontsproto
$REQUIRED_MODULES" 2>/dev/null`
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto fontsproto
$REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21576,14 +21584,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "xorg-server xproto xvmc fontsproto $REQUIRED_MODULES"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
else
- XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"xorg-server xproto xvmc fontsproto $REQUIRED_MODULES"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"xorg-server xproto fontsproto $REQUIRED_MODULES"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XORG_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (xorg-server
xproto xvmc fontsproto $REQUIRED_MODULES) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (xorg-server
xproto fontsproto $REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@@ -21594,7 +21602,7 @@ Alternatively, you may set the environment variables
XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements (xorg-server xproto xvmc fontsproto
$REQUIRED_MODULES) were not met:
+echo "$as_me: error: Package requirements (xorg-server xproto fontsproto
$REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@@ -22304,6 +22312,75 @@ fi
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+
+{ echo "$as_me:$LINENO: checking whether xf86RotateFreeShadow is declared" >&5
+echo $ECHO_N "checking whether xf86RotateFreeShadow is declared... $ECHO_C"
>&6; }
+if test "${ac_cv_have_decl_xf86RotateFreeShadow+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <xorg-server.h>
+ #include <windowstr.h>
+ #include <xf86Crtc.h>
+
+int
+main ()
+{
+#ifndef xf86RotateFreeShadow
+ (void) xf86RotateFreeShadow;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_xf86RotateFreeShadow=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_xf86RotateFreeShadow=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_xf86RotateFreeShadow" >&5
+echo "${ECHO_T}$ac_cv_have_decl_xf86RotateFreeShadow" >&6; }
+if test $ac_cv_have_decl_xf86RotateFreeShadow = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FREE_SHADOW 1
+_ACEOF
+
+fi
+
+
+CPPFLAGS="$SAVE_CPPFLAGS"
+
WARN_CFLAGS=""
@@ -22615,8 +22692,6 @@ _ACEOF
fi
-{ echo "$as_me:$LINENO: checking whether to include XvMC support" >&5
-echo $ECHO_N "checking whether to include XvMC support... $ECHO_C" >&6; }
if test "$XVMC" = auto; then
XVMC="$DRI"
fi
@@ -22625,6 +22700,81 @@ if test "$XVMC" = yes && test "$DRI" = no; then
echo "$as_me: error: XvMC can't be enabled without DRI" >&2;}
{ (exit 1); exit 1; }; }
fi
+if test "$XVMC" = yes; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for XVMCLIB" >&5
+echo $ECHO_N "checking for XVMCLIB... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XVMCLIB_CFLAGS"; then
+ pkg_cv_XVMCLIB_CFLAGS="$XVMCLIB_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xvmc\"")
>&5
+ ($PKG_CONFIG --exists --print-errors "xvmc") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_XVMCLIB_CFLAGS=`$PKG_CONFIG --cflags "xvmc" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XVMCLIB_LIBS"; then
+ pkg_cv_XVMCLIB_LIBS="$XVMCLIB_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xvmc\"")
>&5
+ ($PKG_CONFIG --exists --print-errors "xvmc") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_XVMCLIB_LIBS=`$PKG_CONFIG --libs "xvmc" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "xvmc"`
+ else
+ XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "xvmc"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XVMCLIB_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ XVMC=no
+elif test $pkg_failed = untried; then
+ XVMC=no
+else
+ XVMCLIB_CFLAGS=$pkg_cv_XVMCLIB_CFLAGS
+ XVMCLIB_LIBS=$pkg_cv_XVMCLIB_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ XVMC=yes
+fi
+fi
+{ echo "$as_me:$LINENO: checking whether to include XvMC support" >&5
+echo $ECHO_N "checking whether to include XvMC support... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $XVMC" >&5
echo "${ECHO_T}$XVMC" >&6; }
if test x$XVMC = xyes; then
@@ -22641,6 +22791,7 @@ cat >>confdefs.h <<\_ACEOF
#define ENABLE_XVMC 1
_ACEOF
+
fi
@@ -23448,7 +23599,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-intel $as_me 2.3.0, which was
+This file was extended by xf86-video-intel $as_me 2.3.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23501,7 +23652,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-intel config.status 2.3.0
+xf86-video-intel config.status 2.3.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
@@ -23861,6 +24012,8 @@ DRI_MM_CFLAGS!$DRI_MM_CFLAGS$ac_delim
DRI_MM_LIBS!$DRI_MM_LIBS$ac_delim
VIDEO_DEBUG_TRUE!$VIDEO_DEBUG_TRUE$ac_delim
VIDEO_DEBUG_FALSE!$VIDEO_DEBUG_FALSE$ac_delim
+XVMCLIB_CFLAGS!$XVMCLIB_CFLAGS$ac_delim
+XVMCLIB_LIBS!$XVMCLIB_LIBS$ac_delim
XVMC_TRUE!$XVMC_TRUE$ac_delim
XVMC_FALSE!$XVMC_FALSE$ac_delim
WARN_CFLAGS!$WARN_CFLAGS$ac_delim
@@ -23892,7 +24045,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/debian/changelog b/debian/changelog
index b9c327e..0f37cf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Mon, 12 May 2008 03:55:45 +0200
+
xserver-xorg-video-intel (2:2.3.0-1) experimental; urgency=low
* Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings.
diff --git a/ltmain.sh b/ltmain.sh
index bba8b1c..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-3"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
diff --git a/man/Makefile.in b/man/Makefile.in
index ccfaa35..8c9fc6f 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -167,6 +167,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/src/Makefile.in b/src/Makefile.in
index 39337df..638ffef 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -240,6 +240,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/src/bios_reader/Makefile.in b/src/bios_reader/Makefile.in
index b542ae5..b6b44a5 100644
--- a/src/bios_reader/Makefile.in
+++ b/src/bios_reader/Makefile.in
@@ -157,6 +157,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/src/ch7017/Makefile.in b/src/ch7017/Makefile.in
index e091458..27cf1e1 100644
--- a/src/ch7017/Makefile.in
+++ b/src/ch7017/Makefile.in
@@ -161,6 +161,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/src/ch7xxx/Makefile.in b/src/ch7xxx/Makefile.in
index 221710c..e76efa4 100644
--- a/src/ch7xxx/Makefile.in
+++ b/src/ch7xxx/Makefile.in
@@ -161,6 +161,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
XMODES_CFLAGS = @XMODES_CFLAGS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/src/ivch/Makefile.in b/src/ivch/Makefile.in
index 88e389f..4764631 100644
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
