xserver-xorg-video-intel: Changes to 'debian-experimental'
ChangeLog | 1306 ++++++++++++++--
config.h.in | 3
configure | 118 -
configure.ac | 24
debian/changelog | 14
debian/control | 2
debian/patches/01_gen_pci_ids.diff | 2
debian/xserver-xorg-video-intel.install | 1
man/Makefile.am | 1
man/Makefile.in | 1
man/intel.man | 5
src/Makefile.am | 21
src/Makefile.in | 57
src/bios_reader/Makefile.am | 3
src/bios_reader/Makefile.in | 27
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 | 4
src/ch7017/ch7017.c | 41
src/ch7xxx/Makefile.am | 3
src/ch7xxx/Makefile.in | 4
src/ch7xxx/ch7xxx.c | 17
src/common.h | 107 -
src/i810.h | 12
src/i810_cursor.c | 6
src/i810_driver.c | 8
src/i810_io.c | 24
src/i810_memory.c | 4
src/i810_reg.h | 44
src/i810_ring.h | 90 +
src/i810_video.c | 70
src/i830.h | 192 +-
src/i830_3d.c | 322 ++--
src/i830_accel.c | 19
src/i830_bios.c | 2
src/i830_bios.h | 135 -
src/i830_crt.c | 41
src/i830_cursor.c | 14
src/i830_debug.c | 166 +-
src/i830_display.c | 128 +
src/i830_dri.c | 24
src/i830_driver.c | 854 +++++-----
src/i830_dvo.c | 21
src/i830_exa.c | 150 -
src/i830_hwmc.c | 154 +
src/i830_hwmc.h | 106 +
src/i830_i2c.c | 21
src/i830_lvds.c | 68
src/i830_memory.c | 93 -
src/i830_quirks.c | 14
src/i830_render.c | 441 +++--
src/i830_ring.h | 113 +
src/i830_sdvo.c | 121 -
src/i830_sdvo_regs.h | 54
src/i830_tv.c | 115 -
src/i830_video.c | 376 ++--
src/i830_video.h | 29
src/i830_xaa.c | 138 -
src/i915_3d.c | 66
src/i915_3d.h | 13
src/i915_hwmc.c | 873 +++++++++++
src/i915_hwmc.h | 61
src/i915_reg.h | 10
src/i915_render.c | 162 +-
src/i915_video.c | 297 ++-
src/i965_render.c | 297 +--
src/i965_video.c | 234 +-
src/ivch/Makefile.am | 3
src/ivch/Makefile.in | 4
src/ivch/ivch.c | 35
src/reg_dumper/.gitignore | 2
src/reg_dumper/Makefile.am | 16
src/reg_dumper/Makefile.in | 103 -
src/reg_dumper/idle.c | 177 ++
src/reg_dumper/reg_dumper.h | 1
src/reg_dumper/stepping.c | 137 +
src/sil164/Makefile.am | 3
src/sil164/Makefile.in | 4
src/sil164/sil164.c | 25
src/sil164/sil164_reg.h | 15
src/tfp410/Makefile.am | 3
src/tfp410/Makefile.in | 4
src/tfp410/tfp410.c | 23
src/tfp410/tfp410_reg.h | 15
src/xvmc/Makefile.am | 20
src/xvmc/Makefile.in | 99 +
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 | 2535 ++++++++++++++++++++++++++++++++
src/xvmc/i915_xvmc.h | 117 +
src/xvmc/intel_batchbuffer.c | 271 +++
src/xvmc/intel_batchbuffer.h | 42
src/xvmc/intel_xvmc.c | 1069 +++++++++++++
src/xvmc/intel_xvmc.h | 252 +++
src/xvmc/xf86dri.c | 601 +++++++
src/xvmc/xf86dri.h | 111 +
src/xvmc/xf86dristr.h | 390 ++++
102 files changed, 12984 insertions(+), 2664 deletions(-)
New commits:
commit 13ee1015aad08f492f26a63a0fb90a22f48fff91
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Mar 21 21:51:21 2008 +0100
New upstream release candidate
diff --git a/config.h.in b/config.h.in
index c147fb9..3b764d9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -5,6 +5,9 @@
/* Use Damage extension */
#undef DAMAGE
+/* Enable XvMC support */
+#undef ENABLE_XVMC
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
diff --git a/configure b/configure
index f03d207..2f334ef 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.2.1.
+# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.2.99.901.
#
# 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.2.1'
-PACKAGE_STRING='xf86-video-intel 2.2.1'
+PACKAGE_VERSION='2.2.99.901'
+PACKAGE_STRING='xf86-video-intel 2.2.99.901'
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
+XVMC_TRUE
+XVMC_FALSE
WARN_CFLAGS
moduledir
DRIVER_NAME
@@ -1453,7 +1455,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.2.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-intel 2.2.99.901 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1523,7 +1525,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-intel 2.2.1:";;
+ short | recursive ) echo "Configuration of xf86-video-intel 2.2.99.901:";;
esac
cat <<\_ACEOF
@@ -1541,6 +1543,7 @@ Optional Features:
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-dri Disable DRI support [default=auto]
--enable-video-debug Enable video debugging support [default=no]
+ --disable-xvmc Disable XvMC support [default=yes]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1648,7 +1651,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-intel configure 2.2.1
+xf86-video-intel configure 2.2.99.901
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1662,7 +1665,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.2.1, which was
+It was created by xf86-video-intel $as_me 2.2.99.901, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2357,7 +2360,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-intel'
- VERSION='2.2.1'
+ VERSION='2.2.99.901'
cat >>confdefs.h <<_ACEOF
@@ -4426,7 +4429,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4429 "configure"' > conftest.$ac_ext
+ echo '#line 4432 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7483,11 +7486,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:7486: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7489: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7490: \$? = $ac_status" >&5
+ echo "$as_me:7493: \$? = $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.
@@ -7773,11 +7776,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:7776: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7779: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7780: \$? = $ac_status" >&5
+ echo "$as_me:7783: \$? = $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.
@@ -7877,11 +7880,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:7880: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7883: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7884: \$? = $ac_status" >&5
+ echo "$as_me:7887: \$? = $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
@@ -10254,7 +10257,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10257 "configure"
+#line 10260 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10354,7 +10357,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10357 "configure"
+#line 10360 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12755,11 +12758,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:12758: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12761: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12762: \$? = $ac_status" >&5
+ echo "$as_me:12765: \$? = $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.
@@ -12859,11 +12862,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:12862: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12865: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12866: \$? = $ac_status" >&5
+ echo "$as_me:12869: \$? = $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
@@ -14457,11 +14460,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:14460: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14463: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14464: \$? = $ac_status" >&5
+ echo "$as_me:14467: \$? = $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.
@@ -14561,11 +14564,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:14564: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14567: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14568: \$? = $ac_status" >&5
+ echo "$as_me:14571: \$? = $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
@@ -16781,11 +16784,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:16784: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16787: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16788: \$? = $ac_status" >&5
+ echo "$as_me:16791: \$? = $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.
@@ -17071,11 +17074,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:17074: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17077: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17078: \$? = $ac_status" >&5
+ echo "$as_me:17081: \$? = $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.
@@ -17175,11 +17178,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:17178: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17181: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17182: \$? = $ac_status" >&5
+ echo "$as_me:17185: \$? = $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
@@ -20860,6 +20863,13 @@ else
fi
+# Check whether --enable-xvmc was given.
+if test "${enable_xvmc+set}" = set; then
+ enableval=$enable_xvmc; XVMC="$enableval"
+else
+ XVMC=yes
+fi
+
# Checks for extensions
@@ -22020,16 +22030,16 @@ if test -d "$XSERVER_SOURCE"; then
XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`"
;;
esac
- if test -f src/modes/xf86Modes.h; then
+ if test -f $srcdir/src/modes/xf86Modes.h; then
:
else
- ln -sf $XSERVER_SOURCE/hw/xfree86/modes src/modes
+ ln -sf $XSERVER_SOURCE/hw/xfree86/modes $srcdir/src/modes
fi
- if test -f src/parser/xf86Parser.h; then
+ if test -f $srcdir/src/parser/xf86Parser.h; then
:
else
- ln -sf $XSERVER_SOURCE/hw/xfree86/parser src/parser
+ ln -sf $XSERVER_SOURCE/hw/xfree86/parser $srcdir/src/parser
fi
fi
@@ -22043,7 +22053,7 @@ _ACEOF
XMODES_CFLAGS=
else
- if test -f src/modes/xf86Modes.h -a -f src/parser/xf86Parser.h; then
+ if test -f $srcdir/src/modes/xf86Modes.h -a -f $srcdir/src/parser/xf86Parser.h; then
{ echo "$as_me:$LINENO: X server is missing new mode code, using local copy" >&5
echo "$as_me: X server is missing new mode code, using local copy" >&6;}
else
@@ -22367,6 +22377,27 @@ _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; }
+{ echo "$as_me:$LINENO: result: $XVMC" >&5
+echo "${ECHO_T}$XVMC" >&6; }
+ if test x$XVMC = xyes; then
+ XVMC_TRUE=
+ XVMC_FALSE='#'
+else
+ XVMC_TRUE='#'
+ XVMC_FALSE=
+fi
+
+if test "$XVMC" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_XVMC 1
+_ACEOF
+
+fi
+
+
@@ -22850,6 +22881,13 @@ echo "$as_me: error: conditional \"VIDEO_DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${XVMC_TRUE}" && test -z "${XVMC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"XVMC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XVMC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${BUILD_LINUXDOC_TRUE}" && test -z "${BUILD_LINUXDOC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_LINUXDOC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23164,7 +23202,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.2.1, which was
+This file was extended by xf86-video-intel $as_me 2.2.99.901, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23217,7 +23255,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-intel config.status 2.2.1
+xf86-video-intel config.status 2.2.99.901
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -23577,6 +23615,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
+XVMC_TRUE!$XVMC_TRUE$ac_delim
+XVMC_FALSE!$XVMC_FALSE$ac_delim
WARN_CFLAGS!$WARN_CFLAGS$ac_delim
moduledir!$moduledir$ac_delim
DRIVER_NAME!$DRIVER_NAME$ac_delim
@@ -23606,7 +23646,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` = 60; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; 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 51d7f88..c6ad534 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,19 @@
-xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.2.99.901-1) experimental; urgency=low
+ [ Julien Cristau ]
* Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to
bring in libpciaccess0 (closes: #467215).
* Only build on x86, this package doesn't make sense anywhere else.
* The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix.
- * configure: change the pciaccess version check to 0.10 instead of 0.10.0.
* Bump Standards-Version to 3.7.3 (no changes).
- -- Julien Cristau <jcristau@debian.org> Sun, 24 Feb 2008 10:29:49 +0100
+ [ Brice Goglin ]
+ * New upstream release.
+ + Fix pciaccess version check, closes: #470266.
+ + Fix crash on VT switch, closes: #469113.
+ + Fix video playback on rotated display, closes: #432157.
+
+ -- Brice Goglin <bgoglin@debian.org> Fri, 21 Mar 2008 21:50:59 +0100
xserver-xorg-video-intel (2:2.2.1-1) unstable; urgency=low
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index 37de1ae..e872b52 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -2,7 +2,7 @@ Index: xserver-xorg-video-i810/src/Makefile.am
===================================================================
--- xserver-xorg-video-i810.orig/src/Makefile.am 2007-08-18 13:04:47.000000000 -0400
+++ xserver-xorg-video-i810/src/Makefile.am 2007-08-18 13:10:06.000000000 -0400
-@@ -196,3 +196,9 @@
+@@ -211,3 +211,9 @@
uninstall-local:
(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
diff --git a/man/Makefile.in b/man/Makefile.in
index 5a055ce..ccfaa35 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -14,7 +14,6 @@
@SET_MAKE@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff --git a/src/Makefile.in b/src/Makefile.in
index 4881219..e8677bd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -59,6 +59,9 @@ host_triplet = @host@
@DRI_TRUE@am__append_2 = \
@DRI_TRUE@ $(INTEL_DRI_SRCS)
+@XVMC_TRUE@am__append_3 = \
+@XVMC_TRUE@ $(INTEL_XVMC_SRCS)
+
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -82,12 +85,13 @@ intel_drv_la_LIBADD =
am__intel_drv_la_SOURCES_DIST = brw_defines.h brw_structs.h sf_prog.h \
wm_prog.h common.h i2c_vid.h i810_accel.c i810_common.h \
i810_cursor.c i810_dga.c i810_driver.c i810.h i810_io.c \
- i810_memory.c i810_reg.h i810_video.c i810_wmark.c i830_3d.c \
- i830_accel.c i830_bios.c i830_bios.h i830_common.h i830_crt.c \
- i830_cursor.c i830_debug.c i830_debug.h i830_display.c \
- i830_display.h i830_quirks.c i830_driver.c i830_dvo.c i830.h \
- i830_i2c.c i830_io.c i830_lvds.c i830_memory.c i830_modes.c \
- i830_video.c i830_video.h i830_reg.h i830_sdvo.c i830_sdvo.h \
+ i810_memory.c i810_reg.h i810_ring.h i810_video.c i810_wmark.c \
+ i830_3d.c i830_accel.c i830_bios.c i830_bios.h i830_common.h \
+ i830_crt.c i830_cursor.c i830_debug.c i830_debug.h \
+ i830_display.c i830_display.h i830_quirks.c i830_driver.c \
+ i830_dvo.c i830.h i830_i2c.c i830_io.c i830_lvds.c \
+ i830_memory.c i830_modes.c i830_video.c i830_video.h \
+ i830_reg.h i830_ring.h i830_sdvo.c i830_sdvo.h \
i830_sdvo_regs.h i830_tv.c i915_3d.c i915_3d.h i915_reg.h \
i915_video.c i965_video.c i830_exa.c i830_xaa.c i830_render.c \
i915_render.c i965_render.c local_xf86Rename.h \
@@ -96,12 +100,15 @@ am__intel_drv_la_SOURCES_DIST = brw_defines.h brw_structs.h sf_prog.h \
modes/xf86Crtc.c modes/xf86Cursors.c modes/xf86EdidModes.c \
modes/xf86RandR12.c modes/xf86RandR12.h modes/xf86Rename.h \
modes/xf86Rotate.c modes/xf86DiDGA.c i810_dri.c i810_dri.h \
- i830_dri.c i810_hwmc.c i830_dri.h
+ i830_dri.c i810_hwmc.c i830_dri.h i830_hwmc.h i830_hwmc.c \
+ i915_hwmc.c i915_hwmc.h
am__objects_1 = xf86Modes.lo xf86cvt.lo xf86Crtc.lo xf86Cursors.lo \
xf86EdidModes.lo xf86RandR12.lo xf86Rotate.lo xf86DiDGA.lo
@XMODES_TRUE@am__objects_2 = $(am__objects_1)
am__objects_3 = i810_dri.lo i830_dri.lo i810_hwmc.lo
@DRI_TRUE@am__objects_4 = $(am__objects_3)
+am__objects_5 = i830_hwmc.lo i915_hwmc.lo
+@XVMC_TRUE@am__objects_6 = $(am__objects_5)
am_intel_drv_la_OBJECTS = i810_accel.lo i810_cursor.lo i810_dga.lo \
i810_driver.lo i810_io.lo i810_memory.lo i810_video.lo \
i810_wmark.lo i830_3d.lo i830_accel.lo i830_bios.lo \
@@ -111,7 +118,7 @@ am_intel_drv_la_OBJECTS = i810_accel.lo i810_cursor.lo i810_dga.lo \
i830_video.lo i830_sdvo.lo i830_tv.lo i915_3d.lo i915_video.lo \
i965_video.lo i830_exa.lo i830_xaa.lo i830_render.lo \
i915_render.lo i965_render.lo $(am__objects_2) \
- $(am__objects_4)
+ $(am__objects_4) $(am__objects_6)
intel_drv_la_OBJECTS = $(am_intel_drv_la_OBJECTS)
intel_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -295,8 +302,8 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ \
- -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
+AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \
+ @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
intel_drv_la_LTLIBRARIES = intel_drv.la
intel_drv_la_LDFLAGS = -module -avoid-version
@@ -325,18 +332,25 @@ INTEL_DRI_SRCS = \
i810_hwmc.c \
i830_dri.h
+INTEL_XVMC_SRCS = \
+ i830_hwmc.h \
+ i830_hwmc.c \
+ i915_hwmc.c \
+ i915_hwmc.h
+
intel_drv_la_SOURCES = brw_defines.h brw_structs.h sf_prog.h wm_prog.h \
common.h i2c_vid.h i810_accel.c i810_common.h i810_cursor.c \
i810_dga.c i810_driver.c i810.h i810_io.c i810_memory.c \
- i810_reg.h i810_video.c i810_wmark.c i830_3d.c i830_accel.c \
- i830_bios.c i830_bios.h i830_common.h i830_crt.c i830_cursor.c \
- i830_debug.c i830_debug.h i830_display.c i830_display.h \
- i830_quirks.c i830_driver.c i830_dvo.c i830.h i830_i2c.c \
- i830_io.c i830_lvds.c i830_memory.c i830_modes.c i830_video.c \
- i830_video.h i830_reg.h i830_sdvo.c i830_sdvo.h \
- i830_sdvo_regs.h i830_tv.c i915_3d.c i915_3d.h i915_reg.h \
- i915_video.c i965_video.c i830_exa.c i830_xaa.c i830_render.c \
- i915_render.c i965_render.c $(am__append_1) $(am__append_2)
+ i810_reg.h i810_ring.h i810_video.c i810_wmark.c i830_3d.c \
+ i830_accel.c i830_bios.c i830_bios.h i830_common.h i830_crt.c \
+ i830_cursor.c i830_debug.c i830_debug.h i830_display.c \
+ i830_display.h i830_quirks.c i830_driver.c i830_dvo.c i830.h \
+ i830_i2c.c i830_io.c i830_lvds.c i830_memory.c i830_modes.c \
+ i830_video.c i830_video.h i830_reg.h i830_ring.h i830_sdvo.c \
+ i830_sdvo.h i830_sdvo_regs.h i830_tv.c i915_3d.c i915_3d.h \
+ i915_reg.h i915_video.c i965_video.c i830_exa.c i830_xaa.c \
+ i830_render.c i915_render.c i965_render.c $(am__append_1) \
+ $(am__append_2) $(am__append_3)
INTEL_G4A = \
packed_yuv_sf.g4a \
packed_yuv_wm.g4a \
@@ -365,7 +379,8 @@ EXTRA_DIST = \
$(XMODE_SRCS) \
$(INTEL_G4A) \
$(INTEL_G4H) \
- $(INTEL_DRI_SRCS)
+ $(INTEL_DRI_SRCS) \
+ $(INTEL_XVMC_SRCS)
pcidatadir = $(datadir)/xserver-xorg/pci
pcidata_DATA = intel.ids
@@ -459,6 +474,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_driver.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_dvo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_exa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_hwmc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_i2c.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_io.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_lvds.Plo@am__quote@
@@ -471,6 +487,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_video.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_xaa.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i915_3d.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i915_hwmc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i915_render.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i915_video.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_render.Plo@am__quote@
diff --git a/src/bios_reader/Makefile.in b/src/bios_reader/Makefile.in
index a718eb0..b542ae5 100644
--- a/src/bios_reader/Makefile.in
+++ b/src/bios_reader/Makefile.in
@@ -45,14 +45,10 @@ CONFIG_CLEAN_FILES =
@LIBPCIACCESS_TRUE@am__EXEEXT_1 = bios_dumper$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
am__bios_dumper_SOURCES_DIST = bios_dumper.c
-@LIBPCIACCESS_TRUE@am_bios_dumper_OBJECTS = \
-@LIBPCIACCESS_TRUE@ bios_dumper-bios_dumper.$(OBJEXT)
+@LIBPCIACCESS_TRUE@am_bios_dumper_OBJECTS = bios_dumper.$(OBJEXT)
bios_dumper_OBJECTS = $(am_bios_dumper_OBJECTS)
am__DEPENDENCIES_1 =
@LIBPCIACCESS_TRUE@bios_dumper_DEPENDENCIES = $(am__DEPENDENCIES_1)
-bios_dumper_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(bios_dumper_CFLAGS) \
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
bios_reader_SOURCES = bios_reader.c
bios_reader_OBJECTS = bios_reader.$(OBJEXT)
bios_reader_LDADD = $(LDADD)
@@ -214,10 +210,9 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ @PCIACCESS_CFLAGS@
@LIBPCIACCESS_TRUE@BIOS_DUMPER = bios_dumper
@LIBPCIACCESS_TRUE@bios_dumper_SOURCES = bios_dumper.c
-@LIBPCIACCESS_TRUE@bios_dumper_CFLAGS = $(PCIACCESS_CFLAGS)
@LIBPCIACCESS_TRUE@bios_dumper_LDADD = $(PCIACCESS_LIBS)
all: all-am
@@ -261,7 +256,7 @@ clean-noinstPROGRAMS:
done
bios_dumper$(EXEEXT): $(bios_dumper_OBJECTS) $(bios_dumper_DEPENDENCIES)
@rm -f bios_dumper$(EXEEXT)
- $(bios_dumper_LINK) $(bios_dumper_OBJECTS) $(bios_dumper_LDADD) $(LIBS)
+ $(LINK) $(bios_dumper_OBJECTS) $(bios_dumper_LDADD) $(LIBS)
bios_reader$(EXEEXT): $(bios_reader_OBJECTS) $(bios_reader_DEPENDENCIES)
@rm -f bios_reader$(EXEEXT)
$(LINK) $(bios_reader_OBJECTS) $(bios_reader_LDADD) $(LIBS)
@@ -272,7 +267,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bios_dumper-bios_dumper.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bios_dumper.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bios_reader.Po@am__quote@
.c.o:
@@ -296,20 +291,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-bios_dumper-bios_dumper.o: bios_dumper.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bios_dumper_CFLAGS) $(CFLAGS) -MT bios_dumper-bios_dumper.o -MD -MP -MF $(DEPDIR)/bios_dumper-bios_dumper.Tpo -c -o bios_dumper-bios_dumper.o `test -f 'bios_dumper.c' || echo '$(srcdir)/'`bios_dumper.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bios_dumper-bios_dumper.Tpo $(DEPDIR)/bios_dumper-bios_dumper.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bios_dumper.c' object='bios_dumper-bios_dumper.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bios_dumper_CFLAGS) $(CFLAGS) -c -o bios_dumper-bios_dumper.o `test -f 'bios_dumper.c' || echo '$(srcdir)/'`bios_dumper.c
-
-bios_dumper-bios_dumper.obj: bios_dumper.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bios_dumper_CFLAGS) $(CFLAGS) -MT bios_dumper-bios_dumper.obj -MD -MP -MF $(DEPDIR)/bios_dumper-bios_dumper.Tpo -c -o bios_dumper-bios_dumper.obj `if test -f 'bios_dumper.c'; then $(CYGPATH_W) 'bios_dumper.c'; else $(CYGPATH_W) '$(srcdir)/bios_dumper.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bios_dumper-bios_dumper.Tpo $(DEPDIR)/bios_dumper-bios_dumper.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bios_dumper.c' object='bios_dumper-bios_dumper.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bios_dumper_CFLAGS) $(CFLAGS) -c -o bios_dumper-bios_dumper.obj `if test -f 'bios_dumper.c'; then $(CYGPATH_W) 'bios_dumper.c'; else $(CYGPATH_W) '$(srcdir)/bios_dumper.c'; fi`
-
mostlyclean-libtool:
-rm -f *.lo
diff --git a/src/ch7017/Makefile.in b/src/ch7017/Makefile.in
index 2c333ae..e091458 100644
--- a/src/ch7017/Makefile.in
+++ b/src/ch7017/Makefile.in
@@ -220,7 +220,9 @@ top_srcdir = @top_srcdir@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ @PCIACCESS_CFLAGS@
+
ch7017_la_LTLIBRARIES = ch7017.la
ch7017_la_LDFLAGS = -module -avoid-version
ch7017_ladir = @moduledir@/drivers
diff --git a/src/ch7xxx/Makefile.in b/src/ch7xxx/Makefile.in
index 8ecf242..221710c 100644
--- a/src/ch7xxx/Makefile.in
+++ b/src/ch7xxx/Makefile.in
@@ -220,7 +220,9 @@ top_srcdir = @top_srcdir@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ @PCIACCESS_CFLAGS@
+
ch7xxx_la_LTLIBRARIES = ch7xxx.la
ch7xxx_la_LDFLAGS = -module -avoid-version
ch7xxx_ladir = @moduledir@/drivers
diff --git a/src/ivch/Makefile.in b/src/ivch/Makefile.in
index 210f6cb..88e389f 100644
--- a/src/ivch/Makefile.in
+++ b/src/ivch/Makefile.in
@@ -220,7 +220,9 @@ top_srcdir = @top_srcdir@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ @PCIACCESS_CFLAGS@
+
ivch_la_LTLIBRARIES = ivch.la
ivch_la_LDFLAGS = -module -avoid-version
ivch_ladir = @moduledir@/drivers
diff --git a/src/reg_dumper/Makefile.in b/src/reg_dumper/Makefile.in
index 18a99b3..d4d3690 100644
--- a/src/reg_dumper/Makefile.in
+++ b/src/reg_dumper/Makefile.in
@@ -32,7 +32,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-noinst_PROGRAMS = intel_reg_dumper$(EXEEXT)
+noinst_PROGRAMS = intel_reg_dumper$(EXEEXT) intel_idle$(EXEEXT) \
+ intel_stepping$(EXEEXT)
subdir = src/reg_dumper
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -43,15 +44,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
PROGRAMS = $(noinst_PROGRAMS)
-am_intel_reg_dumper_OBJECTS = intel_reg_dumper-main.$(OBJEXT) \
- intel_reg_dumper-xprintf.$(OBJEXT) \
- intel_reg_dumper-i830_debug.$(OBJEXT)
-intel_reg_dumper_OBJECTS = $(am_intel_reg_dumper_OBJECTS)
+am_intel_idle_OBJECTS = idle.$(OBJEXT) xprintf.$(OBJEXT) \
+ i830_debug.$(OBJEXT)
+intel_idle_OBJECTS = $(am_intel_idle_OBJECTS)
am__DEPENDENCIES_1 =
+intel_idle_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_intel_reg_dumper_OBJECTS = main.$(OBJEXT) xprintf.$(OBJEXT) \
+ i830_debug.$(OBJEXT)
+intel_reg_dumper_OBJECTS = $(am_intel_reg_dumper_OBJECTS)
intel_reg_dumper_DEPENDENCIES = $(am__DEPENDENCIES_1)
-intel_reg_dumper_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(intel_reg_dumper_CFLAGS) \
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_intel_stepping_OBJECTS = stepping.$(OBJEXT)
+intel_stepping_OBJECTS = $(am_intel_stepping_OBJECTS)
+intel_stepping_DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -64,8 +68,10 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(intel_reg_dumper_SOURCES)
-DIST_SOURCES = $(intel_reg_dumper_SOURCES)
+SOURCES = $(intel_idle_SOURCES) $(intel_reg_dumper_SOURCES) \
+ $(intel_stepping_SOURCES)
+DIST_SOURCES = $(intel_idle_SOURCES) $(intel_reg_dumper_SOURCES) \
+ $(intel_stepping_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -216,8 +222,19 @@ intel_reg_dumper_SOURCES = \
xprintf.c \
../i830_debug.c
+intel_idle_SOURCES = \
+ idle.c \
+ reg_dumper.h \
+ xprintf.c \
+ ../i830_debug.c
+
+intel_stepping_SOURCES = \
+ stepping.c
+
intel_reg_dumper_LDADD = $(PCIACCESS_LIBS)
-intel_reg_dumper_CFLAGS = $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \
+intel_idle_LDADD = $(PCIACCESS_LIBS)
+intel_stepping_LDADD = $(PCIACCESS_LIBS)
+AM_CFLAGS = $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \
-I$(srcdir)/.. -DREG_DUMPER
all: all-am
@@ -260,9 +277,15 @@ clean-noinstPROGRAMS:
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
+intel_idle$(EXEEXT): $(intel_idle_OBJECTS) $(intel_idle_DEPENDENCIES)
+ @rm -f intel_idle$(EXEEXT)
+ $(LINK) $(intel_idle_OBJECTS) $(intel_idle_LDADD) $(LIBS)
intel_reg_dumper$(EXEEXT): $(intel_reg_dumper_OBJECTS) $(intel_reg_dumper_DEPENDENCIES)
@rm -f intel_reg_dumper$(EXEEXT)
- $(intel_reg_dumper_LINK) $(intel_reg_dumper_OBJECTS) $(intel_reg_dumper_LDADD) $(LIBS)
+ $(LINK) $(intel_reg_dumper_OBJECTS) $(intel_reg_dumper_LDADD) $(LIBS)
+intel_stepping$(EXEEXT): $(intel_stepping_OBJECTS) $(intel_stepping_DEPENDENCIES)
+ @rm -f intel_stepping$(EXEEXT)
+ $(LINK) $(intel_stepping_OBJECTS) $(intel_stepping_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -270,9 +293,11 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_reg_dumper-i830_debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_reg_dumper-main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_reg_dumper-xprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_debug.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stepping.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xprintf.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -295,47 +320,19 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-intel_reg_dumper-main.o: main.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -MT intel_reg_dumper-main.o -MD -MP -MF $(DEPDIR)/intel_reg_dumper-main.Tpo -c -o intel_reg_dumper-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/intel_reg_dumper-main.Tpo $(DEPDIR)/intel_reg_dumper-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='intel_reg_dumper-main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -c -o intel_reg_dumper-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-
-intel_reg_dumper-main.obj: main.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -MT intel_reg_dumper-main.obj -MD -MP -MF $(DEPDIR)/intel_reg_dumper-main.Tpo -c -o intel_reg_dumper-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/intel_reg_dumper-main.Tpo $(DEPDIR)/intel_reg_dumper-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='intel_reg_dumper-main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -c -o intel_reg_dumper-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-
-intel_reg_dumper-xprintf.o: xprintf.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -MT intel_reg_dumper-xprintf.o -MD -MP -MF $(DEPDIR)/intel_reg_dumper-xprintf.Tpo -c -o intel_reg_dumper-xprintf.o `test -f 'xprintf.c' || echo '$(srcdir)/'`xprintf.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/intel_reg_dumper-xprintf.Tpo $(DEPDIR)/intel_reg_dumper-xprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xprintf.c' object='intel_reg_dumper-xprintf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -c -o intel_reg_dumper-xprintf.o `test -f 'xprintf.c' || echo '$(srcdir)/'`xprintf.c
-
-intel_reg_dumper-xprintf.obj: xprintf.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -MT intel_reg_dumper-xprintf.obj -MD -MP -MF $(DEPDIR)/intel_reg_dumper-xprintf.Tpo -c -o intel_reg_dumper-xprintf.obj `if test -f 'xprintf.c'; then $(CYGPATH_W) 'xprintf.c'; else $(CYGPATH_W) '$(srcdir)/xprintf.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/intel_reg_dumper-xprintf.Tpo $(DEPDIR)/intel_reg_dumper-xprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xprintf.c' object='intel_reg_dumper-xprintf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -c -o intel_reg_dumper-xprintf.obj `if test -f 'xprintf.c'; then $(CYGPATH_W) 'xprintf.c'; else $(CYGPATH_W) '$(srcdir)/xprintf.c'; fi`
-
-intel_reg_dumper-i830_debug.o: ../i830_debug.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -MT intel_reg_dumper-i830_debug.o -MD -MP -MF $(DEPDIR)/intel_reg_dumper-i830_debug.Tpo -c -o intel_reg_dumper-i830_debug.o `test -f '../i830_debug.c' || echo '$(srcdir)/'`../i830_debug.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/intel_reg_dumper-i830_debug.Tpo $(DEPDIR)/intel_reg_dumper-i830_debug.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../i830_debug.c' object='intel_reg_dumper-i830_debug.o' libtool=no @AMDEPBACKSLASH@
+i830_debug.o: ../i830_debug.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT i830_debug.o -MD -MP -MF $(DEPDIR)/i830_debug.Tpo -c -o i830_debug.o `test -f '../i830_debug.c' || echo '$(srcdir)/'`../i830_debug.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/i830_debug.Tpo $(DEPDIR)/i830_debug.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../i830_debug.c' object='i830_debug.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -c -o intel_reg_dumper-i830_debug.o `test -f '../i830_debug.c' || echo '$(srcdir)/'`../i830_debug.c
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o i830_debug.o `test -f '../i830_debug.c' || echo '$(srcdir)/'`../i830_debug.c
-intel_reg_dumper-i830_debug.obj: ../i830_debug.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -MT intel_reg_dumper-i830_debug.obj -MD -MP -MF $(DEPDIR)/intel_reg_dumper-i830_debug.Tpo -c -o intel_reg_dumper-i830_debug.obj `if test -f '../i830_debug.c'; then $(CYGPATH_W) '../i830_debug.c'; else $(CYGPATH_W) '$(srcdir)/../i830_debug.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/intel_reg_dumper-i830_debug.Tpo $(DEPDIR)/intel_reg_dumper-i830_debug.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../i830_debug.c' object='intel_reg_dumper-i830_debug.obj' libtool=no @AMDEPBACKSLASH@
+i830_debug.obj: ../i830_debug.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT i830_debug.obj -MD -MP -MF $(DEPDIR)/i830_debug.Tpo -c -o i830_debug.obj `if test -f '../i830_debug.c'; then $(CYGPATH_W) '../i830_debug.c'; else $(CYGPATH_W) '$(srcdir)/../i830_debug.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/i830_debug.Tpo $(DEPDIR)/i830_debug.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../i830_debug.c' object='i830_debug.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(intel_reg_dumper_CFLAGS) $(CFLAGS) -c -o intel_reg_dumper-i830_debug.obj `if test -f '../i830_debug.c'; then $(CYGPATH_W) '../i830_debug.c'; else $(CYGPATH_W) '$(srcdir)/../i830_debug.c'; fi`
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o i830_debug.obj `if test -f '../i830_debug.c'; then $(CYGPATH_W) '../i830_debug.c'; else $(CYGPATH_W) '$(srcdir)/../i830_debug.c'; fi`
mostlyclean-libtool:
-rm -f *.lo
diff --git a/src/sil164/Makefile.in b/src/sil164/Makefile.in
index af0b831..a0edb4c 100644
--- a/src/sil164/Makefile.in
+++ b/src/sil164/Makefile.in
@@ -220,7 +220,9 @@ top_srcdir = @top_srcdir@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ @PCIACCESS_CFLAGS@
+
sil164_la_LTLIBRARIES = sil164.la
sil164_la_LDFLAGS = -module -avoid-version
sil164_ladir = @moduledir@/drivers
diff --git a/src/tfp410/Makefile.in b/src/tfp410/Makefile.in
index 5af6a9c..3bca31e 100644
--- a/src/tfp410/Makefile.in
+++ b/src/tfp410/Makefile.in
@@ -220,7 +220,9 @@ top_srcdir = @top_srcdir@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ @PCIACCESS_CFLAGS@
+
tfp410_la_LTLIBRARIES = tfp410.la
tfp410_la_LDFLAGS = -module -avoid-version
tfp410_ladir = @moduledir@/drivers
diff --git a/src/xvmc/Makefile.in b/src/xvmc/Makefile.in
index eb6135b..b108d56 100644
--- a/src/xvmc/Makefile.in
+++ b/src/xvmc/Makefile.in
@@ -52,12 +52,27 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libI810XvMC_la_DEPENDENCIES =
Reply to: