From 273858705379c49f655ea4fd8143e0d1fe4ebfb2 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 19 Jun 2015 17:31:24 +0200 Subject: [PATCH] - updated to 2.3.4 - dropped xf86gtfmode (now driver requires Xserver 1.6 anyway) --- xorg-driver-video-vesa-xf86gtfmode.patch | 19 ------------------- xorg-driver-video-vesa.spec | 12 +++++------- 2 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 xorg-driver-video-vesa-xf86gtfmode.patch diff --git a/xorg-driver-video-vesa-xf86gtfmode.patch b/xorg-driver-video-vesa-xf86gtfmode.patch deleted file mode 100644 index a6d891e..0000000 --- a/xorg-driver-video-vesa-xf86gtfmode.patch +++ /dev/null @@ -1,19 +0,0 @@ -/usr/bin/Xwrapper: symbol lookup error: /usr/lib/xorg/modules/drivers//vesa_drv.so: undefined symbol: xf86GTFMode - -ref: http://bugs.debian.org/489051 - ---- xf86-video-vesa-2.0.0/src/vesa.c~ 2008-07-01 19:40:04.000000000 +0200 -+++ xf86-video-vesa-2.0.0/src/vesa.c 2008-08-21 21:30:41.964937080 +0200 -@@ -342,7 +342,12 @@ - * then, by this point, you're well into despair territory. - */ - for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) { -+#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,4,2,0,0) -+ /* xf86GTFMode is only avalaible in newer versions of Xorg */ - mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0); -+#else -+ mode = xf86CVTMode(p->HDisplay, p->VDisplay, v, FALSE, FALSE); -+#endif - ret = xf86CheckModeForMonitor(mode, mon); - xfree(mode); - if (ret == MODE_OK) diff --git a/xorg-driver-video-vesa.spec b/xorg-driver-video-vesa.spec index 3bdd851..76e41d0 100644 --- a/xorg-driver-video-vesa.spec +++ b/xorg-driver-video-vesa.spec @@ -1,13 +1,12 @@ Summary: X.org video driver for generic VESA video cards Summary(pl.UTF-8): Sterownik obrazu X.org dla kart graficznych zgodnych z VESA Name: xorg-driver-video-vesa -Version: 2.3.3 -Release: 5 +Version: 2.3.4 +Release: 1 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-%{version}.tar.bz2 -# Source0-md5: 3690a5356ed121b1a7dfb59a6dcf4bf9 -Patch0: %{name}-xf86gtfmode.patch +# Source0-md5: a893c37c589f7a31cea929a5d896a0e2 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -20,10 +19,10 @@ BuildRequires: xorg-proto-randrproto-devel BuildRequires: xorg-proto-renderproto-devel BuildRequires: xorg-proto-xextproto-devel >= 7.0.99.1 BuildRequires: xorg-util-util-macros >= 1.8 -BuildRequires: xorg-xserver-server-devel >= 1.0.99.901 +BuildRequires: xorg-xserver-server-devel >= 1.6 %{?requires_xorg_xserver_videodrv} Requires: xorg-lib-libpciaccess >= 0.12.901 -Requires: xorg-xserver-server >= 1.0.99.901 +Requires: xorg-xserver-server >= 1.6 Provides: xorg-driver-video BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -36,7 +35,6 @@ VESA. %prep %setup -q -n xf86-video-vesa-%{version} -%patch0 -p1 %build %{__libtoolize} -- 2.44.0