.gitignore | 70 +++++++++++++-
COPYING | 26 +++--
ChangeLog | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 12 ++
configure.ac | 63 ++++++++-----
debian/changelog | 7 +
debian/rules | 3
man/.cvsignore | 2
man/Makefile.am | 59 ++++--------
man/sunffb.man | 1
src/.cvsignore | 6 -
src/Makefile.am | 1
src/VISmoveImage.s | 3
src/compat-api.h | 99 ++++++++++++++++++++
src/ffb.h | 6 +
src/ffb_accel.c | 25 +++--
src/ffb_asm.s | 7 +
src/ffb_attr.c | 1
src/ffb_cursor.c | 3
src/ffb_dac.c | 1
src/ffb_dac.h | 1
src/ffb_ddc.c | 1
src/ffb_dga.c | 11 +-
src/ffb_driver.c | 69 +++++++-------
src/ffb_fifo.h | 1
src/ffb_loops.h | 1
src/ffb_rcache.h | 1
src/ffb_regs.h | 1
src/ffb_wid.c | 1
29 files changed, 594 insertions(+), 143 deletions(-)
New commits:
commit 4e0248bf4e72b70b90da47e7ad94a201cd351647
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Sep 29 14:13:31 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index a58964e..3c8ee61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-sunffb (1:1.2.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-sunffb (1:1.2.2-1) unstable; urgency=low
* New upstream release.
* Disable silent build rules.
- -- Julien Cristau <jcris...@debian.org> Sun, 29 Sep 2013 14:07:30 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 29 Sep 2013 14:13:03 +0200
xserver-xorg-video-sunffb (1:1.2.1-4) unstable; urgency=low
commit f5876de6582d8d9393331dff58b0630bf1e17edf
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Sep 29 14:09:08 2013 +0200
Disable silent build rules.
diff --git a/debian/changelog b/debian/changelog
index 88226d3..a58964e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-sunffb (1:1.2.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Disable silent build rules.
-- Julien Cristau <jcris...@debian.org> Sun, 29 Sep 2013 14:07:30 +0200
diff --git a/debian/rules b/debian/rules
index 3d192dc..496a59a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-silent-rules
+
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit 347eb682cddf7784ade8bd0bd04a3c8e257b1b5d
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Sep 29 14:07:47 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..b2b8025
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,707 @@
+commit 181b60190c1f81fc9b9b5deb07d536b78f2536ab
+Author: Matthieu Herrb <matthieu.he...@laas.fr>
+Date: Mon Jun 10 21:51:08 2013 +0200
+
+ Unbreak when XAA is not present.
+
+ Turn accel off if loading XAA fails.
+
+ Signed-off-by: Matthieu Herrb <matthieu.he...@laas.fr>
+ Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
+
+commit 46e71051e0eb879a3d08ceb5675afbfdbff1f57b
+Author: Matt Turner <matts...@gmail.com>
+Date: Mon Jan 21 22:47:57 2013 -0800
+
+ xf86-video-sunffb 1.2.2
+
+commit 17f43d1d727081f022872a6df88ceebc5a4c3628
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Sep 25 08:54:56 2012 -0400
+
+ Remove mibstore.h
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 079960018061e5ae261ee7f627c6afb859177ef4
+Author: Dave Airlie <airl...@gmail.com>
+Date: Mon Jul 16 19:12:32 2012 +1000
+
+ sunffb: fix XAA-less build.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 5954960d4bbaee9ee4d2d3a4d1ca9a93d02f6697
+Author: Dave Airlie <airl...@redhat.com>
+Date: Thu Jun 7 18:41:23 2012 +0100
+
+ sunffb: port to new compat API.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 20e5b57ca3186dd58f88bc663e410aeea638100f
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat Oct 29 19:56:26 2011 -0700
+
+ Add missing prototypes to silence warnings
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit d76eda9d1c6456ece6b5e2a6b8a772293e10beb6
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat Oct 29 19:52:52 2011 -0700
+
+ Use malloc/calloc/realloc/free directly
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 205ed4acdfc9e73821b83244cb27f808bbab9933
+Author: Jesse Adkins <jesserayadk...@gmail.com>
+Date: Tue Sep 28 13:29:51 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadk...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 0fceb69e06e143e6a0c4ced64c1237ec420c85b8
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit fcc30b64c0d5512ab8acd4248da5aaaa12e10b80
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 16:07:00 2010 -0400
+
+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 3c193eae6b172540eb1127f3f78619e562b8f18d
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 14:37:41 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 482076d49e7e6077c8d8bf68bbf7814b79b4b5ff
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 46c139525092a5d0565a8d0efd53605c216f1f93
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit e4720abcbd0965eeb58bdd1eee66506c8b46110a
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 21:44:58 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit ad2fcf65a4b26d4313ad3ff164f8a6f103bf2fe2
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 20:24:42 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 6b4530c9a82f2a499e961d3eaa370b6b918ae2d4
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 19:41:31 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit cec4e973f7b494f246aaae6f6680710efcec414d
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 18:45:19 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit a7761b1173073145f76eb5b8beb7ebf22affe4cc
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 16:15:30 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+commit b66ebd55e7464563a6ff41c847cf8d339c9c90c5
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sun Jun 13 11:17:54 2010 -0400
+
+ COPYING: replace stub file with actual Copyright notices.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit de8b9a67020f0e12b55a7de017398d050600ca41
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jan 15 15:07:08 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+
+commit 41591e982529a47cce8cbb8705a360c95cf76914
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Dec 15 22:01:02 2009 -0500
+
+ configure.ac: remove unused sdkdir=$(pkg-config...) statement
+
+ The sdkdir variable isn't use, so remove the statement.
+
+ Acked-by: Dan Nicholson <dbn.li...@gmail.com>
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 5b29cc8ca27522d25dcfb9216824ecdbd5870601
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Mon Nov 23 09:25:06 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 049a5b39f0c22e56e405b7fd57633aede75b9634
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Oct 28 14:41:41 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
+
+commit 0a68d33d6fdc8119869bae778cdb9fae196ed652
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit b65c79395c4e7d54c55894e4c2dfd47b0df9c785
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Mon Oct 26 12:54:22 2009 -0400
+
+ Several driver modules do not have a ChangeLog target in Makefile.am #23814
+
+ The git generated ChangeLog replaces the hand written one.
+ Update configure.ac to xorg-macros level 1.3.
+ Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+ Update Makefile.am to add ChangeLog target if missing
+ Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+ This is a pre-req for the INSTALL_CMD
+
+commit d7849069734c731951e2708dc552e7fb55293dd5
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Thu Oct 22 12:34:18 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit a0bbebcbd8cb77580327829e9bfc7bb1edaa851e
+Author: Denis Gilmore <den...@ausil.us>
+Date: Tue Sep 8 15:35:37 2009 +1000
+
+ sunffb: define %g2 and %g3 registers when building 64 bit version of the
sunffb driver
+
+commit 2e5762537082ee14425e16db53a5f9e5c5f81f70
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Mon Sep 7 11:12:13 2009 -0400
+
+ xf86-video-sunffb: Remove unused .cvsignore file #23776
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 03b1a6d6d92e8f751c93cc7996e26d929d02f3b0
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Sep 7 15:10:03 2009 +1000
+
+ sunffb 1.2.1
+
+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>
+
+commit 4f881efe2ec8ae4def01014f9acf7400e93a807f
+Author: Julien Cristau <jcris...@debian.org>
+Date: Mon May 4 18:39:10 2009 +0200
+
+ Remove DRI remnants from build system
+
+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
+
+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
+
+commit 18c56ae8c3f5bbb133db426e9c253d47bb72a0d4
+Author: Adam Jackson <a...@redhat.com>
+Date: Wed Sep 3 15:35:42 2008 -0400
+
+ sunffb 1.2.0
+
+commit a58df3038b1913b54ca2e8ebb19ff23a7c7d1e6a
+Author: Adam Jackson <a...@redhat.com>
+Date: Wed Sep 3 15:35:22 2008 -0400
+
+ Fix distcheck.
+
+commit 54c2addfceb3d8336268fa4ffcd65c418da72b0d
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Aug 19 10:25:43 2008 -0400
+
+ Uninclude xf86Version.h
+
+commit 3ac0f6635abba7550e84c2becab544bf321fb285
+Author: Matthieu Herrb <matthieu.he...@laas.fr>
+Date: Sat Mar 8 23:57:47 2008 +0100
+
+ Makefile.am: nuke RCS Id
+
+commit bd8ef525a9421d21468fb006fe98173bbac7e274
+Author: Benjamin Close <benjamin.cl...@clearchain.com>
+Date: Thu Jan 10 10:22:09 2008 +1030
+
+ Fix compilation after dri removal in the last commit
+
+ Found by: Tinderbox
+
+commit 843d93e775cd46a0e24e1a725594fa2d942f14ba
+Author: David S. Miller <da...@davemloft.net>
+Date: Fri Dec 28 23:55:06 2007 +0200
+
+ Remove DRI support to fix build after devPrivates rework
+
+ This driver uses devprivates of all kinds, but this is
+ only done in deprecated and unused code so we can simply
+ remove it all.
+
+ DRM/DRI support has been commented out for years, and was
+ done during the conversion over to XAA acceleration. This
+ code would need to be essentially rewritten to work again,
+ so we can just remove this stuff for now.
+
+ The rest were either:
+
+ 1) DRI/DRM related uses
+ 2) the private allocation code
+ 3) cases that could index to the pScrn to get the FFB private
+
+ And that's all fixed up here.
+
+ Signed-off-by: David S. Miller <da...@davemloft.net>
+
+commit 5c1e059cfed608b1f051cc8825c1243db76e8995
+Author: Brice Goglin <bgog...@debian.org>
+Date: Tue Aug 7 13:53:20 2007 +0200
+
+ Define FFB_*_VERSION using PACKAGE_VERSION*
+
+commit 697a0195476c9a65b5ee17ccca3eab60439ffdad
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Thu Mar 1 11:04:01 2007 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit b86a3f4662d384e3a3540340bfd5171ab2523c34
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Thu Mar 1 11:03:41 2007 -0800
+
+ modified: man/sunffb.man
+
+commit 57dcab65e95003ecabc25fbc4b3c01b8558538fa
+Author: Adam Jackson <a...@nwnk.net>
+Date: Fri Apr 7 21:27:00 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
+commit 78d80c93260b9a67c65b12cb5cf4c4e624efc144
+Author: Adam Jackson <a...@nwnk.net>
+Date: Thu Jan 26 03:26:06 2006 +0000
+
+ Remove remaining cfb-isms and dead accel code.
+
+commit 214eb92d43214e206cdb38e72ae0f5c667b5d29f
+Author: Adam Jackson <a...@nwnk.net>
+Date: Wed Jan 25 22:53:12 2006 +0000
+
+ Remove xf8_32wid damage, it is going away.
+
+commit 19dd5927079ac262d45660907f336e8838bad374
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Dec 21 02:30:03 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit defa4b890adf74f8036fe0e7fe35eef9ca38faf4
+Author: Adam Jackson <a...@nwnk.net>
+Date: Mon Dec 19 16:25:55 2005 +0000
+
+ Stub COPYING files
+
+commit 8aaf8c1f61e8528eaa12179509900251ae4893e8
+Author: Kevin E Martin <k...@kem.org>
+Date: Thu Dec 15 00:24:20 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 05917a2d030d8359b2a30f471e7100bc020d5a3f
+Author: Adam Jackson <a...@nwnk.net>
+Date: Wed Dec 14 20:42:18 2005 +0000
+
+ Bug #4890" Include the assembly in the build (Ferris McCormick)
+
+commit da7b74edb223745fc38dce3d3107a00784714f03
+Author: Kevin E Martin <k...@kem.org>
+Date: Tue Dec 6 22:48:39 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 1bf0231995e8ad32a839854d08d8f3bdc3a385dd
+Author: Kevin E Martin <k...@kem.org>
+Date: Sat Dec 3 05:49:35 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit dd99c53ed663b390f497a4a8032ab795fd0cba4b
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri Dec 2 02:16:10 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 23f5a1d4c6cbd7a2ab130cedbf7a785ba518d69d
+Author: Adam Jackson <a...@nwnk.net>
+Date: Wed Nov 30 18:51:52 2005 +0000
+
+ Bump libdrm dep to 2.0.
+
+commit bcf2a2c5eb91537c33f1838d8591916badc89d74
+Author: Adam Jackson <a...@nwnk.net>
+Date: Tue Nov 29 23:30:04 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit a0f33f27d401967657ce0ed037b6591d84060e99
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon Nov 28 22:04:13 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 625bfc14e7bc3bc10f4c7f9abdc1c5df217d94fc
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Mon Nov 21 10:49:19 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 5bc8aaccae7475e21fc9fc97651c2076f96e9483
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Nov 9 21:31:21 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit 43e39abb4c9bf91e5218a73ed4bb74c2acf6ce56
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Nov 9 21:15:21 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 2803b5c7c60eed0202098924bd7614df66a98ddd
+Author: Kevin E Martin <k...@kem.org>
+Date: Tue Nov 1 15:08:55 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 51f8f302cfd06be9398d04e326ace75662b0504d
+Author: Adam Jackson <a...@nwnk.net>
+Date: Fri Oct 21 18:40:19 2005 +0000
+
+ Bug #4829: Remove some useless DRI symbol checks.
+
+commit 3648fd25fe2c38ef70a86ea090e3566793d823a1
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Oct 19 02:48:05 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 1b43194ffc88097b5a5906d7b1e02da3ef4c3d73
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Tue Oct 18 00:01:54 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 39077f5188e3d24692a34b628966dd6f6ffdc6ee
+Author: Adam Jackson <a...@nwnk.net>
+Date: Mon Oct 17 22:57:36 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit b59dd8a3ba59fa7ea117e239a55847dc723163c9
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon Oct 17 00:09:06 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 047c415b8f094d6fbcc24d09bc70bd02959b9ffc
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Date: Tue Sep 27 22:22:16 2005 +0000
+
+ Add some files to the rendition and sunffb build systems
+
+commit 45a0e677c8332c19e003cd85caa22b6f8376ab1f
+Author: Felix Kuehling <fxku...@gmx.de>
+Date: Thu Sep 22 14:20:53 2005 +0000
+
+ Fixed DRI detection in the sunffb configure script. Without this DRI was
+ not detected properly. As a result DRM include paths were missing on
+ the compiler command line and the build failed if DRI was enabled in
+ the Xorg server. Committing after no feedback from the xorg-modular
+ list in over a week. If it breaks something, feel free to revert this
+ and revoke my commit rights. ;-)
+
+commit 71d1b743cab6e93ef33bcb840f2da6e0068dfac2
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Thu Aug 18 09:03:50 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 4bdcfaaa58cc36d156ca94b55b3f9ac9ceb113ec
+Author: Alan Hourihane <al...@fairlite.demon.co.uk>
+Date: Mon Aug 15 07:30:05 2005 +0000
+
+ Egbert's 64bit fixes for mixed 32/64bit clients
+
+commit 56b87a3418a34b8f9290e87675c244e7de781dd4
+Author: Adam Jackson <a...@nwnk.net>
+Date: Sun Jul 31 17:19:29 2005 +0000
+
+ Post-merge fixups:
+ - Disable building the gamma driver
+ - Fix numerous Imakefiles to get header paths and subdirs right
+ - Symlink client-side GLX lib source from Mesa
+ - Add new shader subdirs to the Mesa core build
+ - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it,
+ since they don't generate protocol, and it was breaking the build.
+
+commit 72d32dd10f53317b9dadde67e723327cc2018a16
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri Jul 29 21:22:45 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit d2b894704751df14f61e0b63333f4b2d89ca8e4e
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Date: Wed Jul 27 21:23:29 2005 +0000
+
+ Add xf86driproto to dependencies for drivers with DRI support. Patch from
+ Donnie Berkholz
+
+commit 1aaf55726f4f85b24d24458dfca9d463df01bc15
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Date: Tue Jul 26 23:36:05 2005 +0000
+
+ Build system for sunffb
+
+commit 52138352933072b2f38e5b6de4ed4b11c0212732
+Author: Adam Jackson <a...@nwnk.net>
+Date: Mon Jul 11 02:30:01 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 39421243b0318ce2e9c10a93d1b9dbd4ff5b4411
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Sun Jul 3 08:53:43 2005 +0000
+
+ Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
+
+commit 95f88d487422b022457a1d2f2611b10b77ed9b46
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Sun Jul 3 07:01:27 2005 +0000
+
+ Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
+ Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
+ Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
+ source files in the xserver/xorg tree, predicated on defines of
+ HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
+ <X11/fonts/foo.h>.
+
+commit 632161e98ed1ce857d572d8b65bbd8be3bc5a15a
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Fri Jul 1 22:43:21 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit a0644204d1fa8413f20a701fe00b89ca1ba49d04
+Author: Adam Jackson <a...@nwnk.net>
+Date: Sat Jun 25 21:16:56 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit e5efbae7842e99b4f5d7a8cf322fa91fde5b343b
+Author: Adam Jackson <a...@nwnk.net>
+Date: Fri May 20 16:15:02 2005 +0000
+
+ Bug #3346: Don't include DRI-internal headers from the drivers. Pointed out
+ by Kevin Martin.
+
+commit 6c9a3742c576454eb7f56433c3196968bc73a991
+Author: Adam Jackson <a...@nwnk.net>
+Date: Wed May 18 17:47:36 2005 +0000
+
+ Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
+ number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
+ version number. Modify DRIQueryVersion to return the libdri version
+ number, which all DDXes were requesting implicitly. Fix the DDXes to
+ check for the DRIINFO version they were compiled against.
+
+commit 74b13899c20fcbe5030fbf6891e3931a2de9b50f
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Wed Apr 20 12:25:30 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit f4d45d198607956fb059941905b990be952fd33f
+Author: Adam Jackson <a...@nwnk.net>
+Date: Fri Jan 14 06:08:03 2005 +0000
+
+ Bug #1891: XAA support for Sun FFB. (Dave S. Miller)
+
+commit 7c14b1189ac8605de9be3d85c338563396bb9c06
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Wed Jun 16 09:44:00 2004 +0000
+
+ Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
+ with the following notes:
+ - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
+ insecurity.
+ - VIA driver converted to new drmContext and drmHandle names.
+ - Radeon driver merge conflicted in many places, and MergedFB at least
+ could probably use some checking at this point.
+
+commit f47ae0017ff8c7fa8ec7c5a9da7e3d5775ee2673
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Wed Jun 16 09:27:15 2004 +0000
+
+ DRI trunk-20040613 import
+
+commit a302d3993349aeec3fbf3bf753e1e7d57519b300
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Wed Jun 16 09:23:59 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit e04839d52cadd3b08c48d86d7416d28e7c89427c
+Author: Egbert Eich <e...@suse.de>
+Date: Fri Apr 23 19:48:17 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 73d194647e988fa127f73c989fb233fab78a03fc
+Author: Egbert Eich <e...@suse.de>
+Date: Sun Mar 14 08:33:37 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit a0f5bdc28ef96f2a7c8c8c2a74fc6decef974702
+Author: Egbert Eich <e...@suse.de>
+Date: Wed Mar 3 12:12:25 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 8f3d03cefe870b257186d6c874eb62f4805cb228
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 13:35:55 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 3ab17ec38c3f6c072884cc677677b95bfd84d293
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 09:23:27 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 00f21f357a123a981d1ffaedc8e3a24b17f07cb0
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Tue Nov 25 19:28:42 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit d9ee679d756a1151893c58620ba396c0f2b3bdbf
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 68c56916d79bf06e26e01c3e84206edc928d9b51
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index 630a686..88226d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sunffb (1:1.2.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 29 Sep 2013 14:07:30 +0200
+
xserver-xorg-video-sunffb (1:1.2.1-4) unstable; urgency=low
* Switch to dh:
commit 181b60190c1f81fc9b9b5deb07d536b78f2536ab
Author: Matthieu Herrb <matthieu.he...@laas.fr>
Date: Mon Jun 10 21:51:08 2013 +0200
Unbreak when XAA is not present.
Turn accel off if loading XAA fails.
Signed-off-by: Matthieu Herrb <matthieu.he...@laas.fr>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
diff --git a/src/ffb_driver.c b/src/ffb_driver.c
index af13484..7f17d64 100644
--- a/src/ffb_driver.c
+++ b/src/ffb_driver.c
@@ -413,9 +413,12 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
- FFBFreeRec(pScrn);
- return FALSE;
+ if (!pFfb->NoAccel) {
+ if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Loading XAA failed, acceleration disabled\n");
+ pFfb->NoAccel = TRUE;
+ }
}
if (pFfb->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
commit 46e71051e0eb879a3d08ceb5675afbfdbff1f57b
Author: Matt Turner <matts...@gmail.com>
Date: Mon Jan 21 22:47:57 2013 -0800
xf86-video-sunffb 1.2.2
diff --git a/configure.ac b/configure.ac
index 2a3b86a..af1dabf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-sunffb],
- [1.2.1],
+ [1.2.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-sunffb])
AC_CONFIG_SRCDIR([Makefile.am])
commit 17f43d1d727081f022872a6df88ceebc5a4c3628
Author: Adam Jackson <a...@redhat.com>
Date: Tue Sep 25 08:54:56 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson <a...@redhat.com>
diff --git a/src/ffb_driver.c b/src/ffb_driver.c
index d02835e..af13484 100644
--- a/src/ffb_driver.c
+++ b/src/ffb_driver.c
@@ -30,7 +30,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "mipointer.h"
-#include "mibstore.h"
#include "micmap.h"
#include "fb.h"
@@ -762,7 +761,6 @@ FFBScreenInit(SCREEN_INIT_ARGS_DECL)
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
commit 079960018061e5ae261ee7f627c6afb859177ef4
Author: Dave Airlie <airl...@gmail.com>
Date: Mon Jul 16 19:12:32 2012 +1000
sunffb: fix XAA-less build.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 0fbe15f..2a3b86a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,24 @@ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test
"$HAVE_XEXTPROTO_71" = "yes" ])
# Checks for libraries.
+AC_ARG_ENABLE(xaa,
+ AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA)
[default=auto]]),
+ [XAA="$enableval"],
+ [XAA=auto])
+if test "x$XAA" != xno; then
+ save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CFLAGS=$XORG_CFLAGS
+ CPPFLAGS="$XORG_CFLAGS"
+ AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+ CFLAGS=$save_CFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
+
AM_CONDITIONAL(SPARC, test x$SPARC = xyes)
AC_SUBST([moduledir])
diff --git a/src/ffb.h b/src/ffb.h
index 14edcbe..67a2d87 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -31,7 +31,9 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86RamDac.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
+#endif
#include <X11/Xmd.h>
#include "gcstruct.h"
#include "windowstr.h"
@@ -174,7 +176,9 @@ typedef struct {
unsigned char has_double_buffer;
/* XAA related info */
+#ifdef HAVE_XAA_H
XAAInfoRecPtr pXAAInfo;
+#endif
unsigned int xaa_fbc;
unsigned int xaa_wid;
unsigned int xaa_planemask;
diff --git a/src/ffb_accel.c b/src/ffb_accel.c
index 7dc1228..86cac94 100644
--- a/src/ffb_accel.c
+++ b/src/ffb_accel.c
@@ -35,7 +35,6 @@
#include "mistruct.h"
#include "miline.h"
#include "fb.h"
-#include "xaa.h"
#include "ffb.h"
#include "ffb_fifo.h"
@@ -43,6 +42,7 @@
#include "ffb_loops.h"
#include "ffb_regs.h"
+#ifdef HAVE_XAA_H
/* VISmoveImage.s */
extern void VISmoveImageRL(unsigned char *src, unsigned char *dst, long w,
long h, long skind, long dkind);
extern void VISmoveImageLR(unsigned char *src, unsigned char *dst, long w,
long h, long skind, long dkind);
@@ -841,8 +841,11 @@ static void CreatorAlignTabInit(FFBPtr pFfb)
}
}
+#endif
+
Bool FFBAccelInit(ScreenPtr pScreen, FFBPtr pFfb)
{
+#ifdef HAVE_XAA_H
XAAInfoRecPtr infoRec;
ffb_fbcPtr ffb = pFfb->regs;
@@ -1097,4 +1100,7 @@ Bool FFBAccelInit(ScreenPtr pScreen, FFBPtr pFfb)
/* Success */
return TRUE;
+#else
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vqgmz-0004ko...@vasks.debian.org
