[xorg-x11-server] Always install XAA SDK headers so drivers still build

[Adam Jackson]

commit 95edefe0660fcf48a0b183641b77003f2477d18b
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Dec 16 17:36:01 2011 -0500

    Always install XAA SDK headers so drivers still build

 xorg-x11-server.spec               |    8 +++++-
 xserver-1.12-xaa-sdk-headers.patch |   50 ++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index a4180da..d030949 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -48,7 +48,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.11.99.1
-Release:   10%{?gitdate:.%{gitdate}}%{dist}
+Release:   11%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -104,6 +104,9 @@ Patch7010: 0001-Xext-don-t-swap-CARD8-in-SProcSELinuxQueryVersion.patch
 # missing file needed to build other stuff
 Patch7011: xserver-1.11.99-optionstr.patch
 
+# always install xaa headers even though we don't build the module
+Patch7012: xserver-1.12-xaa-sdk-headers.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -559,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Dec 16 2011 Adam Jackson <ajax at redhat.com> 1.11.99.1-11
+- Always install XAA SDK headers so drivers still build
+
 * Thu Dec 15 2011 Adam Jackson <ajax at redhat.com> 1.11.99.1-10
 - --disable-xaa
 
diff --git a/xserver-1.12-xaa-sdk-headers.patch b/xserver-1.12-xaa-sdk-headers.patch
new file mode 100644
index 0000000..7924e8f
--- /dev/null
+++ b/xserver-1.12-xaa-sdk-headers.patch
@@ -0,0 +1,50 @@
+From 2267970ea31d81cd0b9d3ede2eaeec586168b464 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x at fedoraproject.org>
+Date: Fri, 16 Dec 2011 17:15:04 -0500
+Subject: [PATCH] Always install xaa sdk headers
+
+Signed-off-by: Fedora X Ninjas <x at fedoraproject.org>
+---
+ hw/xfree86/Makefile.am     |    2 --
+ hw/xfree86/xaa/Makefile.am |    4 ++++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
+index 4f08772..72be889 100644
+--- a/hw/xfree86/Makefile.am
++++ b/hw/xfree86/Makefile.am
+@@ -11,9 +11,7 @@ if XF86UTILS
+ XF86UTILS_SUBDIR = utils
+ endif
+ 
+-if XAA
+ XAA_SUBDIR = xaa
+-endif
+ 
+ if VGAHW
+ VGAHW_SUBDIR = vgahw
+diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
+index 7ebe0b9..78d9348 100644
+--- a/hw/xfree86/xaa/Makefile.am
++++ b/hw/xfree86/xaa/Makefile.am
+@@ -8,6 +8,8 @@ MSB_FIXED = mf-xaaBitmap.c mf-xaaStipple.c mf-xaaTEGlyph.c
+ MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c
+ POLYSEG = s-xaaLine.c s-xaaDashLine.c
+ 
++if XAA
++
+ libxaa_la_LDFLAGS = -module -avoid-version
+ if COMPOSITE
+ libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
+@@ -60,6 +62,8 @@ ${MSB_3_FIXED}:
+ 	$(AM_V_GEN)echo "#define FIXEDBASE" >> $@
+ 	$(AM_V_GEN)echo '#include "$(srcdir)/${@:mf3-%=%}"' >> $@
+ 
++endif # XAA
++
+ DISTCLEANFILES = $(POLYSEG) \
+ 	$(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED) \
+ 	$(LSB_3_FIRST) $(LSB_3_FIXED) $(MSB_3_FIRST) $(MSB_3_FIXED)
+-- 
+1.7.8
+