.gitignore | 20
CALLMAP | 2
ChangeLog | 523
Makefile.in | 16
README | 2
Release.txt | 2
aclocal.m4 | 379
autogen.sh | 12
config.guess | 667
config.h.in | 9
config.sub | 230
configure | 7897
+++++-----
configure.ac | 2
debian/changelog | 24
debian/control | 14
debian/patches/01_siliconmotion_rotate_option_disables_randr.diff | 24
debian/rules | 4
debian/xsfbs/xsfbs.mk | 28
ltmain.sh | 12
man/.cvsignore | 2
man/Makefile.am | 2
man/Makefile.in | 16
man/siliconmotion.man | 35
mkinstalldirs | 89
src/.cvsignore | 6
src/Makefile.am | 2
src/Makefile.in | 24
src/regsmi.h | 274
src/smi.h | 351
src/smi_accel.c | 1116 -
src/smi_dac.c | 108
src/smi_dga.c | 327
src/smi_driver.c | 5345 +++---
src/smi_exa.c | 540
src/smi_hwcurs.c | 515
src/smi_i2c.c | 80
src/smi_shadow.c | 528
src/smi_video.c | 2064 +-
src/smi_video.h | 23
src/smi_xaa.c | 844 +
40 files changed, 11883 insertions(+), 10275 deletions(-)
New commits:
commit 5d40ae52741de87faa1558a0ebc8ff5587ee6c59
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 28 18:11:37 2007 +0200
Refresh 01_siliconmotion_rotate_option_disables_randr.diff
diff --git a/debian/changelog b/debian/changelog
index 3c42b76..8509dd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xserver-xorg-video-siliconmotion (1:1.5.1-1) UNRELEASED;
urgency=low
[ Brice Goglin ]
* New upstream version
+ Pull more upstream fixes up-to 1a803a8f91a931c00106f9d3d41cfa5d74c19f55
+ + Refresh 01_siliconmotion_rotate_option_disables_randr.diff
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
@@ -19,8 +20,9 @@ xserver-xorg-video-siliconmotion (1:1.5.1-1) UNRELEASED;
urgency=low
* Add a link to www.X.org and a reference to the xf86-video-siliconmotion
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
+ *
- -- Brice Goglin <[EMAIL PROTECTED]> Sat, 28 Apr 2007 18:02:43 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Sat, 28 Apr 2007 18:11:17 +0200
xserver-xorg-video-siliconmotion (1:1.4.2-1) experimental; urgency=low
diff --git a/debian/patches/01_siliconmotion_rotate_option_disables_randr.diff
b/debian/patches/01_siliconmotion_rotate_option_disables_randr.diff
index ba8ccfe..aba11d2 100644
--- a/debian/patches/01_siliconmotion_rotate_option_disables_randr.diff
+++ b/debian/patches/01_siliconmotion_rotate_option_disables_randr.diff
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-siliconmotion/man/siliconmotion.man
===================================================================
---- xserver-xorg-video-siliconmotion.orig/man/siliconmotion.man
2004-04-23 19:45:06.000000000 +0000
-+++ xserver-xorg-video-siliconmotion/man/siliconmotion.man 2006-08-15
23:46:12.000000000 +0000
-@@ -90,7 +90,7 @@
+--- xserver-xorg-video-siliconmotion.orig/man/siliconmotion.man
2007-04-28 18:01:49.000000000 +0200
++++ xserver-xorg-video-siliconmotion/man/siliconmotion.man 2007-04-28
18:10:06.000000000 +0200
+@@ -87,7 +87,7 @@
.TP
.BI "Option \*qRotate\*q \*qCCW\*q"
Rotate the screen CW - clockwise or CCW - counter clockwise.
@@ -13,13 +13,13 @@ Index:
xserver-xorg-video-siliconmotion/man/siliconmotion.man
Set the video color key. Default: a little off full blue.
Index: xserver-xorg-video-siliconmotion/src/smi_driver.c
===================================================================
---- xserver-xorg-video-siliconmotion.orig/src/smi_driver.c 2006-04-08
01:42:57.000000000 +0000
-+++ xserver-xorg-video-siliconmotion/src/smi_driver.c 2006-08-15
23:46:12.000000000 +0000
-@@ -2195,6 +2195,7 @@
- pSmi->PointerMoved = pScrn->PointerMoved;
- pScrn->PointerMoved = SMI_PointerMoved;
- }
-+ xf86DisableRandR();
- }
+--- xserver-xorg-video-siliconmotion.orig/src/smi_driver.c 2007-04-28
18:02:12.000000000 +0200
++++ xserver-xorg-video-siliconmotion/src/smi_driver.c 2007-04-28
18:10:06.000000000 +0200
+@@ -2149,6 +2149,7 @@
+ pSmi->PointerMoved = pScrn->PointerMoved;
+ pScrn->PointerMoved = SMI_PointerMoved;
+ }
++ xf86DisableRandR();
+ }
- ShadowFBInit(pScreen, refreshArea);
+ ShadowFBInit(pScreen, refreshArea);
commit 644446f2dbfbbb9c5db0315d8a92842fe2c9f925
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 28 18:04:25 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 46bee4b..ded1615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,68 +1,501 @@
-2006-04-07 Adam Jackson <[EMAIL PROTECTED]>
+commit 1a803a8f91a931c00106f9d3d41cfa5d74c19f55
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Mar 20 21:08:38 2007 -0400
- * configure.ac:
- * src/smi_driver.c:
- Bump to 1.4.1 for Xv changes.
+ minor fixup
-2006-04-07 Aaron Plattner <[EMAIL PROTECTED]>
+commit 503027d38dab759277c0a67746ac205a1dfa9277
+Author: Dennis De Winter <[EMAIL PROTECTED]>
+Date: Fri Mar 16 21:29:19 2007 -0400
- * src/smi_video.c: (SMI_PutVideo), (SMI_PutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ Fix UTS issues with flash
+
+ Also remove safety padding on memory manager calculation
-2006-04-07 Adam Jackson <[EMAIL PROTECTED]>
+commit fe4114033f2853e2df8d37c490deba26bf0366e8
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Thu Mar 15 02:11:24 2007 -0400
- * configure.ac:
- * src/smi.h:
- * src/smi_dga.c:
- * src/smi_driver.c:
- * src/smi_i2c.c:
- * src/smi_shadow.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.4.0.
+ hostdata blit UTS works, but SW is faster
+
+ UTS is working, but SW is faster so leave it disabled
-2006-02-08 Luc Verhaegen <[EMAIL PROTECTED]>
+commit 62442ce9e62b484e4f2067e3c52c153cd356be2c
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Wed Mar 14 20:13:28 2007 -0400
- * src/smi.h:
- * src/smi_driver.c: (SMI_PreInit), (SMI_ModeInit):
-
- Clean up insane pScrn->clock usage.
+ more clock fixes
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6ff1241636e25d2c0f20bd14e92c8585f209aeb0
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Mar 13 02:32:52 2007 -0400
- * configure.ac:
- Update package version for X11R7 release.
+ bump to 1.5.1
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b53db3bc5ba7648d392dc630ef47e57fb8a0afb4
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Mar 13 02:31:30 2007 -0400
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ fix clk calculation on older lynx chips
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 7d1392be291e99fd3dde2292b82423b5f78d3a21
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Mar 13 00:44:29 2007 -0400
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ bump to 1.5.0
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 449fedec0e38289d10d75799bbf995b0e7189911
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Mar 13 00:13:35 2007 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ fix Solid()
+
+ Unforunately, for 32 bpp solid fills the HW ignores alpha.
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6d40f87d6cddde2d88f25be686b6392449cdecf1
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Mar 12 23:58:41 2007 -0400
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ remove spurious waitqueue() line
-2005-11-29 Adam Jackson <[EMAIL PROTECTED]>
+commit 452cabd6e3870b832cb19c8ad8a1fce27eef9c48
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Mar 12 01:11:16 2007 -0400
- * configure.ac:
- Only build dlloader modules by default.
+ Update copyright.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 55266778ac693582131acae80def32211e09f18f
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Mar 12 01:02:53 2007 -0400
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ switch the engine to quick start mode
+
+ Rather than writing to the engine command register for every
+ operation, set quick start mode, and the operation executes
+ automatically when the width register is written.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4b37b514907da4a567261569eaebcc5a35aff6db
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Mar 12 00:12:23 2007 -0400
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ fixup waitqueue slots
+
+commit 493c93de288437501fd898800bce45300379ebc3
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Mar 11 18:49:48 2007 -0400
+
+ more exa fixups, disable UTS for now.
+
+commit c1d6373624428c8c52e4d1d295b1d77ed75391a0
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Mar 11 16:22:05 2007 -0400
+
+ engine likes to use blit command for solid fills
+
+commit 9db380c99decdb9ab7fbf481788a5b63a84cd6e0
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Mar 11 15:53:29 2007 -0400
+
+ fix postscalar shift
+
+commit b6082e628289221864e96ebc41ce93d8efe2d2ce
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Mar 11 14:09:45 2007 -0400
+
+ support 32 bpp
+
+commit 3ebbc2e55a1584e01949ec760501ac4a3c086b04
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Mar 11 13:40:06 2007 -0400
+
+ fix up vclk1 setup
+
+commit 3e62ec8736ea9ea64a2c0c5c41df9c6d742397ca
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Mar 6 02:42:52 2007 -0500
+
+ revert the last commit.
+
+ FBBase already take the register offset into account.
+
+commit 7da75a99159f80f215ee409377128f7dcbc4064d
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Mar 6 02:38:02 2007 -0500
+
+ fix memoryBase
+
+ pSmi->FBOffset is the offset from the start of the framebuffer
+ pScrn->fbOffset is the aperture offset where the framebuffer
+ starts
+
+commit ba0b2492269ea81e91f7ce4fb8da618187a3997f
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Mar 6 02:24:08 2007 -0500
+
+ first pass at UTS
+
+commit e650ca36da5cf7614e4f1a0a524eadb46b1cc21d
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Mar 5 23:58:25 2007 -0500
+
+ fix up EXA code
+
+commit c5b23ba581a3a4395b528d4ed824d5df986527e4
+Author: Dennis De Winter <[EMAIL PROTECTED]>
+Date: Sun Mar 4 23:17:57 2007 -0500
+
+ Initial import of EXA support
+
+ Based on Dennis' code from bug 8721 with some minor
+ changes by me.
+
+commit cf83ef7685609cd9daea193b4c842d232edcf506
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Mar 4 17:18:10 2007 -0500
+
+ actually calculate and use vclk1
+
+commit 3030e5a6afda5d05ddee5b586295a9e608b7a0de
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Mar 4 02:45:55 2007 -0500
+
+ Whitespace and formatting changes
+
+commit 606971fc8a323b0b33bb43524941b4bae6a0c334
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Feb 27 13:04:31 2007 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit 4b3d28435d2f046d48a38694d89166fe38b00597
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Feb 27 13:04:01 2007 -0800
+
+ Replace XFree86 references in man page
+
+commit 3ff1d1aaf93df90f3a96b87bd8447db44b1722f5
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Wed Jan 10 21:58:47 2007 -0500
+
+ only idle the engine on mode switches
+
+ on the initial mode set the engine doesn't idle
+ for some users.
+
+commit 72c1d44182a49dbd502bbdc0b48f69a43ad5aed0
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Oct 13 18:41:44 2006 -0400
+
+ Bump to 1.4.2
+
+commit 36bbaaf3f44321fc7bb8ff1b71ff1d7f87f3b19b
+Author: Alex Deucher <[EMAIL PROTECTED](none)>
+Date: Sat Sep 16 15:48:54 2006 -0400
+
+ make siliconmotion build again. somehow a bunch of defines in
+ regsmi.h got lost? commit 9a58bc9adbc982680dd8df27caeb9a5819f2adad looks
+ like the culprit, but siliconmotion has built fine subsequent to that
commit.
+ Not sure exactly what's going on.
+
+commit c090b2d97dbedfc278a4691b70cf3f73f9799aa6
+Author: <[EMAIL PROTECTED](none)>
+Date: Thu Jul 20 23:35:30 2006 -0400
+
+ - add dualhead support for lynx chips (pretty limited due to severe
hardware
+ limitations -- I'll improve it a bit at some point)
+ - small driver clean ups
+
+commit 845d45cd2066be53f6e2e53d5af6375045dac6e2
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sat Apr 8 01:43:52 2006 +0000
+
+ Bump to 1.4.1 for Xv changes.
+
+commit 2951e947c56909c9d51bf3f937502d0f682b1d76
+Author: Aaron Plattner <[EMAIL PROTECTED]>
+Date: Fri Apr 7 23:13:59 2006 +0000
+
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
+
+commit 9a316eaea700e3a356f922506bf2c79e00fd9d83
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Apr 7 20:58:57 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 1.4.0.
+
+commit c394f38c9a998eebec134a9a77ced46b9c005b9d
+Author: Luc Verhaegen <[EMAIL PROTECTED]>
+Date: Wed Feb 8 16:52:34 2006 +0000
+
+ SiliconMotion: Clean up insane pScrn->clock usage.
+
+commit 2453cfe259dec826fceab3cff1b2c3803d3d8042
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Dec 21 02:30:02 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit e398882fba13cd081916d2ff04ead4f9023c9bfb
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Dec 19 16:25:54 2005 +0000
+
+ Stub COPYING files
+
+commit 818baab410deef2b3a3b6653dd2134dea29e98de
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu Dec 15 00:24:19 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 6c95cd7b0ac0c113c25bf985365f3ccb1d30d7c9
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Dec 6 22:48:37 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 10d5542f95e86463b96cc1fd31378473c2394bc0
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Dec 3 05:49:35 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 8180ea0cb0df275831b900836d9387bb2a730de4
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Dec 2 02:16:10 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 73e22f89e205a61c315ffaca63cc7f5ab1f2df5f
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Tue Nov 29 23:30:03 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 8b156b75c37fb642d6c680cc9fb5361fb0a8ff74
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Nov 28 22:04:10 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 8ad5ff0aa74eabc5b4dca2e0422d36713415b1b1
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Mon Nov 21 10:49:18 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 0d4f340f197b14dacc5c33d82f0094ee1f9bb2a8
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Nov 9 21:15:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 280644786854eea8e8dbe7873e6c79d18f8048f0
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Nov 1 15:08:54 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit bcc4f2555d4e4fa7ba2cf022165d3dd8ef331cd9
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Oct 19 02:48:04 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 2da8c99697874a012dccfc582561a0b89e111ecd
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+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 9f9d3fcd3dca04b7d960d8777e8f8ba612fa1510
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Oct 17 22:57:35 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 286bf9de5baebd75ca129e50af9dc5f66dbf4e4f
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Oct 17 00:09:05 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 0db428f930db99d70897ca90b9ec0e130f4e6635
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Tue Sep 27 22:04:08 2005 +0000
+
+ Add some more documentation files for siliconmotion driver
+
+commit bdc896858ed819dcb79bb7443bfa57d63c8e0fad
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Thu Aug 18 09:03:48 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit a3add2e05412767c49ca1c0a1069cd5805ea09e9
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Jul 29 21:22:44 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 5754df51d9b0f8bb8dac7b8c0072da929f1241f0
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Tue Jul 26 22:12:58 2005 +0000
+
+ Build system for siliconmotion
+
+commit 4b98eb4b30d694139d5e597c445d65d637ab7472
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Jul 11 02:29:59 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 6389dd3dc1259865a4b5fcc6b6c7b3f4429593cf
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Fri Jul 1 22:43:12 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit 1dc135becf5898950e04c84cc4d87870840140c1
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Thu Jun 30 00:14:26 2005 +0000
+
+ - add 800x480 mode to smi driver (bug 3639)
+
+commit 0670b675c2133dd7c29f79bdf17d24d64181537d
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sat Jun 25 21:16:56 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 39112b558fdccd2b0a15b8e41d6215e3b0e6e7bd
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Wed Apr 20 12:25:29 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 c34e24d83a0f84ad90b7cbaba78d54cc779f74d5
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Sep 17 03:04:54 2004 +0000
+
+ Bug #1192: Remove cfb support from drivers where its use is an option.
+ Delete xf24_32bpp, as s3virge was the last user. Fix up some comments
+ to refer to fb rather than cfb.
+
+commit 61457616aea5d5d7d98e869d3b24e989c2404d6b
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Aug 16 09:13:15 2004 +0000
+
+ Bug #1087: Make sure all the *Weak symbols are documented in the import
+ list, so the loader knows not to complain about unresolved symbols when
+ an optional module isn't loaded. This typically manifests as warnings
+ about fbdevHW symbols when the user isn't using the framebuffer
+ console.
+
+commit 74176c460a4f5206cbc7cd7b9f48d1b6cedae7cb
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Sat Jul 31 01:21:51 2004 +0000
+
+ Rename some COMPOSITE macros and enums to avoid conflicting with the
+ COMPOSITE extension's new macro. These appear to only be used
+ internally.
+
+commit 0f239a7f12e1c0a0b7ede424b0f1eb0fe189e9d6
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sat Jul 31 01:21:19 2004 +0000
+
+ Change several LoaderSymbol calls introduced by the bug #400 patch to
+ *Weak() resolver functions.
+
+commit 865ba2a4c1107bb82d22ed648f8a1d63c833d6fc
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Jul 30 20:30:54 2004 +0000
+
+ Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+ framebuffer formats except cfb and the overlay modes should work, and
+ r128 and radeon need to be loaded from the ati driver (both issues to
+ be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+ drivers. elfloader users shouldn't be affected.
+
+commit 9a58bc9adbc982680dd8df27caeb9a5819f2adad
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Wed Jun 16 09:23:38 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 1f957fb7e44762197b0fc5a3b7def25c7888929a
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Wed May 26 16:24:09 2004 +0000
+
+ Fixing setting of physical framebuffer base for several drivers. C&T
+ driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
+ driver: improved support for lowres double scan modes.
+
+commit 445708ff1249e96628dd6b11e20f83e568fb4ad1
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Fri Apr 23 19:45:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 90141c8b6da8e6b57f2e4bae486a3d39c4069a8b
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Sun Mar 14 08:33:31 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 1082b4e0760359234cb5f51b953bbffc65d594ec
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Wed Mar 3 12:12:24 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit b1c51d42211f715043a3252550ef2fde1a3065e5
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 13:35:54 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 2ae35696e96079b192c2cac4e092f6deeb300325
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 09:23:23 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit ac5b2461e620df7026eefda6a389127e7d41f67d
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Dec 19 20:55:14 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit 14cd4af100e1deb1c7b63e9f19587e38ce1f08f2
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Tue Nov 25 19:28:39 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 1684aa7a21a194b6e7dd518f3895c9b2dfce229a
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 78af703cb019a60cc93843efcd4889ccb15abd13
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
commit 92f8e9cb0c59d82138c918d172fb889a24892fb0
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 28 18:04:02 2007 +0200
autoreconf
diff --git a/configure b/configure
index 467d06d..bfb6e7c 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-siliconmotion 1.4.2.
+# Generated by GNU Autoconf 2.61 for xf86-video-siliconmotion 1.5.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-siliconmotion'
PACKAGE_TARNAME='xf86-video-siliconmotion'
-PACKAGE_VERSION='1.4.2'
-PACKAGE_STRING='xf86-video-siliconmotion 1.4.2'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='xf86-video-siliconmotion 1.5.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1412,7 +1412,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-siliconmotion 1.4.2 to adapt to many kinds
of systems.
+\`configure' configures xf86-video-siliconmotion 1.5.1 to adapt to many kinds
of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1482,7 +1482,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-siliconmotion
1.4.2:";;
+ short | recursive ) echo "Configuration of xf86-video-siliconmotion
1.5.1:";;
esac
cat <<\_ACEOF
@@ -1594,7 +1594,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-siliconmotion configure 1.4.2
+xf86-video-siliconmotion configure 1.5.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1608,7 +1608,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-siliconmotion $as_me 1.4.2, which was
+It was created by xf86-video-siliconmotion $as_me 1.5.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2283,7 +2283,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-siliconmotion'
- VERSION='1.4.2'
+ VERSION='1.5.1'
cat >>confdefs.h <<_ACEOF
@@ -21156,7 +21156,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-siliconmotion $as_me 1.4.2, which was
+This file was extended by xf86-video-siliconmotion $as_me 1.5.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21209,7 +21209,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-siliconmotion config.status 1.4.2
+xf86-video-siliconmotion config.status 1.5.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/src/Makefile.in b/src/Makefile.in
index 9aa3f14..1354f71 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -75,9 +75,9 @@ am__installdirs = "$(DESTDIR)$(siliconmotion_drv_ladir)"
siliconmotion_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(siliconmotion_drv_la_LTLIBRARIES)
siliconmotion_drv_la_LIBADD =
-am_siliconmotion_drv_la_OBJECTS = smi_accel.lo smi_dac.lo smi_dga.lo \
- smi_driver.lo smi_hwcurs.lo smi_i2c.lo smi_shadow.lo \
- smi_video.lo
+am_siliconmotion_drv_la_OBJECTS = smi_accel.lo smi_xaa.lo smi_exa.lo \
+ smi_dac.lo smi_dga.lo smi_driver.lo smi_hwcurs.lo smi_i2c.lo \
+ smi_shadow.lo smi_video.lo
siliconmotion_drv_la_OBJECTS = $(am_siliconmotion_drv_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -229,6 +229,8 @@ siliconmotion_drv_ladir = @moduledir@/drivers
siliconmotion_drv_la_SOURCES = \
regsmi.h \
smi_accel.c \
+ smi_xaa.c \
+ smi_exa.c \
smi_dac.c \
smi_dga.c \
smi_driver.c \
@@ -312,10 +314,12 @@ distclean-compile:
@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]@
[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]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
commit 4351b4c04c5b792ac55a185c8518f7520b33c1fd
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 28 18:03:15 2007 +0200
Pull more upstream fixes up-to 1a803a8f91a931c00106f9d3d41cfa5d74c19f55
diff --git a/debian/changelog b/debian/changelog
index 7515548..3c42b76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-video-siliconmotion (1:1.5.1-1) UNRELEASED;
urgency=low
[ Brice Goglin ]
* New upstream version
+ + Pull more upstream fixes up-to 1a803a8f91a931c00106f9d3d41cfa5d74c19f55
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
@@ -19,7 +20,7 @@ xserver-xorg-video-siliconmotion (1:1.5.1-1) UNRELEASED;
urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin <[EMAIL PROTECTED]> Sat, 28 Apr 2007 17:52:06 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Sat, 28 Apr 2007 18:02:43 +0200
xserver-xorg-video-siliconmotion (1:1.4.2-1) experimental; urgency=low
commit 27cf6caeacbb12982ea36f604661399f927af9b1
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 28 17:55:52 2007 +0200
New upstream version 1.5.1
diff --git a/debian/changelog b/debian/changelog
index 7c501c5..7515548 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-siliconmotion (1:1.4.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-siliconmotion (1:1.5.1-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -10,6 +10,7 @@ xserver-xorg-video-siliconmotion (1:1.4.2-2) UNRELEASED;
urgency=low
* Replaces/Conflicts: xserver-xorg-driver-siliconmotion.
[ Brice Goglin ]
+ * New upstream version
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
commit c87e13748d28ecda09a9ff68175dad33eafc7a74
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 28 17:52:45 2007 +0200
Miscellaneous fixed in debian/control and debian/rules.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-siliconmotion
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome
back.
diff --git a/debian/changelog b/debian/changelog
index b70039b..7c501c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,16 @@ xserver-xorg-video-siliconmotion (1:1.4.2-2) UNRELEASED;
urgency=low
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-siliconmotion.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 24 Apr 2007 14:23:46 +0300
+ [ Brice Goglin ]
+ * Install the upstream changelog.
+ * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+ (needed to let xsfbs get access to serverminver).
+ * Add XS-Vcs-*.
+ * Add a link to www.X.org and a reference to the xf86-video-siliconmotion
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Sat, 28 Apr 2007 17:52:06 +0200
xserver-xorg-video-siliconmotion (1:1.4.2-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index b512f77..a9ba06a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-siliconmotion
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>=
2:1.2.0), x11proto-video-dev, x11proto-xext-dev, x11proto-core-dev,
x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, quilt
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-xext-dev, x11proto-core-dev,
x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, quilt
Standards-Version: 3.7.2.0
+XS-Vcs-Git:
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-siliconmotion
+XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
Package: xserver-xorg-video-siliconmotion
Architecture: any
@@ -17,8 +19,8 @@ Description: X.Org X server -- SiliconMotion display driver
of chipsets, commonly found in laptops.
.
More information about X.Org can be found at:
+ <URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
- This module can be found as the module 'driver/xf86-video-siliconmotion' at
- :pserver:[EMAIL PROTECTED]:/cvs/xorg
+ This package is built from the X.org xf86-video-siliconmotion driver module.
diff --git a/debian/rules b/debian/rules
index e627030..78b212e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
dh_link
dh_strip
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <[EMAIL PROTECTED](none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to
it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 1a803a8f91a931c00106f9d3d41cfa5d74c19f55
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Tue Mar 20 21:08:38 2007 -0400
minor fixup
diff --git a/src/smi_exa.c b/src/smi_exa.c
index a7cb25f..575ab65 100644
--- a/src/smi_exa.c
+++ b/src/smi_exa.c
@@ -514,7 +514,7 @@ SMI_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int
h,
/* Drawing engine data format */
WRITE_DPR(pSmi, 0x1C, SMI_DEDataFormat(pDst));
/* Source and Destination Base Address (offset) */
- WRITE_DPR(pSmi, 0x44, 0);
+ WRITE_DPR(pSmi, 0x40, 0);
WRITE_DPR(pSmi, 0x44, dst_offset);
WRITE_DPR(pSmi, 0x0C, pSmi->AccelCmd);
commit 503027d38dab759277c0a67746ac205a1dfa9277
Author: Dennis De Winter <[EMAIL PROTECTED]>
Date: Fri Mar 16 21:29:19 2007 -0400
Fix UTS issues with flash
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
