xserver-xorg-video-ati: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/control | 2 +-
src/r6xx_accel.c | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit d9da70ca0fab45487f3888174311207afa1b0d71
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 15 07:07:10 2010 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 622ca28..e397f1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:6.13.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.13.1-2) unstable; urgency=low
* Make libudev-dev build dependencies linux-any.
* Pull upstream commit 06691376 to fix build without KMS.
- -- Brice Goglin <bgoglin@debian.org> Thu, 15 Jul 2010 07:06:04 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 15 Jul 2010 07:07:07 +0200
xserver-xorg-video-ati (1:6.13.1-1) unstable; urgency=low
commit b2d0c07efb08ec562c0cbf3df3dd6796f47d80bb
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 15 07:07:00 2010 +0200
Update changelog after cherry-pick
diff --git a/debian/changelog b/debian/changelog
index 865a299..622ca28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-ati (1:6.13.1-2) UNRELEASED; urgency=low
* Make libudev-dev build dependencies linux-any.
+ * Pull upstream commit 06691376 to fix build without KMS.
- -- Brice Goglin <bgoglin@debian.org> Wed, 14 Jul 2010 20:13:45 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 15 Jul 2010 07:06:04 +0200
xserver-xorg-video-ati (1:6.13.1-1) unstable; urgency=low
commit 41d0440ede985724f6becf3a5a2356efb98c42f5
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 7 13:15:03 2010 +1000
fix build on non-kms
diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index 0edfe8b..73f9462 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -1262,9 +1262,9 @@ void r600_finish_op(ScrnInfoPtr pScrn, int vtx_size)
void r600_vb_no_space(ScrnInfoPtr pScrn, int vert_size)
{
-#ifdef XF86DRM_MODE
RADEONInfoPtr info = RADEONPTR(pScrn);
struct radeon_accel_state *accel_state = info->accel_state;
+#ifdef XF86DRM_MODE
if (info->cs) {
if (accel_state->vb_bo) {
commit dea9487e0a588c8d85497df5f946a29ee5d174cd
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jul 14 20:14:28 2010 +0200
Make libudev-dev build dependencies linux-any
diff --git a/debian/changelog b/debian/changelog
index c73349f..865a299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.13.1-2) UNRELEASED; urgency=low
+
+ * Make libudev-dev build dependencies linux-any.
+
+ -- Brice Goglin <bgoglin@debian.org> Wed, 14 Jul 2010 20:13:45 +0200
+
xserver-xorg-video-ati (1:6.13.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 57cdbf6..189a451 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
libdrm-dev (>= 2.4.17) [!hurd-i386],
x11proto-dri2-dev,
x11proto-xf86dri-dev,
- libudev-dev,
+ libudev-dev [linux-any],
dpkg-dev (>= 1.14.17),
automake,
libtool,
Reply to: