.gear/rules | 2 + .../tags/42a7e3b5f07a396c3a99e3a0f027c974b1c79b66 | 20 +++ .gear/tags/list | 1 + .gitlab-ci.yml | 98 ++++++++++++ README.md | 2 +- configure.ac | 2 +- src/vesa.c | 6 +- xorg-drv-vesa.spec | 164 +++++++++++++++++++++ 8 files changed, 292 insertions(+), 3 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..b0c11bf --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: xf86-video-vesa-@version@:. +diff: xf86-video-vesa-@version@:. . diff --git a/.gear/tags/42a7e3b5f07a396c3a99e3a0f027c974b1c79b66 b/.gear/tags/42a7e3b5f07a396c3a99e3a0f027c974b1c79b66 new file mode 100644 index 0000000..14afda0 --- /dev/null +++ b/.gear/tags/42a7e3b5f07a396c3a99e3a0f027c974b1c79b66 @@ -0,0 +1,20 @@ +object 68f2589c687c132fc9abfd1501930bf191701165 +type commit +tag xf86-video-vesa-2.5.0 +tagger Adam Jackson 1599775467 -0400 + +xf86-video-vesa-2.5.0 +-----BEGIN PGP SIGNATURE----- + +iQHEBAABCAAuFiEEmV7VyKYTjrCWHxhHTAndg8qqULIFAl9aousQHGFqYXhAcmVk +aGF0LmNvbQAKCRBMCd2DyqpQss7gC/9KGwKrXrfBiNK+fT4tMlPqGKSNbD8n9HTD +bvs5igVGckqe0+wbAYTBAJAUMGUQyExHdNk5AJ9KFdqy2e0E3QXDd+qeeTlTekJW +uPHBM7TCc76J/E5xGJmMgXacHZXp+6nEPz0pC3Xnb9S4PqtKMqvK8ZAt388dtXY/ +EjnE+IaPmUpGpNflfiQW0IKqb3w3ebQzkqapcv8WNiQVaYdRGwgRujh0tEUKqEvy +sFg6kmKUnYLDKbgWK+kOwGAuFUml+gUW3iG5MB/L/mhr1gQy2weg6EtOon9zQz9z +B4e71ptrw57ZqRHJj2L7v1q0qHABOvaFeeK8kbXnD7Ovbj0739Pq8NvjCR9UBrfs +0Zbg2P0ndMQNTM2bpjq09rRxEYbe9NuF87dPhF2upqm+eLroA/eUsPxV4gTuTjxK +ZNLObulYMU0kwJAPlRIgMiyKO1QertTuRs9fI6NU6V8nI6FsAXmyDPq8mgZV4Zkv ++JmrDU9WaoLgyBAqHHLIaZvjqlPNsSI= +=dFc0 +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..9958602 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +42a7e3b5f07a396c3a99e3a0f027c974b1c79b66 xf86-video-vesa-2.5.0 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..7f94b6c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,98 @@ +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml: +# +# This CI uses the freedesktop.org ci-templates. +# Please see the ci-templates documentation for details: +# https://freedesktop.pages.freedesktop.org/ci-templates/ + +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile + + +include: + # Arch container builder template + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/arch.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' + - template: Security/SAST.gitlab-ci.yml + + +stages: + - prep # prep work like rebuilding the container images if there is a change + - build # for actually building and testing things in a container + - test + - deploy + + +variables: + FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-vesa' + # The tag should be updated each time the list of packages is updated. + # Changing a tag forces the associated image to be rebuilt. + # Note: the tag has no meaning, we use a date format purely for readability + FDO_DISTRIBUTION_TAG: '2022-01-30.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto xorg-server-devel pixman libpciaccess' + + +# +# Verify that commit messages are as expected, signed-off, etc. +# +check-commits: + extends: + - .fdo.ci-fairy + stage: prep + script: + - ci-fairy check-commits --signed-off-by --junit-xml=results.xml + except: + - master@xorg/driver/xf86-video-vesa + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + +# +# Verify that the merge request has the allow-collaboration checkbox ticked +# +check-merge-request: + extends: + - .fdo.ci-fairy + stage: deploy + script: + - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml + artifacts: + when: on_failure + reports: + junit: results.xml + allow_failure: true + + +# +# Build a container with the given tag and the packages pre-installed. +# This only happens if the tag changes, otherwise the existing image is +# re-used. +# +container-prep: + extends: + - .fdo.container-build@arch + stage: prep + variables: + GIT_STRATEGY: none + + +# +# The default build, runs on the image built above. +# +build: + stage: build + extends: + - .fdo.distribution-image@arch + script: + - autoreconf -ivf + - mkdir _builddir + - pushd _builddir > /dev/null + - ../configure --disable-silent-rules + - make + - make check + - make distcheck + - popd > /dev/null diff --git a/README.md b/README.md index 1fb77ab..b202110 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa diff --git a/configure.ac b/configure.ac index 48e0c7f..a36a12b 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(.) # Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-xz]) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], diff --git a/src/vesa.c b/src/vesa.c index 8d47294..e8278cc 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -186,7 +186,7 @@ static IsaChipsets VESAISAchipsets[] = { /* * This contains the functions needed by the server after loading the * driver module. It must be supplied, and gets added the driver list by - * the Module Setup funtion in the dynamic case. In the static case a + * the Module Setup function in the dynamic case. In the static case a * reference to this is compiled in, and this requires that the name of * this DriverRec be an upper-case version of the driver name. */ @@ -411,7 +411,11 @@ VESAValidMode(SCRN_ARG_TYPE arg, DisplayModePtr p, Bool flag, int pass) * then, by this point, you're well into despair territory. */ for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 3 mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0); +#else + mode = xf86CVTMode(p->HDisplay, p->VDisplay, v, FALSE, FALSE); +#endif ret = xf86CheckModeForMonitor(mode, mon); free(mode->name); free(mode); diff --git a/xorg-drv-vesa.spec b/xorg-drv-vesa.spec new file mode 100644 index 0000000..e8da576 --- /dev/null +++ b/xorg-drv-vesa.spec @@ -0,0 +1,164 @@ +Name: xorg-drv-vesa +Version: 2.5.0 +Release: alt1 +Epoch: 1 +Summary: Generic VESA video driver +License: MIT/X11 +Group: System/X11 +Url: http://xorg.freedesktop.org +Packager: Valery Inozemtsev + +PreReq: XORG_ABI_VIDEODRV = %get_xorg_abi_videodrv + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +ExclusiveArch: %ix86 x86_64 +BuildRequires(Pre): xorg-sdk xorg-util-macros +BuildRequires: libXext-devel xorg-proto-devel + +%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 +%patch -p1 + +%build +%autoreconf +%configure \ + --with-xorg-module-dir=%_x11modulesdir \ + --disable-static + +%make_build + +%install +%make DESTDIR=%buildroot install + +%files +%dir %_x11modulesdir/drivers +%_x11modulesdir/drivers/*.so +%_man4dir/* + +%changelog +* Fri Feb 18 2022 Valery Inozemtsev 1:2.5.0-alt1 +- 2.5.0 + +* Mon Nov 08 2021 Valery Inozemtsev 1:2.4.0-alt2 +- requires XORG_ABI_VIDEODRV = 25.2 + +* Thu May 31 2018 Valery Inozemtsev 1:2.4.0-alt1 +- 2.4.0 + +* Wed Nov 30 2016 Valery Inozemtsev 1:2.3.4-alt3 +- requires XORG_ABI_VIDEODRV = 23.0 + +* Fri Nov 27 2015 Valery Inozemtsev 1:2.3.4-alt2 +- requires XORG_ABI_VIDEODRV = 20.0 + +* Mon Oct 05 2015 Valery Inozemtsev 1:2.3.4-alt1 +- 2.3.4 + +* Wed Feb 04 2015 Valery Inozemtsev 1:2.3.3-alt3 +- requires XORG_ABI_VIDEODRV = 19.0 + +* Fri Oct 10 2014 Valery Inozemtsev 1:2.3.3-alt2 +- requires XORG_ABI_VIDEODRV = 18.0 + +* Thu Jan 09 2014 Valery Inozemtsev 1:2.3.3-alt1 +- 2.3.3 + +* Wed Mar 06 2013 Valery Inozemtsev 1:2.3.2-alt3 +- requires XORG_ABI_VIDEODRV = 14.1 + +* Fri Jan 18 2013 Valery Inozemtsev 1:2.3.2-alt2 +- requires XORG_ABI_VIDEODRV = 13.1 + +* Mon Aug 27 2012 Valery Inozemtsev 1:2.3.2-alt1 +- 2.3.2 + +* Fri Mar 23 2012 Valery Inozemtsev 1:2.3.1-alt1 +- 2.3.1 + +* Mon Mar 05 2012 Valery Inozemtsev 1:2.3.0-alt4 +- requires XORG_ABI_VIDEODRV = 12.0 + +* Mon Aug 29 2011 Valery Inozemtsev 1:2.3.0-alt3 +- requires XORG_ABI_VIDEODRV = 11.0 + +* Wed Dec 08 2010 Valery Inozemtsev 1:2.3.0-alt2 +- requires XORG_ABI_VIDEODRV = 10.0 + +* Fri Aug 13 2010 Valery Inozemtsev 1:2.3.0-alt1 +- 2.3.0 + +* Tue Oct 06 2009 Valery Inozemtsev 1:2.2.1-alt1 +- requires XORG_ABI_VIDEODRV = 6.0 + +* Fri Feb 27 2009 Valery Inozemtsev 1:2.2.0-alt2 +- requires XORG_ABI_VIDEODRV = 5.0 + +* Wed Feb 18 2009 Valery Inozemtsev 1:2.2.0-alt1 +- updated build dependencies + +* Mon Dec 22 2008 Valery Inozemtsev 1:2.1.0-alt1 +- 2.1.0 + +* Wed Aug 27 2008 Valery Inozemtsev 1:2.0.0-alt3 +- requires XORG_ABI_VIDEODRV = 4.1 + +* Sun Aug 24 2008 Valery Inozemtsev 1:2.0.0-alt2 +- fixed mode check (close #16872) + +* Tue Jul 01 2008 Valery Inozemtsev 1:2.0.0-alt1 +- 2.0.0 + +* Fri Jun 13 2008 Valery Inozemtsev 1:1.99.1-alt1 +- 1.99.1 + +* Mon Jun 02 2008 Valery Inozemtsev 1:1.3.0-alt5 +- renamed xorg-x11-drv-vesa to xorg-drv-vesa +- added requires XORG_ABI_VIDEODRV = 2.0 + +* Thu Apr 03 2008 Valery Inozemtsev 1:1.3.0-alt4 +- death to mfb + +* Mon Sep 10 2007 Valery Inozemtsev 1:1.3.0-alt3 +- rebuild with xorg-server-1.4 + +* Sun Jul 15 2007 Valery Inozemtsev 1:1.3.0-alt2 +- merged RH patches (close #12215) + +* Fri Dec 01 2006 Valery Inozemtsev 1:1.3.0-alt1 +- 1.3.0 + +* Sat Oct 14 2006 Valery Inozemtsev 1:1.2.2-alt1 +- 1.2.2 + +* Sat Jun 03 2006 Valery Inozemtsev 1:1.2.1-alt1 +- 1.2.1 + +* Fri May 19 2006 Valery Inozemtsev 1:1.2.0-alt1 +- 1.2.0 + +* Sat May 13 2006 Valery Inozemtsev 1:1.1.0-alt2 +- prereq xorg-x11-server-common >= 1.0.99.901 + +* Fri Apr 21 2006 Valery Inozemtsev 1:1.1.0-alt1 +- 1.1.0 + +* Mon Jan 23 2006 Valery Inozemtsev 1:1.0.1.3-alt2 +- fixed requires + +* Wed Dec 28 2005 Valery Inozemtsev 1:1.0.1.3-alt1 +- Xorg-7.0 + +* Sun Dec 04 2005 Valery Inozemtsev 1:1.0.1.1-alt1 +- Xorg-7.0RC3 + +* Sun Nov 27 2005 Valery Inozemtsev 1:1.0.1-alt0.1 +- initial release +