Accepting request 231237 from X11:XOrg

- u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch:
  * No longer hardcode path for drm.h include in qxl_drm.h, i.e.
    handle it the same as in other <driver>_drm.h files; change
    required for KMS support in xf86-video-qxl (bnc#870501)

OBS-URL: https://build.opensuse.org/request/show/231237
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdrm?expand=0&rev=95

libdrm.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr 24 09:46:48 UTC 2014 - sndirsch@suse.com
+
+- u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch:
+  * No longer hardcode path for drm.h include in qxl_drm.h, i.e.
+    handle it the same as in other <driver>_drm.h files; change
+    required for KMS support in xf86-video-qxl (bnc#870501)
+
 -------------------------------------------------------------------
 Sat Apr 12 01:28:02 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
 

libdrm.spec

@@ -40,6 +40,7 @@ Source2:        baselibs.conf
 # PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c
 Patch1:         libdrm-implicit-defs.diff
 Patch2:         u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch
+Patch3:         u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf >= 2.63
@@ -165,6 +166,7 @@ Group:          System/Libraries
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"

u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch

@@ -0,0 +1,27 @@
+From ef61a3e62f87443a7384883b87cc01ec488e4823 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Wed, 23 Apr 2014 16:35:19 +0200
+Subject: [PATCH] No longer hardcode path for drm.h include in qxl_drm.h.
+
+\#include "drm/drm.h" --> #include "drm.h"
+(same as in other <driver>_drm.h files)
+---
+ include/drm/qxl_drm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
+index 5d7de70..1e331a8 100644
+--- a/include/drm/qxl_drm.h
++++ b/include/drm/qxl_drm.h
+@@ -25,7 +25,7 @@
+ #define QXL_DRM_H
+ 
+ #include <stddef.h>
+-#include "drm/drm.h"
++#include "drm.h"
+ 
+ /* Please note that modifications to all structs defined here are
+  * subject to backwards-compatibility constraints.
+-- 
+1.8.4.5
+