From 6e3c3d66b9c7bf19700a0b317dfa3658929e4a62 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Apr 01 2010 01:32:53 +0000
Subject: - Fix things up to work with new drm header file locations


---

diff --git a/fix-includes.patch b/fix-includes.patch
new file mode 100644
index 0000000..c9659c6
--- /dev/null
+++ b/fix-includes.patch
@@ -0,0 +1,69 @@
+From 855ea1bbf5a3fd5faa3ac2b6aee4b537255b18dd Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 31 Mar 2010 21:29:16 -0400
+Subject: [PATCH] [drm] Drop drm/ from include directives
+
+They've moved to a different directly with the latest
+libdrm, and we should be relying on pkgconfig anyway.
+---
+ .../renderers/drm/ply-renderer-i915-driver.c       |    4 ++--
+ .../renderers/drm/ply-renderer-nouveau-driver.c    |    8 ++++----
+ .../renderers/drm/ply-renderer-radeon-driver.c     |    8 ++++----
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/plugins/renderers/drm/ply-renderer-i915-driver.c b/src/plugins/renderers/drm/ply-renderer-i915-driver.c
+index c2eeacb..907a061 100644
+--- a/src/plugins/renderers/drm/ply-renderer-i915-driver.c
++++ b/src/plugins/renderers/drm/ply-renderer-i915-driver.c
+@@ -40,8 +40,8 @@
+ #include <values.h>
+ #include <unistd.h>
+ 
+-#include <drm/drm.h>
+-#include <drm/i915_drm.h>
++#include <drm.h>
++#include <i915_drm.h>
+ #include <intel_bufmgr.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
+diff --git a/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c b/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
+index b8137df..2cef56e 100644
+--- a/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
++++ b/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
+@@ -40,10 +40,10 @@
+ #include <values.h>
+ #include <unistd.h>
+ 
+-#include <drm/drm.h>
+-#include <drm/nouveau_drm.h>
+-#include <drm/nouveau_drmif.h>
+-#include <nouveau/nouveau_bo.h>
++#include <drm.h>
++#include <nouveau_drm.h>
++#include <nouveau_drmif.h>
++#include <nouveau_bo.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
+ 
+diff --git a/src/plugins/renderers/drm/ply-renderer-radeon-driver.c b/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
+index 5d4032c..36cee47 100644
+--- a/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
++++ b/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
+@@ -40,10 +40,10 @@
+ #include <values.h>
+ #include <unistd.h>
+ 
+-#include <drm/drm.h>
+-#include <drm/radeon_drm.h>
+-#include <drm/radeon_bo.h>
+-#include <drm/radeon_bo_gem.h>
++#include <drm.h>
++#include <radeon_drm.h>
++#include <radeon_bo.h>
++#include <radeon_bo_gem.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
+ 
+-- 
+1.6.5.2
+
diff --git a/plymouth.spec b/plymouth.spec
index d1f8be6..6faf31b 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -33,6 +33,7 @@ Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
 
 Patch0: add-debug.patch
 Patch1: fix-assertion-failure.patch
+Patch2: fix-includes.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -247,6 +248,7 @@ plugin.
 %setup -q
 %patch0 -p1 -b .add-debug
 %patch1 -p1 -b .fix-assertion-failure
+%patch2 -p1 -b .fix-includes
 
 # Change the default theme
 sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@@ -448,6 +450,7 @@ fi
 %changelog
 * Wed Mar 31 2010 Ray Strode <rstrode@redhat.com> 0.8.1-3
 - Fix assertion failure.  May fix bug 578633
+- Fix things up to work with new drm header file locations
 
 * Thu Mar 25 2010 Ray Strode <rstrode@redhat.com> 0.8.1-2
 - Add debug statements to help debug transition