Makefile.in | 2
aclocal.m4 | 2
avivotool/Makefile.in | 2
avivotool/avivotool.c | 20
config.h.in | 3
configure | 110 +---
configure.ac | 13
debian/changelog | 10
debian/patches/implicit_declarations.diff | 56 --
debian/patches/map_mem_ctrl_mem_return.diff | 6
debian/patches/output_init_return.diff | 12
debian/rules | 16
include/Makefile.in | 2
include/avivo.h | 152 +-----
include/avivo_chipset.h | 54 ++
include/radeon_reg.h | 61 +-
xorg/Makefile.am | 1
xorg/Makefile.in | 10
xorg/avivo.c | 675 +++++-----------------------
xorg/avivo_bios.c | 258 +---------
xorg/avivo_chipset.c | 105 ++++
xorg/avivo_common.c | 2
xorg/avivo_crtc.c | 96 ++-
xorg/avivo_i2c.c | 315 -------------
xorg/avivo_output.c | 77 +++
xorg/avivo_state.c | 55 +-
26 files changed, 709 insertions(+), 1406 deletions(-)
New commits:
commit e440e6bf1f402b65426153b8d449b50c89b4eef7
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Jul 2 01:50:50 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index e018410..f1ab581 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-xserver-xorg-video-avivo (0.0.1+git20070701-1) UNRELEASED; urgency=low
+xserver-xorg-video-avivo (0.0.1+git20070701-1) experimental; urgency=low
* Use a separate build directory.
* New upstream snapshot.
- + most of implicit_declarations.diff is now obsolete.
+ + update implicit_declarations.diff and refresh other patches.
* chmod +x configure in debian/rules clean (closes: #431315); thanks, Frank
Lichtenheld!
- -- Julien Cristau <[EMAIL PROTECTED]> Sun, 01 Jul 2007 18:36:40 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 02 Jul 2007 01:49:53 +0200
xserver-xorg-video-avivo (0.0.1+git20070614-1) experimental; urgency=low
commit 3a9231c826b29a189802c216441b94519a3f92a4
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Jul 2 01:44:12 2007 +0200
Update implicit_declarations.diff with new missing includes and
declarations.
diff --git a/debian/patches/implicit_declarations.diff
b/debian/patches/implicit_declarations.diff
index 9a940e4..37e95e5 100644
--- a/debian/patches/implicit_declarations.diff
+++ b/debian/patches/implicit_declarations.diff
@@ -1,19 +1,25 @@
Index: xserver-xorg-video-avivo/include/avivo.h
===================================================================
---- xserver-xorg-video-avivo.orig/include/avivo.h 2007-07-01
18:23:40.000000000 +0200
-+++ xserver-xorg-video-avivo/include/avivo.h 2007-07-01 18:27:00.000000000
+0200
-@@ -243,4 +243,7 @@
+--- xserver-xorg-video-avivo.orig/include/avivo.h 2007-07-02
01:46:10.000000000 +0200
++++ xserver-xorg-video-avivo/include/avivo.h 2007-07-02 01:47:47.000000000
+0200
+@@ -243,4 +243,13 @@
*/
void avivo_cursor_init(ScreenPtr screen);
+
+void avivo_wait_idle(struct avivo_info *avivo);
+
++Bool avivo_output_setup(ScrnInfoPtr screen_info);
++
++Bool avivo_output_exist(ScrnInfoPtr screen_info, xf86ConnectorType type,
++ int number, unsigned long ddc_reg);
++
++
#endif /* _AVIVO_H_ */
Index: xserver-xorg-video-avivo/avivotool/xf86i2c.c
===================================================================
---- xserver-xorg-video-avivo.orig/avivotool/xf86i2c.c 2007-07-01
18:23:40.000000000 +0200
-+++ xserver-xorg-video-avivo/avivotool/xf86i2c.c 2007-07-01
18:27:00.000000000 +0200
+--- xserver-xorg-video-avivo.orig/avivotool/xf86i2c.c 2007-07-02
01:46:10.000000000 +0200
++++ xserver-xorg-video-avivo/avivotool/xf86i2c.c 2007-07-02
01:46:21.000000000 +0200
@@ -10,6 +10,7 @@
#include <string.h>
#include <stdio.h>
@@ -22,3 +28,16 @@ Index: xserver-xorg-video-avivo/avivotool/xf86i2c.c
#include "xf86i2c.h"
#define I2C_TIMEOUT(x) /*(x)*/ /* Report timeouts */
+Index: xserver-xorg-video-avivo/xorg/avivo.c
+===================================================================
+--- xserver-xorg-video-avivo.orig/xorg/avivo.c 2007-07-02 01:46:10.000000000
+0200
++++ xserver-xorg-video-avivo/xorg/avivo.c 2007-07-02 01:46:21.000000000
+0200
+@@ -39,6 +39,8 @@
+ #include "cursorstr.h"
+ #include "xf86Cursor.h"
+ #include "xf86str.h"
++#include "xf86RandR12.h"
++#include "xf86fbman.h"
+
+ #ifdef WITH_VGAHW
+ #include "vgaHW.h"
commit ab67178382a3fc358c3a610636ba2c12710a5ec0
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Jul 1 18:38:10 2007 +0200
chmod +x configure in debian/rules clean (closes: #431315).
diff --git a/debian/changelog b/debian/changelog
index 83e690d..e018410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ xserver-xorg-video-avivo (0.0.1+git20070701-1) UNRELEASED;
urgency=low
* Use a separate build directory.
* New upstream snapshot.
+ most of implicit_declarations.diff is now obsolete.
+ * chmod +x configure in debian/rules clean (closes: #431315); thanks, Frank
+ Lichtenheld!
- -- Julien Cristau <[EMAIL PROTECTED]> Sun, 01 Jul 2007 18:30:42 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 01 Jul 2007 18:36:40 +0200
xserver-xorg-video-avivo (0.0.1+git20070614-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index b94d315..598bd9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,9 @@ clean: xsfclean
# Add here commands to clean up after the build process.
rm -f config.sub config.guess
rm -rf obj-$(DEB_BUILD_GNU_TYPE)
+ # when we use git snapshots configure is in the diff.gz, thus not
+ # executable
+ chmod +x configure
dh_clean
commit 8c90f6ef104b2e17057c6e96dc9cd1c750fa80be
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Jul 1 18:34:41 2007 +0200
New upstream snapshot.
+ autoreconf
+ update/refresh patches
diff --git a/Makefile.in b/Makefile.in
index 8220efd..46949bd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,9 +158,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
-PCIACCESS_FALSE = @PCIACCESS_FALSE@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
-PCIACCESS_TRUE = @PCIACCESS_TRUE@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
diff --git a/aclocal.m4 b/aclocal.m4
index aaae5ad..f8a69fa 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6528,7 +6528,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/avivotool/Makefile.in b/avivotool/Makefile.in
index dea96cb..c8226ce 100644
--- a/avivotool/Makefile.in
+++ b/avivotool/Makefile.in
@@ -136,9 +136,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
-PCIACCESS_FALSE = @PCIACCESS_FALSE@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
-PCIACCESS_TRUE = @PCIACCESS_TRUE@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
diff --git a/config.h.in b/config.h.in
index 72ca535..a6aea89 100644
--- a/config.h.in
+++ b/config.h.in
@@ -59,9 +59,6 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
-/* Use libpciaccess */
-#undef PCIACCESS
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff --git a/configure b/configure
index 6e11395..6a14fe7 100755
--- a/configure
+++ b/configure
@@ -876,8 +876,6 @@ moduledir
PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
-PCIACCESS_TRUE
-PCIACCESS_FALSE
PCIACCESS_CFLAGS
PCIACCESS_LIBS
INCLUDES
@@ -4356,7 +4354,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4359 "configure"' > conftest.$ac_ext
+ echo '#line 4357 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7088,11 +7086,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:7091: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7089: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7095: \$? = $ac_status" >&5
+ echo "$as_me:7093: \$? = $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.
@@ -7356,11 +7354,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:7359: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7357: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7363: \$? = $ac_status" >&5
+ echo "$as_me:7361: \$? = $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.
@@ -7460,11 +7458,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:7463: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7461: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7467: \$? = $ac_status" >&5
+ echo "$as_me:7465: \$? = $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
@@ -9757,7 +9755,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9760 "configure"
+#line 9758 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9857,7 +9855,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9860 "configure"
+#line 9858 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12193,11 +12191,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:12196: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12194: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12200: \$? = $ac_status" >&5
+ echo "$as_me:12198: \$? = $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.
@@ -12297,11 +12295,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:12300: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12298: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12304: \$? = $ac_status" >&5
+ echo "$as_me:12302: \$? = $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
@@ -13858,11 +13856,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:13861: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13859: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13865: \$? = $ac_status" >&5
+ echo "$as_me:13863: \$? = $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.
@@ -13962,11 +13960,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:13965: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13963: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13969: \$? = $ac_status" >&5
+ echo "$as_me:13967: \$? = $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
@@ -16149,11 +16147,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:16152: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16150: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16156: \$? = $ac_status" >&5
+ echo "$as_me:16154: \$? = $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.
@@ -16417,11 +16415,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:16420: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16418: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16424: \$? = $ac_status" >&5
+ echo "$as_me:16422: \$? = $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.
@@ -16521,11 +16519,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:16524: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16522: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16528: \$? = $ac_status" >&5
+ echo "$as_me:16526: \$? = $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
@@ -20169,12 +20167,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 >= 1.0.99.901 xproto \$REQUIRED_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto
$REQUIRED_MODULES") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"xorg-server >= 1.2.99.901 xproto \$REQUIRED_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2.99.901 xproto
$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 >= 1.0.99.901 xproto
$REQUIRED_MODULES" 2>/dev/null`
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.2.99.901 xproto
$REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20187,12 +20185,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 >= 1.0.99.901 xproto \$REQUIRED_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto
$REQUIRED_MODULES") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"xorg-server >= 1.2.99.901 xproto \$REQUIRED_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2.99.901 xproto
$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 >= 1.0.99.901 xproto
$REQUIRED_MODULES" 2>/dev/null`
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.2.99.901 xproto
$REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20211,14 +20209,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 >= 1.0.99.901 xproto $REQUIRED_MODULES"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "xorg-server >= 1.2.99.901 xproto $REQUIRED_MODULES"`
else
- XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"xorg-server >= 1.2.99.901 xproto $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 >=
1.0.99.901 xproto $REQUIRED_MODULES) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (xorg-server >=
1.2.99.901 xproto $REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@@ -20229,7 +20227,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 >= 1.0.99.901 xproto
$REQUIRED_MODULES) were not met:
+echo "$as_me: error: Package requirements (xorg-server >= 1.2.99.901 xproto
$REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@@ -20250,7 +20248,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.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old.
Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -20260,7 +20258,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.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -20272,23 +20270,6 @@ echo "${ECHO_T}yes" >&6; }
fi
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
-
-if test "x$PCIACCESS" = xyes; then
- PCIACCESS_TRUE=
- PCIACCESS_FALSE='#'
-else
- PCIACCESS_TRUE='#'
- PCIACCESS_FALSE=
-fi
-
-if test "x$PCIACCESS" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define PCIACCESS 1
-_ACEOF
-
-
pkg_failed=no
{ echo "$as_me:$LINENO: checking for PCIACCESS" >&5
echo $ECHO_N "checking for PCIACCESS... $ECHO_C" >&6; }
@@ -20379,7 +20360,7 @@ Alternatively, you may set the environment variables
PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old.
Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -20389,7 +20370,7 @@ Alternatively, you may set the environment variables
PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -20399,8 +20380,6 @@ else
echo "${ECHO_T}yes" >&6; }
:
fi
- XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
-fi
CFLAGS="$CFLAGS $XORG_CFLAGS "
INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/include'
@@ -20498,7 +20477,7 @@ Alternatively, you may set the environment variables
PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old.
Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -20508,7 +20487,7 @@ Alternatively, you may set the environment variables
PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -20946,13 +20925,6 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was
never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${PCIACCESS_TRUE}" && test -z "${PCIACCESS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"PCIACCESS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"PCIACCESS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -21635,8 +21607,6 @@ moduledir!$moduledir$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
XORG_CFLAGS!$XORG_CFLAGS$ac_delim
XORG_LIBS!$XORG_LIBS$ac_delim
-PCIACCESS_TRUE!$PCIACCESS_TRUE$ac_delim
-PCIACCESS_FALSE!$PCIACCESS_FALSE$ac_delim
PCIACCESS_CFLAGS!$PCIACCESS_CFLAGS$ac_delim
PCIACCESS_LIBS!$PCIACCESS_LIBS$ac_delim
INCLUDES!$INCLUDES$ac_delim
@@ -21657,7 +21627,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` = 30; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; 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 3e11504..83e690d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xserver-xorg-video-avivo (0.0.1+git20070614-2) UNRELEASED; urgency=low
+xserver-xorg-video-avivo (0.0.1+git20070701-1) UNRELEASED; urgency=low
* Use a separate build directory.
+ * New upstream snapshot.
+ + most of implicit_declarations.diff is now obsolete.
- -- Julien Cristau <[EMAIL PROTECTED]> Fri, 15 Jun 2007 17:48:34 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 01 Jul 2007 18:30:42 +0200
xserver-xorg-video-avivo (0.0.1+git20070614-1) experimental; urgency=low
diff --git a/debian/patches/implicit_declarations.diff
b/debian/patches/implicit_declarations.diff
index be2dabf..9a940e4 100644
--- a/debian/patches/implicit_declarations.diff
+++ b/debian/patches/implicit_declarations.diff
@@ -1,52 +1,19 @@
Index: xserver-xorg-video-avivo/include/avivo.h
===================================================================
---- xserver-xorg-video-avivo.orig/include/avivo.h 2007-06-18
17:23:07.000000000 +0100
-+++ xserver-xorg-video-avivo/include/avivo.h 2007-06-18 17:23:18.000000000
+0100
-@@ -336,4 +336,15 @@
+--- xserver-xorg-video-avivo.orig/include/avivo.h 2007-07-01
18:23:40.000000000 +0200
++++ xserver-xorg-video-avivo/include/avivo.h 2007-07-01 18:27:00.000000000
+0200
+@@ -243,4 +243,7 @@
*/
void avivo_cursor_init(ScreenPtr screen);
+
+void avivo_wait_idle(struct avivo_info *avivo);
+
-+void avivo_probe_monitor(ScrnInfoPtr screen_info);
-+
-+void avivo_restore_cursor(ScrnInfoPtr screen_info);
-+
-+void avivo_save_cursor(ScrnInfoPtr screen_info);
-+
-+void avivo_setup_cursor(struct avivo_info *avivo, int id, int enable);
-+
#endif /* _AVIVO_H_ */
-Index: xserver-xorg-video-avivo/xorg/avivo_i2c.c
-===================================================================
---- xserver-xorg-video-avivo.orig/xorg/avivo_i2c.c 2007-06-18
17:22:48.000000000 +0100
-+++ xserver-xorg-video-avivo/xorg/avivo_i2c.c 2007-06-18 17:23:18.000000000
+0100
-@@ -28,6 +28,7 @@
- #include "avivo.h"
- #include "radeon_reg.h"
- #include <stdint.h>
-+#include <unistd.h>
-
- void
- avivo_wait_idle(struct avivo_info *avivo)
-Index: xserver-xorg-video-avivo/xorg/avivo_state.c
-===================================================================
---- xserver-xorg-video-avivo.orig/xorg/avivo_state.c 2007-06-18
17:23:07.000000000 +0100
-+++ xserver-xorg-video-avivo/xorg/avivo_state.c 2007-06-18
17:23:18.000000000 +0100
-@@ -44,7 +44,7 @@
- state->cursor1_position = INREG(AVIVO_CURSOR1_POSITION);
- }
-
--static void
-+void
- avivo_restore_cursor(ScrnInfoPtr screen_info)
- {
- struct avivo_info *avivo = avivo_get_info(screen_info);
Index: xserver-xorg-video-avivo/avivotool/xf86i2c.c
===================================================================
---- xserver-xorg-video-avivo.orig/avivotool/xf86i2c.c 2007-06-18
17:22:48.000000000 +0100
-+++ xserver-xorg-video-avivo/avivotool/xf86i2c.c 2007-06-18
17:23:18.000000000 +0100
+--- xserver-xorg-video-avivo.orig/avivotool/xf86i2c.c 2007-07-01
18:23:40.000000000 +0200
++++ xserver-xorg-video-avivo/avivotool/xf86i2c.c 2007-07-01
18:27:00.000000000 +0200
@@ -10,6 +10,7 @@
#include <string.h>
#include <stdio.h>
diff --git a/debian/patches/map_mem_ctrl_mem_return.diff
b/debian/patches/map_mem_ctrl_mem_return.diff
index 3966902..db5f179 100644
--- a/debian/patches/map_mem_ctrl_mem_return.diff
+++ b/debian/patches/map_mem_ctrl_mem_return.diff
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-avivo/xorg/avivo.c
===================================================================
---- xserver-xorg-video-avivo.orig/xorg/avivo.c 2007-06-15 01:09:13.000000000
+0200
-+++ xserver-xorg-video-avivo/xorg/avivo.c 2007-06-15 01:09:24.000000000
+0200
-@@ -193,6 +193,7 @@
+--- xserver-xorg-video-avivo.orig/xorg/avivo.c 2007-07-01 18:28:12.000000000
+0200
++++ xserver-xorg-video-avivo/xorg/avivo.c 2007-07-01 18:28:25.000000000
+0200
+@@ -152,6 +152,7 @@
"Couldn't map control memory at %p", avivo->ctrl_addr);
return 0;
}
diff --git a/debian/patches/output_init_return.diff
b/debian/patches/output_init_return.diff
index 28bbb7b..608ec38 100644
--- a/debian/patches/output_init_return.diff
+++ b/debian/patches/output_init_return.diff
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-avivo/xorg/avivo_output.c
===================================================================
---- xserver-xorg-video-avivo.orig/xorg/avivo_output.c 2007-06-18
17:23:07.000000000 +0100
-+++ xserver-xorg-video-avivo/xorg/avivo_output.c 2007-06-18
17:27:11.000000000 +0100
-@@ -285,7 +285,7 @@
+--- xserver-xorg-video-avivo.orig/xorg/avivo_output.c 2007-07-01
18:28:13.000000000 +0200
++++ xserver-xorg-video-avivo/xorg/avivo_output.c 2007-07-01
18:28:16.000000000 +0200
+@@ -325,7 +325,7 @@
xf86DrvMsg(screen_info->scrnIndex, X_ERROR,
"Couldn't initialise I2C bus for %s connector %d\n",
xf86ConnectorGetName(type), number);
@@ -11,7 +11,7 @@ Index: xserver-xorg-video-avivo/xorg/avivo_output.c
}
avivo_output->type = type;
avivo_output->number = number;
-@@ -319,4 +319,5 @@
+@@ -362,4 +362,5 @@
xf86DrvMsg(screen_info->scrnIndex, X_INFO,
"added %s connector %d (0x%04X)\n",
xf86ConnectorGetName(type), number, ddc_reg);
diff --git a/include/Makefile.in b/include/Makefile.in
index 4c44a35..711d1af 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -114,9 +114,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
-PCIACCESS_FALSE = @PCIACCESS_FALSE@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
-PCIACCESS_TRUE = @PCIACCESS_TRUE@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
diff --git a/xorg/Makefile.in b/xorg/Makefile.in
index 9dbd5de..4b709d2 100644
--- a/xorg/Makefile.in
+++ b/xorg/Makefile.in
@@ -75,9 +75,9 @@ am__installdirs = "$(DESTDIR)$(avivo_drv_ladir)"
avivo_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(avivo_drv_la_LTLIBRARIES)
avivo_drv_la_LIBADD =
-am_avivo_drv_la_OBJECTS = avivo_common.lo avivo_state.lo avivo_bios.lo \
- avivo_cursor.lo avivo_crtc.lo avivo_output.lo avivo_i2c.lo \
- avivo.lo
+am_avivo_drv_la_OBJECTS = avivo_chipset.lo avivo_common.lo \
+ avivo_state.lo avivo_bios.lo avivo_cursor.lo avivo_crtc.lo \
+ avivo_output.lo avivo_i2c.lo avivo.lo
avivo_drv_la_OBJECTS = $(am_avivo_drv_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -162,9 +162,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
-PCIACCESS_FALSE = @PCIACCESS_FALSE@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
-PCIACCESS_TRUE = @PCIACCESS_TRUE@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
@@ -231,6 +229,7 @@ avivo_drv_la_LTLIBRARIES = avivo_drv.la
avivo_drv_la_LDFLAGS = -module -avoid-version
avivo_drv_ladir = @moduledir@/drivers
avivo_drv_la_SOURCES = \
+ avivo_chipset.c \
avivo_common.c \
avivo_state.c \
avivo_bios.c \
@@ -311,6 +310,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
commit c3d60875cd750d54f74b0cf7e06e551e01a723bd
Author: Jerome Glisse <[EMAIL PROTECTED]>
Date: Thu Jun 28 01:16:51 2007 +0200
avivo: fix typo
diff --git a/xorg/avivo_crtc.c b/xorg/avivo_crtc.c
index 1ffd6fc..724f0aa 100644
--- a/xorg/avivo_crtc.c
+++ b/xorg/avivo_crtc.c
@@ -242,7 +242,7 @@ avivo_crtc_mode_set(xf86CrtcPtr crtc,
adjusted_mode->CrtcHSyncEnd, adjusted_mode->CrtcHSkew,
avivo_crtc->h_sync_pol);
xf86DrvMsg(crtc->scrn->scrnIndex, X_INFO,
- "crtc(%d) vdisp %d, vtotal %d, vss %d, vse %d, vsc %di, vsp
%d\n",
+ "crtc(%d) vdisp %d, vtotal %d, vss %d, vse %d, vsc %d, vsp
%d\n",
avivo_crtc->crtc_number, adjusted_mode->CrtcVDisplay,
adjusted_mode->CrtcVTotal, adjusted_mode->CrtcVSyncStart,
adjusted_mode->CrtcVSyncEnd, adjusted_mode->VScan,
commit 4bae344da3ebdc1952962ecacd5a80a7dde1dd0b
Author: Jerome Glisse <[EMAIL PROTECTED]>
Date: Thu Jun 28 01:12:23 2007 +0200
avivo: change pll computation to meet new constraint.
It seems that AVIVO_PLL_POST_DIVIDER * AVIVO_PLL_DIVIDER needs
to be above 40 for PLL stability, changed PLL computation to
meet this. This seems to improve image stability and should fix
couple of bad behavior.
diff --git a/include/radeon_reg.h b/include/radeon_reg.h
index cf46a55..3b4ee8c 100644
--- a/include/radeon_reg.h
+++ b/include/radeon_reg.h
@@ -3192,17 +3192,9 @@
* (vclk is video mode clock)
* vclk = (1080 * AVIVO_PLL_POST_MUL) /
* (AVIVO_PLL_DIVIDER * AVIVO_PLL_POST_DIV * 40)
- *
- * So computation for register:
- * PLL_DIVIDER = 1080 / (vclk)
- * PLL_POST_DIV = 2
- * PLL_POST_MUL = (40 * vclk * PLL_DIVIDER * PLL_POST_DIV) / (1080)
- * AVIVO_PLL_POST_MUL must be inferior to 255
- * Then you repeat this until you come to the nearest value:
- * increment PLL_POST_MUL recompute PLL_POST_DIV
- * if new video mode clock value is better keep on otherwise last
- * previously found value should be the better.
- * Refclk appears to be 108MHz 1080000 / mode clock = this.
+ * It seems that AVIVO_PLL_DIVIDER * AVIVO_PLL_POST_DIV needs to be
+ * above 40 and that AVIVO_DIVIDER should be greater than AVIVO_PLL_POST_DIV
+ * Try to keep this constraint while computing PLL values.
*/
#define AVIVO_PLL1_POST_DIV_CNTL 0x0400
# define AVIVO_PLL_POST_DIV_EN (1 << 0)
diff --git a/xorg/avivo_crtc.c b/xorg/avivo_crtc.c
index a717cab..1ffd6fc 100644
--- a/xorg/avivo_crtc.c
+++ b/xorg/avivo_crtc.c
@@ -121,25 +121,37 @@ avivo_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode)
struct avivo_info *avivo = avivo_get_info(crtc->scrn);
int adjusted_clock;
int div, pdiv, pmul;
- int n_pdiv, n_pmul;
+ int n_pdiv, n_pmul, n_div;
int clock;
int diff, n_diff;
- /* compute pll to be 0.1% above of mode clock */
adjusted_clock = mode->Clock;
- div = 1080000 / adjusted_clock;
- pdiv = 2;
- pmul = floor(((40.0 * adjusted_clock * pdiv * div) / 1080000.0) + 0.5);
+ div = 8;
+ pdiv = 6;
+ pmul = floor(((40.0 * adjusted_clock * pdiv * div)
+ / 1080000.0) + 0.5);
clock = (pmul * 1080000) / (40 * pdiv * div);
diff = clock - adjusted_clock;
while (1) {
- n_pdiv = pdiv + 1;
- n_pmul = floor(((40.0 * adjusted_clock * n_pdiv * div) / 1080000.0)
+ if (pmul > 255) {
+ if (pdiv > 2) {
+ n_pdiv = pdiv - 1;
+ n_div = div;
+ } else {
+ n_pdiv = pdiv;
+ n_div = div - 1;
+ }
+ } else {
+ n_pdiv = pdiv;
+ n_div = div + 1;
+ }
+ n_pmul = floor(((40.0 * adjusted_clock * n_pdiv * n_div) / 1080000.0)
+ 0.5);
- clock = (n_pmul * 1080000) / (40 * n_pdiv * div);
+ clock = (n_pmul * 1080000) / (40 * n_pdiv * n_div);
n_diff = clock - adjusted_clock;
- if ((diff >= 0 && fabsl(n_diff) >= diff) || n_pmul >= 255)
+ if (diff >= 0 && fabsl(n_diff) >= diff && pmul <= 255)
break;
+ div = n_div;
pdiv = n_pdiv;
pmul = n_pmul;
diff = n_diff;
commit 14e502a548b5cb3b9bc8a0ba47317cd673806364
Author: Jerome Glisse <[EMAIL PROTECTED]>
Date: Wed Jun 27 18:05:07 2007 +0200
avivo: improve connector/output creation from bios.
Now LFP represent TMDS2 if it exist as LFP as to be
driven by TMDS2 so we cannot create a separate output
for TMDS2.
diff --git a/xorg/avivo_bios.c b/xorg/avivo_bios.c
index 366ac83..31c0e6a 100644
--- a/xorg/avivo_bios.c
+++ b/xorg/avivo_bios.c
@@ -178,10 +178,12 @@ avivo_output_setup(ScrnInfoPtr screen_info)
}
switch (type) {
- case XF86ConnectorVGA:
case XF86ConnectorLFP:
+ number = 1;
+ case XF86ConnectorVGA:
case XF86ConnectorDVI_I:
- avivo_output_init(screen_info, type, number, ddc_reg);
+ if (!avivo_output_exist(screen_info, type, number, ddc_reg))
+ avivo_output_init(screen_info, type, number, ddc_reg);
break;
}
}
diff --git a/xorg/avivo_output.c b/xorg/avivo_output.c
index 0628e26..0c73a81 100644
--- a/xorg/avivo_output.c
+++ b/xorg/avivo_output.c
@@ -262,6 +262,29 @@ static const xf86OutputFuncsRec avivo_output_funcs = {
};
Bool
+avivo_output_exist(ScrnInfoPtr screen_info, xf86ConnectorType type,
+ int number, unsigned long ddc_reg)
+{
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(screen_info);
+ int i;
+
+ for (i = 0; i < config->num_output; i++) {
+ xf86OutputPtr output = config->output[i];
+ struct avivo_output_private *avivo_output = output->driver_private;
+ if (avivo_output->number == number && avivo_output->type == type)
+ return TRUE;
+ /* TMDS2 is shared by LFP & DVI-I */
+ if (avivo_output->type == XF86ConnectorLFP && number == 1)
+ return TRUE;
+ if (type == XF86ConnectorLFP && avivo_output->number == 1) {
+ avivo_output->i2c->DriverPrivate.uval = ddc_reg;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+Bool
avivo_output_init(ScrnInfoPtr screen_info, xf86ConnectorType type,
int number, unsigned long ddc_reg)
{
commit 0955007e2826d97e971d3a37373a1bcbc242541d
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jun 27 16:22:48 2007 +0100
Update from upstream git; use a separate build dir.
diff --git a/debian/changelog b/debian/changelog
index 164efde..3e11504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-avivo (0.0.1+git20070614-2) UNRELEASED; urgency=low
+
+ * Use a separate build directory.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 15 Jun 2007 17:48:34 +0200
+
xserver-xorg-video-avivo (0.0.1+git20070614-1) experimental; urgency=low
* First upload to Debian (closes: #428777).
diff --git a/debian/patches/implicit_declarations.diff
b/debian/patches/implicit_declarations.diff
index 6262fbd..be2dabf 100644
--- a/debian/patches/implicit_declarations.diff
+++ b/debian/patches/implicit_declarations.diff
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-avivo/include/avivo.h
===================================================================
---- xserver-xorg-video-avivo.orig/include/avivo.h 2007-06-15
01:27:34.000000000 +0200
-+++ xserver-xorg-video-avivo/include/avivo.h 2007-06-15 01:27:56.000000000
+0200
-@@ -331,4 +331,15 @@
+--- xserver-xorg-video-avivo.orig/include/avivo.h 2007-06-18
17:23:07.000000000 +0100
++++ xserver-xorg-video-avivo/include/avivo.h 2007-06-18 17:23:18.000000000
+0100
+@@ -336,4 +336,15 @@
*/
void avivo_cursor_init(ScreenPtr screen);
@@ -20,8 +20,8 @@ Index: xserver-xorg-video-avivo/include/avivo.h
#endif /* _AVIVO_H_ */
Index: xserver-xorg-video-avivo/xorg/avivo_i2c.c
===================================================================
---- xserver-xorg-video-avivo.orig/xorg/avivo_i2c.c 2007-06-15
01:27:34.000000000 +0200
-+++ xserver-xorg-video-avivo/xorg/avivo_i2c.c 2007-06-15 01:27:56.000000000
+0200
+--- xserver-xorg-video-avivo.orig/xorg/avivo_i2c.c 2007-06-18
17:22:48.000000000 +0100
++++ xserver-xorg-video-avivo/xorg/avivo_i2c.c 2007-06-18 17:23:18.000000000
+0100
@@ -28,6 +28,7 @@
#include "avivo.h"
#include "radeon_reg.h"
@@ -32,8 +32,8 @@ Index: xserver-xorg-video-avivo/xorg/avivo_i2c.c
avivo_wait_idle(struct avivo_info *avivo)
Index: xserver-xorg-video-avivo/xorg/avivo_state.c
===================================================================
---- xserver-xorg-video-avivo.orig/xorg/avivo_state.c 2007-06-15
01:27:34.000000000 +0200
-+++ xserver-xorg-video-avivo/xorg/avivo_state.c 2007-06-15
01:27:56.000000000 +0200
+--- xserver-xorg-video-avivo.orig/xorg/avivo_state.c 2007-06-18
17:23:07.000000000 +0100
++++ xserver-xorg-video-avivo/xorg/avivo_state.c 2007-06-18
17:23:18.000000000 +0100
@@ -44,7 +44,7 @@
state->cursor1_position = INREG(AVIVO_CURSOR1_POSITION);
}
@@ -45,8 +45,8 @@ Index: xserver-xorg-video-avivo/xorg/avivo_state.c
struct avivo_info *avivo = avivo_get_info(screen_info);
Index: xserver-xorg-video-avivo/avivotool/xf86i2c.c
===================================================================
---- xserver-xorg-video-avivo.orig/avivotool/xf86i2c.c 2007-06-15
01:28:05.000000000 +0200
-+++ xserver-xorg-video-avivo/avivotool/xf86i2c.c 2007-06-15
01:28:17.000000000 +0200
+--- xserver-xorg-video-avivo.orig/avivotool/xf86i2c.c 2007-06-18
17:22:48.000000000 +0100
++++ xserver-xorg-video-avivo/avivotool/xf86i2c.c 2007-06-18
17:23:18.000000000 +0100
@@ -10,6 +10,7 @@
#include <string.h>
#include <stdio.h>
diff --git a/debian/patches/output_init_return.diff
b/debian/patches/output_init_return.diff
index a8da853..28bbb7b 100644
--- a/debian/patches/output_init_return.diff
+++ b/debian/patches/output_init_return.diff
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-avivo/xorg/avivo_output.c
===================================================================
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
