diff --git a/.gitignore b/.gitignore index 4c4751d..663e278 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ xf86-video-ati-20100705.tar.xz /xf86-video-ati-20151116.tar.xz /xf86-video-ati-20160215.tar.xz /xf86-video-ati-20160518.tar.xz +/xf86-video-ati-20160928.tar.xz diff --git a/0001-configure-Include-xorg-server.h-before-glamor.h.patch b/0001-configure-Include-xorg-server.h-before-glamor.h.patch deleted file mode 100644 index 99dd799..0000000 --- a/0001-configure-Include-xorg-server.h-before-glamor.h.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 91748e5640a38a7c9645927cfef7178f79ff0cd1 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 28 Jul 2014 15:49:41 +0200 -Subject: [PATCH xf86-video-ati] configure: Include xorg-server.h before - glamor.h - -glamor.h cannot be included without first including xorg-server.h, this also -applies to including it from configure snippets. - -Without this the configure glamor checks fail on systems with the latest -glibc, throwing this error: - -In file included from /usr/include/xorg/misc.h:115:0, - from /usr/include/xorg/screenint.h:50, - from /usr/include/xorg/scrnintstr.h:50, - from /usr/include/xorg/glamor.h:32, - from conftest.c:61: -/usr/include/xorg/os.h:579:2: error: expected identifier or '(' before -'__exten - strndup(const char *str, size_t n); - ^ - -This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h), -causing os.h to redefine it. - -Signed-off-by: Hans de Goede ---- - configure.ac | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 101ca17..e74a0a2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -106,12 +106,13 @@ AC_ARG_ENABLE(glamor, - [GLAMOR=yes]) - - if test "x$GLAMOR" != "xno"; then -- AC_CHECK_HEADERS([glamor.h], [GLAMOR_H="yes"], [GLAMOR_H="no"], []) -+ AC_CHECK_HEADERS([glamor.h], [GLAMOR_H="yes"], [GLAMOR_H="no"], [#include "xorg-server.h"]) - - if test "x$GLAMOR_H" = xyes; then - AC_CHECK_DECL(GLAMOR_NO_DRI3, - [GLAMOR_XSERVER="yes"], [GLAMOR_XSERVER="no"], -- [#include "glamor.h"]) -+ [#include "xorg-server.h" -+ #include "glamor.h"]) - fi - - if test "x$GLAMOR_XSERVER" != xyes; then --- -2.0.1 - diff --git a/sources b/sources index 93aedb0..30ceaa3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d527a71db8eff936c765ff869c9d3003 xf86-video-ati-20160215.tar.xz -7ce386c5dca7ba52c4973867b9c9d372 xf86-video-ati-20160518.tar.xz +dfdee0a5f1dd917bece150eae566760a xf86-video-ati-20160928.tar.xz diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 63ce601..5cc15d4 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -1,8 +1,8 @@ %global tarball xf86-video-ati %global moduledir %(pkg-config xorg-server --variable=moduledir ) %global driverdir %{moduledir}/drivers -%global gitdate 20160518 -%global gitversion 1181b9c +%global gitdate 20160928 +%global gitversion 3fc839ff %undefine _hardened_build @@ -12,7 +12,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati -Version: 7.7.0 +Version: 7.7.1 Release: 1%{?gver}%{?dist} URL: http://www.x.org License: MIT @@ -69,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT%{moduledir}/multimedia/ %{_mandir}/man4/radeon.4* %changelog +* Wed Sep 28 2016 Hans de Goede 7.7.1-1 +- Update to latest git, this is the equivalent of 7.7.1 + fixes for use + with xserver-1.19 (rhbz#1325613) +- Rebuild against xserver-1.19 + * Wed May 18 2016 Dave Airlie 7.7.0-1 - Update to latest git.