xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 12b13c75afae0be00bea734da22c3dd04bd3e316 Author: Andreas Boll Date: Wed Jan 18 15:24:33 2017 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 7843cec..84384a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -xserver-xorg-video-savage (1:2.3.9-1) UNRELEASED; urgency=medium +xserver-xorg-video-savage (1:2.3.9-1) unstable; urgency=medium + * Team upload. * New upstream release. * Update debian/upstream/signing-key.asc. * Move URL from description to Homepage field. * Bump Standards-Version to 3.9.8. - -- Andreas Boll Wed, 18 Jan 2017 14:17:24 +0100 + -- Andreas Boll Wed, 18 Jan 2017 15:24:23 +0100 xserver-xorg-video-savage (1:2.3.8-2) unstable; urgency=medium
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 28 configure.ac|2 debian/changelog|9 debian/control |6 -- debian/upstream/signing-key.asc | 89 src/savage_driver.c |6 ++ 6 files changed, 134 insertions(+), 6 deletions(-) New commits: commit 70405d56272aac1d2a45807e886d69d8794036a3 Author: Andreas Boll Date: Wed Jan 18 14:19:16 2017 +0100 Bump Standards-Version to 3.9.8. diff --git a/debian/changelog b/debian/changelog index 2c7aaee..7843cec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-video-savage (1:2.3.9-1) UNRELEASED; urgency=medium * New upstream release. * Update debian/upstream/signing-key.asc. * Move URL from description to Homepage field. + * Bump Standards-Version to 3.9.8. -- Andreas Boll Wed, 18 Jan 2017 14:17:24 +0100 diff --git a/debian/control b/debian/control index d37adb5..817cc17 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: x11proto-xf86dri-dev, quilt, xutils-dev (>= 1:7.5+4), -Standards-Version: 3.9.2 +Standards-Version: 3.9.8 Homepage: https://www.x.org Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage.git commit 063786e358fe33d34cba03ace7129f9832b66ddf Author: Andreas Boll Date: Wed Jan 18 14:18:56 2017 +0100 Move URL from description to Homepage field. diff --git a/debian/changelog b/debian/changelog index 09fc099..2c7aaee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-savage (1:2.3.9-1) UNRELEASED; urgency=medium * New upstream release. * Update debian/upstream/signing-key.asc. + * Move URL from description to Homepage field. -- Andreas Boll Wed, 18 Jan 2017 14:17:24 +0100 diff --git a/debian/control b/debian/control index 63e92df..d37adb5 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ Build-Depends: quilt, xutils-dev (>= 1:7.5+4), Standards-Version: 3.9.2 +Homepage: https://www.x.org Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage.git @@ -37,7 +38,4 @@ Description: X.Org X server -- Savage display driver This package provides the driver for the S3/VIA Savage/ProSavage/Twister family of chipsets. . - More information about X.Org can be found at: - https://www.X.org> - . This package is built from the X.org xf86-video-savage driver module. commit a29840c759c731874afa0dcb5e387c761cce0af8 Author: Andreas Boll Date: Wed Jan 18 14:17:57 2017 +0100 Update debian/upstream/signing-key.asc. diff --git a/debian/changelog b/debian/changelog index d622ca9..09fc099 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-savage (1:2.3.9-1) UNRELEASED; urgency=medium * New upstream release. + * Update debian/upstream/signing-key.asc. -- Andreas Boll Wed, 18 Jan 2017 14:17:24 +0100 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 9930dd6..1c0475b 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -62,3 +62,92 @@ gksZFyWOfV82jHBeu+O0xJNU/9xvZsJF4TORrRWRO1o1gkF7x/oBk7yilh+mSq1P DNOWZJQhmuWMtbOUL2WMkKRPDwJrcbwpt3bc6aZCeAH1SSRLEe9Y+2uLeneTMA== =+xMJ -END PGP PUBLIC KEY BLOCK- +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBE6HVy4BEADACp0EU6HZ4KyFx/qfhzNarCfnlyEoCFY08k516UaHrUOrYWPp +ukoahcceA/M3H/xM0CGIn6uiuG/Cq7+qODAZNBsr6haIbDaqSUt+953b5qCSbD65 +LBR8TXvW+9KkXPhXTKi/osYBdmsbFLeVLqU5Kd4QJqWKRLtuo0ENbFkQPVypEJk8 +Ozg2zZ2yeSQAy0pgeFh8lezI7A23yj229kFq0EEfeqHpgifIzR2hNIhS5pTSOt8V +RDapO3FpOmxPPUMsaJ1KATD92+SgbZW8evW7ffz4QUiQiFsfTSOTCaTFu8qpu6Fb +a9u/u6mTrJQGRdqDcFp3iWjEUOVr0gUdLSr3zey152PBRaC26/eLqH8PFgCerBkn +o9vso0Vr+Kh63OOQeDHATZGy7tMHbWW5AEXVkTpNoSRYr48pd6u9Z1TfWVcovNAZ +tWiFVKKxniTa4MZY2czOSyh2YahCbEt3P0DoNihy3YHhTvW1k0Os2x5yCsfpGzp3 +U8x1apfQqAyRNIa9SptLpQ7xF+lv52D9kp3XdkWXw1BFY+nmm/FqoC4tKU8AmbuB +n3SX/sYjq3Z6aLoBOmZ849G0Zp1xEYHCbfWBxvqhIc6dlPc3Y9uYV01+FlTzX9Mh +THa8p6oABrXbWRJpkOvaVbdDhXON+02Jlvawy3T3rwVkuEfEZu8akv7miwARAQAB +tCBNYXR0IFR1cm5lciA8bWF0dHN0ODhAZ21haWwuY29tPokCQQQTAQIAKwIbAwYL +CQgHAwIGFQgCCQoLBBYCAwECHgECF4ACGQEFAlQAmskFCQsc3hsACgkQD91oLZdM +pyo5Jw//QaWhsC9TWUGTLO4Qc/5B6GYeeZxU/G8GWhz0e09/rtLZd0KqTLwXv/CT +njhq49wlScgbz/2ahxCsSbyhTs0wiAtZeDQ5w3D3VTjni8rIqXExXPOHlAM1JqpK +IoaSY2VVKo/ZjDH2CfZMd7h86MeE911socrTcKFl71YvofdLRA0W0nJPyF/lSc6B +tblAAs0aHfBUZpxXYoZpdZzE1sXPxO8hbyyhmToBAtPtfj4hrSratI7GXEGQoPHe +5+gBQ7Wvt+0p7kvN30OwEllBzWF0BHbaznfDzkwfpILbcxyAUVJFo0YcOCCes4Kj +C0aFW2mjTebst6S3IEstkKlSW6VQudpCC3YokXJshqWg0Wyt6kVEYWUUeZVilmmy +xq55a2IhA6+4RZEs/7Lrb329YJDEytcbq+KoauAFmeHWDYidbXBFga2MzVdNWBH9 +R0cY/DXExuutZjigrV62GQ5hyHab8iRvO3nsqy32B0XqXY13p1Kr08290HTBFx5c
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 3f158e28a6ffeaaa0b61173e7553339df7946727 Author: Timo Aaltonen Date: Fri Nov 18 14:19:02 2016 +0200 release to sid diff --git a/debian/changelog b/debian/changelog index dcd289d..cc80793 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -xserver-xorg-video-savage (1:2.3.8-2) UNRELEASED; urgency=medium +xserver-xorg-video-savage (1:2.3.8-2) unstable; urgency=medium + [ Andreas Boll ] * Cherry-pick commit de3e180 (Adapt Block/WakeupHandler signature for ABI 23) from upstream master branch. * Update a bunch of URLs in packaging to https. - -- Andreas Boll Fri, 18 Nov 2016 12:23:22 +0100 + -- Timo Aaltonen Fri, 18 Nov 2016 14:18:53 +0200 xserver-xorg-video-savage (1:2.3.8-1) unstable; urgency=medium
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |8 debian/control |6 +++--- debian/copyright |2 +- debian/watch |2 +- src/compat-api.h |8 5 files changed, 21 insertions(+), 5 deletions(-) New commits: commit f4bde6c63a24d8c1b0d569093ac1d4358619cc57 Author: Andreas Boll Date: Fri Nov 18 12:36:10 2016 +0100 Update a bunch of URLs in packaging to https. diff --git a/debian/changelog b/debian/changelog index 650fb2f..dcd289d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-savage (1:2.3.8-2) UNRELEASED; urgency=medium * Cherry-pick commit de3e180 (Adapt Block/WakeupHandler signature for ABI 23) from upstream master branch. + * Update a bunch of URLs in packaging to https. -- Andreas Boll Fri, 18 Nov 2016 12:23:22 +0100 diff --git a/debian/control b/debian/control index 16512bd..63e92df 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,8 @@ Build-Depends: quilt, xutils-dev (>= 1:7.5+4), Standards-Version: 3.9.2 -Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage.git Package: xserver-xorg-video-savage Architecture: any @@ -38,6 +38,6 @@ Description: X.Org X server -- Savage display driver of chipsets. . More information about X.Org can be found at: - http://www.X.org> + https://www.X.org> . This package is built from the X.org xf86-video-savage driver module. diff --git a/debian/copyright b/debian/copyright index 4bcafb4..d92f298 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ +https://xorg.freedesktop.org/releases/individual/driver/ Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. Copyright (c) 2003-2006, X.Org Foundation diff --git a/debian/watch b/debian/watch index bf9394e..02aec3a 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-video-savage version=3 opts="pgpsigurlmangle=s/$/.sig/" \ -http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-savage-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-savage-(.*)\.tar\.gz commit 8380f674a90fa71e44c6708c793ad29513c88935 Author: Andreas Boll Date: Fri Nov 18 12:23:30 2016 +0100 Document the cherry-pick in debian/changelog diff --git a/debian/changelog b/debian/changelog index 4a78e38..650fb2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-savage (1:2.3.8-2) UNRELEASED; urgency=medium + + * Cherry-pick commit de3e180 (Adapt Block/WakeupHandler signature for +ABI 23) from upstream master branch. + + -- Andreas Boll Fri, 18 Nov 2016 12:23:22 +0100 + xserver-xorg-video-savage (1:2.3.8-1) unstable; urgency=medium * New upstream release. commit dd25432b9c47ebb9232294507ab41f675bb6beba Author: Adam Jackson Date: Tue Jul 19 10:03:56 2016 -0400 Adapt Block/WakeupHandler signature for ABI 23 Signed-off-by: Adam Jackson (cherry picked from commit de3e1803314820968502156703d5bfe3fab24972) diff --git a/src/compat-api.h b/src/compat-api.h index 98ba435..44daea4 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -78,11 +78,19 @@ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout +#define BLOCKHANDLER_ARGS arg, pTimeout + +#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result +#define WAKEUPHANDLER_ARGS arg, result +#else #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask #define WAKEUPHANDLER_ARGS arg, result, read_mask +#endif #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen #define CLOSE_SCREEN_ARGS pScreen
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 47 +
configure.ac|2 -
debian/changelog|9 +
debian/compat |2 -
debian/control |3 -
debian/rules|5 +++
debian/upstream/signing-key.asc | 64
debian/watch|1
src/savage_dri.c|3 -
src/savage_driver.c | 11 +-
src/savage_driver.h |1
11 files changed, 139 insertions(+), 9 deletions(-)
New commits:
commit 1127b3a88a3a4725dde00a27adfc00dc677962c3
Author: Julien Cristau
Date: Fri May 8 12:19:49 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 15f2431..4a78e38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-savage (1:2.3.8-1) UNRELEASED; urgency=medium
+xserver-xorg-video-savage (1:2.3.8-1) unstable; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
* Bump debhelper compat level to 9.
- -- Julien Cristau Fri, 08 May 2015 12:16:57 +0200
+ -- Julien Cristau Fri, 08 May 2015 12:19:40 +0200
xserver-xorg-video-savage (1:2.3.7-2) unstable; urgency=low
commit 076ec8f7cd62b329c4fd19688fff3192a8a369a7
Author: Julien Cristau
Date: Fri May 8 12:19:34 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 97cc0c7..15f2431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-savage (1:2.3.8-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
+ * Bump debhelper compat level to 9.
-- Julien Cristau Fri, 08 May 2015 12:16:57 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index f6126b1..16512bd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force
Uploaders:
Tormod Volden
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
pkg-config,
xserver-xorg-dev (>= 2:1.9.4),
diff --git a/debian/rules b/debian/rules
index 3d192dc..bf3cf96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --libdir=\$${exec_prefix}/lib
+
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit c0d815daa87ac9d1d84daeb17009012034e6f2fc
Author: Julien Cristau
Date: Fri May 8 12:18:39 2015 +0200
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 933b409..97cc0c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-savage (1:2.3.8-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
+ * Remove Cyril from Uploaders.
-- Julien Cristau Fri, 08 May 2015 12:16:57 +0200
diff --git a/debian/control b/debian/control
index 4dd6c61..f6126b1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force
Uploaders:
- Cyril Brulebois ,
Tormod Volden
Build-Depends:
debhelper (>= 8),
commit 481738c4191a53f1c391ced5884a83b96b84e54b
Author: Julien Cristau
Date: Fri May 8 12:18:11 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 87efed0..933b409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-savage (1:2.3.8-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Let uscan verify tarball signatures.
-- Julien Cristau Fri, 08 May 2015 12:16:57 +0200
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 000..9930dd6
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,64 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBEoIZDEBEAD5MrFJC9Hi4mXZ97HlFotHIrkMURIFkvl17XEuJ8Jh3hlzJD/q
+K1ByzQGHozzVcfbg4lP4lzqfdps6WCbusqtVYcTF61jjFhYo398lBgpKHUBbsEPC
+SfYp5WkoICa824zcmWO9qYizGqkpd1C6gdQtK6ZaGjLx3xt08M9oVZqj+E2SsPHz
+WaYLugCwCKhlbVTaP28OGy7tBRY6hcLtiZc2CNpr0YjZ53B7Ubs0BVYQutYxho7l
+u0ChE9zNesy4KaIOumXZjTUrMCLpxF/01M1tfzXArMMLAqx3F1M6QIuy18F1zJ2W
+LlkRwJi47NTiJ6jwLUYKBTN9T3nmy0oNAvv5v4B8nWgZAOjjDC2pFoVJa1O3K8Ab
+vSRA3L/N+80MxM9VK5bw451pDqNhxn5q0yeS+RBagmOb2PZSMIuw9adooMurAfDJ
+hsxqp3KaCTdYX5p+mCczNkoKMRUQiVUi250426o69IAmtpVi1q+MV0qWLl2tSvx4
+I4iph9XAhho7ycb4jziWf46ZljnhoGn54EU5GEqH0huakYcXK7XoNxU0XzS/eQuD
+qVy2NH2C945h3LAtMo4zr49VZXjNnFn++zZqCUHASDX6Y3h8uMpzIY6Eslu2S85W
+gpb+V4M5RvKPeuEJTuzxJOOW/B
xserver-xorg-video-savage: Changes to 'debian-unstable'
configure.ac|2 +-
debian/changelog|6 ++
src/savage_driver.c |9 ++---
src/savage_driver.h |4 ++--
src/savage_exa.c|2 +-
src/savage_video.c |8
6 files changed, 20 insertions(+), 11 deletions(-)
New commits:
commit 6fdcef4a62b6693c571cdfd4b76e3a45fe320d50
Author: Maarten Lankhorst
Date: Thu Sep 26 15:44:20 2013 +0200
Actually upload with correct contents. (closes: #724675)
diff --git a/debian/changelog b/debian/changelog
index 06f27ab..51a28d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-savage (1:2.3.7-2) unstable; urgency=low
+
+ * Actually upload with correct contents. (closes: #724675)
+
+ -- Maarten Lankhorst Thu, 26 Sep 2013
15:43:11 +0200
+
xserver-xorg-video-savage (1:2.3.7-1) unstable; urgency=low
* New upstream release that actually works.
commit d27abbf74fee30ddb9a3ca0d597ca0ce16a1bc35
Author: Tormod Volden
Date: Tue Sep 24 23:14:35 2013 +0200
xf86-video-savage: bump to version 2.3.7
Signed-off-by: Tormod Volden
diff --git a/configure.ac b/configure.ac
index 2b99314..a34e624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-savage],
-[2.3.6],
+[2.3.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-savage])
AC_CONFIG_SRCDIR([Makefile.am])
commit 966a0e95d6c420e5e0ab01e665144e66a4004846
Author: Alexander Grothe
Date: Sun Sep 15 11:00:41 2013 +0200
Drop miInitializeBackingStore() call
It was only needed up to xserver 1.4 and is not supported in the
recent xserver versions.
Thanks to Alexander Grothe for reporting the issue and providing
the fix.
https://bugs.freedesktop.org/show_bug.cgi?id=65444
> commit 1cb0261ef54b7dd6a7ef84e1c3959e424706228b
> Author: Daniel Martin
> Date: Thu Sep 6 00:38:26 2012 +0200
>
>dix: Delete mibstore.h
>
>Since Nov 2010 (commit c4c4676) the only purpose of mibstore.h was to
>define an empty function (miInitializeBackingStore()) for backward
>compatibility. Time to say goodbye.
Signed-off-by: Tormod Volden
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 4c8386d..bca2c60 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -3412,7 +3412,6 @@ static Bool SavageScreenInit(SCREEN_INIT_ARGS_DECL)
SavageInitAccel(pScreen);
}
-miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
if( !psav->shadowFB && !psav->useEXA )
commit 44581aef5f878e7f2b34d5693d50ef75263b195c
Author: Tormod Volden
Date: Wed Feb 6 22:14:59 2013 +0100
Fix video window height on MX/IX/SuperSavage
Some copy-pasto caused the width to be written into the height register.
Thanks to Hans-Jürgen Mauser for pointing out a couple of more places this
was wrong.
Signed-off-by: Tormod Volden
diff --git a/src/savage_video.c b/src/savage_video.c
index 63958b7..81a5a82 100644
--- a/src/savage_video.c
+++ b/src/savage_video.c
@@ -1717,28 +1717,28 @@ SavageDisplayVideoNew(
OUTREG(SEC_STREAM2_STRIDE_LPB, pitch & 0xfff );
OUTREG(SEC_STREAM2_WINDOW_START, ((dstBox->x1+1) << 16) |
(dstBox->y1+1) );
OUTREG(SEC_STREAM2_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16)
- | (dstBox->x2-dstBox->x1) );
+ | (dstBox->y2 - dstBox->y1) );
} else if (psav->IsPrimary) {
OUTREG(SEC_STREAM_FBUF_ADDR0, (offset + (x1>>15))
& (0x7ff & ~BASE_PAD));
OUTREG(SEC_STREAM_STRIDE, pitch & 0xfff );
OUTREG(SEC_STREAM_WINDOW_START, ((dstBox->x1+1) << 16) |
(dstBox->y1+1) );
OUTREG(SEC_STREAM_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16)
- | (dstBox->x2-dstBox->x1) );
+ | (dstBox->y2 - dstBox->y1) );
} else {
OUTREG(SEC_STREAM_FBUF_ADDR0, (offset + (x1>>15))
& (0x7ff & ~BASE_PAD));
OUTREG(SEC_STREAM_STRIDE, pitch & 0xfff );
OUTREG(SEC_STREAM_WINDOW_START, ((dstBox->x1+1) << 16) |
(dstBox->y1+1) );
OUTREG(SEC_STREAM_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16)
- | (dstBox->x2-dstBox->x1) );
+ | (dstBox->y2 - dstBox->y1) );
#if 0
OUTREG(SEC_STREAM2_FBUF_ADDR0, (offset + (x1>>15))
& (0x7ff & ~BASE_PAD));
OUTREG(SEC_STREAM2_STRIDE_LPB, pitch & 0xfff );
OUTREG(SEC_STREAM2_WINDOW_START, ((dstBox->x1+1) << 16) |
(dstBox->y1+1) );
OUTREG(SEC_STREAM2_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16)
- | (dstBox->x2-dstBox->x1) );
+ | (dstBox->y2 - dstBox->y1) );
#endif
}
commit 3425ddb4c5dd7bbd91068c7ba0b1c001719795a5
Author: Tormod Volden
Date: Thu May 9 12:39:58 2013 +
Fix building with TRACEON defined
Signed-off-by: Tormod Volden
diff --git a/src/savage_driver.c b/src/savage_driver.c
ind
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog| 94 +++ debian/changelog |6 +++ 2 files changed, 100 insertions(+) New commits: commit eece3c79c6ce3c6103cb4aa3d2bae303bfe2bbc6 Author: Maarten Lankhorst Date: Wed Sep 25 17:10:53 2013 +0200 release to unstable diff --git a/debian/changelog b/debian/changelog index 6c3e47f..06f27ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-savage (1:2.3.7-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.7-1) unstable; urgency=low * New upstream release that actually works. - -- Maarten Lankhorst Wed, 25 Sep 2013 17:10:15 +0200 + -- Maarten Lankhorst Wed, 25 Sep 2013 17:10:41 +0200 xserver-xorg-video-savage (1:2.3.6-1) unstable; urgency=low commit 5cd6e8dfd5f3901df2620aa328948bdfd3a6bb09 Author: Maarten Lankhorst Date: Wed Sep 25 17:10:38 2013 +0200 bump changelogs diff --git a/ChangeLog b/ChangeLog index ac40aff..b70bce3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,97 @@ +commit d27abbf74fee30ddb9a3ca0d597ca0ce16a1bc35 +Author: Tormod Volden +Date: Tue Sep 24 23:14:35 2013 +0200 + +xf86-video-savage: bump to version 2.3.7 + +Signed-off-by: Tormod Volden + +commit 966a0e95d6c420e5e0ab01e665144e66a4004846 +Author: Alexander Grothe +Date: Sun Sep 15 11:00:41 2013 +0200 + +Drop miInitializeBackingStore() call + +It was only needed up to xserver 1.4 and is not supported in the +recent xserver versions. + +Thanks to Alexander Grothe for reporting the issue and providing +the fix. + +https://bugs.freedesktop.org/show_bug.cgi?id=65444 + +> commit 1cb0261ef54b7dd6a7ef84e1c3959e424706228b +> Author: Daniel Martin +> Date: Thu Sep 6 00:38:26 2012 +0200 +> +>dix: Delete mibstore.h +> +>Since Nov 2010 (commit c4c4676) the only purpose of mibstore.h was to +>define an empty function (miInitializeBackingStore()) for backward +>compatibility. Time to say goodbye. + +Signed-off-by: Tormod Volden + +commit 44581aef5f878e7f2b34d5693d50ef75263b195c +Author: Tormod Volden +Date: Wed Feb 6 22:14:59 2013 +0100 + +Fix video window height on MX/IX/SuperSavage + +Some copy-pasto caused the width to be written into the height register. + +Thanks to Hans-Jürgen Mauser for pointing out a couple of more places this +was wrong. + +Signed-off-by: Tormod Volden + +commit 3425ddb4c5dd7bbd91068c7ba0b1c001719795a5 +Author: Tormod Volden +Date: Thu May 9 12:39:58 2013 + + +Fix building with TRACEON defined + +Signed-off-by: Tormod Volden + +commit ac460e6836bdd2cd16c9d29743376c16fdc6924e +Author: Tormod Volden +Date: Tue May 7 22:41:31 2013 +0200 + +exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr + +Signed-off-by: Tormod Volden + +commit c30f9b4a61283f21f6bd230950f52961afa203cf +Author: Tormod Volden +Date: Thu May 9 12:36:33 2013 + + +Really fix default accel arch when built with no XAA + +After ca9718a887ecbc59b76869af673791ab591b849b it would +still default to XAA unless AccelMethod option was used. + +Make sure the default is EXA if there is no XAA support. + +Signed-off-by: Tormod Volden + +commit ca9718a887ecbc59b76869af673791ab591b849b +Author: Dave Airlie +Date: Sat Dec 22 20:00:00 2012 +1000 + +savage: fix default accel arch when built with no XAA + +Signed-off-by: Dave Airlie + +commit 3d181030a6ba2205a57ef4665e53aed0251ccaa6 +Author: Dave Airlie +Date: Wed Jul 18 18:52:38 2012 +1000 + +savage: move compat-api.h down to proper place. + +This screws up when DRI isn't enabled. + +Signed-off-by: Dave Airlie + commit cb27a7a072c6e087a2e272d84c1d569dc717da8b Author: Dave Airlie Date: Tue Jul 17 16:05:09 2012 +1000 diff --git a/debian/changelog b/debian/changelog index 3e0d167..6c3e47f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.7-1) UNRELEASED; urgency=low + + * New upstream release that actually works. + + -- Maarten Lankhorst Wed, 25 Sep 2013 17:10:15 +0200 + xserver-xorg-video-savage (1:2.3.6-1) unstable; urgency=low * New upstream release -- 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/e1voqq0-0005ld...@vasks.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 53 ++ configure.ac| 20 + debian/changelog|6 ++ src/Makefile.am |1 src/compat-api.h| 105 src/savage_accel.c |2 src/savage_cursor.c |4 - src/savage_dga.c| 23 +++ src/savage_dri.c| 54 ++ src/savage_driver.c | 93 +- src/savage_driver.h | 16 +-- src/savage_exa.c| 14 +++--- src/savage_hwmc.c |5 +- src/savage_i2c.c| 11 + src/savage_shadow.c |6 +- src/savage_vbe.c| 25 ++-- src/savage_video.c | 10 ++-- src/savage_xaa.c| 17 +--- 18 files changed, 343 insertions(+), 122 deletions(-) New commits: commit cdb1396417d63e727612b5f27eb36c89a10c34b5 Author: Maarten Lankhorst Date: Wed Sep 25 14:07:17 2013 +0200 release to unstable diff --git a/debian/changelog b/debian/changelog index bb7137f..3e0d167 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-savage (1:2.3.6-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.6-1) unstable; urgency=low * New upstream release - -- Maarten Lankhorst Wed, 18 Jul 2012 13:42:19 +0200 + -- Maarten Lankhorst Wed, 25 Sep 2013 14:06:58 +0200 xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low commit 3299a36b373cc6d3237b79ef42908e63f822edd1 Author: Maarten Lankhorst Date: Wed Jul 18 13:42:47 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index e68bc48..bb7137f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.6-1) UNRELEASED; urgency=low + + * New upstream release + + -- Maarten Lankhorst Wed, 18 Jul 2012 13:42:19 +0200 + xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low * New upstream release commit 03e24e57a11ed176c845ab9c2e5308dceab08d26 Author: Maarten Lankhorst Date: Wed Jul 18 13:42:38 2012 +0200 Bump changelog diff --git a/ChangeLog b/ChangeLog index eda84db..ac40aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +commit cb27a7a072c6e087a2e272d84c1d569dc717da8b +Author: Dave Airlie +Date: Tue Jul 17 16:05:09 2012 +1000 + +xf86-video-savage: bump to version 2.3.6 + +Signed-off-by: Dave Airlie + +commit d7edd7c545473d5ed80c9a46c1405042267a7293 +Author: Dave Airlie +Date: Mon Jul 16 03:39:32 2012 +0100 + +savage: make build with no xaa server. + +This fixes savage build against the no XAA server. + +Signed-off-by: Dave Airlie + +commit 508e0742b7d1ac1e4ff6b648d19bfa062c535d61 +Author: Dave Airlie +Date: Mon Jul 2 12:29:41 2012 +0100 + +savage: bump to 2.3.5 + +Signed-off-by: Dave Airlie + +commit 430b956b49b6c883189074ce13bc234545b714e0 +Author: Dave Airlie +Date: Wed Jun 6 11:24:31 2012 +0100 + +savage: i2c drop xf86Screens usage. + +Signed-off-by: Dave Airlie + +commit a2714fb09e1e0badbb3e98e24d4b1ed92003bdb9 +Author: Dave Airlie +Date: Wed Jun 6 11:22:29 2012 +0100 + +savage: port to new compat API + +Signed-off-by: Dave Airlie + +commit de22eab9a21df80fe965dc37d21ba3ac2b9f5fd0 +Author: Tormod Volden +Date: Wed Feb 15 22:20:37 2012 +0100 + +Refactor BIOS modes retrieval to call VBEGetVBEInfo only once + +Otherwise, calling it twice would trigger a VBE bug when using +xserver 1.12. + +Signed-off-by: Tormod Volden + commit 63dd44674a28263c5d8d6aec8b72e95f94d3fe6c Author: Alan Coopersmith Date: Fri Mar 23 19:46:12 2012 -0700 commit cb27a7a072c6e087a2e272d84c1d569dc717da8b Author: Dave Airlie Date: Tue Jul 17 16:05:09 2012 +1000 xf86-video-savage: bump to version 2.3.6 Signed-off-by: Dave Airlie diff --git a/configure.ac b/configure.ac index 5e4fbe2..2b99314 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-savage], -[2.3.5], +[2.3.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-savage]) AC_CONFIG_SRCDIR([Makefile.am]) commit d7edd7c545473d5ed80c9a46c1405042267a7293 Author: Dave Airlie Date: Mon Jul 16 03:39:32 2012 +0100 savage: make build with no xaa server. This fixes savage build against the no XAA server. Signed-off-by: Dave Airlie diff --git a/configure.ac b/configure.ac index ca60e76..5e4fbe2 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,24 @@ if test "$DRI" = yes; then AC_DEFINE(SAVAGEDRI_DEVEL,1,[Enable developmental DRI driver support]) fi +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 +
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog| 86 + configure.ac |6 - debian/changelog |7 ++ src/Makefile.am |1 src/savage_accel.c |4 - src/savage_bci.h |7 -- src/savage_common.h |6 - src/savage_dri.c | 170 +++ src/savage_dri.h |6 - src/savage_dripriv.h |6 - src/savage_driver.c | 46 +++-- src/savage_driver.h | 11 ++- src/savage_drm.h | 12 +-- src/savage_exa.c |8 +- src/savage_hwmc.c|1 src/savage_i2c.c |5 - src/savage_pciids.h | 55 src/savage_regs.h|6 - src/savage_sarea.h | 12 +-- src/savage_streams.h |7 -- src/savage_vbe.h |6 - src/savage_video.c | 12 +-- 22 files changed, 280 insertions(+), 200 deletions(-) New commits: commit a148cd99785b5312d923ad0df34b56bf1b32063e Author: Julien Cristau Date: Tue May 8 11:44:47 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index b3463ff..e68bc48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-savage (1:2.3.4-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low * New upstream release + Fix for new vgahw ABI (closes: #671800) - -- Julien Cristau Tue, 08 May 2012 11:32:10 +0200 + -- Julien Cristau Tue, 08 May 2012 11:44:31 +0200 xserver-xorg-video-savage (1:2.3.3-1) unstable; urgency=low commit ddf889f135e1df01ea71d36574dcb00084f0cd71 Author: Julien Cristau Date: Tue May 8 11:35:07 2012 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 9c3d48e..eda84db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,89 @@ +commit 63dd44674a28263c5d8d6aec8b72e95f94d3fe6c +Author: Alan Coopersmith +Date: Fri Mar 23 19:46:12 2012 -0700 + +xf86-video-savage 2.3.4 + +Signed-off-by: Alan Coopersmith + +commit dfcc325f55d580eb630f3b236eadf99f6b7d6ad6 +Author: Alan Coopersmith +Date: Fri Mar 23 19:38:07 2012 -0700 + +Add savage_pciids.h to src/Makefile.am to fix distcheck + +Signed-off-by: Alan Coopersmith + +commit c4022796ec69bb3223d435d8442f9168aebe9c3d +Author: Peter Hutterer +Date: Tue Jan 17 15:35:39 2012 +1000 + +Untangle XF86DRI from the driver-specific DRI define + +XF86DRI is defined by xorg-server.h, so --disable-dri in the driver +itself does exactly nothing other than not fill in the CFLAGS and thus stop +the driver from compiling. + +Signed-off-by: Peter Hutterer +Signed-off-by: Tormod Volden + +commit 05f74bd80018bc503ff5631b357fc0b02df6187f +Author: Andrew Turner +Date: Fri Oct 14 00:18:40 2011 +0200 + +Merge almost identical code in SAVAGEInitVisualConfigs + +https://bugs.freedesktop.org/show_bug.cgi?id=9961 + +Signed-off-by: Andrew Turner +[Tormod: Rename table to SAVAGEVisuals] +Signed-off-by: Tormod Volden + +commit 0600b7279382c66445506fa98dc50299574a1abd +Author: Tormod Volden +Date: Sun Dec 4 23:36:19 2011 +0100 + +Avoid leading underscores in #include guards + +In a user header file, the macro name should not begin with `_' +http://gcc.gnu.org/onlinedocs/cpp/Once_002dOnly-Headers.html + +Signed-off-by: Tormod Volden + +commit 10f319e43f77fef450aa723eff25bd200600c48d +Author: Tormod Volden +Date: Sun Dec 4 23:36:18 2011 +0100 + +Do not use the deprecated xf86PciInfo.h from xserver + +Instead maintain our own list of supported PCI IDs. + +Signed-off-by: Tormod Volden + +commit c3eaacd25358c225e355a1ea7d64dece8188b69a +Author: Adam Jackson +Date: Mon Dec 19 17:23:35 2011 -0500 + +Fix for new vgahw ABI + +Signed-off-by: Adam Jackson + +commit a0776b675a4a62d972d135508079950b8adbfe28 +Author: Adam Jackson +Date: Mon Dec 19 17:22:53 2011 -0500 + +Fall back to shadowfb if XAA is unavailable + +Signed-off-by: Adam Jackson + +commit 4618374e37674345303b5b44474195def65bba2a +Author: Adam Jackson +Date: Wed Jun 22 17:05:37 2011 -0400 + +Don't include xf86Priv.h + +Signed-off-by: Adam Jackson + commit 8b9c81bacf45a9f56b0ec275e1b48e1407380baf Author: Tormod Volden Date: Sat Oct 8 21:55:38 2011 +0200 diff --git a/debian/changelog b/debian/changelog index 45ffbee..b3463ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-savage (1:2.3.4-1) UNRELEASED; urgency=low + + * New upstream release ++ Fix for new vgahw ABI (closes: #671800) + + -- Julien Cristau Tue, 08 May 2012 11:32:10 +0200 + xserver-xorg-video-savage (1:2.3.3-1) unstable; urgency=low [ Tormod Volden ] commit 63dd44674a28263c5d8d6aec8b72e95f94d3fe6c Author: Alan Coopersmith Date: Fri Mar 23 19:46:12 2012 -0700 xf86-video-savage 2.3.4 Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index 2db5746..d82af14 100644 --- a/configure.ac +++ b/co
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 6a72e9198a2f0e1add63c12ac65ca4127203d5c2 Author: Julien Cristau Date: Sun Oct 23 17:15:18 2011 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 7f8710a..45ffbee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -xserver-xorg-video-savage (1:2.3.3-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.3-1) unstable; urgency=low + [ Tormod Volden ] * New upstream release * Bump Standards-Version to 3.9.2 (no changes needed) - -- Tormod Volden Sun, 09 Oct 2011 17:43:44 +0200 + -- Julien Cristau Sun, 23 Oct 2011 17:15:11 +0200 xserver-xorg-video-savage (1:2.3.2-3) unstable; urgency=low -- 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/e1rhzv2-0003zf...@vasks.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |1 + debian/control |4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit 98f48aaa0e6949487048f76337d4cd29b68b78a4 Author: Tormod Volden Date: Mon Feb 21 23:38:58 2011 +0100 Add myself as uploader diff --git a/debian/changelog b/debian/changelog index ed86d4b..f7c9fce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ xserver-xorg-video-savage (1:2.3.2-3) UNRELEASED; urgency=low - df80590... savage: More (intermediate) casts to silence warnings - 35d9734... savage: Replace deprecated x(c)alloc/xfree with m/calloc/free - 0cbb6d2... savage: Add casts to silence build warnings + * Add myself as uploader -- Tormod Volden Mon, 21 Feb 2011 22:00:45 +0100 diff --git a/debian/control b/debian/control index cdf07ed..ed6e160 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,9 @@ Source: xserver-xorg-video-savage Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: Cyril Brulebois +Uploaders: + Cyril Brulebois , + Tormod Volden Build-Depends: debhelper (>= 8), dh-autoreconf, -- 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/e1prepp-mi...@alioth.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1b277de8d62db71a85a4dadf3201ea0d1969a141 Author: Cyril Brulebois Date: Mon Feb 21 23:43:20 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index f7c9fce..700b301 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-savage (1:2.3.2-3) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.2-3) unstable; urgency=low * Merge from upstream up to aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef - aff8f96... Use proper casts on framebuffer addresses @@ -14,7 +14,7 @@ xserver-xorg-video-savage (1:2.3.2-3) UNRELEASED; urgency=low - 0cbb6d2... savage: Add casts to silence build warnings * Add myself as uploader - -- Tormod Volden Mon, 21 Feb 2011 22:00:45 +0100 + -- Tormod Volden Mon, 21 Feb 2011 23:43:12 +0100 xserver-xorg-video-savage (1:2.3.2-2) unstable; urgency=low -- 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/e1prewp-00033q...@alioth.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ab985e3104b5c8747638da2e52879edf0a059c22 Author: Tormod Volden Date: Mon Feb 21 22:54:04 2011 +0100 Fix debian version to simply bump revision So that we can use the same tarball. diff --git a/debian/changelog b/debian/changelog index 226d5cb..ed86d4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -xserver-xorg-video-savage (1:2.3.2+git20110221.aff8f96-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.2-3) UNRELEASED; urgency=low - * New upstream snapshot: + * Merge from upstream up to aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef - aff8f96... Use proper casts on framebuffer addresses - 6b22be0... savage: Fix initialization typo in SAVAGEDRIMoveBuffers - 9872b5f... savage: Fix building with TRACEON defined -- 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/e1prdiu-0007pz...@alioth.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 125 + debian/changelog| 17 src/savage_accel.c |3 src/savage_cursor.c |2 src/savage_dga.c|8 +- src/savage_dri.c| 193 ++-- src/savage_driver.c | 31 src/savage_driver.h |1 src/savage_exa.c|3 src/savage_hwmc.c | 10 +- src/savage_vbe.c| 10 +- src/savage_video.c | 35 - 12 files changed, 292 insertions(+), 146 deletions(-) New commits: commit be186c1aebb6c656c6e5b9ba7cf91018faa1ae76 Author: Tormod Volden Date: Mon Feb 21 22:05:06 2011 +0100 New upstream snapshot, bump changelogs diff --git a/ChangeLog b/ChangeLog index 29b05ed..f8c4a54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,128 @@ +commit aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef +Author: Tormod Volden +Date: Sun Feb 13 23:04:09 2011 +0100 + +Use proper casts on framebuffer addresses + +Correction to df8059025cafadaeea7672842d31134ed8c9c5df. +Casting addresses to int is a 32bitism. If we want to use +this intermediate cast to silence compiler warnings, we +should use uintptr_t instead to not introduce potential +bit truncation. + +Thanks to Mark Kettenis for spotting this. + +Signed-off-by: Tormod Volden + +commit 6b22be096bed59a853e5e1cdd25d8943cce30d4f +Author: Tormod Volden +Date: Sun Jan 23 23:45:49 2011 +0100 + +savage: Fix initialization typo in SAVAGEDRIMoveBuffers + +This was warned about when building with -O2, and seems +to be a copy-and-paste glitch. + +savage_dri.c: In function ‘SAVAGEDRIMoveBuffers’: +savage_dri.c:1445: warning: ‘pptNew2’ may be used uninitialized in this function + +commit 9872b5f7ce7a7b07ff68bd2c389c56a3cb1b4ed6 +Author: Tormod Volden +Date: Sun Jan 23 22:47:01 2011 +0100 + +savage: Fix building with TRACEON defined + +Two warnings and an error. + +commit b018d343e6a6810afdaf1a73091dd9bc8c1c95bd +Author: Tormod Volden +Date: Sun Jan 23 20:23:49 2011 +0100 + +savage: Setup tiled surface registers in SavageEnterVT + +These registers are cleared after suspend/resume, so set them +up again in EnterVT. + +commit f3cd2946d0f38e89643aa6624e6bf35472828995 +Author: Tormod Volden +Date: Sun Jan 23 20:23:48 2011 +0100 + +savage: Factor out a SAVAGEDRISetupTiledSurfaceRegs function + +The tiled surface registers were only setup in SAVAGEDRIScreenInit, +however, after suspend/resume these registers must be set up again. +So factor it out in a new function so it can be reused. + +commit 055ca25faeb9decee091e8c59134c8f537bb7bc3 +Author: Tormod Volden +Date: Sun Jan 23 19:28:47 2011 +0100 + +savage: Cast all handles before printing them + +Removes the last bunch of -Wall build warnings. + +savage_dri.c:490: warning: format ‘%08lx’ expects type ‘long unsigned int’, +but argument 5 has type ‘drm_handle_t’ +... + +commit 3f18b334812086e5f487a4570a34a3906a67724c +Author: Tormod Volden +Date: Sun Jan 23 15:49:58 2011 +0100 + +savage: Fix ambiguity in SavageLoadPaletteSavage4 + +It looks like "!" was meant for logic negation and the parentheses +were wrong. + +I don't have a Savage 4 so I can't check if this fixes or breaks +anything. + +commit 6f8aa9c90cccbd893323f5f1892958b7f46e400d +Author: Tormod Volden +Date: Sun Jan 23 15:49:57 2011 +0100 + +savage: Drop unused variables and functions + +Silence -Wall warnings. + +The functions are just #if'ed out, to be left for inspiration. + +commit df8059025cafadaeea7672842d31134ed8c9c5df +Author: Tormod Volden +Date: Sun Jan 23 12:47:04 2011 +0100 + +savage: More (intermediate) casts to silence warnings + +savage_dga.c: In function ‘Savage_OpenFramebuffer’: +savage_dga.c:393: warning: cast to pointer from integer of different size + +savage_dri.c: In function ‘SAVAGEDRIScreenInit’: +savage_dri.c:924: warning: cast to pointer from integer of different size + +commit 35d9734049a0f701d2c1f84f778f30816176d29e +Author: Tormod Volden +Date: Sun Jan 23 12:47:02 2011 +0100 + +savage: Replace deprecated x(c)alloc/xfree with m/calloc/free + +sed -i 's/xalloc/malloc/g; s/xcalloc/calloc/g; s/xfree/free/g' + +Also replace xrealloc with realloc. + +commit 0cbb6d275726aaed648b5ea4dcff45ce14388f91 +Author: Tormod Volden +Date: Sun Jan 23 12:47:03 2011 +0100 + +savage: Add casts to silence build warnings + +savage_exa.c: In function ‘SavageUploadToScreen’: +savage_exa.c:545: warning: passing argument 1 of ‘memcpy’ discards qualifiers from pointer target type +/usr/include/bits/string3.h:49: note: expected ‘void * restrict’ but argument is of type ‘volatile CARD32 *’ + +savage_video.c: In function ‘SavagePutImage’: +savage_video.c:2007: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type
xserver-xorg-video-savage: Changes to 'debian-unstable'
.gitignore | 78 ++
COPYING| 118 -
ChangeLog | 229 ++
Makefile.am| 12
configure.ac | 50 +--
debian/README.source | 24 -
debian/changelog | 28 ++
debian/compat |2
debian/control | 24 -
debian/copyright | 71 +
debian/rules | 103
debian/xsfbs/repack.sh | 32 --
debian/xsfbs/xsfbs.mk | 285 --
debian/xsfbs/xsfbs.sh | 622 -
man/Makefile.am| 59 +---
man/savage.man |1
src/savage_driver.c|3
src/savage_exa.c |4
src/savage_video.c | 13 -
19 files changed, 613 insertions(+), 1145 deletions(-)
New commits:
commit 1b49cc8850874ddd6cf95a453c0548cd0fce1ce0
Author: Cyril Brulebois
Date: Sat Feb 5 14:55:01 2011 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index d2cbfdb..9ec59a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-savage (1:2.3.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.3.2-2) unstable; urgency=low
* Switch to dh:
- Use debhelper 8.
@@ -11,7 +11,7 @@ xserver-xorg-video-savage (1:2.3.2-2) UNRELEASED; urgency=low
* Wrap Depends/Provides.
* Bump Standards-Version to 3.9.1 (no changes needed).
- -- Cyril Brulebois Fri, 04 Feb 2011 05:21:22 +0100
+ -- Cyril Brulebois Sat, 05 Feb 2011 14:55:01 +0100
xserver-xorg-video-savage (1:2.3.2-1) experimental; urgency=low
commit 2d4b214c56b6796c3a64da6db901fe26efdd37ca
Author: Cyril Brulebois
Date: Fri Feb 4 05:26:14 2011 +0100
Bump Standards-Version to 3.9.1 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 636ad40..d2cbfdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-savage (1:2.3.2-2) UNRELEASED; urgency=low
* Update Uploaders list. Thanks, David & Brice!
* Remove long obsolete Replaces/Conflicts.
* Wrap Depends/Provides.
+ * Bump Standards-Version to 3.9.1 (no changes needed).
-- Cyril Brulebois Fri, 04 Feb 2011 05:21:22 +0100
diff --git a/debian/control b/debian/control
index 2b16568..cdf07ed 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
x11proto-xf86dri-dev,
quilt,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
commit c2abde0ff4c6cd3781db67071210fe43b029b6cf
Author: Cyril Brulebois
Date: Fri Feb 4 05:25:58 2011 +0100
Wrap Depends/Provides.
diff --git a/debian/changelog b/debian/changelog
index 0a1a0e2..636ad40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-savage (1:2.3.2-2) UNRELEASED; urgency=low
* Remove xsfbs accordingly.
* Update Uploaders list. Thanks, David & Brice!
* Remove long obsolete Replaces/Conflicts.
+ * Wrap Depends/Provides.
-- Cyril Brulebois Fri, 04 Feb 2011 05:21:22 +0100
diff --git a/debian/control b/debian/control
index 351408d..2b16568 100644
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,12 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.
Package: xserver-xorg-video-savage
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
-Provides: ${xviddriver:Provides}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
Description: X.Org X server -- Savage display driver
This package provides the driver for the S3/VIA Savage/ProSavage/Twister
family
of chipsets.
commit 298d4904f18aef19ea97273d029365ad8a95f4f2
Author: Cyril Brulebois
Date: Fri Feb 4 05:25:35 2011 +0100
Remove long obsolete Replaces/Conflicts.
diff --git a/debian/changelog b/debian/changelog
index 76f0099..0a1a0e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-savage (1:2.3.2-2) UNRELEASED; urgency=low
debhelper sequence.
* Remove xsfbs accordingly.
* Update Uploaders list. Thanks, David & Brice!
+ * Remove long obsolete Replaces/Conflicts.
-- Cyril Brulebois Fri, 04 Feb 2011 05:21:22 +0100
diff --git a/debian/control b/debian/control
index c1004aa..351408d 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,6 @@ Package: xserver-xorg-video-savage
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-savage
-Conflicts: xserver-xorg-driver-savage
Description: X.Org X server -- Savage display driver
This package provides the driver for the S3/VIA Savage/ProSavage/Twister
family
of chipsets.
commit fcf1232b215e55cbed22d3a
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/control |2 -- 1 file changed, 2 deletions(-) New commits: commit d404ae524cb59a89e72032c1d5944b675c5e7fb4 Author: Mikhail Gusarov Date: Fri May 7 18:58:58 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index 5e83aa8..5b3c71c 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,5 @@ Description: X.Org X server -- Savage display driver . More information about X.Org can be found at: http://www.X.org> - http://xorg.freedesktop.org> - http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-video-savage driver module. -- 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/e1oampx-0001yi...@alioth.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/README.source |2 +-
debian/changelog | 12 ++--
debian/control|8
debian/xsfbs/xsfbs.mk | 35 ++-
4 files changed, 37 insertions(+), 20 deletions(-)
New commits:
commit bf54dba378b9d3bcec47b5660b1189dd915f3bbc
Author: Cyril Brulebois
Date: Tue May 4 00:12:25 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index afcaa05..b3467da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.3.1-2) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -12,7 +12,7 @@ xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
* Add myself to Uploaders.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
- -- Julien Cristau Sat, 23 Jan 2010 02:28:29 +0100
+ -- Cyril Brulebois Tue, 04 May 2010 00:12:21 +0200
xserver-xorg-video-savage (1:2.3.1-1) experimental; urgency=low
commit 6bf0c9154258e5aaef1a090a9dfa44e70eccfcdb
Author: Cyril Brulebois
Date: Tue May 4 00:12:07 2010 +0200
Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index de2e6e1..afcaa05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
accordingly.
* Add myself to Uploaders.
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau Sat, 23 Jan 2010 02:28:29 +0100
diff --git a/debian/control b/debian/control
index 10f8630..5e83aa8 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
commit b6cbf1dcceca5cbeafc7a18ac0c6b536ae296abb
Author: Cyril Brulebois
Date: Tue May 4 00:11:29 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index af319da..de2e6e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
* Update to new xsfbs, replace deprecated ${xserver:Depends} with
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
accordingly.
+ * Add myself to Uploaders.
-- Julien Cristau Sat, 23 Jan 2010 02:28:29 +0100
diff --git a/debian/control b/debian/control
index 37225fb..10f8630 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-savage
Section: x11
Priority: optional
Maintainer: Debian X Strike Force
-Uploaders: David Nusinow , Brice Goglin
+Uploaders: David Nusinow , Brice Goglin
, Cyril Brulebois
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit c4de24d35380d442787ef3314a47a000e695cba2
Author: Cyril Brulebois
Date: Tue May 4 00:10:53 2010 +0200
Update to new xsfbs, replace deprecated ${xserver:Depends} with
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly.
diff --git a/debian/changelog b/debian/changelog
index 572cde6..af319da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ [ Cyril Brulebois ]
+ * Update to new xsfbs, replace deprecated ${xserver:Depends} with
+${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
+accordingly.
+
-- Julien Cristau Sat, 23 Jan 2010 02:28:29 +0100
xserver-xorg-video-savage (1:2.3.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 2e1b086..37225fb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow , Brice Goglin
= 5.0.0),
pkg-config,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
x11proto-video-dev,
x11proto-xext-dev,
x11proto-gl-dev,
@@ -28,7 +28,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.
Package: xserver-xorg-video-savage
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
Provides: ${xviddriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-savage
Conflicts: xserver-xorg-driver-savage
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois
Date: Sun May 2 02:14:45 2010 +0200
Add xorg-driver-{video,input} to Provides.
diff
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog | 17 - debian/control |2 +- 2 files changed, 13 insertions(+), 6 deletions(-) New commits: commit 4dd522441af7f2fd478c19eec56da6b32185bc74 Author: Julien Cristau Date: Sat Jan 23 01:46:36 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index e472a67..111c7f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Remove myself from Uploaders -- Timo Aaltonen Sat, 05 Dec 2009 01:49:10 +0200 diff --git a/debian/control b/debian/control index e87ccba..2e1b086 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-savage Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow , Julien Cristau , Brice Goglin +Uploaders: David Nusinow , Brice Goglin Build-Depends: debhelper (>= 5.0.0), pkg-config, commit e0e5e50e205e057ef1c3e2974836ac6f9c4df1c3 Author: Cyril Brulebois Date: Sun Dec 6 01:54:22 2009 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 1c55dce..3371c33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.1-1) experimental; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. - -- Timo Aaltonen Sat, 05 Dec 2009 01:49:10 +0200 + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 01:54:17 +0100 xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |5 +
debian/rules | 14 +++---
2 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 60079969b542dcf166ee92d51fdf99ec1342962f
Author: Julien Cristau
Date: Sat Jan 16 16:48:49 2010 +
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index 1c55dce..e472a67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason. Thanks, Colin Watson!
+
-- Timo Aaltonen Sat, 05 Dec 2009 01:49:10 +0200
xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 096daa7..7f32407 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,17 +35,17 @@ confflags += --disable-static
configure: $(STAMP_DIR)/patch
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+build/config.status: configure
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean: xsfclean
@@ -57,7 +57,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f $$(find -name Makefile.in)
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
@@ -70,7 +70,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install serverabi
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |3 ++- debian/control |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 8ad8c98bab6031973f4d04dd0fb1c8620bd46c58 Author: Timo Aaltonen Date: Sat Dec 5 02:09:30 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index 8c8d8f7..1c55dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. - -- Timo Aaltonen Tue, 01 Dec 2009 10:12:09 +0200 + -- Timo Aaltonen Sat, 05 Dec 2009 01:49:10 +0200 xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8d5e0ab..e87ccba 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow , Julien Cristau = 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.5.99.901), + xserver-xorg-dev (>= 2:1.7), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 35 +++ configure.ac |6 + debian/changelog |7 + debian/control|2 debian/xsfbs/xsfbs.mk | 21 debian/xsfbs/xsfbs.sh | 233 -- src/savage_driver.c | 16 +++ src/savage_driver.h |2 src/savage_hwmc.c |1 9 files changed, 67 insertions(+), 256 deletions(-) New commits: commit de9a3b3e267d045736fd941eed8831d8f4fbca84 Author: Timo Aaltonen Date: Tue Dec 1 10:13:01 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index bbd0ad1..8c8d8f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen Tue, 01 Dec 2009 10:12:09 +0200 diff --git a/debian/control b/debian/control index 37edece..8d5e0ab 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git commit c630a872cb929e498f5f831cff15f2b1c8a590c4 Author: Timo Aaltonen Date: Tue Dec 1 10:12:35 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 76d0280..3d9bfcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +commit 36ab23a95fd8d46a1206a941278df8845d5765ba +Author: Dave Airlie +Date: Thu Jul 30 12:04:29 2009 +1000 + +savage: bump for release 2.3.1 + +commit ad0b7ba4618c09c1a9d5a6da6b12f42980b7450c +Author: Dave Airlie +Date: Tue Jul 28 18:40:18 2009 +1000 + +savage: move abi check down for RAC + +commit 21f6bf3e492d328b8c7003ffb0c9deec0113fb05 +Author: Dave Airlie +Date: Tue Jul 28 15:22:41 2009 +1000 + +savage: change to using ABI version check + +commit 3c0b164ffe9e1f582cee43f89a94fc0a2899bed8 +Author: Dave Airlie +Date: Tue Jul 28 13:32:36 2009 +1000 + +savage: update for resources/RAC API removal + +commit 96d19b654e934fc3f85f9b45f1dee224cb40b389 +Author: Peter Hutterer +Date: Thu Jul 16 11:54:48 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 + commit 75ce40850ea2ce2ed7122cf62856dcf8022187d2 Author: Adam Jackson Date: Thu Jul 2 11:39:22 2009 -0400 diff --git a/debian/changelog b/debian/changelog index 173b4d7..bbd0ad1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen Tue, 01 Dec 2009 10:12:09 +0200 + xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low * New upstream release. commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau Date: Fri Sep 25 16:39:23 2009 +0200 xsfbs.mk: remove more obsolete code We can use plain debconf-updatepo, and don't need to clean the 'imports' directory or shlibs.local. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 82eb45f..5e16b10 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc rm -rf $(STAMP_DIR) - rm -rf imports - dh_clean debian/shlibs.local \ -debian/po/pothead - -# Generate the debconf templates POT file header. -debian/po/pothead: debian/po/pothead.in - sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ - -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ - -# Update POT and PO files. -.PHONY: updatepo -updatepo: debian/po/pothead - debian/scripts/debconf-updatepo --pot-header=pothead --verbose + dh_clean # Remove files from the upstream source tree that we don't need, or which have # licensing problems. It must be run before creating the .orig.tar.gz. commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc Author: Julien Cristau Date: Fri Sep 25 15:43:28 2009 +0200 xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage These variables aren't set anywhere. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 1f86848..82eb45f 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -176,7 +176,7 @@ cleanscripts: xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc - rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf $(STAMP_DIR) rm -rf imports dh_clean debian/shlibs.local \ debian/po/pothead @@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ sed -e 's/@SOURCE_VERSION@/
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog| 154 +- README | 20 ++ configure.ac |6 debian/README.source | 73 ++ debian/changelog |9 + debian/control |2 debian/patches/01_gen_pci_ids.diff | 39 - debian/patches/series|1 debian/xserver-xorg-video-savage.install |1 debian/xsfbs/xsfbs.sh| 12 - man/savage.man | 35 - src/savage_accel.c | 26 +++ src/savage_dri.c | 42 +- src/savage_driver.c | 217 +++ src/savage_driver.h |4 src/savage_exa.c | 128 +- src/savage_video.c | 196 ++-- 17 files changed, 627 insertions(+), 338 deletions(-) New commits: commit 2347c3e039ffdb93739616279f7a4d44a2a6 Author: Brice Goglin Date: Sun Jul 19 22:21:39 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 8d23efb..173b4d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xserver-xorg-video-savage (1:2.3.0-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low * New upstream release. * Bump Standards-Version to 3.8.2. * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. - -- Brice Goglin Sun, 19 Jul 2009 22:26:31 +0200 + -- Brice Goglin Sun, 19 Jul 2009 22:28:54 +0200 xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low commit 1579cd7cb9872b96630bcffc590eea344dd0b7b1 Author: Brice Goglin Date: Sun Jul 19 22:28:15 2009 +0200 Remove 01_gen_pci_ids.diff diff --git a/debian/changelog b/debian/changelog index bec1672..8d23efb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ xserver-xorg-video-savage (1:2.3.0-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.8.2. + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to +choose a driver during autoconfiguration. - -- Brice Goglin Sun, 19 Jul 2009 22:17:50 +0200 + -- Brice Goglin Sun, 19 Jul 2009 22:26:31 +0200 xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index d1d3811..000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,39 +0,0 @@ -Index: xserver-xorg-video-savage/src/savage.ids -=== /dev/null 1970-01-01 00:00:00.0 + -+++ xserver-xorg-video-savage/src/savage.ids 2007-08-31 18:03:03.0 -0400 -@@ -0,0 +1,23 @@ -+53338A22 -+53338A20 -+53338A21 -+53339102 -+53338C10 -+53338C11 -+53338C12 -+53338C13 -+53338A25 -+53338A26 -+53338D01 -+53338D02 -+53338C22 -+53338C24 -+53338C26 -+53338C2A -+53338C2B -+53338C2C -+53338C2D -+53338C2E -+53338C2F -+53338D03 -+53338D04 -Index: xserver-xorg-video-savage/src/Makefile.am -=== xserver-xorg-video-savage.orig/src/Makefile.am 2007-08-31 18:03:21.0 -0400 -+++ xserver-xorg-video-savage/src/Makefile.am 2007-08-31 18:04:03.0 -0400 -@@ -56,3 +56,6 @@ - savage_dri.h \ - savage_dripriv.h - endif -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = savage.ids diff --git a/debian/patches/series b/debian/patches/series index dc070a7..d7eb8d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -01_gen_pci_ids.diff 03_request_16bit_depth.diff diff --git a/debian/xserver-xorg-video-savage.install b/debian/xserver-xorg-video-savage.install index 8a9f4ba..614cfb4 100644 --- a/debian/xserver-xorg-video-savage.install +++ b/debian/xserver-xorg-video-savage.install @@ -1,3 +1,2 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* -usr/share/xserver-xorg/pci/* commit ccb3c05dc4bc9afcd1b47538180420fd88c5fba4 Author: Brice Goglin Date: Sun Jul 19 22:18:24 2009 +0200 Adding README.source means we can bump Standards-Version diff --git a/debian/changelog b/debian/changelog index 80d24f2..bec1672 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xserver-xorg-video-savage (1:2.3.0-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.2. - -- Brice Goglin Sun, 19 Jul 2009 22:10:34 +0200 + -- Brice Goglin Sun, 19 Jul 2009 22:17:50 +0200 xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low diff --git a/debian/control b/debian/control index 7edc777..37edece 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@
xserver-xorg-video-savage: Changes to 'debian-unstable'
Makefile.in | 673
aclocal.m4| 8256 ---
config.guess | 1526 -
config.h.in | 72
config.sub| 1658 -
configure |23065 --
debian/changelog | 30
debian/control| 20
debian/patches/02_temporary_revert_pciaccess.diff | 771
debian/patches/series |1
debian/rules | 25
debian/xsfbs/repack.sh| 32
debian/xsfbs/xsfbs.mk | 29
debian/xsfbs/xsfbs.sh | 66
depcomp | 589
install-sh| 519
ltmain.sh | 6964 --
man/Makefile.in | 426
missing | 367
mkinstalldirs | 161
src/Makefile.in | 572
src/savage_driver.c |5
22 files changed, 111 insertions(+), 45716 deletions(-)
New commits:
commit 48b75b8091b90346a5126161fcf0ee3dbad1bc3f
Author: Julien Cristau
Date: Thu Apr 9 11:25:44 2009 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index cd8147b..d9ac365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-savage (1:2.2.1-5) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low
* Merge bugfix from 1:2.2.1-2.lenny1 stable update.
+ * Upload to unstable.
- -- Julien Cristau Thu, 09 Apr 2009 11:24:08 +0100
+ -- Julien Cristau Thu, 09 Apr 2009 11:25:40 +0100
xserver-xorg-video-savage (1:2.2.1-4) experimental; urgency=low
commit 11e7af431a8562e1413abd889ed5ea567aaf0ea9
Author: Julien Cristau
Date: Fri Mar 20 21:37:40 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7be7c31..3e314a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.2.1-2.lenny1) stable; urgency=low
+
+ * Cherry-pick from upstream: Do not add panel modes when there is no panel
+(closes: #520547). Thanks, Tormod Volden!
+
+ -- Julien Cristau Fri, 20 Mar 2009 21:35:43 +0100
+
xserver-xorg-video-savage (1:2.2.1-2) unstable; urgency=low
* Reenable 02_temporary_revert_pciaccess.diff and append all recent
commit d4f9cf894a7baeea808017a1b5a08ef7427ddb7e
Author: Tormod Volden
Date: Thu Jan 22 01:22:53 2009 -0500
Savage: Do not add panel modes when there is no panel
SavageGetPanelInfo will reset DisplayType if the panel is not
active, so check again before calling SavageAddPanelMode so that
bogus modes are not added.
This fixes startup failures in some cases, for instance when there is no
real panel and EDID is missing. The bogus sync ranges (typically 0 Hz)
would also block the default sync ranges from being applied.
Thanks to Peter Belew for testing.
https://bugs.launchpad.net/bugs/294899
(cherry picked from commit 0fae48235841f05d7e52e61a2450835fdb8892b3)
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 919bd1a..64f4cb9 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -2190,10 +2190,11 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
/* Check LCD panel information */
if(psav->DisplayType == MT_LCD)
-{
SavageGetPanelInfo(pScrn);
+
+/* DisplayType will be reset if panel is not active */
+if(psav->DisplayType == MT_LCD)
SavageAddPanelMode(pScrn);
-}
#if 0
if (psav->CrtOnly && !psav->UseBIOS) {
commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau
Date: Wed Feb 25 21:31:03 2009 +0100
xsfbs: repack.sh needs to be executable
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconf
xserver-xorg-video-savage: Changes to 'debian-unstable'
Makefile.in |2
configure | 256 --
debian/changelog |7
debian/patches/02_temporary_revert_pciaccess.diff | 558 --
debian/patches/series |2
man/Makefile.in |2
src/Makefile.in |2
7 files changed, 261 insertions(+), 568 deletions(-)
New commits:
commit dfe96e5d364fc08cddf3a453d16323ce22513af8
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Fri Sep 5 19:39:54 2008 +0200
Reenable 02_temporary_revert_pciaccess.diff and append all pci-rework
changes
diff --git a/Makefile.in b/Makefile.in
index 86587c6..c01a4f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,8 +157,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
-PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
diff --git a/configure b/configure
index 9d43b77..b24977f 100755
--- a/configure
+++ b/configure
@@ -883,10 +883,6 @@ DRI_TRUE
DRI_FALSE
DRI_CFLAGS
DRI_LIBS
-PCIACCESS_CFLAGS
-PCIACCESS_LIBS
-XSERVER_LIBPCIACCESS_TRUE
-XSERVER_LIBPCIACCESS_FALSE
moduledir
DRIVER_NAME
APP_MAN_SUFFIX
@@ -923,9 +919,7 @@ PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
DRI_CFLAGS
-DRI_LIBS
-PCIACCESS_CFLAGS
-PCIACCESS_LIBS'
+DRI_LIBS'
# Initialize some variables set by options.
@@ -1548,10 +1542,6 @@ Some influential environment variables:
XORG_LIBS linker flags for XORG, overriding pkg-config
DRI_CFLAGS C compiler flags for DRI, overriding pkg-config
DRI_LIBSlinker flags for DRI, overriding pkg-config
- PCIACCESS_CFLAGS
- C compiler flags for PCIACCESS, overriding pkg-config
- PCIACCESS_LIBS
- linker flags for PCIACCESS, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -4395,7 +4385,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4398 "configure"' > conftest.$ac_ext
+ echo '#line 4388 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7452,11 +7442,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:7455: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7445: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7459: \$? = $ac_status" >&5
+ echo "$as_me:7449: \$? = $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.
@@ -7742,11 +7732,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:7745: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7735: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7749: \$? = $ac_status" >&5
+ echo "$as_me:7739: \$? = $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.
@@ -7846,11 +7836,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:7849: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7839: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7853: \$? = $ac_status" >&5
+ echo "$as_me:7843: \$? = $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
@@ -10223,7 +10213,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:12717: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12731: \$? = $ac_status" >&5
+ echo "$as_me:12721: \$? = $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.
@@ -12828,11 +12818,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_comp
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/xsfbs/xsfbs-autoreconf.mk | 150 --
debian/xsfbs/xsfbs.mk| 102 --
debian/xsfbs/xsfbs.sh| 394 ---
3 files changed, 216 insertions(+), 430 deletions(-)
New commits:
commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat May 31 13:23:24 2008 +0200
Update xsfbs/quilt patching rules to be compatible with the
"3.0 (quilt)" source package.
Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
# Set up parameters for the upstream build environment.
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches
$(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/patches ]; then \
- mkdir $(STAMP_DIR)/patches; \
- ln -s $(STAMP_DIR)/patches .pc; \
- echo 2 >$(STAMP_DIR)/patches/.version; \
- fi; \
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ -e debian/patches ] && [ ! -e patches ]; then \
- ln -s debian/patches patches; \
- fi; \
>$@
# Apply all patches to the upstream source.
@@ -162,10 +152,10 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch:
+unpatch: $(STAMP_DIR)/prepare
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
- if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+ if $(QUILT) applied >/dev/null 2>/dev/null; then \
if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
@@ -192,7 +182,7 @@ cleanscripts:
.PHONY: xsfclean
xsfclean: cleanscripts unpatch
dh_testdir
- rm -rf .pc patches
+ rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
commit dcf4204d5328834172df80951a18de014b0f74ef
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri May 30 12:26:18 2008 +0200
xsfbs.sh: use 'local' now that policy allows it
Policy 3.7.3 allows /bin/sh scripts to use 'local'.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 0c7607a..72efa95 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -238,19 +238,19 @@ analyze_path () {
# analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
# Thanks to Randolph Chung for this clever hack.
- #local f g
+ local f g
while [ -n "$1" ]; do
reject_whitespace "$1"
-_g=
+g=
message "Analyzing $1:"
-for _f in $(echo "$1" | tr / \ ); do
- if [ -e /$_g$_f ]; then
-ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true
-_g=$_g$_f/
+for f in $(echo "$1" | tr / \ ); do
+ if [ -e /$g$f ]; then
+ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
+g=$g$f/
else
-message "/$_g$_f: nonexistent; directory contents of /$_g:"
-ls -l /$_g
+message "/$g$f: nonexistent; directory contents of /$g:"
+ls -l /$g
break
fi
done
@@ -259,27 +259,27 @@ analyze_path () {
}
find_culprits () {
- #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package
\
- # msg
+ local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
+msg
reject_whitespace "$1"
message "Searching for overlapping packages..."
- _dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $_dpkg_info_dir ]; then
-if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then
- _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \
+ dpkg_info_dir=/var/lib/dpkg/info
+ if [ -d $dpkg_info_dir ]; then
+if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
+ possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
"(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$_possible_culprits" ]; then
-_smoking_guns=$(grep -l "$1" $_possible_culprits || true)
-if [ -n
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 154 Makefile.in| 31 aclocal.m4 | 265 +-- config.guess | 32 config.sub | 44 + configure | 978 +++-- configure.ac |4 debian/changelog | 16 debian/control |8 debian/patches/03_request_16bit_depth.diff |6 debian/patches/series |2 debian/rules |2 depcomp| 33 install-sh | 228 +++--- ltmain.sh | 58 + man/Makefile.am|1 man/Makefile.in|9 src/Makefile.in| 31 src/savage_accel.c |1 src/savage_bci.h |1 src/savage_dga.c |1 src/savage_dri.c | 35 - src/savage_driver.c| 55 + src/savage_driver.h|1 src/savage_exa.c | 21 src/savage_i2c.c |1 src/savage_regs.h |1 src/savage_shadow.c|1 src/savage_vbe.c | 11 src/savage_vbe.h |1 src/savage_video.c | 55 + 31 files changed, 1523 insertions(+), 564 deletions(-) New commits: commit 05a45144b2953c3e7e54c3da49866af1cea45ad4 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Thu May 22 21:07:32 2008 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 2309d22..4c00117 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-savage (1:2.2.1-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.2.1-1) unstable; urgency=low [ David Nusinow ] * Add 03_request_16bit_depth.diff @@ -19,7 +19,7 @@ xserver-xorg-video-savage (1:2.2.1-1) UNRELEASED; urgency=low dpkg-shlibdeps to shut up about symbols it can't find. + Build-depend on dpkg-dev >= 1.14.17. - -- Brice Goglin <[EMAIL PROTECTED]> Thu, 22 May 2008 20:59:07 +0200 + -- Brice Goglin <[EMAIL PROTECTED]> Thu, 22 May 2008 21:07:26 +0200 xserver-xorg-video-savage (1:2.1.3-5) unstable; urgency=low commit 2a340763859dcbdc420d0accc5fcecff94a11f65 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Thu May 22 20:59:44 2008 +0200 Misc debian/rules and debian/control updates * Remove XS- prefix to Vcs-* fields in debian/rules. * Bump Standards-Version to 3.7.3, no change needed. * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from /usr/bin/Xorg and other modules, and that's not a bug, so we want dpkg-shlibdeps to shut up about symbols it can't find. + Build-depend on dpkg-dev >= 1.14.17. diff --git a/debian/changelog b/debian/changelog index 822e0d4..2309d22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,14 @@ xserver-xorg-video-savage (1:2.2.1-1) UNRELEASED; urgency=low * New upstream release. * Disable 02_temporary_revert_pciaccess.diff for now since upstream fixed some related code. - - -- Brice Goglin <[EMAIL PROTECTED]> Thu, 22 May 2008 20:54:59 +0200 + * Remove XS- prefix to Vcs-* fields in debian/rules. + * Bump Standards-Version to 3.7.3, no change needed. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from +/usr/bin/Xorg and other modules, and that's not a bug, so we want +dpkg-shlibdeps to shut up about symbols it can't find. ++ Build-depend on dpkg-dev >= 1.14.17. + + -- Brice Goglin <[EMAIL PROTECTED]> Thu, 22 May 2008 20:59:07 +0200 xserver-xorg-video-savage (1:2.1.3-5) unstable; urgency=low diff --git a/debian/control b/debian/control index 0be9597..9554cee 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,10 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt -Standards-Version: 3.7.2.0 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git +Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-vi
Re: xserver-xorg-video-savage: Changes to 'debian-unstable'
On Thu, Nov 22, 2007 at 10:12:00AM +0200, Timo Aaltonen wrote: > On Thu, 22 Nov 2007, David Nusinow wrote: > >> debian/changelog | 11 +++ >> debian/patches/03_request_16bit_depth.diff | 13 + >> debian/patches/series |1 + >> 3 files changed, 25 insertions(+) >> >> New commits: >> commit 8461f00b2320409eb4536392dd935b4a9e61087a >> Author: David Nusinow <[EMAIL PROTECTED]> >> Date: Thu Nov 22 00:06:38 2007 -0500 >> >>* Add 03_request_16bit_depth.diff >> We set the default depth for savage chips to 16bpp in the xserver >> debconfage. This patch has the driver request that depth from the >> server during init. If the user doesn't override this depth, it should >> be >> used by the server, thus allowing us to drop this special case from the >> debconfage. > > Works just fine on my Thinkpad T23. The reason why it was 16bpp in the > first place was, that if you used 24bpp and after one suspend-resume cycle > restart the server, the screen would be corrupt (also console). > (https://bugs.launchpad.net/bugs/21107) > > But, I just tried it with the new server/driver, and 24bpp works ok :) So > this change might not be needed anymore \o/ > I need to try it on the T21&T22 that I have piled on my desk.. Excellent! Thanks for testing! I'll revert this commit if 24bpp works on your other machines. As it is, I'll disable using 16bpp in the debconfage, since we don't need it there any more. - David Nusinow -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: xserver-xorg-video-savage: Changes to 'debian-unstable'
On Thu, 22 Nov 2007, David Nusinow wrote: debian/changelog | 11 +++ debian/patches/03_request_16bit_depth.diff | 13 + debian/patches/series |1 + 3 files changed, 25 insertions(+) New commits: commit 8461f00b2320409eb4536392dd935b4a9e61087a Author: David Nusinow <[EMAIL PROTECTED]> Date: Thu Nov 22 00:06:38 2007 -0500 * Add 03_request_16bit_depth.diff We set the default depth for savage chips to 16bpp in the xserver debconfage. This patch has the driver request that depth from the server during init. If the user doesn't override this depth, it should be used by the server, thus allowing us to drop this special case from the debconfage. Works just fine on my Thinkpad T23. The reason why it was 16bpp in the first place was, that if you used 24bpp and after one suspend-resume cycle restart the server, the screen would be corrupt (also console). (https://bugs.launchpad.net/bugs/21107) But, I just tried it with the new server/driver, and 24bpp works ok :) So this change might not be needed anymore \o/ I need to try it on the T21&T22 that I have piled on my desk.. t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog | 11 +++
debian/patches/03_request_16bit_depth.diff | 13 +
debian/patches/series |1 +
3 files changed, 25 insertions(+)
New commits:
commit 8461f00b2320409eb4536392dd935b4a9e61087a
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Thu Nov 22 00:06:38 2007 -0500
* Add 03_request_16bit_depth.diff
We set the default depth for savage chips to 16bpp in the xserver
debconfage. This patch has the driver request that depth from the
server during init. If the user doesn't override this depth, it should be
used by the server, thus allowing us to drop this special case from the
debconfage.
diff --git a/debian/changelog b/debian/changelog
index da87678..6ffc707 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-savage (1:2.1.3-6) UNRELEASED; urgency=low
+
+ * Add 03_request_16bit_depth.diff
+We set the default depth for savage chips to 16bpp in the xserver
+debconfage. This patch has the driver request that depth from the
+server during init. If the user doesn't override this depth, it should be
+used by the server, thus allowing us to drop this special case from the
+debconfage.
+
+ -- David Nusinow <[EMAIL PROTECTED]> Thu, 22 Nov 2007 00:06:24 -0500
+
xserver-xorg-video-savage (1:2.1.3-5) unstable; urgency=low
* Add 02_temporary_revert_pciaccess.diff to temporary revert
diff --git a/debian/patches/03_request_16bit_depth.diff
b/debian/patches/03_request_16bit_depth.diff
new file mode 100644
index 000..fd4e800
--- /dev/null
+++ b/debian/patches/03_request_16bit_depth.diff
@@ -0,0 +1,13 @@
+Index: xserver-xorg-video-savage/src/savage_driver.c
+===
+--- xserver-xorg-video-savage.orig/src/savage_driver.c 2007-11-22
00:00:18.0 -0500
xserver-xorg-video-savage/src/savage_driver.c 2007-11-22
00:02:21.0 -0500
+@@ -1118,7 +1118,7 @@
+ * We support bpp of 8, 16, and 32.
+ */
+
+-if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support32bppFb))
++if (!xf86SetDepthBpp(pScrn, 16, 0, 0, Support32bppFb))
+ return FALSE;
+ else {
+ int requiredBpp;
diff --git a/debian/patches/series b/debian/patches/series
index 717f91f..41b0919 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_gen_pci_ids.diff
02_temporary_revert_pciaccess.diff
+03_request_16bit_depth.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
Makefile.in |2
configure | 256 --
debian/changelog |8
debian/patches/02_temporary_revert_pciaccess.diff | 873 ++
debian/patches/series |1
man/Makefile.in |2
src/Makefile.in |2
7 files changed, 907 insertions(+), 237 deletions(-)
New commits:
commit 0f51b69cedfd45dcab85c49914496237aa737b08
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Thu Nov 15 08:28:10 2007 +0100
Add 02_temporary_revert_pciaccess.diff to temporary revert all the
pci-rework code
diff --git a/Makefile.in b/Makefile.in
index d972541..340f363 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -155,8 +155,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
-PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
diff --git a/configure b/configure
index 763ffe9..3b5740d 100755
--- a/configure
+++ b/configure
@@ -881,10 +881,6 @@ DRI_TRUE
DRI_FALSE
DRI_CFLAGS
DRI_LIBS
-PCIACCESS_CFLAGS
-PCIACCESS_LIBS
-XSERVER_LIBPCIACCESS_TRUE
-XSERVER_LIBPCIACCESS_FALSE
moduledir
DRIVER_NAME
APP_MAN_SUFFIX
@@ -921,9 +917,7 @@ PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
DRI_CFLAGS
-DRI_LIBS
-PCIACCESS_CFLAGS
-PCIACCESS_LIBS'
+DRI_LIBS'
# Initialize some variables set by options.
@@ -1546,10 +1540,6 @@ Some influential environment variables:
XORG_LIBS linker flags for XORG, overriding pkg-config
DRI_CFLAGS C compiler flags for DRI, overriding pkg-config
DRI_LIBSlinker flags for DRI, overriding pkg-config
- PCIACCESS_CFLAGS
- C compiler flags for PCIACCESS, overriding pkg-config
- PCIACCESS_LIBS
- linker flags for PCIACCESS, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -4393,7 +4383,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4396 "configure"' > conftest.$ac_ext
+ echo '#line 4386 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7135,11 +7125,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:7138: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7128: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7142: \$? = $ac_status" >&5
+ echo "$as_me:7132: \$? = $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.
@@ -7425,11 +7415,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:7428: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7418: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7432: \$? = $ac_status" >&5
+ echo "$as_me:7422: \$? = $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.
@@ -7529,11 +7519,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:7532: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7522: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7536: \$? = $ac_status" >&5
+ echo "$as_me:7526: \$? = $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
@@ -9891,7 +9881,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:12404: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12418: \$? = $ac_status" >&5
+ echo "$as_me:12408: \$? = $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.
@@ -12515,11 +12505,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_comp
xserver-xorg-video-savage: Changes to 'debian-unstable'
.cvsignore | 19 -- ChangeLog | 96 +++ Makefile.in |2 config.guess|6 config.sub | 10 - configure | 256 --- configure.ac| 12 + debian/changelog|7 debian/control |2 man/.cvsignore |2 man/Makefile.in |2 src/.cvsignore |6 src/Makefile.in |2 src/savage_dga.c|2 src/savage_dri.c| 14 + src/savage_driver.c | 418 +++- src/savage_driver.h | 33 +++- src/savage_hwmc.c |2 18 files changed, 711 insertions(+), 180 deletions(-) New commits: commit 3c49eb8964ba5fbc2b0d222014d1109b6fd0204a Author: Brice Goglin <[EMAIL PROTECTED]> Date: Sun Nov 11 15:24:18 2007 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 3e91567..d90e43b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -xserver-xorg-video-savage (1:2.1.3-4) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.1.3-4) unstable; urgency=low * Pull upstream up to 9c959f53ca8376aa136a9d434c3383cdb20487c2 + Fix crash in SavageSwitchMode(), closes: #440839. * Add upstream URL to debian/copyright. + * Add myself to Uploaders. - -- Brice Goglin <[EMAIL PROTECTED]> Sun, 11 Nov 2007 15:17:43 +0100 + -- Brice Goglin <[EMAIL PROTECTED]> Sun, 11 Nov 2007 15:23:29 +0100 xserver-xorg-video-savage (1:2.1.3-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 7114062..0be9597 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-savage Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]> +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt Standards-Version: 3.7.2.0 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage commit ecad3bde4dade36a85d59f991aed6d893a0cf440 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Sun Nov 11 15:21:51 2007 +0100 Pull upstream up to 9c959f53ca8376aa136a9d434c3383cdb20487c2 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2df4a8d..000 --- a/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -Makefile -Makefile.in -*.la -*.lo -aclocal.m4 -autom4te.cache -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -stamp-h1 -*~ diff --git a/ChangeLog b/ChangeLog index bd4b1b9..871f56d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,82 @@ +commit 9c959f53ca8376aa136a9d434c3383cdb20487c2 +Author: Alex Deucher <[EMAIL PROTECTED](none)> +Date: Fri Sep 14 20:21:12 2007 -0400 + +fix the build for the non-pci-rework case (compile tested only) + +commit 846a69f70d189c486448df269a512b8d42fab0c2 +Author: Alex Deucher <[EMAIL PROTECTED](none)> +Date: Fri Sep 14 20:13:33 2007 -0400 + +fix segfault from pScrn->currentMode + +should fix bug 12260 + +commit 53a2088c5590bb96ce9a7ad30d908c7ea1d54027 +Merge: 7da1a03... 0287432... +Author: James Cloos <[EMAIL PROTECTED]> +Date: Mon Sep 3 06:08:13 2007 -0400 + +Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-savage + +commit 7da1a03d4b8b40483001b1f6e56dae655a1797f4 +Author: James Cloos <[EMAIL PROTECTED]> +Date: Mon Sep 3 05:52:43 2007 -0400 + +Add *~ to .gitignore to skip patch/emacs droppings + +commit 0287432c65231460fadff7d8d7b332208e345a31 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Fri Aug 31 13:07:17 2007 -0700 + +Fix odd typo. + +commit 514dc647d108e179965adb1377b1d4c011afa367 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Thu Aug 30 17:53:11 2007 -0700 + +Update to use new libpciaccess interfaces for mapping with MTRR support. + +commit 1eec792391d9ce9127817107100a53382f167749 +Merge: 4a87cab... ffc5ba7... +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Thu Aug 23 18:21:37 2007 -0700 + +Merge branch 'pci-rework' + +commit 4a87cab2765df548a3b5d796e19568a2576306b8 +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Aug 23 19:25:53 2007 -0400 + +Rename .cvsignore to .gitignore + +commit ffc5ba7f0b1cdefdcecf6bd47018b6a4924bfc44 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Wed Aug 22 12:38:14 2007 -0700 + +Merge PCI-rework support and "classic" PCI interface support into one tree + +First pass at merging both trees. So far, this has only been compile +tested. I need to dig out a savage card to put in a sy
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/copyright |3 +++ 2 files changed, 9 insertions(+) New commits: commit 38c86bd51e49ffa8d7dc147605ca3ec33e3fdcf4 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Sat Sep 15 02:15:19 2007 +0200 Add upstream URL to debian/copyright diff --git a/debian/changelog b/debian/changelog index 235fd18..b854a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.1.3-3) UNRELEASED; urgency=low + + * Add upstream URL to debian/copyright. + + -- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 02:15:05 +0200 + xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low [ Brice Goglin ] diff --git a/debian/copyright b/debian/copyright index 5bd8fdb..e17bb32 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,6 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog | 17 +++- debian/control |2 - debian/patches/01_gen_pci_ids.diff | 39 debian/patches/series|1 debian/rules |2 - debian/xserver-xorg-video-savage.install |1 src/Makefile.in | 42 --- 7 files changed, 91 insertions(+), 13 deletions(-) New commits: commit 4decfe03f8d2592ad93975fccf497c7dd9848251 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Sep 16 16:18:39 2007 -0400 * Upload to unstable diff --git a/debian/changelog b/debian/changelog index 235fd18..ee28b9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.1.3-3) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow <[EMAIL PROTECTED]> Sun, 16 Sep 2007 15:43:47 -0400 + xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low [ Brice Goglin ] commit c3e06ad850cf7f857b2c44903522922b216176b7 Author: David Nusinow <[EMAIL PROTECTED]> Date: Thu Sep 13 20:41:36 2007 -0400 * Build against X server 1.4 and build-dep on it as well diff --git a/debian/changelog b/debian/changelog index d5c0bb9..235fd18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,12 +5,12 @@ xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low thanks Tormod Volden, closes: #438975. [ David Nusinow ] - * Build against X server 1.3.99.0 and build-dep on it as well + * Build against X server 1.4 and build-dep on it as well * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this driver supports so that the server can automatically load it * Exclude savage_drv.la from dh_install - -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:09:56 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Thu, 13 Sep 2007 20:40:23 -0400 xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a0264c9..7114062 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt +Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt Standards-Version: 3.7.2.0 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git commit 23e26098563ab2c9090dd765ef51eb8c92edd19a Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Aug 31 18:11:42 2007 -0400 Exclude savage_drv.la from dh_install diff --git a/debian/changelog b/debian/changelog index 97abd67..d5c0bb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low * Build against X server 1.3.99.0 and build-dep on it as well * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this driver supports so that the server can automatically load it + * Exclude savage_drv.la from dh_install - -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:04:25 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:09:56 -0400 xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 0dfa1a3..9af5d18 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --list-missing --exclude=savage_drv.la dh_link dh_strip dh_compress commit 96703c6c0448e969f2fd78a9e2b0e3bbc40f3827 Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Aug 31 18:09:08 2007 -0400 Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this driver supports so that the server can automatically load it Autoreconf diff --git a/debian/changelog b/debian/changelog index fd81cc8..97abd67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low [ Brice Goglin ] * Drop
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |7 +
src/savage_image.c | 204 -
2 files changed, 7 insertions(+), 204 deletions(-)
New commits:
commit 77e220f2b27ec9f0c491ec903d1a4daf7b182275
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Tue Aug 21 20:28:58 2007 +0200
Drop the obsolete src/savage_image.c from the .diff.gz
diff --git a/debian/changelog b/debian/changelog
index fec184a..ccc953a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low
+
+ * Drop the obsolete src/savage_image.c from the .diff.gz,
+thanks Tormod Volden, closes: #438975.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Tue, 21 Aug 2007 20:27:33 +0200
+
xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low
* New upstream release.
diff --git a/src/savage_image.c b/src/savage_image.c
deleted file mode 100644
index 766c810..000
--- a/src/savage_image.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v
1.4 2001/05/18 23:35:32 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "savage_driver.h"
-#include "xaarop.h"
-#include "savage_bci.h"
-
-void SavageSubsequentImageWriteRect (
-ScrnInfoPtr pScrn,
-int x,
-int y,
-int w,
-int h,
-int skipleft);
-
-void SavageSetupForImageWrite (
-ScrnInfoPtr pScrn,
-int rop,
-unsigned planemask,
-int transparency_color,
-int bpp,
-int depth);
-
-void SavageWriteBitmapCPUToScreenColorExpand (
-ScrnInfoPtr pScrn,
-int x, int y, int w, int h,
-unsigned char * src,
-int srcwidth,
-int skipleft,
-int fg, int bg,
-int rop,
-unsigned int planemask);
-
-#if 0
-void SavageWriteBitmapScreenToScreenColorExpand(
-ScrnPtr pScrn,
-int x,
-int y,
-int w,
-int h,
-unsigned char * src,
-int srcwidth,
-int srcx,
-int srcy,
-int bg,
-int fg,
-int rop,
-unsigned int planemask
-)
-{
-SavagePtr psav = SAVPTR(pScrn);
-BCI_GET_PTR;
-unsigned int cmd;
-unsigned char * bd_offset;
-unsigned int bd;
-
-cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP
-| BCI_CMD_SEND_COLOR
-| BCI_CMD_DEST_GBD | BCI_CMD_SRC_SBD_MONO_NEW;
-cmd |= (bg != -1) ? BCI_CMD_SEND_COLOR : BCI_CMD_SRC_TRANSPARENT;
-cmd |= s3vAlu[rop];
-
-bd |= BCI_BD_BW_DISABLE;
-BCI_BD_SET_BPP(bd, 1);
-BCI_BD_SET_STRIDE(bd, srcwidth);
-bd_offset = srcwidth * srcy + (srcx >> 3) + src;
-
-psav->WaitQueue(psav,10);
-BCI_SEND(cmd);
-BCI_SEND((unsigned int)bd_offset);
-BCI_SEND(bd);
-BCI_SEND(fg);
-BCI_SEND((bg != -1) ? bg : 0);
-BCI_SEND(BCI_X_Y(srcx, srcy));
-BCI_SEND(BCI_X_Y(x, y));
-BCI_SEND(BCI_W_H(w, h));
-}
-#endif
-
-void
-SavageWriteBitmapCPUToScreenColorExpand (
-ScrnInfoPtr pScrn,
-int x, int y, int w, int h,
-unsigned char * src,
-int srcwidth,
-int skipleft,
-int fg, int bg,
-int rop,
-unsigned int planemask
-)
-{
-SavagePtr psav = SAVPTR(pScrn);
-BCI_GET_PTR;
-int i, j, count, reset;
-unsigned int cmd;
-CARD32 * srcp;
-
-/* We aren't using planemask at all here... */
-
-if( !srcwidth )
- return;
-
-cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP
-| BCI_CMD_SEND_COLOR | BCI_CMD_CLIP_LR
-| BCI_CMD_DEST_PBD_NEW | BCI_CMD_SRC_MONO;
-cmd |= XAAGetCopyROP(rop) << 16;
-
-if( bg == -1 )
-cmd |= BCI_CMD_SRC_TRANSPARENT;
-
-BCI_SEND(cmd);
-
-BCI_SEND(psav->GlobalBD.bd2.LoPart);
-BCI_SEND(psav->GlobalBD.bd2.HiPart);
-
-BCI_SEND(BCI_CLIP_LR(x+skipleft, x+w-1));
-BCI_SEND(fg);
-if( bg != -1 )
- BCI_SEND(bg);
-
-/* Bitmaps come in in units of DWORDS, LSBFirst. This is exactly */
-/* reversed of what we expect. */
-
-count = (w + 31) / 32;
-/*src += ((srcx & ~31) / 8); */
-
-/* The BCI region is 128k bytes. A screen-sized mono bitmap can */
-/* exceed that. */
-
-reset = 65536 / count;
-
-for (j = 0; j < h; j ++) {
-BCI_SEND(BCI_X_Y(x, y+j));
-BCI_SEND(BCI_W_H(w, 1));
-srcp = (CARD32 *) src;
-for (i = count; i > 0; srcp ++, i --) {
-/* We have to invert the bits in each byte. */
-CARD32 u = *srcp;
-u = ((u & 0x0f0f0f0f) << 4) | ((u & 0xf0f0f0f0) >> 4);
-u = ((u & 0x) << 2) | ((u & 0x) >> 2);
-u = ((u & 0x) << 1) | ((u & 0x) >> 1);
-BCI_SEND(u);
-}
-src += srcwidth;
-if( !--reset ) {
- BCI_RESET;
-reset = 65536 / count;
-}
-}
-}
-
-void
-SavageSetupForImageWrite(
-ScrnInfoPtr pScrn,
-int rop,
-unsigned planemask,
-int transparency_color,
-int bpp,
-int depth)
-{
-SavagePtr psav = SAVPTR(pScrn);
-int cmd;
-
-cmd = BCI_CMD_RECT |
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 18
Makefile.in | 127 +++--
aclocal.m4 | 676 --
config.guess| 32 +
config.sub | 16
configure | 1147
configure.ac|2
debian/changelog|7
depcomp | 64 ++
install-sh | 348 ---
ltmain.sh | 233 ++
man/Makefile.in | 94 ++--
missing | 61 +-
mkinstalldirs |5
src/Makefile.in | 119 ++---
src/savage_driver.c |2
src/savage_driver.h |8
17 files changed, 1923 insertions(+), 1036 deletions(-)
New commits:
commit 590a5fec0cf51dae55837d77ce630734545e9680
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Aug 17 04:15:06 2007 +0200
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 6d06333..bd4b1b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+commit bf5e2a5d33fbab07bc3606927c58a3a04a5c9b1e
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Fri Aug 17 03:25:48 2007 +0200
+
+Include to get a declaration for usleep()
+
commit 83f3db97b107a84d79e21c64039328c05095719e
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Thu Aug 16 20:45:12 2007 -0400
diff --git a/debian/changelog b/debian/changelog
index fdb0377..fec184a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low
* New upstream release.
+ * Fix implicit declaration of usleep() in savage_driver.c.
- -- Julien Cristau <[EMAIL PROTECTED]> Fri, 17 Aug 2007 03:17:22 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 17 Aug 2007 04:14:31 +0200
xserver-xorg-video-savage (1:2.1.2-6) unstable; urgency=low
commit bf5e2a5d33fbab07bc3606927c58a3a04a5c9b1e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Aug 17 03:25:48 2007 +0200
Include to get a declaration for usleep()
diff --git a/src/savage_driver.c b/src/savage_driver.c
index c56edf1..ab91bc4 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -39,6 +39,8 @@
#include "config.h"
#endif
+#include
+
#include "xf86RAC.h"
#include "shadowfb.h"
commit 8d2fc95e243ca568167c2c7c928dd8168bd27574
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Aug 17 03:19:35 2007 +0200
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 3237e30..6d06333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit 83f3db97b107a84d79e21c64039328c05095719e
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Thu Aug 16 20:45:12 2007 -0400
+
+update for 2.1.3 release
+
+commit 1f6258c7f4c4073de0bdd72f06c1e94bb6895c73
+Author: Brice Goglin <[EMAIL PROTECTED]>
+Date: Tue Aug 7 09:54:47 2007 +0200
+
+Define SAVAGE_VERSION* using PACKAGE_VERSION*
+
commit b706ffe07fc61281d2dea406f828418f42e3da85
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Thu Jul 12 00:03:13 2007 -0400
diff --git a/debian/changelog b/debian/changelog
index c38e325..fdb0377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 17 Aug 2007 03:17:22 +0200
+
xserver-xorg-video-savage (1:2.1.2-6) unstable; urgency=low
[ Brice Goglin ]
commit fc8476b343b1f457f6cb81e6171c45dbb7111bdd
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Aug 17 03:17:20 2007 +0200
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 7fe234f..340f363 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(src
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |8 ++-- debian/control |2 +- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit ca4f6885995d8ba09ca52e936fc968f051e7b6c7 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Wed Jul 18 03:07:32 2007 +0200 Prepare changelog for upload, update Uploaders. Add myself and remove Branden with his permission. diff --git a/debian/changelog b/debian/changelog index be7f564..c38e325 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,16 @@ -xserver-xorg-video-savage (1:2.1.2-6) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.1.2-6) unstable; urgency=low + [ Brice Goglin ] * Pull more upstream fixes, up to b706ffe07fc61281d2dea406f828418f42e3da85 + Fix segfault in SavageDoAdjustFrame() on server 1.3, closes: #423485. + Fix console corruption due to invalid shadow status, closes: #428089. + Drop 01_savage_driver_disable_randr_on_rotation.diff, integrated uptream. - -- Brice Goglin <[EMAIL PROTECTED]> Wed, 11 Jul 2007 19:04:31 +0200 + [ Julien Cristau ] + * Add myself to Uploaders, and remove Branden with his permission. + + -- Julien Cristau <[EMAIL PROTECTED]> Wed, 18 Jul 2007 03:06:12 +0200 xserver-xorg-video-savage (1:2.1.2-5) unstable; urgency=low diff --git a/debian/control b/debian/control index 427225b..4b87f6a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-savage Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]> +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[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-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt Standards-Version: 3.7.2.0 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/xsfbs/xsfbs.mk |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 12a633f722a2ff9677728d1e2ae56767f804232a Author: Brice Goglin <[EMAIL PROTECTED]> Date: Thu Jul 12 16:06:22 2007 +0200 Fix "display the output of quilt push/pop". Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the return value of quilt, not the one of tee. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5f13302..bfca7bb 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare fi; \ if $(QUILT) next >/dev/null 2>&1; then \ echo -n "Applying patches..."; \ - if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ echo "successful."; \ else \ + cat $(STAMP_DIR)/log/patch; \ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ exit 1; \ fi; \ @@ -164,9 +166,11 @@ unpatch: rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ - if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ echo "successful."; \ else \ + cat $(STAMP_DIR)/log/unpatch; \ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ exit 1; \ fi; \ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 46 debian/changelog |7 debian/patches/01_savage_driver_disable_randr_on_rotation.diff | 58 -- debian/patches/02_savage_check_ShadowVirtual.diff | 23 -- debian/patches/series |2 man/savage.man | 17 + src/savage_driver.c| 96 -- 7 files changed, 144 insertions(+), 105 deletions(-) New commits: commit b8c9e078445bb8d1339111b889e465fb0910a14c Author: Brice Goglin <[EMAIL PROTECTED]> Date: Thu Jul 12 10:13:27 2007 +0200 Pull more upstream fixes, up to b706ffe07fc61281d2dea406f828418f42e3da85 + Fix segfault in SavageDoAdjustFrame() on server 1.3, closes: #423485. + Fix console corruption due to invalid shadow status, closes: #428089. + Drop 01_savage_driver_disable_randr_on_rotation.diff and 02_savage_check_ShadowVirtual.diff, both integrated uptream. diff --git a/ChangeLog b/ChangeLog index 265740d..3237e30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +commit b706ffe07fc61281d2dea406f828418f42e3da85 +Author: Alex Deucher <[EMAIL PROTECTED]> +Date: Thu Jul 12 00:03:13 2007 -0400 + +Unmap mem before freeing driverPrivate + +commit fab88bce3b9f19918bbf1a2b0f57d34113c8381f +Author: Alex Deucher <[EMAIL PROTECTED]> +Date: Wed Jul 11 23:40:51 2007 -0400 + +Add panel native mode automatically. + +Based on Henry Zhao's code from nv + +commit b126b204d3465700e8c6a1fcc4770f322c8bb7db +Author: Tormod Volden <[EMAIL PROTECTED]> +Date: Wed Jul 11 21:25:30 2007 -0400 + +Add "DRI" option to enable/disable DRI support + +fixes bug 10746 + +commit 90692b3a123861ca02100f86b4c80f070fd4196d +Author: Alex Deucher <[EMAIL PROTECTED]> +Date: Wed Jul 11 21:07:47 2007 -0400 + +fix segfault in SavageDoAdjustFrame() on server 1.3 + +tracked down by Tormod Volden, fixes bug 10934 + +commit 7832dcd82046238d5accb55468c65241f0edc6d0 +Author: Alex Deucher <[EMAIL PROTECTED]> +Date: Wed Jul 11 21:01:03 2007 -0400 + +fix console corruption due to invalid shadow status + +tracked down by Tormod Volden, fixes bug 11237 + +commit 8dd310538df11cc5ff4e8e84920218b819bbae47 +Author: David Nusinow <[EMAIL PROTECTED]> +Date: Wed Jul 11 20:00:25 2007 -0400 + +disable randr when savage rotation is enabled + +fixes bug 7899 + commit 4b2a0ad8f15e7b11f7c8251fb032b9df4f07ce96 Author: Nate Bargmann <[EMAIL PROTECTED]> Date: Sat May 5 13:35:02 2007 +0200 diff --git a/debian/changelog b/debian/changelog index cba288c..be7f564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ xserver-xorg-video-savage (1:2.1.2-6) UNRELEASED; urgency=low - * Add 02_savage_check_ShadowVirtual.diff, thanks Tormod Volden -(closes: #428089). + * Pull more upstream fixes, up to b706ffe07fc61281d2dea406f828418f42e3da85 ++ Fix segfault in SavageDoAdjustFrame() on server 1.3, closes: #423485. ++ Fix console corruption due to invalid shadow status, closes: #428089. ++ Drop 01_savage_driver_disable_randr_on_rotation.diff, integrated + uptream. -- Brice Goglin <[EMAIL PROTECTED]> Wed, 11 Jul 2007 19:04:31 +0200 diff --git a/debian/patches/01_savage_driver_disable_randr_on_rotation.diff b/debian/patches/01_savage_driver_disable_randr_on_rotation.diff deleted file mode 100644 index 4094df6..000 --- a/debian/patches/01_savage_driver_disable_randr_on_rotation.diff +++ /dev/null @@ -1,58 +0,0 @@ -Index: xf86-video-savage-X11R7.0-2.0.2.3/man/savage.man -=== xf86-video-savage-X11R7.0-2.0.2.3.orig/man/savage.man 2006-01-12 22:55:15.0 -0500 -+++ xf86-video-savage-X11R7.0-2.0.2.3/man/savage.man 2006-02-26 18:44:31.0 -0500 -@@ -84,13 +84,18 @@ - .BI "Option \*qRotate\*q \*qCW\*q" - .TP - .BI "Option \*qRotate\*q \*qCCW\*q" --Rotate the desktop 90 degrees clockwise or counterclockwise. This option --forces the ShadowFB option on, and disables acceleration. -+Rotate the desktop 90 degrees clockwise or counterclockwise. -+This option forces the ShadowFB option on, and disables acceleration and -+the RandR extension. - Default: no rotation. - .TP - .BI "Option \*qShadowFB\*q \*q" boolean \*q --Enable or disable use of the shadow framebuffer layer. This option --disables acceleration. Default: off. -+Enable or disable use of the shadow framebuffer layer. -+.\" See -+.\" .BR shadowfb (__drivermansuffix__) -+.\" for further information. -+This option disables acceleration. -+Default: off. - .TP - .BI "Option \*qLCDClock\*q \*q" frequency \*q - Override the maximum dot clock. Some LCD panels produce incorrect results if -Index: xf86-video-savage-X11R7.0-2.0.2.3/src/savage_driver.c -=
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |7 ++ debian/patches/02_savage_check_ShadowVirtual.diff | 23 ++ debian/patches/series |1 debian/xsfbs/xsfbs.mk | 23 +- 4 files changed, 45 insertions(+), 9 deletions(-) New commits: commit 61b5026e8e47b80d96f87918b824e16216171ef8 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Wed Jul 11 19:05:49 2007 +0200 Add 02_savage_check_ShadowVirtual.diff diff --git a/debian/changelog b/debian/changelog index f5cf7d5..cba288c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-savage (1:2.1.2-6) UNRELEASED; urgency=low + + * Add 02_savage_check_ShadowVirtual.diff, thanks Tormod Volden +(closes: #428089). + + -- Brice Goglin <[EMAIL PROTECTED]> Wed, 11 Jul 2007 19:04:31 +0200 + xserver-xorg-video-savage (1:2.1.2-5) unstable; urgency=low [ Timo Aaltonen ] diff --git a/debian/patches/02_savage_check_ShadowVirtual.diff b/debian/patches/02_savage_check_ShadowVirtual.diff new file mode 100644 index 000..7c5ee49 --- /dev/null +++ b/debian/patches/02_savage_check_ShadowVirtual.diff @@ -0,0 +1,23 @@ +Fixes #428089 + +https://bugs.freedesktop.org/show_bug.cgi?id=11237 + +This is a workaround, that keeps the server from crashing and borking the +consoles. It returns from ShadowWait if there is no ShadowVirtual pointer. +But I think ShadowWait should not have been called in the first place. + +Index: xserver-xorg-video-savage-2.1.2/src/savage_driver.c +=== +--- xserver-xorg-video-savage-2.1.2.orig/src/savage_driver.c 2007-07-07 11:22:06.0 +0200 xserver-xorg-video-savage-2.1.2/src/savage_driver.c2007-07-07 11:28:35.0 +0200 +@@ -549,6 +549,10 @@ + if( !psav->NoPCIRetry ) + return 0; + ++/* in case we should not have been here */ ++if( !psav->ShadowVirtual ) ++ return 0; ++ + psav->ShadowCounter = (psav->ShadowCounter + 1) & 0x; + if (psav->ShadowCounter == 0) + psav->ShadowCounter++; /* 0 is reserved for the BIOS diff --git a/debian/patches/series b/debian/patches/series index aca27e7..edbcf00 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_savage_driver_disable_randr_on_rotation.diff +02_savage_check_ShadowVirtual.diff commit e29b56820909668b062fdba72458ee9483a4ae44 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Mon Jul 9 21:50:47 2007 +0200 Minor fixes in the patching system. * Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920). * Display which patches are applied and removed instead of just the first one (for #428090). diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 2930c1e..5f13302 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -21,6 +21,11 @@ # Pass $(DH_OPTIONS) into the environment for debhelper's benefit. export DH_OPTIONS +# force quilt to not use ~/.quiltrc +QUILT = quilt --quiltrc /dev/null +# force QUILT_PATCHES to the default in case it is exported in the environment +QUILT_PATCHES = patches/ + # Set up parameters for the upstream build environment. # Determine (source) package name from Debian changelog. @@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ exit 1; \ fi; \ - if quilt next >/dev/null 2>&1; then \ + if $(QUILT) next >/dev/null 2>&1; then \ echo -n "Applying patches..."; \ - if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ + if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ echo "successful."; \ else \ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ @@ -159,7 +164,7 @@ unpatch: rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ - if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ + if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ echo "successful."; \ else \ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ @@ -295,17 +300,17 @@ patch-audit: prepare unpatch @echo -n "Auditing patches..."; \ >$(STAMP_DIR)/log/patch; \ FUZZY=; \ - while [ -n "$$(quilt next)" ]; do \ - RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ case "$$RESULT" in \ succeeded) \ - echo "fuzzy
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) New commits: commit bb7dd0968516ff652f3a3fb3f63ef05a0bf25641 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat May 5 18:19:40 2007 +0200 Prepare changelog for upload. diff --git a/debian/changelog b/debian/changelog index 462adee..f5cf7d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-savage (1:2.1.2-5) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.1.2-5) unstable; urgency=low [ Timo Aaltonen ] * Replaces/Conflicts: xserver-xorg-driver-savage. @@ -18,7 +18,7 @@ xserver-xorg-video-savage (1:2.1.2-5) 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 16:36:03 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Sat, 05 May 2007 18:18:59 +0200 xserver-xorg-video-savage (1:2.1.2-4) experimental; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog |6 ++ 1 files changed, 6 insertions(+) New commits: commit ff88f26116e7b550f5517ba2160d499a788dd158 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Sat May 5 17:56:35 2007 +0200 Update upstream ChangeLog diff --git a/ChangeLog b/ChangeLog index edc068a..265740d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit 4b2a0ad8f15e7b11f7c8251fb032b9df4f07ce96 +Author: Nate Bargmann <[EMAIL PROTECTED]> +Date: Sat May 5 13:35:02 2007 +0200 + +Fixed a markup error. + commit ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887 Author: Alex Deucher <[EMAIL PROTECTED]> Date: Mon Apr 2 17:32:02 2007 -0400 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |4 +++- man/savage.man |2 +- 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 5b5cf6011330f8ee88d40042cf0db6fa229a0c47 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Sat May 5 15:21:36 2007 +0200 Pull upstream manpage fix 4b2a0ad8f15e7b11f7c8251fb032b9df4f07ce96 (closes: #401643). diff --git a/debian/changelog b/debian/changelog index df85cff..462adee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ xserver-xorg-video-savage (1:2.1.2-5) UNRELEASED; urgency=low * Replaces/Conflicts: xserver-xorg-driver-savage. [ Brice Goglin ] - * Pull fixes from upstream up-to ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887 + * Pull fixes from upstream up-to 4b2a0ad8f15e7b11f7c8251fb032b9df4f07ce96 + Drop 02_fix_respawn_crash_regression.diff, applied upstream ++ Fix a markup error in savage.4 manpage, thanks Nate Bargmann + (closes: #401643). * Don't build-dep on libdrm-dev on hurd-i386, thanks to Michael Banck (closes: #392873). * Install the upstream changelog. commit 4b2a0ad8f15e7b11f7c8251fb032b9df4f07ce96 Author: Nate Bargmann <[EMAIL PROTECTED]> Date: Sat May 5 13:35:02 2007 +0200 Fixed a markup error. diff --git a/man/savage.man b/man/savage.man index 935b0fc..721c6b8 100644 --- a/man/savage.man +++ b/man/savage.man @@ -80,7 +80,7 @@ Default: hardware cursor. .TP .BI "Option \*qNoAccel\*q \*q" boolean \*q Disable or enable acceleration. Default: acceleration is enabled. -TP +.TP .BI "Option \*qAccelMethod\*q \*q" "string" \*q Chooses between available acceleration architectures. Valid options are .B XAA -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) New commits: commit d2ded7f6ea3b88c3c931edeebec45109c926f34a Author: Brice Goglin <[EMAIL PROTECTED]> Date: Sat May 5 13:11:12 2007 +0200 Add closer for #392873 about libdrm-dev on hurd-i386 diff --git a/debian/changelog b/debian/changelog index 446e4dc..df85cff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,8 @@ xserver-xorg-video-savage (1:2.1.2-5) UNRELEASED; urgency=low [ Brice Goglin ] * Pull fixes from upstream up-to ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887 + Drop 02_fix_respawn_crash_regression.diff, applied upstream - * Don't build-dep on libdrm-dev on hurd-i386. + * Don't build-dep on libdrm-dev on hurd-i386, thanks to Michael Banck +(closes: #392873). * Install the upstream changelog. * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 (needed to let xsfbs get access to serverminver). -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
.cvsignore | 19
ChangeLog | 1003 -
Makefile.in |4
aclocal.m4 | 306 +++-
autogen.sh | 12
config.guess| 21
config.h.in |9
config.sub | 58
configure | 1524 +---
debian/changelog| 24
debian/control | 14
debian/patches/02_fix_respawn_crash_regression.diff | 23
debian/patches/series |1
debian/rules|4
debian/xsfbs/xsfbs.mk | 28
man/.cvsignore |2
man/Makefile.in |6
mkinstalldirs | 89 -
src/.cvsignore |6
src/Makefile.in |6
src/savage_bci.h|6
src/savage_driver.c |6
src/savage_driver.h | 1284
src/savage_exa.c| 142 +
src/savage_video.c | 32
25 files changed, 2537 insertions(+), 2092 deletions(-)
New commits:
commit 8322053b349091d2762b8abeaa1b48344b2de026
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 28 16:41:48 2007 +0200
Drop 02_fix_respawn_crash_regression.diff
diff --git a/debian/changelog b/debian/changelog
index 52001f8..446e4dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-video-savage (1:2.1.2-5) UNRELEASED; urgency=low
* Replaces/Conflicts: xserver-xorg-driver-savage.
[ Brice Goglin ]
+ * Pull fixes from upstream up-to ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887
++ Drop 02_fix_respawn_crash_regression.diff, applied upstream
* Don't build-dep on libdrm-dev on hurd-i386.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
@@ -12,9 +14,8 @@ xserver-xorg-video-savage (1:2.1.2-5) UNRELEASED; urgency=low
* Add a link to www.X.org and a reference to the xf86-video-savage
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- * Pull fixes from upstream up-to ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887
- -- Brice Goglin <[EMAIL PROTECTED]> Sat, 28 Apr 2007 16:28:53 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Sat, 28 Apr 2007 16:36:03 +0200
xserver-xorg-video-savage (1:2.1.2-4) experimental; urgency=low
diff --git a/debian/patches/02_fix_respawn_crash_regression.diff
b/debian/patches/02_fix_respawn_crash_regression.diff
deleted file mode 100644
index 7144f8f..000
--- a/debian/patches/02_fix_respawn_crash_regression.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-This patch by Mikko Rapeli <[EMAIL PROTECTED]>.
-
-The savage driver some time ago started crashing when respawned from
-kdm et al. When MapMMIO and MapFB functions were merged to MapMem, one
-MapFB call in SavageScreenInit was not replaced with MapMem.
-
-See Debian bugs #397084 and #398860.
-Committed upstream as 3e2d370e291f5f222de88075f1f285446cca0569.
-
-Index: xserver-xorg-video-savage/src/savage_driver.c
-===
xserver-xorg-video-savage.orig/src/savage_driver.c 2006-12-24
18:47:22.0 +0100
-+++ xserver-xorg-video-savage/src/savage_driver.c 2006-12-24
18:50:34.0 +0100
-@@ -3096,6 +3096,9 @@
-
- SavageEnableMMIO(pScrn);
-
-+if (!SavageMapMem(pScrn))
-+return FALSE;
-+
- psav->FBStart2nd = 0;
-
- if (psav->overlayDepth) {
diff --git a/debian/patches/series b/debian/patches/series
index 15a2be4..aca27e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_savage_driver_disable_randr_on_rotation.diff
-02_fix_respawn_crash_regression.diff
commit 90347b424b9b8b6d15babd11bb80c482eba8b1f3
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat Apr 28 16:31:00 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 0d5c037..edc068a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,116 +1,945 @@
-2006-05-09 Alex Deucher <[EMAIL PROTECTED]>
+commit ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Apr 2 17:32:02 2007 -0400
- * man/savage.man:
- * src/savage_exa.c: (SavageEXAInit), (SavageDownloadFromScreen):
- - add AccelMethod to savage.man
- - fix bug 6847
- - add memcpy based DFS
+final odds and ends for exa
+
xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog |6 ++
debian/control |3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 1bbade1f4295a07bd72af2614d35c1ffb8be20d1
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Tue Apr 24 14:20:28 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-savage.
diff --git a/debian/changelog b/debian/changelog
index 7d39de6..37311a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-savage (1:2.1.2-4) UNRELEASED; urgency=low
+
+ * Replaces/Conflicts: xserver-xorg-driver-savage.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 24 Apr 2007 14:19:55 +0300
+
xserver-xorg-video-savage (1:2.1.2-3) unstable; urgency=medium
* SavageMamMem -> SavageMapMem in the previous patch. Thanks Mikael
diff --git a/debian/control b/debian/control
index 755322e..b2dddc7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-savage
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
Provides: xserver-xorg-video-1.0
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-savage
+Conflicts: xserver-xorg-driver-savage
Description: X.Org X server -- Savage display driver
This package provides the driver for the S3/VIA Savage/ProSavage/Twister
family
of chipsets.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit a7a5b56a7a7e4b8ccd51fee5a31cecc060c05b03 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Jan 4 03:41:14 2007 + Add reference to upstream commit. commit cc99e9b2b4b662ad1a5ef55bee973fa13f8e0920 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Dec 31 00:09:01 2006 + * SavageMamMem -> SavageMapMem in the previous patch. Thanks Mikael Petersson for reporting the bug, and Jon K Hellan for noticing the fix. Closes: #405061, #405021 commit 88d350601725db89d54b76fc1d4657f5c3a72030 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Dec 30 00:45:53 2006 + * Remove duplicate libdrm-dev build-dep commit 84816819235a7cac90f5725e08de4322861341c8 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Dec 24 18:03:36 2006 + * Add patch by Mikko Rapeli <[EMAIL PROTECTED]> to fix a crash when the last client exits and the server is respawned, closes: #397084. Thanks, Mikko! commit 0af963f2746d91bb485409d48ea7e3b01a419733 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Nov 7 06:46:29 2006 + For each driver, add a symlink to xserver-xorg-core's bug script, so that each new bugreport contains the user's config and log files. Bump dependencies on xserver-xorg-core to >= 2:1.1.1-11, to make sure that the bug script is present. commit 565d5b595421937b604d755330ac1965925fa24b Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Sep 30 18:31:43 2006 + * New upstream release + Fixes DRI lock handling. Closes: #389794 commit 9342a607f89a69be12794bfe229377fdcd005e58 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Tue Sep 26 10:26:34 2006 + Add some more watch files. commit 5dd5dff1f0c7e8c9a9d8d363317d6310f1f5197c Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Sep 22 02:15:45 2006 + * Standards version bump to 3.7.2.0. No change needed. commit 21329f3730b547709c17a6c1b08e42eea283585a Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Sep 22 01:58:49 2006 + * Add build-depends on quilt. Thanks lamont. (closes: #388640) commit 511e14d617baac9ac58a0788b94df7b81151f435 Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Sep 19 00:38:19 2006 + Prepare changelog for upload to unstable commit 451a13b83929f7cdf60187803f82070069dfadf5 Author: Steve Langasek <[EMAIL PROTECTED]> Date: Mon Sep 18 11:59:06 2006 + merge savage 7.1 video driver to trunk for upload to unstable commit 0cdf8e5f3cccb1149a37583b4b29a61641b772a2 Author: Steve Langasek <[EMAIL PROTECTED]> Date: Mon Sep 18 06:33:05 2006 + more fixes for unversioned directory names commit 5e201074197660342caba4b5b99b75c2b608e998 Author: David Nusinow <[EMAIL PROTECTED]> Date: Wed Apr 5 00:10:22 2006 + Prepare changelogs for upload to unstable commit ee062df251e6d4af40f437eb84675820585d45ce Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Mar 11 23:38:18 2006 + Increment package version for this fix commit eb21f584a6860abd5ef6acffc99cf4fd9177b488 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Mar 11 23:35:33 2006 + * Rename .install file so that things actually get installed to the package. Thanks Peter Eisentraut. (closes: #354848) commit 759771723f2ee55fd3ffd81ca4396f4414eaf4c5 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Feb 26 23:52:12 2006 + * Port patches from trunk + general/099f_savage_driver_disable_randr_on_rotation.diff commit 6727b04ee5bda707a6773390a2ccf7f9f193290d Author: David Nusinow <[EMAIL PROTECTED]> Date: Mon Feb 13 03:46:16 2006 + Fix Branden's email address commit 139b5f242fec789670357b5c6278b4724586a989 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Feb 12 16:24:02 2006 + Move all install files for renaming scheme and delete v4l driver which doesn't currently have packaging commit d04a6bea703af6fc284c1ca23634052f26727d11 Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Feb 10 03:40:14 2006 + Change driver package names to new scheme commit 9a40e798554bc7f16e0477b94bd17194ac938a5c Author: David Nusinow <[EMAIL PROTECTED]> Date: Mon Jan 30 02:24:55 2006 + Move .install files to new naming scheme for drivers commit 325939bad51221805d19090304d7c893796c823f Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Jan 29 21:21:32 2006 + Pull in and use xsfbs commit 48561e523b58ee55323158444831c3e3ebc3d809 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Jan 29 20:36:06 2006 + * Rename driver packages to be more consistent and intuitive + Video drivers are now named xorg-video-driver-foo and input drivers are now named xorg-input-driver-foo + Video drivers provide xorg-video-driver and input drivers provide xorg-input-driver + xorg-server-core depends on xorg-video-drivers-all | xorg-video-driver and also xorg-
