debian/changelog | 11 +++++++++++
debian/control | 3 ++-
nouveau/pushbuf.c | 3 ++-
3 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 2694c321dcd7bfad51acaa49961b7a86631e3b21
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Thu Nov 7 14:14:46 2013 +0100
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 5f59be1..80e961b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.46-4) UNRELEASED; urgency=low
+libdrm (2.4.46-4) unstable; urgency=low
[ Colin Watson ]
* Declare libdrm-dev Multi-Arch: same.
@@ -7,7 +7,7 @@ libdrm (2.4.46-4) UNRELEASED; urgency=low
* Cherry-pick upstream patch to fix relocations for all cards <nv50.
* Do not require valgrind on armel.
- -- Colin Watson <cjwat...@ubuntu.com> Wed, 23 Oct 2013 15:39:53 +0100
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 07 Nov 2013
14:11:38 +0100
libdrm (2.4.46-3) unstable; urgency=low
commit a25b7599158d8484d5008dfd483df40664853ca5
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Thu Nov 7 14:11:34 2013 +0100
Do not require valgrind on armel.
diff --git a/debian/changelog b/debian/changelog
index a5e3731..5f59be1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.46-4) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* Cherry-pick upstream patch to fix relocations for all cards <nv50.
+ * Do not require valgrind on armel.
-- Colin Watson <cjwat...@ubuntu.com> Wed, 23 Oct 2013 15:39:53 +0100
diff --git a/debian/control b/debian/control
index 4612e5a..59f4b7c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
libpthread-stubs0-dev,
libudev-dev [linux-any],
libpciaccess-dev,
- valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
+ valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
libbsd-dev [kfreebsd-any],
Standards-Version: 3.9.4
Section: libs
commit 776fe9ad51becb058578599a4315a63acb8987e2
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Thu Nov 7 13:57:57 2013 +0100
Declare libdrm-dev Multi-Arch: same.
Add changelog entry documenting cherry-pick from upstream.
diff --git a/debian/changelog b/debian/changelog
index 637ea0c..a5e3731 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.46-4) UNRELEASED; urgency=low
+
+ [ Colin Watson ]
+ * Declare libdrm-dev Multi-Arch: same.
+
+ [ Maarten Lankhorst ]
+ * Cherry-pick upstream patch to fix relocations for all cards <nv50.
+
+ -- Colin Watson <cjwat...@ubuntu.com> Wed, 23 Oct 2013 15:39:53 +0100
+
libdrm (2.4.46-3) unstable; urgency=low
* Make drmCheckModesettingSupported work on FreeBSD. Thanks, Christoph
diff --git a/debian/control b/debian/control
index 4963e82..4612e5a 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Depends:
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
libdrm-omap1 (= ${binary:Version}) [any-arm],
${misc:Depends},
+Multi-Arch: same
Replaces:
linux-libc-dev (<< 2.6.32-10)
Description: Userspace interface to kernel DRM services -- development files
commit eade8716a576a2bfe14714a1140ee7ac5b4364d3
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Thu Nov 7 13:30:19 2013 +0100
nouveau: prevent undefined behavior in nouveau_pushbuf_reloc with gcc-4.8
Reported-by: ronald...@gmail.com
Bisected-by (gcc): Andreas Radke <a.ra...@arcor.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71116
Signed-off-by: Maarten Lankhorst <maarten.lankho...@canonical.com>
diff --git a/nouveau/pushbuf.c b/nouveau/pushbuf.c
index 0fd0c47..4f77881 100644
--- a/nouveau/pushbuf.c
+++ b/nouveau/pushbuf.c
@@ -739,7 +739,8 @@ void
nouveau_pushbuf_reloc(struct nouveau_pushbuf *push, struct nouveau_bo *bo,
uint32_t data, uint32_t flags, uint32_t vor, uint32_t tor)
{
- *push->cur++ = pushbuf_krel(push, bo, data, flags, vor, tor);
+ *push->cur = pushbuf_krel(push, bo, data, flags, vor, tor);
+ push->cur++;
}
int
--
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/e1vepf7-0008mq...@vasks.debian.org
