From 904da06993316c8ba8624f7bde17920e7ea6a01b Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Feb 12 2014 16:45:06 +0000 Subject: import libdrm-2.4.50-1.1.el7.src.rpm --- diff --git a/.libdrm.metadata b/.libdrm.metadata index 5d73de2..a98ef95 100644 --- a/.libdrm.metadata +++ b/.libdrm.metadata @@ -1 +1 @@ -d9775b71c681c67a53794a72785a45846a17578c SOURCES/libdrm-2.4.47.tar.bz2 +404ad8146500fe53aad46e8db5d546fec1ca47ac SOURCES/libdrm-2.4.50.tar.bz2 diff --git a/SOURCES/0001-nouveau-prevent-undefined-behavior-in-nouveau_pushbu.patch b/SOURCES/0001-nouveau-prevent-undefined-behavior-in-nouveau_pushbu.patch deleted file mode 100644 index b062783..0000000 --- a/SOURCES/0001-nouveau-prevent-undefined-behavior-in-nouveau_pushbu.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 482abbfafb56cbceaf5355c026434e638cddd0f1 Mon Sep 17 00:00:00 2001 -From: Maarten Lankhorst -Date: Thu, 7 Nov 2013 13:30:19 +0100 -Subject: [PATCH] nouveau: prevent undefined behavior in nouveau_pushbuf_reloc - with gcc-4.8 - -Reported-by: ronald645@gmail.com -Bisected-by (gcc): Andreas Radke -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71116 -Signed-off-by: Maarten Lankhorst ---- - nouveau/pushbuf.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -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 --- -1.8.3.1 - diff --git a/SPECS/libdrm.spec b/SPECS/libdrm.spec index 53f21f5..d588960 100644 --- a/SPECS/libdrm.spec +++ b/SPECS/libdrm.spec @@ -2,8 +2,8 @@ Summary: Direct Rendering Manager runtime library Name: libdrm -Version: 2.4.47 -Release: 2%{?dist} +Version: 2.4.50 +Release: 1.1%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -36,8 +36,6 @@ Patch3: libdrm-make-dri-perms-okay.patch Patch4: libdrm-2.4.0-no-bc.patch # make rule to print the list of test programs Patch5: libdrm-2.4.25-check-programs.patch -# fix nouveau with gcc 4.8 -Patch6: 0001-nouveau-prevent-undefined-behavior-in-nouveau_pushbu.patch %description Direct Rendering Manager runtime library @@ -65,7 +63,6 @@ Requires: libdrm = %{version}-%{release} %patch3 -p1 -b .forceperms %patch4 -p1 -b .no-bc %patch5 -p1 -b .check -%patch6 -p1 -b .gcc48 %build autoreconf -v --install || exit 1 @@ -207,14 +204,24 @@ done %{_mandir}/man7/drm*.7* %changelog -* Fri Nov 08 2013 Dave Airlie 2.4.47-2 -- fix nouveau with gcc 4.8 +* Wed Feb 12 2014 Adam Jackson 2.4.50-1.1 +- Mass rebuild -* Wed Oct 23 2013 Jerome Glisse 2.4.47-1 +* Thu Dec 05 2013 Dave Airlie 2.4.50-1 +- libdrm 2.4.50 + +* Mon Dec 02 2013 Dave Airlie 2.4.49-2 +- backport two fixes from master + +* Sun Nov 24 2013 Dave Airlie 2.4.49-1 +- libdrm 2.4.49 + +* Fri Nov 08 2013 Dave Airlie 2.4.47-1 - libdrm 2.4.47 -* Thu Jul 04 2013 Dave Airlie 2.4.46-2 -- RHEL7 rpmdiff fixes +- add fix for nouveau with gcc 4.8 +* Sat Aug 03 2013 Fedora Release Engineering - 2.4.46-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Wed Jul 03 2013 Dave Airlie 2.4.46-1 - libdrm 2.4.46