Index: x11-drivers/Makefile =================================================================== --- x11-drivers/Makefile +++ x11-drivers/Makefile @@ -12,33 +12,15 @@ SUBDIR += xf86-input-void SUBDIR += xf86-input-wacom SUBDIR += xf86-video-amdgpu - SUBDIR += xf86-video-apm - SUBDIR += xf86-video-ark SUBDIR += xf86-video-ast SUBDIR += xf86-video-ati - SUBDIR += xf86-video-chips - SUBDIR += xf86-video-cirrus SUBDIR += xf86-video-dummy - SUBDIR += xf86-video-geode - SUBDIR += xf86-video-i128 - SUBDIR += xf86-video-i740 SUBDIR += xf86-video-intel - SUBDIR += xf86-video-mach64 - SUBDIR += xf86-video-mga - SUBDIR += xf86-video-neomagic SUBDIR += xf86-video-nv - SUBDIR += xf86-video-openchrome SUBDIR += xf86-video-qxl - SUBDIR += xf86-video-r128 - SUBDIR += xf86-video-rendition - SUBDIR += xf86-video-savage SUBDIR += xf86-video-scfb - SUBDIR += xf86-video-siliconmotion - SUBDIR += xf86-video-sis - SUBDIR += xf86-video-tdfx SUBDIR += xf86-video-vesa SUBDIR += xf86-video-vmware - SUBDIR += xf86-video-voodoo SUBDIR += xorg-drivers SUBDIR += xorgxrdp SUBDIR += xorgxrdp-devel Index: x11-drivers/xf86-video-apm/Makefile =================================================================== --- x11-drivers/xf86-video-apm/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -PORTNAME= xf86-video-apm -PORTVERSION= 1.3.0 -PORTREVISION= 3 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org apm display driver - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-apm/distinfo =================================================================== --- x11-drivers/xf86-video-apm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1550522074 -SHA256 (xorg/driver/xf86-video-apm-1.3.0.tar.bz2) = 808189b9a933fcad1761cb9cd498f9267dfbacee1059859282712e8598c3dc7e -SIZE (xorg/driver/xf86-video-apm-1.3.0.tar.bz2) = 352759 Index: x11-drivers/xf86-video-apm/pkg-descr =================================================================== --- x11-drivers/xf86-video-apm/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-apm driver. Index: x11-drivers/xf86-video-apm/pkg-plist =================================================================== --- x11-drivers/xf86-video-apm/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/apm_drv.so -share/man/man4/apm.4x.gz Index: x11-drivers/xf86-video-ark/Makefile =================================================================== --- x11-drivers/xf86-video-ark/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -PORTNAME= xf86-video-ark -PORTVERSION= 0.7.5 -PORTREVISION= 11 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org ark display driver - -USES= xorg-cat:driver - -.include Index: x11-drivers/xf86-video-ark/distinfo =================================================================== --- x11-drivers/xf86-video-ark/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e -SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423 Index: x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c =================================================================== --- x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/ark_driver.c.orig 2012-07-17 04:51:36 UTC -+++ src/ark_driver.c -@@ -39,7 +39,6 @@ - #include "compiler.h" - #include "mipointer.h" - #include "micmap.h" --#include "mibstore.h" - #include "fb.h" - #include "ark.h" - -@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_AR - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - if (!pARK->NoAccel) { Index: x11-drivers/xf86-video-ark/pkg-descr =================================================================== --- x11-drivers/xf86-video-ark/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-ark driver. Index: x11-drivers/xf86-video-ark/pkg-plist =================================================================== --- x11-drivers/xf86-video-ark/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/xorg/modules/drivers/ark_drv.so Index: x11-drivers/xf86-video-chips/Makefile =================================================================== --- x11-drivers/xf86-video-chips/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -PORTNAME= xf86-video-chips -PORTVERSION= 1.4.0 -PORTREVISION= 3 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org chips display driver -WWW= https://www.x.org/ - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-chips/distinfo =================================================================== --- x11-drivers/xf86-video-chips/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1550523628 -SHA256 (xorg/driver/xf86-video-chips-1.4.0.tar.bz2) = 07f3e41e8f7e6ac24e62cfa94a1aa85f20f03ab375ad89e1a944a09df0f11fbf -SIZE (xorg/driver/xf86-video-chips-1.4.0.tar.bz2) = 424095 Index: x11-drivers/xf86-video-chips/pkg-descr =================================================================== --- x11-drivers/xf86-video-chips/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-chips driver. Index: x11-drivers/xf86-video-chips/pkg-plist =================================================================== --- x11-drivers/xf86-video-chips/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/chips_drv.so -share/man/man4/chips.4x.gz Index: x11-drivers/xf86-video-cirrus/Makefile =================================================================== --- x11-drivers/xf86-video-cirrus/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -PORTNAME= xf86-video-cirrus -PORTVERSION= 1.5.3 -PORTREVISION= 6 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org cirrus display driver - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-cirrus/distinfo =================================================================== --- x11-drivers/xf86-video-cirrus/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-video-cirrus-1.5.3.tar.bz2) = edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab -SIZE (xorg/driver/xf86-video-cirrus-1.5.3.tar.bz2) = 338930 Index: x11-drivers/xf86-video-cirrus/files/patch-Makefile.in =================================================================== --- x11-drivers/xf86-video-cirrus/files/patch-Makefile.in +++ /dev/null @@ -1,127 +0,0 @@ -# Regen with autoreconf after git_04_27f85fc -# ---- Makefile.in.orig 2016-11-24 04:17:45 UTC -+++ Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.14.1 from Makefile.am. -+# Makefile.in generated by automake 1.15 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2014 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -34,7 +34,17 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__is_gnu_make = { \ -+ if test -z '$(MAKELEVEL)'; then \ -+ false; \ -+ elif test -n '$(MAKE_HOST)'; then \ -+ true; \ -+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ -+ true; \ -+ else \ -+ false; \ -+ fi; \ -+} - am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ -@@ -98,14 +108,12 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = . --DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -- $(top_srcdir)/configure $(am__configure_deps) \ -- $(srcdir)/config.h.in COPYING ChangeLog INSTALL README compile \ -- config.guess config.sub depcomp install-sh missing ltmain.sh - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ -+ $(am__configure_deps) $(am__DIST_COMMON) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d -@@ -169,6 +177,9 @@ ETAGS = etags - CTAGS = ctags - CSCOPE = cscope - DIST_SUBDIRS = $(SUBDIRS) -+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ -+ COPYING ChangeLog INSTALL NEWS README compile config.guess \ -+ config.sub install-sh ltmain.sh missing - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -265,6 +276,7 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ - LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ - MAN_SUBSTS = @MAN_SUBSTS@ -@@ -375,7 +387,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile --.PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ -@@ -608,15 +619,15 @@ dist-xz: distdir - $(am__post_remove_distdir) - - dist-tarZ: distdir -- @echo WARNING: "Support for shar distribution archives is" \ -- "deprecated." >&2 -+ @echo WARNING: "Support for distribution archives compressed with" \ -+ "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - - dist-shar: distdir -- @echo WARNING: "Support for distribution archives compressed with" \ -- "legacy program 'compress' is deprecated." >&2 -+ @echo WARNING: "Support for shar distribution archives is" \ -+ "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) -@@ -652,17 +663,17 @@ distcheck: dist - esac - chmod -R a-w $(distdir) - chmod u+w $(distdir) -- mkdir $(distdir)/_build $(distdir)/_inst -+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ -- && $(am__cd) $(distdir)/_build \ -- && ../configure \ -+ && $(am__cd) $(distdir)/_build/sub \ -+ && ../../configure \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ -- --srcdir=.. --prefix="$$dc_install_base" \ -+ --srcdir=../.. --prefix="$$dc_install_base" \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ -@@ -840,6 +851,8 @@ uninstall-am: - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - -+.PRECIOUS: Makefile -+ - - .PHONY: ChangeLog INSTALL - Index: x11-drivers/xf86-video-cirrus/files/patch-git_01_23da607 =================================================================== --- x11-drivers/xf86-video-cirrus/files/patch-git_01_23da607 +++ /dev/null @@ -1,37 +0,0 @@ -From 23da6073369ef6a99d1789de967e57359d1fe3b0 Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Tue, 26 Apr 2016 16:26:49 +0200 -Subject: Disable "acceleration" under qemu - -Disable "acceleration" under qemu, since taking the hypercall trap -is really quite expensive and you're better off doing noaccel. Patch -is based on the one by "Adam Jackson" - -http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-drv-cirrus.git/tree/cirrus-1.2.0-qemu.patch?id=daccd1c8174623500eddfa297d8ea76a86d3c5d9 - -Reviewed-by: Adam Jackson - -diff --git a/src/alp_driver.c b/src/alp_driver.c -index bd5e52f..ba55247 100644 ---- src/alp_driver.c -+++ src/alp_driver.c -@@ -774,6 +774,16 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - else - xf86SetDDCproperties(pScrn,xf86PrintEDID( - xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),pCir->I2CPtr1))); -+ -+#ifdef XSERVER_LIBPCIACCESS -+ #ifndef PCI_CHIP_QEMU -+ #define PCI_CHIP_QEMU 0x1af4 -+ #endif -+ if (!pScrn->monitor->DDC && -+ ((pCir->PciInfo->subvendor_id & 0xffff) == PCI_CHIP_QEMU)) { -+ pCir->NoAccel = TRUE; -+ } -+#endif - - /* Probe the possible LCD display */ - AlpProbeLCD(pScrn); --- -cgit v0.10.2 - Index: x11-drivers/xf86-video-cirrus/files/patch-git_02_82db44f =================================================================== --- x11-drivers/xf86-video-cirrus/files/patch-git_02_82db44f +++ /dev/null @@ -1,50 +0,0 @@ -From 82db44fe8a726a4a1192b1b93992b642d0ec17b3 Mon Sep 17 00:00:00 2001 -From: Frederic Crozat -Date: Tue, 26 Apr 2016 13:57:52 +0200 -Subject: Use 16bpp when running in virt and on XenSource gfx - -Due to graphics corruption default to 16bpp in virt instead of 24 (Fedora). -Do the same on XenSource gfx, which suffers from the same issue. - -Reviewed-by: Adam Jackson - -diff --git a/src/alp_driver.c b/src/alp_driver.c -index ba55247..01e05dc 100644 ---- src/alp_driver.c -+++ src/alp_driver.c -@@ -466,6 +466,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - vgaHWPtr hwp; - MessageType from, from1; - int i; -+ int defaultdepth; - int depth_flags; - ClockRangePtr clockRanges; - char *s; -@@ -551,11 +552,23 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - depth_flags |= Support32bppFb | - SupportConvert32to24 | - PreferConvert32to24; -+ -+ /* use 16bpp in virt and on XenSource */ -+ #ifndef PCI_CHIP_QEMU -+ #define PCI_CHIP_QEMU 0x1af4 -+ #endif -+ #define PCI_CHIP_XENSOURCE 0x5853 -+ if (((pCir->PciInfo->subvendor_id & 0xffff) == PCI_CHIP_QEMU) || -+ ((pCir->PciInfo->subvendor_id & 0xffff) == PCI_CHIP_XENSOURCE)) -+ defaultdepth = 16; -+ else -+ defaultdepth = 24; -+ - /* - * The first thing we should figure out is the depth, bpp, etc. - * We support both 24bpp and 32bpp layouts, so indicate that. - */ -- if (!xf86SetDepthBpp(pScrn, 0, 0, 24, depth_flags)) { -+ if (!xf86SetDepthBpp(pScrn, 0, 0, defaultdepth, depth_flags)) { - return FALSE; - } else { - /* Check that the returned depth is one we support */ --- -cgit v0.10.2 - Index: x11-drivers/xf86-video-cirrus/files/patch-git_03_adaf1fe =================================================================== --- x11-drivers/xf86-video-cirrus/files/patch-git_03_adaf1fe +++ /dev/null @@ -1,87 +0,0 @@ -From adaf1fe744df8d37acdb8b157abc5034b8ea1073 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 13 Apr 2016 16:37:38 -0400 -Subject: Remove (almost) no-op setup functions - -These became practical no-ops when I removed reference to the loader -symbol lists. gcc will still emit code (and bss) for them though. No -functional change, just doing it to prove that nothing special happens -at submodule load. - -Reviewed-by: Julien Cristau -Signed-off-by: Adam Jackson - -diff --git a/src/alp_driver.c b/src/alp_driver.c -index 01e05dc..39802de 100644 ---- src/alp_driver.c -+++ src/alp_driver.c -@@ -159,8 +159,6 @@ static int gd7556_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; - #define ALP_MINOR_VERSION 0 - #define ALP_PATCHLEVEL 0 - --static MODULESETUPPROTO(alpSetup); -- - static XF86ModuleVersionInfo alpVersRec = - { - "cirrus_alpine", -@@ -181,20 +179,10 @@ static XF86ModuleVersionInfo alpVersRec = - */ - _X_EXPORT XF86ModuleData cirrus_alpineModuleData = { - &alpVersRec, -- alpSetup, -+ NULL, - NULL - }; - --static pointer --alpSetup(pointer module, pointer opts, int *errmaj, int *errmin) --{ -- static Bool setupDone = FALSE; -- if (!setupDone) { -- setupDone = TRUE; -- } -- return (pointer)1; --} -- - #endif /* XFree86LOADER */ - - _X_EXPORT const OptionInfoRec * -diff --git a/src/lg_driver.c b/src/lg_driver.c -index 589d14e..c3fe142 100644 ---- src/lg_driver.c -+++ src/lg_driver.c -@@ -165,8 +165,6 @@ static int LgLinePitches[4][11] = { - #define LG_MINOR_VERSION 0 - #define LG_PATCHLEVEL 0 - --static MODULESETUPPROTO(lgSetup); -- - static XF86ModuleVersionInfo lgVersRec = - { - "cirrus_laguna", -@@ -187,21 +185,10 @@ static XF86ModuleVersionInfo lgVersRec = - */ - _X_EXPORT XF86ModuleData cirrus_lagunaModuleData = { - &lgVersRec, -- lgSetup, -+ NULL, - NULL - }; - --static pointer --lgSetup(pointer module, pointer opts, int *errmaj, int *errmin) --{ -- static Bool setupDone = FALSE; -- -- if (!setupDone) { -- setupDone = TRUE; -- } -- return (pointer)1; --} -- - #endif /* XFree86LOADER */ - - _X_EXPORT const OptionInfoRec * --- -cgit v0.10.2 - Index: x11-drivers/xf86-video-cirrus/files/patch-git_04_27f85fc =================================================================== --- x11-drivers/xf86-video-cirrus/files/patch-git_04_27f85fc +++ /dev/null @@ -1,152 +0,0 @@ -From 27f85fc523102f89c3fc1546ae500816ccbffc8a Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 13 Apr 2016 17:05:55 -0400 -Subject: Don't build split alpine and laguna support - -Before: - - text data bss dec hex filename - 25772 2040 16 27828 6cb4 src/.libs/cirrus_alpine.so - 11429 1552 112 13093 3325 src/.libs/cirrus_drv.so - 21968 2016 16 24000 5dc0 src/.libs/cirrus_laguna.so - 59169 5608 114 64921 fd99 (TOTALS) - -After: - - text data bss dec hex filename - 47831 3840 112 51783 ca47 src/.libs/cirrus_drv.so - -So, in the worst case, you're using roughly two more pages for (clean, -evictable) text, but two fewer (dirty) pages for data and bss. Fixing -this also allows the X server to clean up module loading a bit by -enforcing the _drv.so suffix, and since this is the only driver pulling -such shenanigans... - -Reviewed-by: Julien Cristau -Signed-off-by: Adam Jackson - -diff --git a/src/Makefile.am b/src/Makefile.am -index 36b8d8b..2ceb828 100644 ---- src/Makefile.am -+++ src/Makefile.am -@@ -35,32 +35,20 @@ cirrus_drv_la_SOURCES = \ - CirrusClk.c \ - cir_shadow.c \ - cir_pcirename.h \ -- compat-api.h -- --cirrus_alpine_la_LTLIBRARIES = cirrus_alpine.la --cirrus_alpine_la_LDFLAGS = -module -avoid-version --cirrus_alpine_ladir = @moduledir@/drivers --cirrus_alpine_la_SOURCES = \ -+ compat-api.h \ - alp_driver.c \ - alp.h \ - alp_hwcurs.c \ -- alp_i2c.c --if XAA --cirrus_alpine_la_SOURCES += \ -- alp_xaa.c \ -- alp_xaam.c --endif -- --cirrus_laguna_la_LTLIBRARIES = cirrus_laguna.la --cirrus_laguna_la_LDFLAGS = -module -avoid-version --cirrus_laguna_ladir = @moduledir@/drivers --cirrus_laguna_la_SOURCES = \ -+ alp_i2c.c \ - lg_driver.c \ - lg.h \ - lg_hwcurs.c \ - lg_i2c.c -+ - if XAA --cirrus_laguna_la_SOURCES += \ -+cirrus_drv_la_SOURCES += \ -+ alp_xaa.c \ -+ alp_xaam.c - lg_xaa.c \ - lg_xaa.h - endif -diff --git a/src/cir_driver.c b/src/cir_driver.c -index 2df4a2e..bbd8bbc 100644 ---- src/cir_driver.c -+++ src/cir_driver.c -@@ -43,9 +43,6 @@ static const OptionInfoRec * CIRAvailableOptions(int chipid, int busid); - static void CIRIdentify(int flags); - static Bool CIRProbe(DriverPtr drv, int flags); - --static Bool lg_loaded = FALSE; --static Bool alp_loaded = FALSE; -- - #define CIR_VERSION 4000 - #define CIR_NAME "CIRRUS" - #define CIR_DRIVER_NAME "cirrus" -@@ -170,16 +167,10 @@ CIRAvailableOptions(int chipid, int busid) - case PCI_CHIP_GD5464: - case PCI_CHIP_GD5464BD: - case PCI_CHIP_GD5465: -- if (lg_loaded) -- return LgAvailableOptions(chipid); -- else -- return NULL; -+ return LgAvailableOptions(chipid); - - default: -- if (alp_loaded) -- return AlpAvailableOptions(chipid); -- else -- return NULL; -+ return AlpAvailableOptions(chipid); - } - } - -@@ -199,25 +190,6 @@ CIRProbe(DriverPtr drv, int flags) - ErrorF("CirProbe\n"); - #endif - -- /* -- * For PROBE_DETECT, make sure both sub-modules are loaded before -- * calling xf86MatchPciInstances(), because the AvailableOptions() -- * functions may be called before xf86MatchPciInstances() returns. -- */ -- -- if (flags & PROBE_DETECT) { -- if (!lg_loaded) { -- if (xf86LoadDrvSubModule(drv, "cirrus_laguna")) { -- lg_loaded = TRUE; -- } -- } -- if (!alp_loaded) { -- if (xf86LoadDrvSubModule(drv, "cirrus_alpine")) { -- alp_loaded = TRUE; -- } -- } -- } -- - if ((numDevSections = xf86MatchDevice(CIR_DRIVER_NAME, - &devSections)) <= 0) { - return FALSE; -@@ -272,19 +244,8 @@ CIRProbe(DriverPtr drv, int flags) - PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464 || - PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464BD || - PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5465)) { -- -- if (!lg_loaded) { -- if (!xf86LoadDrvSubModule(drv, "cirrus_laguna")) -- continue; -- lg_loaded = TRUE; -- } - pScrn = LgProbe(usedChips[i]); - } else { -- if (!alp_loaded) { -- if (!xf86LoadDrvSubModule(drv, "cirrus_alpine")) -- continue; -- alp_loaded = TRUE; -- } - pScrn = AlpProbe(usedChips[i]); - } - --- -cgit v0.10.2 - Index: x11-drivers/xf86-video-cirrus/files/patch-src_Makefile.in =================================================================== --- x11-drivers/xf86-video-cirrus/files/patch-src_Makefile.in +++ /dev/null @@ -1,356 +0,0 @@ -# Regen with autoreconf after git_04_27f85fc -# ---- src/Makefile.in.orig 2016-11-24 04:25:21 UTC -+++ src/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.14.1 from Makefile.am. -+# Makefile.in generated by automake 1.15 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2014 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -35,7 +35,17 @@ - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__is_gnu_make = { \ -+ if test -z '$(MAKELEVEL)'; then \ -+ false; \ -+ elif test -n '$(MAKE_HOST)'; then \ -+ true; \ -+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ -+ true; \ -+ else \ -+ false; \ -+ fi; \ -+} - am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ -@@ -102,17 +112,12 @@ host_triplet = @host@ - @XAA_TRUE@ alp_xaa.c \ - @XAA_TRUE@ alp_xaam.c - --@XAA_TRUE@am__append_2 = \ --@XAA_TRUE@ lg_xaa.c \ --@XAA_TRUE@ lg_xaa.h -- - subdir = src --DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -- $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = -@@ -144,44 +149,25 @@ am__uninstall_files_from_dir = { \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } --am__installdirs = "$(DESTDIR)$(cirrus_alpine_ladir)" \ -- "$(DESTDIR)$(cirrus_drv_ladir)" \ -- "$(DESTDIR)$(cirrus_laguna_ladir)" --LTLIBRARIES = $(cirrus_alpine_la_LTLIBRARIES) \ -- $(cirrus_drv_la_LTLIBRARIES) $(cirrus_laguna_la_LTLIBRARIES) --cirrus_alpine_la_LIBADD = --am__cirrus_alpine_la_SOURCES_DIST = alp_driver.c alp.h alp_hwcurs.c \ -- alp_i2c.c alp_xaa.c alp_xaam.c -+am__installdirs = "$(DESTDIR)$(cirrus_drv_ladir)" -+LTLIBRARIES = $(cirrus_drv_la_LTLIBRARIES) -+cirrus_drv_la_LIBADD = -+am__cirrus_drv_la_SOURCES_DIST = cir_dga.c cir_driver.c cir.h \ -+ CirrusClk.c cir_shadow.c cir_pcirename.h compat-api.h \ -+ alp_driver.c alp.h alp_hwcurs.c alp_i2c.c lg_driver.c lg.h \ -+ lg_hwcurs.c lg_i2c.c alp_xaa.c alp_xaam.c - @XAA_TRUE@am__objects_1 = alp_xaa.lo alp_xaam.lo --am_cirrus_alpine_la_OBJECTS = alp_driver.lo alp_hwcurs.lo alp_i2c.lo \ -- $(am__objects_1) --cirrus_alpine_la_OBJECTS = $(am_cirrus_alpine_la_OBJECTS) -+am_cirrus_drv_la_OBJECTS = cir_dga.lo cir_driver.lo CirrusClk.lo \ -+ cir_shadow.lo alp_driver.lo alp_hwcurs.lo alp_i2c.lo \ -+ lg_driver.lo lg_hwcurs.lo lg_i2c.lo $(am__objects_1) -+cirrus_drv_la_OBJECTS = $(am_cirrus_drv_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent - am__v_lt_1 = --cirrus_alpine_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(cirrus_alpine_la_LDFLAGS) $(LDFLAGS) \ -- -o $@ --cirrus_drv_la_LIBADD = --am_cirrus_drv_la_OBJECTS = cir_dga.lo cir_driver.lo CirrusClk.lo \ -- cir_shadow.lo --cirrus_drv_la_OBJECTS = $(am_cirrus_drv_la_OBJECTS) - cirrus_drv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(cirrus_drv_la_LDFLAGS) $(LDFLAGS) -o $@ --cirrus_laguna_la_LIBADD = --am__cirrus_laguna_la_SOURCES_DIST = lg_driver.c lg.h lg_hwcurs.c \ -- lg_i2c.c lg_xaa.c lg_xaa.h --@XAA_TRUE@am__objects_2 = lg_xaa.lo --am_cirrus_laguna_la_OBJECTS = lg_driver.lo lg_hwcurs.lo lg_i2c.lo \ -- $(am__objects_2) --cirrus_laguna_la_OBJECTS = $(am_cirrus_laguna_la_OBJECTS) --cirrus_laguna_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(cirrus_laguna_la_LDFLAGS) $(LDFLAGS) \ -- -o $@ - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -216,10 +202,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; - am__v_CCLD_1 = --SOURCES = $(cirrus_alpine_la_SOURCES) $(cirrus_drv_la_SOURCES) \ -- $(cirrus_laguna_la_SOURCES) --DIST_SOURCES = $(am__cirrus_alpine_la_SOURCES_DIST) \ -- $(cirrus_drv_la_SOURCES) $(am__cirrus_laguna_la_SOURCES_DIST) -+SOURCES = $(cirrus_drv_la_SOURCES) -+DIST_SOURCES = $(am__cirrus_drv_la_SOURCES_DIST) - am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ -@@ -244,6 +228,7 @@ am__define_uniq_tagged_files = \ - done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags -+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ -@@ -299,6 +284,7 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ - LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ - MAN_SUBSTS = @MAN_SUBSTS@ -@@ -397,25 +383,10 @@ AM_CFLAGS = @XORG_CFLAGS@ $(CWARNFLAGS) - cirrus_drv_la_LTLIBRARIES = cirrus_drv.la - cirrus_drv_la_LDFLAGS = -module -avoid-version - cirrus_drv_ladir = @moduledir@/drivers --cirrus_drv_la_SOURCES = \ -- cir_dga.c \ -- cir_driver.c \ -- cir.h \ -- CirrusClk.c \ -- cir_shadow.c \ -- cir_pcirename.h \ -- compat-api.h -- --cirrus_alpine_la_LTLIBRARIES = cirrus_alpine.la --cirrus_alpine_la_LDFLAGS = -module -avoid-version --cirrus_alpine_ladir = @moduledir@/drivers --cirrus_alpine_la_SOURCES = alp_driver.c alp.h alp_hwcurs.c alp_i2c.c \ -+cirrus_drv_la_SOURCES = cir_dga.c cir_driver.c cir.h CirrusClk.c \ -+ cir_shadow.c cir_pcirename.h compat-api.h alp_driver.c alp.h \ -+ alp_hwcurs.c alp_i2c.c lg_driver.c lg.h lg_hwcurs.c lg_i2c.c \ - $(am__append_1) --cirrus_laguna_la_LTLIBRARIES = cirrus_laguna.la --cirrus_laguna_la_LDFLAGS = -module -avoid-version --cirrus_laguna_ladir = @moduledir@/drivers --cirrus_laguna_la_SOURCES = lg_driver.c lg.h lg_hwcurs.c lg_i2c.c \ -- $(am__append_2) - all: all-am - - .SUFFIXES: -@@ -432,7 +403,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/Makefile --.PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ -@@ -451,41 +421,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): - --install-cirrus_alpine_laLTLIBRARIES: $(cirrus_alpine_la_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- @list='$(cirrus_alpine_la_LTLIBRARIES)'; test -n "$(cirrus_alpine_ladir)" || list=; \ -- list2=; for p in $$list; do \ -- if test -f $$p; then \ -- list2="$$list2 $$p"; \ -- else :; fi; \ -- done; \ -- test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(cirrus_alpine_ladir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(cirrus_alpine_ladir)" || exit 1; \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(cirrus_alpine_ladir)'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(cirrus_alpine_ladir)"; \ -- } -- --uninstall-cirrus_alpine_laLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @list='$(cirrus_alpine_la_LTLIBRARIES)'; test -n "$(cirrus_alpine_ladir)" || list=; \ -- for p in $$list; do \ -- $(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(cirrus_alpine_ladir)/$$f'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(cirrus_alpine_ladir)/$$f"; \ -- done -- --clean-cirrus_alpine_laLTLIBRARIES: -- -test -z "$(cirrus_alpine_la_LTLIBRARIES)" || rm -f $(cirrus_alpine_la_LTLIBRARIES) -- @list='$(cirrus_alpine_la_LTLIBRARIES)'; \ -- locs=`for p in $$list; do echo $$p; done | \ -- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -- sort -u`; \ -- test -z "$$locs" || { \ -- echo rm -f $${locs}; \ -- rm -f $${locs}; \ -- } -- - install-cirrus_drv_laLTLIBRARIES: $(cirrus_drv_la_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(cirrus_drv_la_LTLIBRARIES)'; test -n "$(cirrus_drv_ladir)" || list=; \ -@@ -521,50 +456,9 @@ clean-cirrus_drv_laLTLIBRARIES: - rm -f $${locs}; \ - } - --install-cirrus_laguna_laLTLIBRARIES: $(cirrus_laguna_la_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- @list='$(cirrus_laguna_la_LTLIBRARIES)'; test -n "$(cirrus_laguna_ladir)" || list=; \ -- list2=; for p in $$list; do \ -- if test -f $$p; then \ -- list2="$$list2 $$p"; \ -- else :; fi; \ -- done; \ -- test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(cirrus_laguna_ladir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(cirrus_laguna_ladir)" || exit 1; \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(cirrus_laguna_ladir)'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(cirrus_laguna_ladir)"; \ -- } -- --uninstall-cirrus_laguna_laLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @list='$(cirrus_laguna_la_LTLIBRARIES)'; test -n "$(cirrus_laguna_ladir)" || list=; \ -- for p in $$list; do \ -- $(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(cirrus_laguna_ladir)/$$f'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(cirrus_laguna_ladir)/$$f"; \ -- done -- --clean-cirrus_laguna_laLTLIBRARIES: -- -test -z "$(cirrus_laguna_la_LTLIBRARIES)" || rm -f $(cirrus_laguna_la_LTLIBRARIES) -- @list='$(cirrus_laguna_la_LTLIBRARIES)'; \ -- locs=`for p in $$list; do echo $$p; done | \ -- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -- sort -u`; \ -- test -z "$$locs" || { \ -- echo rm -f $${locs}; \ -- rm -f $${locs}; \ -- } -- --cirrus_alpine.la: $(cirrus_alpine_la_OBJECTS) $(cirrus_alpine_la_DEPENDENCIES) $(EXTRA_cirrus_alpine_la_DEPENDENCIES) -- $(AM_V_CCLD)$(cirrus_alpine_la_LINK) -rpath $(cirrus_alpine_ladir) $(cirrus_alpine_la_OBJECTS) $(cirrus_alpine_la_LIBADD) $(LIBS) -- - cirrus_drv.la: $(cirrus_drv_la_OBJECTS) $(cirrus_drv_la_DEPENDENCIES) $(EXTRA_cirrus_drv_la_DEPENDENCIES) - $(AM_V_CCLD)$(cirrus_drv_la_LINK) -rpath $(cirrus_drv_ladir) $(cirrus_drv_la_OBJECTS) $(cirrus_drv_la_LIBADD) $(LIBS) - --cirrus_laguna.la: $(cirrus_laguna_la_OBJECTS) $(cirrus_laguna_la_DEPENDENCIES) $(EXTRA_cirrus_laguna_la_DEPENDENCIES) -- $(AM_V_CCLD)$(cirrus_laguna_la_LINK) -rpath $(cirrus_laguna_ladir) $(cirrus_laguna_la_OBJECTS) $(cirrus_laguna_la_LIBADD) $(LIBS) -- - mostlyclean-compile: - -rm -f *.$(OBJEXT) - -@@ -583,7 +477,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lg_driver.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lg_hwcurs.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lg_i2c.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lg_xaa.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -698,7 +591,7 @@ check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) - installdirs: -- for dir in "$(DESTDIR)$(cirrus_alpine_ladir)" "$(DESTDIR)$(cirrus_drv_ladir)" "$(DESTDIR)$(cirrus_laguna_ladir)"; do \ -+ for dir in "$(DESTDIR)$(cirrus_drv_ladir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am -@@ -733,9 +626,7 @@ maintainer-clean-generic: - @echo "it deletes files that may require special tools to rebuild." - clean: clean-am - --clean-am: clean-cirrus_alpine_laLTLIBRARIES \ -- clean-cirrus_drv_laLTLIBRARIES \ -- clean-cirrus_laguna_laLTLIBRARIES clean-generic clean-libtool \ -+clean-am: clean-cirrus_drv_laLTLIBRARIES clean-generic clean-libtool \ - mostlyclean-am - - distclean: distclean-am -@@ -756,9 +647,7 @@ info: info-am - - info-am: - --install-data-am: install-cirrus_alpine_laLTLIBRARIES \ -- install-cirrus_drv_laLTLIBRARIES \ -- install-cirrus_laguna_laLTLIBRARIES -+install-data-am: install-cirrus_drv_laLTLIBRARIES - - install-dvi: install-dvi-am - -@@ -804,34 +693,29 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-cirrus_alpine_laLTLIBRARIES \ -- uninstall-cirrus_drv_laLTLIBRARIES \ -- uninstall-cirrus_laguna_laLTLIBRARIES -+uninstall-am: uninstall-cirrus_drv_laLTLIBRARIES - - .MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ -- clean-cirrus_alpine_laLTLIBRARIES \ -- clean-cirrus_drv_laLTLIBRARIES \ -- clean-cirrus_laguna_laLTLIBRARIES clean-generic clean-libtool \ -+ clean-cirrus_drv_laLTLIBRARIES clean-generic clean-libtool \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ -- install-cirrus_alpine_laLTLIBRARIES \ -- install-cirrus_drv_laLTLIBRARIES \ -- install-cirrus_laguna_laLTLIBRARIES install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags tags-am uninstall uninstall-am \ -- uninstall-cirrus_alpine_laLTLIBRARIES \ -- uninstall-cirrus_drv_laLTLIBRARIES \ -- uninstall-cirrus_laguna_laLTLIBRARIES -+ install-cirrus_drv_laLTLIBRARIES install-data install-data-am \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ -+ uninstall-am uninstall-cirrus_drv_laLTLIBRARIES -+ -+.PRECIOUS: Makefile - -+@XAA_TRUE@ lg_xaa.c \ -+@XAA_TRUE@ lg_xaa.h - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Index: x11-drivers/xf86-video-cirrus/files/patch-src_alp__driver.c =================================================================== --- x11-drivers/xf86-video-cirrus/files/patch-src_alp__driver.c +++ /dev/null @@ -1,13 +0,0 @@ -# Correct a string type that should be const -# ---- src/alp_driver.c.orig 2016-11-24 04:07:05 UTC -+++ src/alp_driver.c -@@ -468,7 +468,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - int i; - int depth_flags; - ClockRangePtr clockRanges; -- char *s; -+ const char *s; - xf86Int10InfoPtr pInt = NULL; - - if (flags & PROBE_DETECT) { Index: x11-drivers/xf86-video-cirrus/files/patch-src_lg__driver.c =================================================================== --- x11-drivers/xf86-video-cirrus/files/patch-src_lg__driver.c +++ /dev/null @@ -1,13 +0,0 @@ -# Correct a string type that should be const -# ---- src/lg_driver.c.orig 2016-11-24 04:05:04 UTC -+++ src/lg_driver.c -@@ -332,7 +332,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) - int i; - ClockRangePtr clockRanges; - int fbPCIReg, ioPCIReg; -- char *s; -+ const char *s; - - if (flags & PROBE_DETECT) { - cirProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index ); Index: x11-drivers/xf86-video-cirrus/pkg-descr =================================================================== --- x11-drivers/xf86-video-cirrus/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-cirrus driver. Index: x11-drivers/xf86-video-cirrus/pkg-plist =================================================================== --- x11-drivers/xf86-video-cirrus/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/cirrus_drv.so -share/man/man4/cirrus.4x.gz Index: x11-drivers/xf86-video-geode/Makefile =================================================================== --- x11-drivers/xf86-video-geode/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -PORTNAME= xf86-video-geode -PORTVERSION= 2.11.20 -PORTREVISION= 2 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org geode display driver -WWW= https://www.x.org/ - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= xorg-cat:driver - -ONLY_FOR_ARCHS= i386 -ONLY_FOR_ARCHS_REASON= Geode processors are 32bit x86 only - -.include Index: x11-drivers/xf86-video-geode/distinfo =================================================================== --- x11-drivers/xf86-video-geode/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1572732549 -SHA256 (xorg/driver/xf86-video-geode-2.11.20.tar.bz2) = f497d0bfb09f36c72e3467e2d701f57f6b03ab8992c5d570e66582f714f84d64 -SIZE (xorg/driver/xf86-video-geode-2.11.20.tar.bz2) = 699973 Index: x11-drivers/xf86-video-geode/files/patch-src_geode.h =================================================================== --- x11-drivers/xf86-video-geode/files/patch-src_geode.h +++ /dev/null @@ -1,34 +0,0 @@ ---- src/geode.h.orig 2020-08-24 18:11:55 UTC -+++ src/geode.h -@@ -343,7 +343,7 @@ typedef struct _geodeRec { - - /* option flags are self-explanatory */ - #ifdef HAVE_LX --enum { -+enum LX_GeodeOpts { - LX_OPTION_SW_CURSOR, - LX_OPTION_HW_CURSOR, - LX_OPTION_NOCOMPRESSION, -@@ -357,11 +357,11 @@ enum { - LX_OPTION_FBSIZE, - LX_OPTION_PANEL_MODE, - LX_OPTION_DONT_PROGRAM --} LX_GeodeOpts; -+}; - #endif - - #ifdef HAVE_GX --enum { -+enum GX_GeodeOpts { - GX_OPTION_SW_CURSOR, - GX_OPTION_HW_CURSOR, - GX_OPTION_NOCOMPRESSION, -@@ -378,7 +378,7 @@ enum { - GX_OPTION_FBSIZE, - GX_OPTION_PANEL_GEOMETRY, - GX_OPTION_DONT_PROGRAM --} GX_GeodeOpts; -+}; - #endif - - /* geode_dcon.c */ Index: x11-drivers/xf86-video-geode/files/patch-src_gx__video.c =================================================================== --- x11-drivers/xf86-video-geode/files/patch-src_gx__video.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gx_video.c.orig 2020-08-24 18:14:49 UTC -+++ src/gx_video.c -@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int h - - extern void GXAccelSync(ScrnInfoPtr pScrni); - --int DeltaX, DeltaY; -+extern int DeltaX, DeltaY; - - unsigned long graphics_lut[256]; - static int lutflag = 0; Index: x11-drivers/xf86-video-geode/files/patch-src_lx__driver.c =================================================================== --- x11-drivers/xf86-video-geode/files/patch-src_lx__driver.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lx_driver.c.orig 2020-08-24 20:15:55 UTC -+++ src/lx_driver.c -@@ -74,7 +74,7 @@ - - extern OptionInfoRec LX_GeodeOptions[]; - --unsigned char *XpressROMPtr; -+extern unsigned char *XpressROMPtr; - - static Bool - LXSaveScreen(ScreenPtr pScrn, int mode) Index: x11-drivers/xf86-video-geode/files/patch-src_panel.c =================================================================== --- x11-drivers/xf86-video-geode/files/patch-src_panel.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/panel.c.orig 2019-09-20 16:17:28 UTC -+++ src/panel.c -@@ -51,7 +51,7 @@ - #define PLATFORM_DORADO 1 /* Dorado + 9211 RevC */ - #define PLATFORM_GX2BASED 1 /* Redcloud */ - --unsigned char *XpressROMPtr; -+extern unsigned char *XpressROMPtr; - - #include "pnl_init.c" - #include "pnl_bios.c" Index: x11-drivers/xf86-video-geode/files/patch-src_panel_panel.c =================================================================== --- x11-drivers/xf86-video-geode/files/patch-src_panel_panel.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/panel/panel.c.orig 2019-09-20 16:17:28 UTC -+++ src/panel/panel.c -@@ -65,7 +65,7 @@ extern unsigned long gfx_detect_video(void); - #define PLATFORM_DORADO 1 /* Dorado + 9211 RevC */ - #define PLATFORM_REDCLOUD 1 /* GX2 */ - --unsigned char *XpressROMPtr; -+extern unsigned char *XpressROMPtr; - - #include "pnl_init.c" - #include "pnl_bios.c" Index: x11-drivers/xf86-video-geode/pkg-descr =================================================================== --- x11-drivers/xf86-video-geode/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-geode driver. Index: x11-drivers/xf86-video-geode/pkg-plist =================================================================== --- x11-drivers/xf86-video-geode/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/xorg/modules/drivers/geode_drv.so Index: x11-drivers/xf86-video-i128/Makefile =================================================================== --- x11-drivers/xf86-video-i128/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -PORTNAME= xf86-video-i128 -PORTVERSION= 1.4.0 -PORTREVISION= 3 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org i128 display driver -WWW= https://www.x.org/ - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-i128/distinfo =================================================================== --- x11-drivers/xf86-video-i128/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546478838 -SHA256 (xorg/driver/xf86-video-i128-1.4.0.tar.bz2) = 8f2c0a6bf5a169dad3fc07c6dd4537b492d0e44489e4a1297311e617c3bed0ea -SIZE (xorg/driver/xf86-video-i128-1.4.0.tar.bz2) = 331897 Index: x11-drivers/xf86-video-i128/pkg-descr =================================================================== --- x11-drivers/xf86-video-i128/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-i128 driver. Index: x11-drivers/xf86-video-i128/pkg-plist =================================================================== --- x11-drivers/xf86-video-i128/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/i128_drv.so -share/man/man4/i128.4x.gz Index: x11-drivers/xf86-video-i740/Makefile =================================================================== --- x11-drivers/xf86-video-i740/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -PORTNAME= xf86-video-i740 -PORTVERSION= 1.4.0 -PORTREVISION= 3 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org i740 display driver -WWW= https://www.x.org/ - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-i740/distinfo =================================================================== --- x11-drivers/xf86-video-i740/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546479073 -SHA256 (xorg/driver/xf86-video-i740-1.4.0.tar.bz2) = 46e401219f8ceea1faa58efd46d05a5c3f85f08d789014e7234fb755520d7a50 -SIZE (xorg/driver/xf86-video-i740-1.4.0.tar.bz2) = 319617 Index: x11-drivers/xf86-video-i740/pkg-descr =================================================================== --- x11-drivers/xf86-video-i740/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-i740 driver. Index: x11-drivers/xf86-video-i740/pkg-plist =================================================================== --- x11-drivers/xf86-video-i740/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/i740_drv.so -share/man/man4/i740.4x.gz Index: x11-drivers/xf86-video-mach64/Makefile =================================================================== --- x11-drivers/xf86-video-mach64/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -PORTNAME= xf86-video-mach64 -PORTVERSION= 6.9.7 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org mach64 display driver -WWW= https://www.x.org/ - -USES= gl tar:xz xorg-cat:driver -USE_GL= gl - -.include Index: x11-drivers/xf86-video-mach64/distinfo =================================================================== --- x11-drivers/xf86-video-mach64/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1659598000 -SHA256 (xorg/driver/xf86-video-mach64-6.9.7.tar.xz) = 50d78abffa7c8227e6f187976f23a244ae2095e97f08de275529b70fba9481ba -SIZE (xorg/driver/xf86-video-mach64-6.9.7.tar.xz) = 488776 Index: x11-drivers/xf86-video-mach64/pkg-descr =================================================================== --- x11-drivers/xf86-video-mach64/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-mach64 driver. Index: x11-drivers/xf86-video-mach64/pkg-plist =================================================================== --- x11-drivers/xf86-video-mach64/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/xorg/modules/drivers/mach64_drv.so Index: x11-drivers/xf86-video-mga/Makefile =================================================================== --- x11-drivers/xf86-video-mga/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -PORTNAME= xf86-video-mga -PORTVERSION= 2.0.0 -PORTREVISION= 4 -PORTEPOCH= 3 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org mga display driver -WWW= https://www.x.org/ - -USES= gl xorg-cat:driver -USE_GL= gl - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-mga/distinfo =================================================================== --- x11-drivers/xf86-video-mga/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546479273 -SHA256 (xorg/driver/xf86-video-mga-2.0.0.tar.bz2) = 268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79 -SIZE (xorg/driver/xf86-video-mga-2.0.0.tar.bz2) = 452486 Index: x11-drivers/xf86-video-mga/files/patch-src_mga__dac3026.c =================================================================== --- x11-drivers/xf86-video-mga/files/patch-src_mga__dac3026.c +++ /dev/null @@ -1,15 +0,0 @@ -# Fix a style warning -# ---- src/mga_dac3026.c.orig 2017-01-17 22:40:29 UTC -+++ src/mga_dac3026.c -@@ -886,8 +886,8 @@ MGA3026LoadCursorImage( - outTi3026dreg(TVP3026_WADR_PAL, 0x00); - - while(i--) { -- while (INREG8(0x1FDA) & 0x01); -- while (!(INREG8(0x1FDA) & 0x01)); -+ while (INREG8(0x1FDA) & 0x01) {} -+ while (!(INREG8(0x1FDA) & 0x01)) {} - outTi3026dreg(TVP3026_CUR_RAM, *(src++)); - } - } Index: x11-drivers/xf86-video-mga/files/patch-src_mga__dri.c =================================================================== --- x11-drivers/xf86-video-mga/files/patch-src_mga__dri.c +++ /dev/null @@ -1,22 +0,0 @@ -# Use the correct constants for this type -# ---- src/mga_dri.c.orig 2017-01-17 22:40:29 UTC -+++ src/mga_dri.c -@@ -316,7 +316,7 @@ static void MGAWaitForIdleDMA( ScrnInfoP - for (;;) { - do { - /* first ask for quiescent and flush */ -- lock.flags = DRM_LOCK_QUIESCENT | DRM_LOCK_FLUSH; -+ lock.flags = _DRM_LOCK_QUIESCENT | _DRM_LOCK_FLUSH; - do { - ret = drmCommandWrite( pMga->drmFD, DRM_MGA_FLUSH, - &lock, sizeof( drm_lock_t ) ); -@@ -324,7 +324,7 @@ static void MGAWaitForIdleDMA( ScrnInfoP - - /* if it's still busy just try quiescent */ - if ( ret == -EBUSY ) { -- lock.flags = DRM_LOCK_QUIESCENT; -+ lock.flags = _DRM_LOCK_QUIESCENT; - do { - ret = drmCommandWrite( pMga->drmFD, DRM_MGA_FLUSH, - &lock, sizeof( drm_lock_t ) ); Index: x11-drivers/xf86-video-mga/pkg-descr =================================================================== --- x11-drivers/xf86-video-mga/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-mga driver. Index: x11-drivers/xf86-video-mga/pkg-plist =================================================================== --- x11-drivers/xf86-video-mga/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/mga_drv.so -share/man/man4/mga.4x.gz Index: x11-drivers/xf86-video-neomagic/Makefile =================================================================== --- x11-drivers/xf86-video-neomagic/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -PORTNAME= xf86-video-neomagic -PORTVERSION= 1.3.0 -PORTREVISION= 3 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org neomagic display driver -WWW= https://www.x.org/ - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-neomagic/distinfo =================================================================== --- x11-drivers/xf86-video-neomagic/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546511815 -SHA256 (xorg/driver/xf86-video-neomagic-1.3.0.tar.bz2) = 93833950fae7757088eb6abb125e15e8c245e5e25681c19c3ad4213ec7319064 -SIZE (xorg/driver/xf86-video-neomagic-1.3.0.tar.bz2) = 362347 Index: x11-drivers/xf86-video-neomagic/files/patch-src_neo__driver.c =================================================================== --- x11-drivers/xf86-video-neomagic/files/patch-src_neo__driver.c +++ /dev/null @@ -1,13 +0,0 @@ -# Double in, double out; use fabs -# ---- src/neo_driver.c.orig 2016-11-25 03:32:57 UTC -+++ src/neo_driver.c -@@ -2952,7 +2952,7 @@ neoCalcVCLK(ScrnInfoPtr pScrn, long freq - for (n = 0; n <= MAX_N; n++) - for (d = 1; d <= MAX_D; d++) { - f_out = (n+1.0)/((d+1.0)*(1< - -# XvMC is only supported by this driver on x86 -.if ${ARCH} == "i386" || ${ARCH} == "amd64" -USE_XORG+= xvmc -PLIST_SUB+= XVMC="" -.else -PLIST_SUB+= XVMC="@comment " -.endif - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=int-conversion -.endif - -.include Index: x11-drivers/xf86-video-openchrome/distinfo =================================================================== --- x11-drivers/xf86-video-openchrome/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1488947220 -SHA256 (xorg/driver/xf86-video-openchrome-0.6.0.tar.bz2) = da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75 -SIZE (xorg/driver/xf86-video-openchrome-0.6.0.tar.bz2) = 537619 Index: x11-drivers/xf86-video-openchrome/files/patch-configure =================================================================== --- x11-drivers/xf86-video-openchrome/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2016-07-06 16:22:03 UTC -+++ configure -@@ -13388,7 +13388,7 @@ $as_echo "#define X_HAVE_XAAGETROP 1" >> - $as_echo "#define X_NEED_I2CSTART 1" >>confdefs.h - - --DRIVER_MAN_SUFFIX="4" -+DRIVER_MAN_SUFFIX="4x" - - - Index: x11-drivers/xf86-video-openchrome/files/patch-edb4657.c =================================================================== --- x11-drivers/xf86-video-openchrome/files/patch-edb4657.c +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/via_driver.h b/src/via_driver.h -index b01229d..bfad2ee 100644 ---- src/via_driver.h -+++ src/via_driver.h -@@ -361,8 +361,8 @@ void viaSetupDefaultOptions(ScrnInfoPtr pScrn); - void viaProcessOptions(ScrnInfoPtr pScrn); - - /* In via_display.c. */ --const xf86CrtcFuncsRec iga1_crtc_funcs; --const xf86CrtcFuncsRec iga2_crtc_funcs; -+extern const xf86CrtcFuncsRec iga1_crtc_funcs; -+extern const xf86CrtcFuncsRec iga2_crtc_funcs; - - /* In via_exa.c. */ - Bool viaInitExa(ScreenPtr pScreen); -diff --git a/src/via_sii164.h b/src/via_sii164.h -index 1a402aa..250ac75 100644 ---- src/via_sii164.h -+++ src/via_sii164.h -@@ -51,7 +51,7 @@ typedef struct _viaSiI164 { - } viaSiI164Rec, *viaSiI164RecPtr; - - --const xf86OutputFuncsRec via_sii164_funcs; -+extern const xf86OutputFuncsRec via_sii164_funcs; - - Bool viaSiI164Probe(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); - void viaSiI164Init(ScrnInfoPtr pScrn); -diff --git a/src/via_vt1632.h b/src/via_vt1632.h -index 4f93f6c..61dada1 100644 ---- src/via_vt1632.h -+++ src/via_vt1632.h -@@ -51,7 +51,7 @@ typedef struct _VIAVT1632 { - } viaVT1632Rec, *viaVT1632RecPtr; - - --const xf86OutputFuncsRec via_vt1632_funcs; -+extern const xf86OutputFuncsRec via_vt1632_funcs; - - Bool viaVT1632Probe(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus); - void viaVT1632Init(ScrnInfoPtr pScrn); Index: x11-drivers/xf86-video-openchrome/pkg-descr =================================================================== --- x11-drivers/xf86-video-openchrome/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-openchrome driver. Index: x11-drivers/xf86-video-openchrome/pkg-plist =================================================================== --- x11-drivers/xf86-video-openchrome/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -%%XVMC%%lib/libchromeXvMC.so -%%XVMC%%lib/libchromeXvMC.so.1 -%%XVMC%%lib/libchromeXvMC.so.1.0.0 -%%XVMC%%lib/libchromeXvMCPro.so -%%XVMC%%lib/libchromeXvMCPro.so.1 -%%XVMC%%lib/libchromeXvMCPro.so.1.0.0 -lib/xorg/modules/drivers/openchrome_drv.so -share/man/man4/openchrome.4x.gz Index: x11-drivers/xf86-video-r128/Makefile =================================================================== --- x11-drivers/xf86-video-r128/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -PORTNAME= xf86-video-r128 -PORTVERSION= 6.12.0 -PORTREVISION= 4 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org r128 display driver - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= gl xorg-cat:driver -USE_GL= gl - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-r128/distinfo =================================================================== --- x11-drivers/xf86-video-r128/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546479503 -SHA256 (xorg/driver/xf86-video-r128-6.12.0.tar.bz2) = 801c86882cbd2bbb3084d471dcc5cfee2c1754dcbfb4dc446676d58a6bd9e057 -SIZE (xorg/driver/xf86-video-r128-6.12.0.tar.bz2) = 483999 Index: x11-drivers/xf86-video-r128/files/patch-src_r128__dri.c =================================================================== --- x11-drivers/xf86-video-r128/files/patch-src_r128__dri.c +++ /dev/null @@ -1,94 +0,0 @@ -# Correct type in format strings -# ---- src/r128_dri.c.orig 2017-01-17 22:42:44 UTC -+++ src/r128_dri.c -@@ -500,7 +500,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[agp] %d kB allocated with handle 0x%08x\n", -+ "[agp] %d kB allocated with handle 0x%08lx\n", - info->agpSize*1024, info->agpMemHandle); - - if (drmAgpBind(info->drmFD, info->agpMemHandle, info->agpOffset) < 0) { -@@ -540,7 +540,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[agp] ring handle = 0x%08x\n", info->ringHandle); -+ "[agp] ring handle = 0x%08lx\n", info->ringHandle); - - if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize, - &info->ring) < 0) { -@@ -558,7 +558,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[agp] ring read ptr handle = 0x%08x\n", -+ "[agp] ring read ptr handle = 0x%08lx\n", - info->ringReadPtrHandle); - - if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize, -@@ -578,7 +578,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[agp] vertex/indirect buffers handle = 0x%08x\n", -+ "[agp] vertex/indirect buffers handle = 0x%08lx\n", - info->bufHandle); - - if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize, -@@ -598,7 +598,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[agp] AGP texture map handle = 0x%08x\n", -+ "[agp] AGP texture map handle = 0x%08lx\n", - info->agpTexHandle); - - if (drmMap(info->drmFD, info->agpTexHandle, info->agpTexMapSize, -@@ -660,7 +660,7 @@ static Bool R128DRIPciInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[pci] %d kB allocated with handle 0x%08x\n", -+ "[pci] %d kB allocated with handle 0x%08lx\n", - info->agpSize*1024, info->pciMemHandle); - - /* Initialize the CCE ring buffer data */ -@@ -684,7 +684,7 @@ static Bool R128DRIPciInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[pci] ring handle = 0x%08x\n", info->ringHandle); -+ "[pci] ring handle = 0x%08lx\n", info->ringHandle); - - if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize, - &info->ring) < 0) { -@@ -705,7 +705,7 @@ static Bool R128DRIPciInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[pci] ring read ptr handle = 0x%08x\n", -+ "[pci] ring read ptr handle = 0x%08lx\n", - info->ringReadPtrHandle); - - if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize, -@@ -728,7 +728,7 @@ static Bool R128DRIPciInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[pci] vertex/indirect buffers handle = 0x%08x\n", -+ "[pci] vertex/indirect buffers handle = 0x%08lx\n", - info->bufHandle); - - if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize, -@@ -829,7 +829,7 @@ static Bool R128DRIMapInit(R128InfoPtr i - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, -- "[drm] register handle = 0x%08x\n", info->registerHandle); -+ "[drm] register handle = 0x%08lx\n", info->registerHandle); - - return TRUE; - } Index: x11-drivers/xf86-video-r128/pkg-descr =================================================================== --- x11-drivers/xf86-video-r128/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-r128 driver. Index: x11-drivers/xf86-video-r128/pkg-plist =================================================================== --- x11-drivers/xf86-video-r128/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/r128_drv.so -share/man/man4/r128.4x.gz Index: x11-drivers/xf86-video-rendition/Makefile =================================================================== --- x11-drivers/xf86-video-rendition/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -PORTNAME= xf86-video-rendition -PORTVERSION= 4.2.7 -PORTREVISION= 5 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org rendition display driver -WWW= https://www.x.org/ - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-rendition/distinfo =================================================================== --- x11-drivers/xf86-video-rendition/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1527020087 -SHA256 (xorg/driver/xf86-video-rendition-4.2.7.tar.bz2) = 9511c6595c9d489a022635bd8d91149de0cb3cbf9034739452ca5b9b5d63f87b -SIZE (xorg/driver/xf86-video-rendition-4.2.7.tar.bz2) = 365454 Index: x11-drivers/xf86-video-rendition/files/patch-src_rendition.c =================================================================== --- x11-drivers/xf86-video-rendition/files/patch-src_rendition.c +++ /dev/null @@ -1,13 +0,0 @@ -# Correct a string that should be const -# ---- src/rendition.c.orig 2014-09-30 14:21:44 UTC -+++ src/rendition.c -@@ -480,7 +480,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo - MessageType From; - int videoRam, Rounding, nModes = 0; - renditionPtr pRendition; -- char *in_string; -+ const char *in_string; - vgaHWPtr pvgaHW; - - #ifdef DEBUG Index: x11-drivers/xf86-video-rendition/pkg-descr =================================================================== --- x11-drivers/xf86-video-rendition/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-rendition driver. Index: x11-drivers/xf86-video-rendition/pkg-plist =================================================================== --- x11-drivers/xf86-video-rendition/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -lib/xorg/modules/drivers/rendition_drv.so -lib/xorg/modules/v10002d.uc -lib/xorg/modules/v20002d.uc -share/man/man4/rendition.4x.gz Index: x11-drivers/xf86-video-savage/Makefile =================================================================== --- x11-drivers/xf86-video-savage/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -PORTNAME= xf86-video-savage -PORTVERSION= 2.3.9 -PORTREVISION= 8 -CATEGORIES= x11-drivers - -PATCH_SITES= https://gitlab.freedesktop.org/xorg/driver/${PORTNAME}/-/commit/ -PATCHFILES+= 0ece556daa8a88771b669d8104396abd9166d2d0.patch:-p1 - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org savage display driver -WWW= https://www.x.org/ - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= gl xorg-cat:driver -USE_GL= gl - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=incompatible-function-pointer-types -.endif - -.include Index: x11-drivers/xf86-video-savage/distinfo =================================================================== --- x11-drivers/xf86-video-savage/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1582450070 -SHA256 (xorg/driver/xf86-video-savage-2.3.9.tar.bz2) = 2c93c4db1f71e725dda0caee5821253129d4b52d7aa0fd720593e7769bceec86 -SIZE (xorg/driver/xf86-video-savage-2.3.9.tar.bz2) = 433686 -SHA256 (xorg/driver/0ece556daa8a88771b669d8104396abd9166d2d0.patch) = c6283acc1a65b1017ac58b696fe6a400c69f784f7f9eb6cef6450b3ce5def890 -SIZE (xorg/driver/0ece556daa8a88771b669d8104396abd9166d2d0.patch) = 1547 Index: x11-drivers/xf86-video-savage/files/patch-src_savage__dri.c =================================================================== --- x11-drivers/xf86-video-savage/files/patch-src_savage__dri.c +++ /dev/null @@ -1,13 +0,0 @@ -# Correct types in a format string -# ---- src/savage_dri.c.orig 2017-01-17 22:43:40 UTC -+++ src/savage_dri.c -@@ -894,7 +894,7 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScr - } - - xf86DrvMsg( pScrn->scrnIndex, X_INFO, -- "[drm] Sarea %d+%d: %d\n", -+ "[drm] Sarea %lu+%lu: %lu\n", - sizeof(XF86DRISAREARec), sizeof(SAVAGESAREAPrivRec), - sizeof(XF86DRISAREARec) + sizeof(SAVAGESAREAPrivRec) ); - Index: x11-drivers/xf86-video-savage/files/patch-src_savage__video.c =================================================================== --- x11-drivers/xf86-video-savage/files/patch-src_savage__video.c +++ /dev/null @@ -1,17 +0,0 @@ -# Correct type in a couple format strings -# ---- src/savage_video.c.orig 2017-01-17 22:43:40 UTC -+++ src/savage_video.c -@@ -303,10 +303,10 @@ unsigned int GetBlendForFourCC2000( int - - void savageOUTREG( SavagePtr psav, unsigned long offset, unsigned long value ) - { -- ErrorF( "MMIO %08lx, was %08lx, want %08lx,", -+ ErrorF( "MMIO %08lx, was %08x, want %08lx,", - offset, (CARD32)MMIO_IN32( psav->MapBase, offset ), value ); - MMIO_OUT32( psav->MapBase, offset, value ); -- ErrorF( " now %08lx\n", (CARD32)MMIO_IN32( psav->MapBase, offset ) ); -+ ErrorF( " now %08x\n", (CARD32)MMIO_IN32( psav->MapBase, offset ) ); - } - - #if 0 Index: x11-drivers/xf86-video-savage/pkg-descr =================================================================== --- x11-drivers/xf86-video-savage/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-savage driver. Index: x11-drivers/xf86-video-savage/pkg-plist =================================================================== --- x11-drivers/xf86-video-savage/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/savage_drv.so -share/man/man4/savage.4x.gz Index: x11-drivers/xf86-video-siliconmotion/Makefile =================================================================== --- x11-drivers/xf86-video-siliconmotion/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -PORTNAME= xf86-video-siliconmotion -PORTVERSION= 1.7.9 -PORTREVISION= 6 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org siliconmotion display driver -WWW= https://www.x.org/ - -USES= xorg-cat:driver - -BROKEN_aarch64= error: implicit declaration of function outb is invalid in C99 -BROKEN_armv6= error: implicit declaration of function outb is invalid in C99 -BROKEN_armv7= error: implicit declaration of function outb is invalid in C99 - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-siliconmotion/distinfo =================================================================== --- x11-drivers/xf86-video-siliconmotion/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1485132207 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.9.tar.bz2) = d0f3c691e71108d27a061beb62bf78b36ec35bd755905692734dd68cfb3359bc -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.9.tar.bz2) = 416351 Index: x11-drivers/xf86-video-siliconmotion/pkg-descr =================================================================== --- x11-drivers/xf86-video-siliconmotion/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-siliconmotion driver. Index: x11-drivers/xf86-video-siliconmotion/pkg-plist =================================================================== --- x11-drivers/xf86-video-siliconmotion/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/siliconmotion_drv.so -share/man/man4/siliconmotion.4x.gz Index: x11-drivers/xf86-video-sis/Makefile =================================================================== --- x11-drivers/xf86-video-sis/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -PORTNAME= xf86-video-sis -PORTVERSION= 0.12.0 -PORTREVISION= 3 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org sis display driver - -LICENSE= BSD3CLAUSE MIT -LICENSE_COMB= multi -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-sis/distinfo =================================================================== --- x11-drivers/xf86-video-sis/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1581789879 -SHA256 (xorg/driver/xf86-video-sis-0.12.0.tar.bz2) = 119d3f17d53c862ec4bf891ed696a6f1d32cdf8bd11d944a9f0ad24625333a5b -SIZE (xorg/driver/xf86-video-sis-0.12.0.tar.bz2) = 741069 Index: x11-drivers/xf86-video-sis/files/patch-src_init301.c =================================================================== --- x11-drivers/xf86-video-sis/files/patch-src_init301.c +++ /dev/null @@ -1,25 +0,0 @@ -# Fix an uninitialized variable -# Remove some dead code to eliminate a style warning -# ---- src/init301.c.orig 2010-03-07 19:36:10 UTC -+++ src/init301.c -@@ -446,7 +446,7 @@ SiS_CR36BIOSWord23d(struct SiS_Private * - void - SiS_DDC2Delay(struct SiS_Private *SiS_Pr, unsigned int delaytime) - { -- unsigned int i, j; -+ unsigned int i, j = 0; - - for(i = 0; i < delaytime; i++) { - j += SiS_GetReg(SiS_Pr->SiS_P3c4,0x05); -@@ -534,9 +534,7 @@ SiS_PanelDelay(struct SiS_Private *SiS_P - SiS_DDC2Delay(SiS_Pr, 0x4000); - } - -- } else if((SiS_Pr->SiS_IF_DEF_LVDS == 1) /* || -- (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) || -- (SiS_Pr->SiS_CustomT == CUT_CLEVO1400) */ ) { /* 315 series, LVDS; Special */ -+ } else if(SiS_Pr->SiS_IF_DEF_LVDS == 1) { /* 315 series, LVDS; Special */ - - if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) { - PanelID = SiS_GetReg(SiS_Pr->SiS_P3d4,0x36); Index: x11-drivers/xf86-video-sis/files/patch-src_initextx.c =================================================================== --- x11-drivers/xf86-video-sis/files/patch-src_initextx.c +++ /dev/null @@ -1,33 +0,0 @@ -# Cast away warnings filling const strings -# ---- src/initextx.c.orig 2019-07-26 23:38:52 UTC -+++ src/initextx.c -@@ -252,7 +252,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc - - current = new; - -- sprintf(current->name, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes, -+ sprintf((char *)current->name, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes, - pSiS->SiS_Pr->SiS_RefIndex[i].YRes); - - current->status = MODE_OK; -@@ -402,7 +402,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc - - pSiS->AddedPlasmaModes = TRUE; - -- strcpy(current->name, SiS_PlasmaMode[l].name); -+ strcpy((char *)current->name, SiS_PlasmaMode[l].name); - - current->status = MODE_OK; - -@@ -485,8 +485,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc - - current = new; - -- sprintf(current->name, "%dx%d", pSiS->SiS_Pr->CP_HDisplay[i], -- pSiS->SiS_Pr->CP_VDisplay[i]); -+ sprintf((char *)current->name, "%dx%d", pSiS->SiS_Pr->CP_HDisplay[i], -+ pSiS->SiS_Pr->CP_VDisplay[i]); - - current->status = MODE_OK; - Index: x11-drivers/xf86-video-sis/files/patch-src_sis300__accel.c =================================================================== --- x11-drivers/xf86-video-sis/files/patch-src_sis300__accel.c +++ /dev/null @@ -1,85 +0,0 @@ -# Fix warning about shift of signed value -# ---- src/sis300_accel.c.orig 2015-08-29 23:34:25 UTC -+++ src/sis300_accel.c -@@ -100,7 +100,7 @@ SiSSetupForScreenToScreenCopy(ScrnInfoPt - - SiSSetupDSTColorDepth(pSiS->DstColor); - SiSSetupSRCPitch(pSiS->scrnOffset) -- SiSSetupDSTRect(pSiS->scrnOffset, -1) -+ SiSSetupDSTRect(pSiS->scrnOffset, -1U) - - if(trans_color != -1) { - SiSSetupROP(0x0A) -@@ -170,7 +170,7 @@ SiSSetupForSolidFill(ScrnInfoPtr pScrn, - } - } - SiSSetupPATFG(color) -- SiSSetupDSTRect(pSiS->scrnOffset, -1) -+ SiSSetupDSTRect(pSiS->scrnOffset, -1U) - SiSSetupDSTColorDepth(pSiS->DstColor); - SiSSetupROP(SiSGetPatternROP(rop)) - /* SiSSetupCMDFlag(PATFG) - is zero */ -@@ -342,7 +342,7 @@ SiSSetupForSolidLine(ScrnInfoPtr pScrn, - - SiSSetupLineCount(1) - SiSSetupPATFG(color) -- SiSSetupDSTRect(pSiS->scrnOffset, -1) -+ SiSSetupDSTRect(pSiS->scrnOffset, -1U) - SiSSetupDSTColorDepth(pSiS->DstColor); - SiSSetupROP(SiSGetPatternROP(rop)) - SiSSetupCMDFlag(PATFG | LINE) -@@ -419,7 +419,7 @@ SiSSetupForDashedLine(ScrnInfoPtr pScrn, - SISPtr pSiS = SISPTR(pScrn); - - SiSSetupLineCount(1) -- SiSSetupDSTRect(pSiS->scrnOffset, -1) -+ SiSSetupDSTRect(pSiS->scrnOffset, -1U) - SiSSetupDSTColorDepth(pSiS->DstColor); - SiSSetupStyleLow(*pattern) - SiSSetupStyleHigh(*(pattern+4)) -@@ -475,7 +475,7 @@ SiSSetupForMonoPatternFill(ScrnInfoPtr p - { - SISPtr pSiS = SISPTR(pScrn); - -- SiSSetupDSTRect(pSiS->scrnOffset, -1) -+ SiSSetupDSTRect(pSiS->scrnOffset, -1U) - SiSSetupDSTColorDepth(pSiS->DstColor); - SiSSetupMONOPAT(patx,paty) - SiSSetupPATFG(fg) -@@ -593,7 +593,7 @@ SiSSetupForScreenToScreenColorExpand(Scr - SISPtr pSiS = SISPTR(pScrn); - - SiSSetupDSTColorDepth(pSiS->DstColor) -- SiSSetupDSTRect(pSiS->scrnOffset, -1) -+ SiSSetupDSTRect(pSiS->scrnOffset, -1U) - SiSSetupROP(SiSGetCopyROP(rop)) - SiSSetupSRCFG(fg) - /* SiSSetupSRCXY(0,0) */ -@@ -762,7 +762,7 @@ SiSSetupForScanlineCPUToScreenColorExpan - SiSSetupSRCXY(0,0); - SiSSetupROP(SiSGetCopyROP(rop)); - SiSSetupSRCFG(fg); -- SiSSetupDSTRect(pSiS->scrnOffset, -1); -+ SiSSetupDSTRect(pSiS->scrnOffset, -1U); - SiSSetupDSTColorDepth(pSiS->DstColor); - if(bg == -1) { - SiSSetupCMDFlag(TRANSPARENT | -@@ -925,7 +925,7 @@ SiSPrepareSolid(PixmapPtr pPixmap, int a - dstbase = (CARD32)exaGetPixmapOffset(pPixmap) + HEADOFFSET; - - SiSSetupPATFG(fg) -- SiSSetupDSTRect(exaGetPixmapPitch(pPixmap), -1) -+ SiSSetupDSTRect(exaGetPixmapPitch(pPixmap), -1U) - SiSSetupDSTColorDepth(dstcol[pPixmap->drawable.bitsPerPixel >> 4]); - SiSSetupROP(SiSGetPatternROP(alu)) - SiSSetupDSTBase(dstbase) -@@ -988,7 +988,7 @@ SiSPrepareCopy(PixmapPtr pSrcPixmap, Pix - - SiSSetupDSTColorDepth(dstcol[pDstPixmap->drawable.bitsPerPixel >> 4]); - SiSSetupSRCPitch(exaGetPixmapPitch(pSrcPixmap)) -- SiSSetupDSTRect(exaGetPixmapPitch(pDstPixmap), -1) -+ SiSSetupDSTRect(exaGetPixmapPitch(pDstPixmap), -1U) - - SiSSetupROP(SiSGetCopyROP(alu)) - Index: x11-drivers/xf86-video-sis/files/patch-src_sis__dri.c =================================================================== --- x11-drivers/xf86-video-sis/files/patch-src_sis__dri.c +++ /dev/null @@ -1,13 +0,0 @@ -# Correct type in a format string -# ---- src/sis_dri.c.orig 2015-08-29 23:34:25 UTC -+++ src/sis_dri.c -@@ -454,7 +454,7 @@ SISDRIScreenInit(ScreenPtr pScreen) - return FALSE; - } - -- xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] MMIO registers mapped to 0x%0x\n", -+ xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] MMIO registers mapped to 0x%0lx\n", - pSISDRI->regs.handle); - - /* AGP */ Index: x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c =================================================================== --- x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c +++ /dev/null @@ -1,14 +0,0 @@ -# Correct a string that should be const -# Cast away a warning filling a const string -# ---- src/sis_driver.c.orig 2017-01-17 22:45:12 UTC -+++ src/sis_driver.c -@@ -6065,7 +6065,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - free(newm); - break; - } -- strcpy(newm->name, tempm->name); -+ strcpy((char *)newm->name, tempm->name); - if(!pSiS->CRT2pScrn->monitor->Modes) pSiS->CRT2pScrn->monitor->Modes = newm; - if(currentm) { - currentm->next = newm; Index: x11-drivers/xf86-video-sis/pkg-descr =================================================================== --- x11-drivers/xf86-video-sis/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-sis driver. Index: x11-drivers/xf86-video-sis/pkg-plist =================================================================== --- x11-drivers/xf86-video-sis/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/sis_drv.so -share/man/man4/sis.4x.gz Index: x11-drivers/xf86-video-tdfx/Makefile =================================================================== --- x11-drivers/xf86-video-tdfx/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -PORTNAME= xf86-video-tdfx -PORTVERSION= 1.5.0 -PORTREVISION= 4 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org tdfx display driver -WWW= https://www.x.org/ - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= gl xorg-cat:driver -USE_GL= gl - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-tdfx/distinfo =================================================================== --- x11-drivers/xf86-video-tdfx/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1560184337 -SHA256 (xorg/driver/xf86-video-tdfx-1.5.0.tar.bz2) = 2f4580e1f66901dd578d6e1f73df8150fd4b8480eb0c9653d4c5d8e0f8e78561 -SIZE (xorg/driver/xf86-video-tdfx-1.5.0.tar.bz2) = 371315 Index: x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__dri.c =================================================================== --- x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__dri.c +++ /dev/null @@ -1,13 +0,0 @@ -# Correct type in a format string -# ---- src/tdfx_dri.c.orig 2015-02-22 21:25:54 UTC -+++ src/tdfx_dri.c -@@ -454,7 +454,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen - xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap failed, disabling DRI.\n"); - return FALSE; - } -- xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n", -+ xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08lx\n", - pTDFXDRI->regs); - - if (!(TDFXInitVisualConfigs(pScreen))) { Index: x11-drivers/xf86-video-tdfx/pkg-descr =================================================================== --- x11-drivers/xf86-video-tdfx/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-tdfx driver. Index: x11-drivers/xf86-video-tdfx/pkg-plist =================================================================== --- x11-drivers/xf86-video-tdfx/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/tdfx_drv.so -share/man/man4/tdfx.4x.gz Index: x11-drivers/xf86-video-voodoo/Makefile =================================================================== --- x11-drivers/xf86-video-voodoo/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -PORTNAME= xf86-video-voodoo -PORTVERSION= 1.2.5 -PORTREVISION= 13 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org voodoo display driver - -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - -.include Index: x11-drivers/xf86-video-voodoo/distinfo =================================================================== --- x11-drivers/xf86-video-voodoo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8 -SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489 Index: x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h =================================================================== --- x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h +++ /dev/null @@ -1,18 +0,0 @@ -From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Mon, 22 Sep 2014 10:56:02 +1000 -Subject: don't use PCITAG in struct anymore - - ---- src/voodoo.h.orig 2012-07-17 05:21:17 UTC -+++ src/voodoo.h -@@ -23,7 +23,9 @@ typedef struct { - - Bool Voodoo2; /* Set if Voodoo2 */ - pciVideoPtr PciInfo; /* PCI data */ -+#ifndef XSERVER_LIBPCIACCESS - PCITAG PciTag; -+#endif - CARD32 PhysBase; - - CARD32 Width; /* Current width */ Index: x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c =================================================================== --- x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c +++ /dev/null @@ -1,12 +0,0 @@ -# Remove obsolete function call -# ---- src/voodoo_driver.c.orig 2016-11-25 18:37:43 UTC -+++ src/voodoo_driver.c -@@ -680,7 +680,6 @@ VoodooScreenInit(SCREEN_INIT_ARGS_DECL) - if(pVoo->Accel) - Voodoo2XAAInit(pScreen); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - Index: x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c =================================================================== --- x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c +++ /dev/null @@ -1,17 +0,0 @@ -# Fix fubar code that worked by accident -# ---- src/voodoo_hardware.c.orig 2016-11-25 18:41:04 UTC -+++ src/voodoo_hardware.c -@@ -390,10 +390,10 @@ static int voodoo_find_dac(VoodooPtr pVo - device_id = dac_in(pVoo, 2); - - /* AT&T 20C409 and clones */ -- if(vendor_id == DAC_VENDOR_ATT && DAC_DEVICE_ATT20C409) -+ if(vendor_id == DAC_VENDOR_ATT && device_id == DAC_DEVICE_ATT20C409) - return DAC_ID_ATT; - -- if(vendor_id == DAC_VENDOR_TI && DAC_DEVICE_TITVP3409) -+ if(vendor_id == DAC_VENDOR_TI && device_id == DAC_DEVICE_TITVP3409) - return DAC_ID_TI; - - /* ICS5432 doesn't implement the back door. Glide does some Index: x11-drivers/xf86-video-voodoo/pkg-descr =================================================================== --- x11-drivers/xf86-video-voodoo/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-voodoo driver. Index: x11-drivers/xf86-video-voodoo/pkg-plist =================================================================== --- x11-drivers/xf86-video-voodoo/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/drivers/voodoo_drv.so -share/man/man4/voodoo.4x.gz Index: x11-drivers/xorg-drivers/Makefile =================================================================== --- x11-drivers/xorg-drivers/Makefile +++ x11-drivers/xorg-drivers/Makefile @@ -23,30 +23,11 @@ void \ wacom -VIDEO_DRIVERS= apm \ - ark \ - ast \ - chips \ - cirrus \ +VIDEO_DRIVERS= ast \ dummy \ - i128 \ - i740 \ - mach64 \ - mga \ - neomagic \ nv \ - openchrome \ - r128 \ - rendition \ - s3virge \ - savage \ scfb \ - siliconmotion \ - sis \ - tdfx \ - tseng \ - vesa \ - voodoo + vesa OPTIONS_DEFAULT= KEYBOARD \ LIBINPUT \