From 9b63929f1a7c2726be38bc613cc7caab6ebea7a9bb787d37c9c07339e3ae87b4 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 19 Apr 2012 09:40:50 +0000 Subject: [PATCH] Accepting request 114542 from home:vuntz:branches:X11:XOrg New package, split from xorg-x11-driver-video OBS-URL: https://build.opensuse.org/request/show/114542 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-vesa?expand=0&rev=1 --- .gitattributes | 23 ++++++++++ .gitignore | 1 + xf86-video-vesa-2.3.0.tar.bz2 | 3 ++ xf86-video-vesa.changes | 6 +++ xf86-video-vesa.spec | 68 +++++++++++++++++++++++++++++ xf86-video-vesa_DefaultRefresh.diff | 22 ++++++++++ 6 files changed, 123 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 xf86-video-vesa-2.3.0.tar.bz2 create mode 100644 xf86-video-vesa.changes create mode 100644 xf86-video-vesa.spec create mode 100644 xf86-video-vesa_DefaultRefresh.diff diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/xf86-video-vesa-2.3.0.tar.bz2 b/xf86-video-vesa-2.3.0.tar.bz2 new file mode 100644 index 0000000..56e1b05 --- /dev/null +++ b/xf86-video-vesa-2.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a +size 264539 diff --git a/xf86-video-vesa.changes b/xf86-video-vesa.changes new file mode 100644 index 0000000..fcd1b13 --- /dev/null +++ b/xf86-video-vesa.changes @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Wed Apr 18 15:51:24 UTC 2012 - vuntz@opensuse.org + +- Split xf86-video-vesa from xorg-x11-driver-video. + Initial version: 2.3.0. + diff --git a/xf86-video-vesa.spec b/xf86-video-vesa.spec new file mode 100644 index 0000000..1aeea53 --- /dev/null +++ b/xf86-video-vesa.spec @@ -0,0 +1,68 @@ +# +# spec file for package xf86-video-vesa +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +Name: xf86-video-vesa +Version: 2.3.0 +Release: 0 +License: MIT +Summary: Generic VESA video driver for the Xorg X server +Url: http://xorg.freedesktop.org/ +Group: System/X11/Servers/XF86_4 +Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 +Patch0: xf86-video-vesa_DefaultRefresh.diff +BuildRequires: pkg-config +BuildRequires: pkgconfig(fontsproto) +BuildRequires: pkgconfig(pciaccess) >= 0.10 +BuildRequires: pkgconfig(randrproto) +BuildRequires: pkgconfig(renderproto) +BuildRequires: pkgconfig(xextproto) +BuildRequires: pkgconfig(xorg-macros) >= 1.3 +BuildRequires: pkgconfig(xorg-server) >= 1.0.99.901 +BuildRequires: pkgconfig(xproto) +Requires: VIDEO_ABI_VERSION = 10 +Supplements: xorg-x11-server +# This was part of the xorg-x11-driver-video package up to version 7.6 +Conflicts: xorg-x11-driver-video <= 7.6 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +vesa is an Xorg driver for Generic VESA video cards. + +It can drive most VESA-compatible video cards, but only makes use of the +basic standard VESA core that is common to these cards. The driver +supports depths 8, 15 16 and 24. + +%prep +%setup -q +%patch0 -p1 + +%build +%configure +make %{?_smp_mflags} + +%install +%make_install +find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print + +%files +%defattr(-,root,root) +%doc ChangeLog COPYING README +%dir %{_libdir}/xorg/modules/drivers +%{_libdir}/xorg/modules/drivers/vesa_drv.so +%{_datadir}/man/man4/vesa.4%{?ext_man} + +%changelog diff --git a/xf86-video-vesa_DefaultRefresh.diff b/xf86-video-vesa_DefaultRefresh.diff new file mode 100644 index 0000000..6a0220f --- /dev/null +++ b/xf86-video-vesa_DefaultRefresh.diff @@ -0,0 +1,22 @@ +Index: xf86-video-vesa-2.2.1/src/vesa.c +=================================================================== +--- xf86-video-vesa-2.2.1.orig/src/vesa.c ++++ xf86-video-vesa-2.2.1/src/vesa.c +@@ -783,9 +783,16 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags + /* Use shadow by default */ + if (xf86ReturnOptValBool(pVesa->Options, OPTION_SHADOW_FB, TRUE)) + pVesa->shadowFB = TRUE; ++ else ++ pVesa->shadowFB = FALSE; + +- if (xf86ReturnOptValBool(pVesa->Options, OPTION_DFLT_REFRESH, FALSE)) ++ /* Use DefaultRefresh by default due to VBE 3.0 often wrongly ++ * implemented. ++ */ ++ if (xf86ReturnOptValBool(pVesa->Options, OPTION_DFLT_REFRESH, TRUE)) + pVesa->defaultRefresh = TRUE; ++ else ++ pVesa->defaultRefresh = FALSE; + + pVesa->ModeSetClearScreen = FALSE; + if (xf86ReturnOptValBool(pVesa->Options, OPTION_MODESET_CLEAR_SCREEN,