From 8416360cb1efc0e073faa4ad99ca768ec77aa2ec Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 20 Jan 2017 19:15:26 +0100 Subject: [PATCH] - updated to 1.3.8 - removed obsolete xserver-1.19 patch --- xorg-driver-video-trident.spec | 14 +++++++------- xserver-1.19.patch | 16 ---------------- 2 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 xserver-1.19.patch diff --git a/xorg-driver-video-trident.spec b/xorg-driver-video-trident.spec index 9053dcf..79f3a3d 100644 --- a/xorg-driver-video-trident.spec +++ b/xorg-driver-video-trident.spec @@ -1,14 +1,13 @@ Summary: X.org video driver for Trident video adapters Summary(pl.UTF-8): Sterownik obrazu X.org dla kart graficznych Trident Name: xorg-driver-video-trident -Version: 1.3.7 -Release: 4 +Version: 1.3.8 +Release: 1 License: MIT Group: X11/Applications -Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-%{version}.tar.bz2 -# Source0-md5: 04243bba246fe369c30a3b970f5b1c23 -Patch0: xserver-1.19.patch -URL: http://xorg.freedesktop.org/ +Source0: https://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-%{version}.tar.bz2 +# Source0-md5: ea23158dc50a5bf48a0596b8375ff01f +URL: https://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: libtool @@ -21,9 +20,11 @@ BuildRequires: xorg-proto-renderproto-devel BuildRequires: xorg-proto-videoproto-devel BuildRequires: xorg-proto-xextproto-devel >= 7.0.99.1 BuildRequires: xorg-proto-xf86dgaproto-devel +BuildRequires: xorg-proto-xf86dgaproto-devel BuildRequires: xorg-util-util-macros >= 1.8 BuildRequires: xorg-xserver-server-devel >= 1.0.99.901 %{?requires_xorg_xserver_videodrv} +Requires: xorg-lib-libpciaccess >= 0.8.0 Requires: xorg-xserver-server >= 1.0.99.901 Provides: xorg-driver-video Obsoletes: X11-driver-trident < 1:7.0.0 @@ -57,7 +58,6 @@ PCI, AGP i ISA oparte na następujących układach: %prep %setup -q -n xf86-video-trident-%{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