From 0fe1c1bb65b80816095336a11a7daa58af93dd18 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 20 Jan 2017 16:42:10 +0100 Subject: [PATCH] - updated to 1.6.5 - removed obsolete xserver-1.19 patch --- xorg-driver-video-mga.spec | 12 +++++------- xserver-1.19.patch | 16 ---------------- 2 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 xserver-1.19.patch diff --git a/xorg-driver-video-mga.spec b/xorg-driver-video-mga.spec index 1782d8a..9470ac7 100644 --- a/xorg-driver-video-mga.spec +++ b/xorg-driver-video-mga.spec @@ -2,15 +2,14 @@ Summary: X.org video driver for Matrox video adapters Summary(pl.UTF-8): Sterownik obrazu X.org dla kart graficznych Matrox Name: xorg-driver-video-mga # NOTE: 1.9.100 is older than 1.6.2 -Version: 1.6.4 -Release: 4 +Version: 1.6.5 +Release: 1 Epoch: 1 License: MIT Group: X11/Applications -Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-%{version}.tar.bz2 -# Source0-md5: cd3db8370caa3e607614ea4e74d4c350 -Patch0: xserver-1.19.patch -URL: http://xorg.freedesktop.org/ +Source0: https://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-%{version}.tar.bz2 +# Source0-md5: 3ee2549247e01de3e7bce52c27483118 +URL: https://xorg.freedesktop.org/ BuildRequires: Mesa-libGL-devel BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -65,7 +64,6 @@ PCI i AGP oparte na następujących układach Matroksa: %prep %setup -q -n xf86-video-mga-%{version} -%patch0 -p1 %build %{__libtoolize} diff --git a/xserver-1.19.patch b/xserver-1.19.patch deleted file mode 100644 index a73ba2d..0000000 --- a/xserver-1.19.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- xf86-video-chips-1.2.6/src/compat-api.h~ 2015-09-26 18:28:01.000000000 +0200 -+++ xf86-video-chips-1.2.6/src/compat-api.h 2016-11-28 09:12:37.337570460 +0100 -@@ -75,8 +75,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.44.0