xserver-xorg-video-mach64: Changes to 'debian-unstable'
ChangeLog | 94 ++++++++++++++++++-------------
Makefile.am | 4 -
configure.ac | 16 ++---
debian/changelog | 8 +-
debian/control | 1
debian/patches/01_gen_pci_ids.diff | 18 -----
debian/patches/series | 1
debian/rules | 4 -
debian/xserver-xorg-video-mach64.install | 1
src/Makefile.am | 2
10 files changed, 75 insertions(+), 74 deletions(-)
New commits:
commit 0c7e358f9879d06c24704ee5f0f6f010106d1b23
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Apr 30 07:02:49 2009 +0200
The X server now uses a built-in table to choose drivers.
Disable patch system and remove quilt from build-depends
diff --git a/debian/changelog b/debian/changelog
index 1032a2b..fcc3b6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ xserver-xorg-video-mach64 (6.8.1-1) UNRELEASED; urgency=low
* New upstream release.
* Move -dbg package to section debug.
+ * Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to
+ choose drivers.
+ + Disable patch system and remove quilt from build-depends
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Apr 2009 06:55:54 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Apr 2009 07:02:27 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d89bae8..61bf843 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends:
x11proto-render-dev,
libdrm-dev (>> 2.2) [!hurd-i386],
x11proto-xf86dri-dev,
- quilt,
dpkg-dev (>= 1.14.17),
automake,
libtool,
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index deddf49..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,18 +0,0 @@
----
- src/Makefile.am | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: xserver-xorg-video-mach64/src/Makefile.am
-===================================================================
---- xserver-xorg-video-mach64.orig/src/Makefile.am 2007-10-06 02:44:47.000000000 +0200
-+++ xserver-xorg-video-mach64/src/Makefile.am 2007-10-06 02:48:34.000000000 +0200
-@@ -108,3 +108,9 @@
- mach64_dri.h \
- mach64_sarea.h \
- atipcirename.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = mach64.ids
-+
-+mach64.ids:
-+ grep PCI_CHIP_MACH64 /usr/include/xorg/xf86PciInfo.h | awk '/^#define.*PCI_CHIP/ {print $$3}' | sed -e 's/0x/1002/' > mach64.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 7794d15..dae3db7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-configure: $(STAMP_DIR)/patch
+configure:
autoreconf -vfi
obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
@@ -48,7 +48,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/debian/xserver-xorg-video-mach64.install b/debian/xserver-xorg-video-mach64.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-mach64.install
+++ b/debian/xserver-xorg-video-mach64.install
@@ -1,2 +1 @@
usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*
commit 22505be984f78ad135d080a0b7a3ffa54d8d08ba
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Apr 30 06:59:13 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 38556e3..858e94b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit 99db87ed49d7eca8de2ff1f7d53b580637ebb916
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Apr 29 17:32:47 2009 -0700
+
+ Version 6.8.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 193744b015e8f2b8c25d90094b7f0b502bc1287b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Apr 29 17:21:53 2009 -0700
+
+ Convert to XORG_CWARNFLAGS & XORG_CHANGELOG
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
commit d394e0b8269ea0a7d36ee8edb38947df170399c9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:41:43 2009 -0800
@@ -177,7 +193,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
@@ -865,7 +881,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
@@ -1058,7 +1074,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
@@ -1265,7 +1281,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
@@ -1306,7 +1322,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
@@ -1381,14 +1397,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
@@ -1537,7 +1553,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
@@ -1590,7 +1606,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
@@ -1646,7 +1662,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
@@ -1660,7 +1676,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
@@ -1720,7 +1736,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
@@ -1821,7 +1837,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
@@ -1853,7 +1869,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
@@ -2074,7 +2090,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
@@ -2127,7 +2143,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
@@ -2227,7 +2243,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
@@ -2252,7 +2268,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
@@ -2264,7 +2280,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
@@ -2277,14 +2293,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
@@ -2315,7 +2331,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
@@ -2352,7 +2368,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
@@ -2421,7 +2437,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
@@ -2484,7 +2500,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
@@ -3005,7 +3021,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
@@ -3464,7 +3480,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
@@ -3728,14 +3744,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
@@ -4608,7 +4624,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
@@ -4663,7 +4679,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
@@ -5145,7 +5161,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
@@ -5596,7 +5612,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
@@ -5789,7 +5805,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
@@ -6962,7 +6978,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
@@ -7107,7 +7123,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
@@ -7723,7 +7739,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
@@ -7742,7 +7758,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
@@ -7767,7 +7783,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 1cb49a5..1032a2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-3) UNRELEASED; urgency=low
+xserver-xorg-video-mach64 (6.8.1-1) UNRELEASED; urgency=low
+ * New upstream release.
* Move -dbg package to section debug.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Apr 2009 23:02:01 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Apr 2009 06:55:54 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
commit 99db87ed49d7eca8de2ff1f7d53b580637ebb916
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Apr 29 17:32:47 2009 -0700
Version 6.8.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 7b19be0..e22b987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-mach64],
- 6.8.0,
+ 6.8.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-mach64)
commit 193744b015e8f2b8c25d90094b7f0b502bc1287b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Apr 29 17:21:53 2009 -0700
Convert to XORG_CWARNFLAGS & XORG_CHANGELOG
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Makefile.am b/Makefile.am
index 56f5cb2..7fd7bae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,11 +27,11 @@ README.ati: README.ati.sgml
endif
EXTRA_DIST = README.ati README.ati.sgml ChangeLog
-CLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = 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 5e8be38..7b19be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,14 +34,15 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# 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)
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-
-if test "x$GCC" = "xyes"; then
- CPPFLAGS="$CPPFLAGS -Wall"
-fi
+XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
@@ -220,10 +221,11 @@ 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 "mach64" or install]
-[the ati wrapper as well:]
+[Please change the Driver line in xorg.conf from "ati" to "mach64"]
+[ or install the ati wrapper as well:]
[ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati]
)
diff --git a/src/Makefile.am b/src/Makefile.am
index 4bc1006..7331cb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ if USE_EXA
ATIMISC_EXA_SOURCES = atimach64exa.c
endif
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) @XORG_CFLAGS@ @DRI_CFLAGS@
mach64_drv_la_LTLIBRARIES = mach64_drv.la
mach64_drv_la_LDFLAGS = -module -avoid-version
commit d394e0b8269ea0a7d36ee8edb38947df170399c9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:41:43 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..143816b
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-mach64 - ATI Mach64 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-mach64
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-mach64
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit cab7a47477e3878cb9f1fdc5b721fc8e3aaadd5b
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 28 01:09:52 2008 -0200
Remove xf86{Disable,Enable}Interrupts
They were already a noop in most "os-support"s, and are no longer
available in the X Server.
diff --git a/src/aticlock.c b/src/aticlock.c
index f4de77f..53e28b5 100644
--- a/src/aticlock.c
+++ b/src/aticlock.c
@@ -330,8 +330,6 @@ ATIClockSet
ATIDelay(50000); /* 50 milliseconds */
- (void)xf86DisableInterrupts();
-
/* Send all 20 bits of programme word */
while (Programme >= CLOCK_BIT)
{
@@ -343,8 +341,6 @@ ATIClockSet
Programme >>= 1;
}
- xf86EnableInterrupts();
-
/* Restore register */
out8(CLOCK_CNTL, clock_cntl0 | CLOCK_STROBE);
break;
commit e993728f7ee618d34163c127231881aec1637ca2
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:31:13 2008 -0400
Don't print the resource list on failure.
If this ever happens it should be printed from the server at any rate.
diff --git a/src/atipreinit.c b/src/atipreinit.c
index f89f5b7..2b84a6c 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -561,8 +561,7 @@ ATIPreInit
if (pResources)
{
xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
- "Unable to register the following bus resources:\n");
- xf86PrintResList(0, pResources);
+ "Unable to register bus resources\n");
xf86FreeResList(pResources);
return FALSE;
}
commit 46a0254b5a0bffe8c57322b085bcd38f893e4b27
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Sep 9 10:32:48 2008 -0400
Make sure the screen is a mach64 screen before doing anything in ATIMach64XVInitialiseAdaptor.
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index ef17861..21cd890 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -31,6 +31,7 @@
#include "atimach64accel.h"
#include "atimach64io.h"
#include "atixv.h"
+#include "atimach64version.h"
#include <X11/extensions/Xv.h>
#include "fourcc.h"
@@ -1358,6 +1359,9 @@ ATIMach64XVInitialiseAdaptor
XF86OffscreenImagePtr surf0 = &(ATIMach64Surface[0]);
XF86OffscreenImagePtr surf1 = &(ATIMach64Surface[1]);
+ if (xf86NameCmp(pScreenInfo->driverName, MACH64_DRIVER_NAME) != 0)
+ return 0;
+
if (pppAdaptor)
*pppAdaptor = NULL;
Reply to: