[xorg-x11-drv-geode] Fix FTBFS against 1.15

Adam Jackson ajax at fedoraproject.org
Fri Oct 25 20:20:51 UTC 2013


commit df017e50eb84ae1478c7b301fbdfa53c6cf361c4
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Oct 25 16:20:58 2013 -0400

    Fix FTBFS against 1.15

 geode-2.11.14-ftbfs.patch |   11 +++++++++++
 xorg-x11-drv-geode.spec   |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/geode-2.11.14-ftbfs.patch b/geode-2.11.14-ftbfs.patch
new file mode 100644
index 0000000..97d9d49
--- /dev/null
+++ b/geode-2.11.14-ftbfs.patch
@@ -0,0 +1,11 @@
+diff -up xf86-video-geode-2.11.14/src/geode_dcon.c.jx xf86-video-geode-2.11.14/src/geode_dcon.c
+--- xf86-video-geode-2.11.14/src/geode_dcon.c.jx	2012-11-24 05:01:15.000000000 -0500
++++ xf86-video-geode-2.11.14/src/geode_dcon.c	2013-10-25 16:19:35.950234174 -0400
+@@ -29,6 +29,7 @@
+ 
+ /* Includes that are used by all drivers */
+ #include <xf86.h>
++#include <xf86Modes.h>
+ #include <xf86_OSproc.h>
+ #include <compiler.h>
+ 
diff --git a/xorg-x11-drv-geode.spec b/xorg-x11-drv-geode.spec
index 47f814e..6628fd4 100644
--- a/xorg-x11-drv-geode.spec
+++ b/xorg-x11-drv-geode.spec
@@ -5,12 +5,13 @@
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-geode
 Version:   2.11.14
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org/wiki/AMDGeodeDriver
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2
 License:   MIT
 Group:     User Interface/X Hardware Support
 Patch0:    0001-Remove-mibstore.h.patch
+Patch1:    geode-2.11.14-ftbfs.patch
 
 ExclusiveArch: %{ix86}
 
@@ -26,6 +27,7 @@ X.Org X11 AMD Geode video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
@@ -49,6 +51,9 @@ ln -s geode_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/amd_drv.so
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Fri Oct 25 2013 Adam Jackson <ajax at redhat.com> 2.11.14-9
+- Fix FTBFS against 1.15
+
 * Fri Oct 25 2013 Adam Jackson <ajax at redhat.com> - 2.11.14-8
 - ABI rebuild
 


More information about the scm-commits mailing list