diff --git a/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch b/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch new file mode 100644 index 0000000..129880e --- /dev/null +++ b/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch @@ -0,0 +1,32 @@ +From df2b017f4f019106b9fad73dc7f44edb6055fc85 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 29 Sep 2016 18:27:18 +0200 +Subject: [PATCH xf86-video-opentegra] Adapt Block/WakeupHandler signature for + ABI 23 + +Signed-off-by: Hans de Goede +--- + src/compat-api.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index bef28ed..294876a 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -76,8 +76,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +2.9.3 + diff --git a/xorg-x11-drv-opentegra.spec b/xorg-x11-drv-opentegra.spec index 7420793..c6571b8 100644 --- a/xorg-x11-drv-opentegra.spec +++ b/xorg-x11-drv-opentegra.spec @@ -3,12 +3,13 @@ Summary: Xorg X11 opentegra driver Name: xorg-x11-drv-opentegra Version: 0.7.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://cgit.freedesktop.org/xorg/driver/xf86-video-opentegra/ License: MIT Group: User Interface/X Hardware Support Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-opentegra-%{version}.tar.xz +Patch0: 0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch ExclusiveArch: %{arm} @@ -27,6 +28,7 @@ X.Org X11 opentegra driver for Nvidia Tegra GPUs. %prep %setup -q -n xf86-video-opentegra-%{version} +%patch0 -p1 %build %configure --disable-static @@ -47,6 +49,10 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" -exec rm -f {} ';' %endif %changelog +* Thu Sep 29 2016 Hans de Goede - 0.7.0-8 +- Add patches from upstream for use with xserver-1.19 +- Rebuild against xserver-1.19 + * Fri Feb 05 2016 Fedora Release Engineering - 0.7.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild