README | 20 ++++++++++++++++++++
configure.ac | 40 +++++-----------------------------------
man/sunffb.man | 2 +-
src/Makefile.am | 2 +-
src/ffb.h | 5 ++++-
5 files changed, 31 insertions(+), 38 deletions(-)
New commits:
commit 03b1a6d6d92e8f751c93cc7996e26d929d02f3b0
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Sep 7 15:10:03 2009 +1000
sunffb 1.2.1
diff --git a/configure.ac b/configure.ac
index 1b4ec7a..5437811 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sunffb],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunffb)
commit ecf5ecebcfc3ec6490111876895ab3a67197e565
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jul 16 12:44:57 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 10cd570..1b4ec7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1,
[xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/ffb.h b/src/ffb.h
index ea1b7fc..a2c3ada 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -39,11 +39,14 @@
#include "ffb_regs.h"
#include "xf86sbusBus.h"
#include "ffb_dac.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#ifndef DPMS_SERVER
#define DPMS_SERVER
#endif /* DPMS_SERVER */
#include <X11/extensions/dpms.h>
-
+#endif
/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
/* Note: do not mmap FFB_DFB8R_VOFF and following mappings using one mmap
together
commit 4f881efe2ec8ae4def01014f9acf7400e93a807f
Author: Julien Cristau <jcris...@debian.org>
Date: Mon May 4 18:39:10 2009 +0200
Remove DRI remnants from build system
diff --git a/configure.ac b/configure.ac
index 5a10b35..10cd570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,11 +53,6 @@ AC_ARG_WITH(xorg-module-dir,
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
- [Disable DRI support [[default=auto]]]),
- [DRI="$enableval"],
- [DRI=auto])
-
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -72,37 +67,8 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for header files.
AC_HEADER_STDC
-if test "$DRI" != no; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
- [have_sarea_h="yes"], [have_sarea_h="no"])
- AC_CHECK_FILE([${sdkdir}/dristruct.h],
- [have_dristruct_h="yes"], [have_dristruct_h="no"])
-fi
-
-AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI = xauto; then
- if test "$have_dri_h" = yes -a \
- "$have_sarea_h" = yes -a \
- "$have_dristruct_h" = yes; then
- DRI="yes"
- else
- DRI="no"
- fi
-fi
-AC_MSG_RESULT([$DRI])
-
-AM_CONDITIONAL(DRI, test x$DRI = xyes)
-if test "$DRI" = yes; then
- PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
- AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
- AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-fi
-
AM_CONDITIONAL(SPARC, test x$SPARC = xyes)
-AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff --git a/src/Makefile.am b/src/Makefile.am
index 3e10f3a..198aac1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
# -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 = @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@
sunffb_drv_la_LTLIBRARIES = sunffb_drv.la
sunffb_drv_la_LDFLAGS = -module -avoid-version
sunffb_drv_ladir = @moduledir@/drivers
commit 330e87f2a5c26aedc9b8f204a7e713f0a3aa3773
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 30 21:04:20 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..ffc2150
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+ffb - SUNFFB video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-sunffb
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-sunffb
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit 55b1ad67715c9af1a652bc893b072ed0cf8d94c0
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 9 16:35:58 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/sunffb.man b/man/sunffb.man
index 8c55bb6..922722b 100644
--- a/man/sunffb.man
+++ b/man/sunffb.man
@@ -25,6 +25,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for
general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1),
Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1),
X(__miscmansuffix__)
.SH AUTHORS
Authors include: Jakub Jelinek <ja...@redhat.com>, David S. Miller
<da...@redhat.com>, Michal Rehacek <ma...@iname.com>
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
