xserver-xorg-video-r128: Changes to 'debian-unstable'
ChangeLog | 136 +++++++++++++++++++++++++++++++++++---------------
Makefile.am | 2
configure.ac | 11 +++-
debian/NEWS | 4 -
debian/README.source | 73 ++++++++++++++++++++++++++
debian/changelog | 6 +-
debian/control | 2
debian/xsfbs/xsfbs.sh | 12 ----
src/r128_driver.c | 21 +++++++
src/r128_probe.c | 4 +
10 files changed, 213 insertions(+), 58 deletions(-)
New commits:
commit f5ec887f93d1c3cbc8a72d1f2d2c11a574eee091
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 10:08:35 2009 +0200
Prepare changelog for upload
diff --git a/debian/NEWS b/debian/NEWS
index 4a746b2..199c654 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) experimental; urgency=low
+xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low
* The standard linux kernels in Debian as of version 2.6.29-1 do not
contain the firmware necessary to allow the r128 driver to use 3D
@@ -6,7 +6,7 @@ xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) experimental; urgency=low
firmware-linux package in non-free, and must be installed to use
this feature.
- -- David Nusinow <dnusinow@debian.org> Wed, 29 Apr 2009 21:21:04 -0400
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 10:12:54 +0200
xserver-xorg-video-r128 (1:6.8.1~git20080301.d855d208-1) experimental; urgency=low
diff --git a/debian/changelog b/debian/changelog
index e3f673c..fc80102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-r128 (6.8.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low
[ Brice Goglin ]
* New upstream release.
@@ -12,7 +12,7 @@ xserver-xorg-video-r128 (6.8.1-1) UNRELEASED; urgency=low
* Remove 01_gen_pci_ids.diff. The server uses a built-in table now to
choose drivers.
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 10:07:48 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 10:08:31 +0200
xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-2) unstable; urgency=low
commit 8c3422c40f5d4bb6470858601f82c95443091d94
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 10:08:26 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 364a67e..da0a08f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+commit 39dac77d3f2b5d69f13dc3aff17a4a245462fcc0
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:28 2009 +1000
+
+ r128: bump for release 6.8.1
+
+commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:41 2009 +1000
+
+ r128: change to using ABI version check
+
+commit e3568b4e5d404076c0f02c1b64af35c8e6d5745f
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:32 2009 +1000
+
+ r128: update for resources/RAC API removal
+
+commit 38d301388cfa1f228a6fa0cddf5b7ad6258154d2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 15 15:44:01 2009 -0400
+
+ Use XORG_CHANGELOG macro to create ChangeLog. #22611
+
+ Adding the macro in configure.ac and use it in Makefile.am
+ Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
+ Global maintenance on all modules
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 178e6f509bb8b351cfa01425ada7331781843954
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:51:08 2009 +1000
+
+ Update to xextproto 7.1 support.
+
+ DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
+ need to include dpmsconst.h if xextproto 7.1 is available.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5d8a8df3aca2f14366946e48df9b674d7254ce04
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Jun 13 19:20:24 2009 +0200
+
+ Don't de-reference a NULL pointer in R128FreeScreen in the error path.
+
+ If R128PreInit() failed, R128FreeRec() was already called and info
+ will be NULL.
+
+commit 771c707eb2bba21b6013327bb62859c37be08673
+Author: John Nielsen <lists@jnielsen.net>
+Date: Fri Apr 17 16:16:57 2009 -0400
+
+ R128: fix zaphod dualhead after libpciaccess switch
+
+ fixes bug 21251
+
commit 08d56c886c6f5cb848e4f5079a66da781ef6da21
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:58:51 2009 -0800
@@ -167,7 +225,7 @@ Date: Mon Feb 25 07:10:48 2008 +1000
fixup check for EXA composite pointed out by Alan Swanson
commit 85e470e64f629de72e361c77770e2e29998d1bf4
-Merge: 27ddb39... 1b84c76...
+Merge: 27ddb39 1b84c76
Author: Alex Deucher <alex@samba.(none)>
Date: Sun Feb 24 05:37:22 2008 -0500
@@ -855,7 +913,7 @@ Date: Mon Jan 14 16:11:09 2008 -0500
Fixes bug 14001
commit 729da30c80d6545b75c8faea44754634f477cc09
-Merge: 000741e... 625a885...
+Merge: 000741e 625a885
Author: Alex Deucher <alex@samba.(none)>
Date: Mon Jan 14 10:05:01 2008 -0500
@@ -1048,7 +1106,7 @@ Date: Wed Jan 2 19:48:28 2008 -0500
RADEON: various avivo tv-out related clean-ups
commit ce34090c758ac91171cb6adb9b8a36e4adbf99cf
-Merge: 2180f04... 30cab1d...
+Merge: 2180f04 30cab1d
Author: Alex Deucher <alex@samba.(none)>
Date: Wed Jan 2 16:41:36 2008 -0500
@@ -1255,7 +1313,7 @@ Date: Fri Dec 21 09:45:55 2007 +1000
set ddc line correctly post-merge
commit 3c31b96afa20913ad947e68fe0c3a662e5eafbdd
-Merge: eb99c3c... f5e8c18...
+Merge: eb99c3c f5e8c18
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 21 09:36:22 2007 +1000
@@ -1296,7 +1354,7 @@ Date: Wed Dec 19 19:15:19 2007 -0500
The correct thing to do is filter by the mode's effective memory bandwidth.
commit c1b0b69cc50516c3b7e881b0eb46cb3cd2e9dce6
-Merge: 0e66348... ce4fa1c...
+Merge: 0e66348 ce4fa1c
Author: Alex Deucher <alex@botch2.(none)>
Date: Wed Dec 19 11:54:50 2007 -0500
@@ -1371,14 +1429,14 @@ Date: Mon Dec 17 20:20:04 2007 -0500
RADEON: fix typo from merge
commit 19b9d3708852b7efe2b05249c8359dadb924dd94
-Merge: cf685f3... 29706ca...
+Merge: cf685f3 29706ca
Author: Alex Deucher <alex@samba.(none)>
Date: Mon Dec 17 20:07:32 2007 -0500
Merge branch 'atombios-support' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
commit cf685f37ec874f0aacd09e7c4eb0402c6daec1b0
-Merge: 2a134af... 44d07c4...
+Merge: 2a134af 44d07c4
Author: Alex Deucher <alex@samba.(none)>
Date: Mon Dec 17 20:07:07 2007 -0500
@@ -1527,7 +1585,7 @@ Date: Thu Dec 13 18:45:09 2007 -0500
- Unify the PLL calculation between legacy and avivo chips
commit f5ac34983411e4c4f41ab1817dce582830f398fd
-Merge: f2b2e08... 6ccf5b3...
+Merge: f2b2e08 6ccf5b3
Author: Alex Deucher <alex@samba.(none)>
Date: Wed Dec 12 22:37:44 2007 -0500
@@ -1580,7 +1638,7 @@ Date: Tue Dec 11 14:04:58 2007 -0500
RADEON: handle HMDI properly (untested) and fix some merge leftovers
commit 3c22ad977c25d5ca2811821fcac6bb8ecd79994a
-Merge: c9a0cee... f3d2ec3...
+Merge: c9a0cee f3d2ec3
Author: Alex Deucher <alex@botch2.(none)>
Date: Tue Dec 11 13:11:15 2007 -0500
@@ -1636,7 +1694,7 @@ Date: Mon Dec 10 15:25:56 2007 +1000
add support for building against legacy servers similiar to Intel codepaths
commit 9c278cb7fa7f18d13bde053fd75221cfba9da377
-Merge: 6451ea2... cc167b9...
+Merge: 6451ea2 cc167b9
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Dec 10 15:18:03 2007 +1000
@@ -1650,7 +1708,7 @@ Date: Mon Dec 10 15:18:03 2007 +1000
src/radeon_output.c
commit 6451ea2dcc4fac762442f699935864f4a8d445f7
-Merge: 0d89556... 5896ca4...
+Merge: 0d89556 5896ca4
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Dec 10 15:08:42 2007 +1000
@@ -1710,7 +1768,7 @@ Date: Thu Dec 6 19:23:06 2007 +1100
powerpc: build fixes from last merge
commit dbe3d2608ecc9896db9c23b3a347b50748c51e13
-Merge: 48e31cd... 21ed435...
+Merge: 48e31cd 21ed435
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Dec 6 14:22:03 2007 +1000
@@ -1811,7 +1869,7 @@ Date: Fri Nov 30 20:11:42 2007 -0500
mode or vesafb etc. after running the driver.
commit af0196f7bf0d1d5d211391149c18935d64ed2b06
-Merge: d9858a2... 0175b79...
+Merge: d9858a2 0175b79
Author: Alex Deucher <alex@botch2.(none)>
Date: Fri Nov 30 16:40:28 2007 -0500
@@ -1843,7 +1901,7 @@ Date: Fri Nov 30 15:37:42 2007 -0500
for now.
commit e1945f1f25a34310bd58ce128c8ff27ecc985618
-Merge: b368b0f... df7777b...
+Merge: b368b0f df7777b
Author: Alex Deucher <alex@botch2.(none)>
Date: Fri Nov 30 14:30:55 2007 -0500
@@ -2064,7 +2122,7 @@ Date: Wed Nov 21 17:03:39 2007 -0500
Thanks to AMD for the information
commit a12390c832abe423def60e39cd5a9118e5910339
-Merge: d531792... e74dca1...
+Merge: d531792 e74dca1
Author: Alex Deucher <alex@botch2.(none)>
Date: Wed Nov 21 02:24:48 2007 -0500
@@ -2117,7 +2175,7 @@ Date: Wed Nov 21 00:05:42 2007 -0500
RADEON: store devices ids from bios for each driver output
commit 3975da2ea8cb628f7f66c3f26c5dfa181cd1c532
-Merge: e283aa3... 295ce27...
+Merge: e283aa3 295ce27
Author: Alex Deucher <alex@botch2.(none)>
Date: Tue Nov 20 23:52:29 2007 -0500
@@ -2217,7 +2275,7 @@ Date: Tue Nov 20 13:37:00 2007 +1000
atombios: add all r5xx and r6xx pci ids
commit 5d023e2c3c2ab44ea57ffadc9607025d602c376c
-Merge: 0d1e0c7... c887260...
+Merge: 0d1e0c7 c887260
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Nov 20 13:02:43 2007 +1000
@@ -2242,7 +2300,7 @@ Date: Tue Nov 20 08:15:58 2007 +1000
r5xx: cleanups after last merge
commit fe2f7a09050fb7a345a1f52239f8f3c4f1053891
-Merge: 744c8cb... 49055d8...
+Merge: 744c8cb 49055d8
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Nov 20 08:04:32 2007 +1000
@@ -2254,7 +2312,7 @@ Date: Tue Nov 20 08:04:32 2007 +1000
src/radeon_output.c
commit 744c8cb6c293fcaa687566f52901644e699baace
-Merge: e258fbe... e530af7...
+Merge: e258fbe e530af7
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Nov 20 07:56:33 2007 +1000
@@ -2267,14 +2325,14 @@ Date: Mon Nov 19 16:35:05 2007 +1000
makes 2-headed cursor work
commit e530af79adf51b3e95a0eca676c915a34dcbf4a7
-Merge: 69e197f... 52aba8d...
+Merge: 69e197f 52aba8d
Author: Alex Deucher <alex@botch2.(none)>
Date: Mon Nov 19 00:59:30 2007 -0500
Merge branch 'agd-atom' of /home/alex/git/airlied/xf86-video-ati2 into agd-atom
commit 69e197f2c8002aacf2587754c8d3bd63c88f85b1
-Merge: 5e8940f... 862dcab...
+Merge: 5e8940f 862dcab
Author: Alex Deucher <alex@botch2.(none)>
Date: Mon Nov 19 00:57:34 2007 -0500
@@ -2305,7 +2363,7 @@ Date: Mon Nov 19 00:39:19 2007 -0500
Don't assign a gpio for TV
commit 52aba8d73189ba959f19c0437499d5e7a8829827
-Merge: 862dcab... 5e8940f...
+Merge: 862dcab 5e8940f
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 19 15:30:46 2007 +1000
@@ -2342,7 +2400,7 @@ Date: Sun Nov 18 23:43:06 2007 -0500
fix typo in loop
commit 384cd8f52c89d089c6559e2eedbae45641fcd14e
-Merge: f3f0e4e... 234b607...
+Merge: f3f0e4e 234b607
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 19 14:02:55 2007 +1000
@@ -2411,7 +2469,7 @@ Date: Sat Nov 17 00:34:56 2007 -0500
WIP: more new ATOM integration work
commit 67db114d97abed7a607467e5d67c7b4ffa2c347e
-Merge: 7d06a87... ea15346...
+Merge: 7d06a87 ea15346
Author: Alex Deucher <alex@botch2.(none)>
Date: Fri Nov 16 14:29:53 2007 -0500
@@ -2474,7 +2532,7 @@ Date: Fri Nov 16 14:48:36 2007 +1000
Add copyright headers
commit 3cfcd2164b400bd0d1cb4ede8eeb01abba9d75c8
-Merge: efac14e... 718bfd3...
+Merge: efac14e 718bfd3
Author: Alex Deucher <alex@botch2.(none)>
Date: Thu Nov 15 23:25:39 2007 -0500
@@ -2995,7 +3053,7 @@ Date: Thu Oct 4 11:32:48 2007 +0200
Surprisingly easy, thanks to George's pci-rework changes.
commit 7addf41885ec5658f531624a9c24ea5bd7d22d19
-Merge: 3a958ba... 78c6bd3...
+Merge: 3a958ba 78c6bd3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 4 11:06:08 2007 +0200
@@ -3454,7 +3512,7 @@ Date: Tue Aug 28 15:37:11 2007 +0300
It still uses the old probe method though, this is due to the ati wrapper.
commit 7b38d9a1209f87255e5bb0aefe46a363ce4fb6ef
-Merge: 2e3d43a... 673f799...
+Merge: 2e3d43a 673f799
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Tue Aug 28 16:01:12 2007 +0300
@@ -3718,14 +3776,14 @@ Date: Thu Aug 23 19:56:21 2007 +1000
updated release numbering for randr 1.2
commit 81a8093f2ffdce59d4e8a44f65f3d5c771fd6425
-Merge: c08e6ec... 53a67e3...
+Merge: c08e6ec 53a67e3
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 23 19:51:47 2007 +1000
Merge remote branch 'origin/randr-1.2'
commit c08e6ec9e7ac06caee53689b0ec50ef6a7a0ba37
-Merge: 5793e87... a0d0fcd...
+Merge: 5793e87 a0d0fcd
Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
Date: Thu Aug 23 19:42:19 2007 +1000
@@ -4598,7 +4656,7 @@ Date: Wed May 30 17:49:01 2007 +1000
we hang when moving the cursor into the second CRTC.
commit 7fc02657c4d740941fbda5a8823cf45de3eca3f8
-Merge: 800bf53... 4c61c0e...
+Merge: 800bf53 4c61c0e
Author: Dave Airlie <airlied@nx6125b.(none)>
Date: Wed May 30 17:27:22 2007 +1000
@@ -4653,7 +4711,7 @@ Date: Tue May 29 07:23:24 2007 +1000
rs480: only has single dac
commit c52322354fe64725733842b3356798c50e7735d5
-Merge: dd6a966... 975da59...
+Merge: dd6a966 975da59
Author: Dave Airlie <airlied@nx6125b.(none)>
Date: Tue May 29 07:21:48 2007 +1000
@@ -5135,7 +5193,7 @@ Date: Tue May 8 19:27:48 2007 +0200
remove some old mergedfb cruft
commit 76670f665ebec7cdf40a04bf9379cb3ad4417507
-Merge: 83f81ed... a3ee422...
+Merge: 83f81ed a3ee422
Author: Alex Deucher <alex@t41p.hsd1.va.comcast.net>
Date: Tue May 8 18:41:25 2007 +0200
@@ -5586,7 +5644,7 @@ Date: Sun Feb 25 23:29:09 2007 +1100
fix typo
commit 3cfe94d5438961b869766dacbcd13fde8b770ca2
-Merge: 31c018c... 3b43788...
+Merge: 31c018c 3b43788
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Feb 25 23:27:19 2007 +1100
@@ -5779,7 +5837,7 @@ Date: Sun Feb 4 11:28:54 2007 +0200
case because pATI->PCIInfo is now set after ATIProcessOptions() is called.
commit 9d77aabdff919360f0c9333105436c31f1f5749a
-Merge: ff8ea19... 57822be...
+Merge: ff8ea19 57822be
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Mon Feb 5 19:16:51 2007 +0200
@@ -6952,7 +7010,7 @@ Date: Mon Sep 25 11:35:32 2006 +1000
radeon: cleanup some bits from superpatch
commit 9827afaa40720a58e2fc029c0bf92ad2fe223d11
-Merge: 10b4b46... ad8259c...
+Merge: 10b4b46 ad8259c
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Sep 25 11:25:17 2006 +1000
@@ -7097,7 +7155,7 @@ Date: Fri Sep 22 06:35:34 2006 +1000
radeon: add enable display function
commit 4a54886d510f26b29d27e5c9a73647554291b1a6
-Merge: 70264d6... 9fa176c...
+Merge: 70264d6 9fa176c
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Sep 22 06:00:04 2006 +1000
@@ -7713,7 +7771,7 @@ Date: Thu Jun 15 15:35:05 2006 +0200
Fix some more cosmetic warnings.
commit ec93e08b24f7c0e583970d08bfe18ad142e6b047
-Merge: 051c49d... 6ca9862...
+Merge: 051c49d 6ca9862
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 15:03:27 2006 +0200
@@ -7732,7 +7790,7 @@ Date: Thu Jun 15 21:24:16 2006 +1000
remove all printf specifier warnings on Linux
commit 051c49d0f002c72d1d8f15f6df264d8b093d4e95
-Merge: a840afc... dfac819...
+Merge: a840afc dfac819
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 13:10:44 2006 +0200
@@ -7757,7 +7815,7 @@ Date: Thu Jun 15 20:59:33 2006 +1000
some more unused variable cleanups
commit a840afc75a0453b4694e3f987ebdbddc6844a169
-Merge: c90c49d... d511ef4...
+Merge: c90c49d d511ef4
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 12:46:58 2006 +0200
diff --git a/debian/changelog b/debian/changelog
index 37e6630..e3f673c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) UNRELEASED; urgency=low
+xserver-xorg-video-r128 (6.8.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
+ * New upstream release.
* xserver-xorg-video-r128 now suggests firmware-linux since
a firmware may be needed to initialize DRI.
* Move -dbg package to section debug.
@@ -11,7 +12,7 @@ xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) UNRELEASED; urgency=low
* Remove 01_gen_pci_ids.diff. The server uses a built-in table now to
choose drivers.
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 10:05:53 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 10:07:48 +0200
xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-2) unstable; urgency=low
commit edcf18b3c7984b57e6a6e0fc1748e928be781720
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 10:06:19 2009 +0200
Bump Standards-Version to 3.8.2 now that we have README.source
diff --git a/debian/changelog b/debian/changelog
index 32e5092..37e6630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,14 @@ xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) UNRELEASED; urgency=low
* xserver-xorg-video-r128 now suggests firmware-linux since
a firmware may be needed to initialize DRI.
* Move -dbg package to section debug.
+ * Add README.source, bump Standards-Version to 3.8.2.
[ David Nusinow ]
* Add a note in NEWS.Debian about firmware-linux
* Remove 01_gen_pci_ids.diff. The server uses a built-in table now to
choose drivers.
- -- David Nusinow <dnusinow@debian.org> Wed, 29 Apr 2009 21:50:52 -0400
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 10:05:53 +0200
xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index df1af92..4d75ced 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-r128.git
commit 39dac77d3f2b5d69f13dc3aff17a4a245462fcc0
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:28 2009 +1000
r128: bump for release 6.8.1
diff --git a/configure.ac b/configure.ac
index 1342662..4e0f463 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-r128],
- 6.8.0,
+ 6.8.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-r128)
commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
r128: change to using ABI version check
diff --git a/src/r128_driver.c b/src/r128_driver.c
index a4a5cea..d6448b6 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -87,7 +87,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86PciInfo.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
diff --git a/src/r128_probe.c b/src/r128_probe.c
index c61da4c..412da92 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -46,8 +46,12 @@
#include "xf86.h"
#include "xf86PciInfo.h"
-#ifndef XSERVER_LIBPCIACCESS
+
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
+#endif
+
+#ifndef XSERVER_LIBPCIACCESS
static Bool R128Probe(DriverPtr drv, int flags);
#endif
commit e3568b4e5d404076c0f02c1b64af35c8e6d5745f
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:32 2009 +1000
r128: update for resources/RAC API removal
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 90e2246..a4a5cea 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -87,8 +87,10 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86PciInfo.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
#include "xf86cmap.h"
#include "xf86xv.h"
#include "vbe.h"
@@ -1980,10 +1982,12 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
PCI_DEV_DEV(info->PciInfo),
PCI_DEV_FUNC(info->PciInfo));
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(info->pEnt->index, 0, ResNone)) goto fail;
if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto fail;
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
+#endif
pScrn->monitor = pScrn->confScreen->monitor;
if (!R128PreInitVisual(pScrn)) goto fail;
diff --git a/src/r128_probe.c b/src/r128_probe.c
index bfec1eb..c61da4c 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -45,9 +45,9 @@
#include "xf86.h"
#include "xf86PciInfo.h"
-#include "xf86Resources.h"
#ifndef XSERVER_LIBPCIACCESS
+#include "xf86Resources.h"
static Bool R128Probe(DriverPtr drv, int flags);
#endif
commit 38d301388cfa1f228a6fa0cddf5b7ad6258154d2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 15 15:44:01 2009 -0400
Use XORG_CHANGELOG macro to create ChangeLog. #22611
Adding the macro in configure.ac and use it in Makefile.am
Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
Global maintenance on all modules
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index c8dcab8..1f4c3c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,6 @@ CLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 0d1f125..1342662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,10 @@ AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
AM_MAINTAINER_MODE
# Checks for programs.
@@ -132,6 +136,7 @@ AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
XORG_CHECK_LINUXDOC
+XORG_CHANGELOG
AC_MSG_NOTICE(
[Please change the Driver line in xorg.conf from "ati" to "r128" or install]
commit 178e6f509bb8b351cfa01425ada7331781843954
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:51:08 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index eed1586..0d1f125 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/r128_driver.c b/src/r128_driver.c
index f42acb6..90e2246 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -101,8 +101,13 @@
#include "dixstruct.h"
/* DPMS support. */
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#ifndef MAX
#define MAX(a,b) ((a)>(b)?(a):(b))
commit 5d8a8df3aca2f14366946e48df9b674d7254ce04
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Jun 13 19:20:24 2009 +0200
Don't de-reference a NULL pointer in R128FreeScreen in the error path.
If R128PreInit() failed, R128FreeRec() was already called and info
will be NULL.
diff --git a/src/r128_driver.c b/src/r128_driver.c
index e3d7bb3..f42acb6 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -4337,6 +4337,8 @@ void R128FreeScreen(int scrnIndex, int flags)
R128InfoPtr info = R128PTR(pScrn);
R128TRACE(("R128FreeScreen\n"));
+ if (info == NULL)
+ return;
#ifdef WITH_VGAHW
if (info->VGAAccess && xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
vgaHWFreeHWRec(pScrn);
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
exit $SHELL_LIB_USAGE_ERROR
fi
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 25 20:08:50 2009 -0400
Add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the "debian-*" branch of
+the Debian repository. XSFBS' scripts then take care of removing
+these listed files during the build so as to generate a modified
+DFSG-free .orig.tar.gz tarball.
commit 771c707eb2bba21b6013327bb62859c37be08673
Author: John Nielsen <lists@jnielsen.net>
Date: Fri Apr 17 16:16:57 2009 -0400
R128: fix zaphod dualhead after libpciaccess switch
fixes bug 21251
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 8f360a1..e3d7bb3 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -234,6 +234,16 @@ static Bool R128MapMMIO(ScrnInfoPtr pScrn)
if (info->FBDev) {
info->MMIO = fbdevHWMapMMIO(pScrn);
} else {
+ /* If the primary screen has already mapped the MMIO region,
+ use its pointer instead of mapping it a second time. */
+ if (info->IsSecondary) {
+ DevUnion* pPriv = xf86GetEntityPrivate(pScrn->entityList[0],
+ getR128EntityIndex());
+ R128EntPtr pR128Ent = pPriv->ptr;
+ R128InfoPtr info0 = R128PTR(pR128Ent->pPrimaryScrn);
+ info->MMIO=info0->MMIO;
+ if (info->MMIO) return TRUE;
+ }
#ifndef XSERVER_LIBPCIACCESS
info->MMIO = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO | VIDMEM_READSIDEEFFECT,
commit 08d56c886c6f5cb848e4f5079a66da781ef6da21
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:58:51 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..cb61870
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-r128
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-r128
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit 23a502faeae838010061269184082348a5c43b39
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:32:13 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/r128.man b/man/r128.man
index 709c2fe..5c7c4fe 100644
--- a/man/r128.man
+++ b/man/r128.man
@@ -149,7 +149,7 @@ output switch (e.g., fn-f7, etc.) prior to starting X or switch to
another VT and back.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
.nf
Rickard E. (Rik) Faith \fIfaith@precisioninsight.com\fP
commit ba8cdda0c8c1151e528d5cd432612ab664abf4f3
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Sep 21 19:55:55 2008 +0200
Kill bare RCS id.
diff --git a/man/Makefile.am b/man/Makefile.am
index 422794f..858ba62 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
Reply to: