Date: Mon, 1 Jul 2024 08:15:12 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 02367ff2b24b - main - x11-drivers: Remove old video drivers Message-ID: <202407010815.4618FCOb068553@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=02367ff2b24b72940b92f7d876deddfbb08cdf33 commit 02367ff2b24b72940b92f7d876deddfbb08cdf33 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2024-06-26 12:51:03 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2024-07-01 08:13:58 +0000 x11-drivers: Remove old video drivers Remove drivers for ancient hardware. Differential Revision: https://reviews.freebsd.org/D45741 Reviewed by: bapt Sponsored by: Beckhoff Automation GmbH & Co. KG --- x11-drivers/Makefile | 18 -- x11-drivers/xf86-video-apm/Makefile | 13 - x11-drivers/xf86-video-apm/distinfo | 3 - x11-drivers/xf86-video-apm/pkg-descr | 1 - x11-drivers/xf86-video-apm/pkg-plist | 2 - x11-drivers/xf86-video-ark/Makefile | 11 - x11-drivers/xf86-video-ark/distinfo | 2 - .../xf86-video-ark/files/patch-src_ark__driver.c | 18 -- x11-drivers/xf86-video-ark/pkg-descr | 1 - x11-drivers/xf86-video-ark/pkg-plist | 1 - x11-drivers/xf86-video-chips/Makefile | 14 - x11-drivers/xf86-video-chips/distinfo | 3 - x11-drivers/xf86-video-chips/pkg-descr | 1 - x11-drivers/xf86-video-chips/pkg-plist | 2 - x11-drivers/xf86-video-cirrus/Makefile | 13 - x11-drivers/xf86-video-cirrus/distinfo | 2 - .../xf86-video-cirrus/files/patch-Makefile.in | 127 -------- .../xf86-video-cirrus/files/patch-git_01_23da607 | 37 --- .../xf86-video-cirrus/files/patch-git_02_82db44f | 50 --- .../xf86-video-cirrus/files/patch-git_03_adaf1fe | 87 ----- .../xf86-video-cirrus/files/patch-git_04_27f85fc | 152 --------- .../xf86-video-cirrus/files/patch-src_Makefile.in | 356 --------------------- .../files/patch-src_alp__driver.c | 13 - .../xf86-video-cirrus/files/patch-src_lg__driver.c | 13 - x11-drivers/xf86-video-cirrus/pkg-descr | 1 - x11-drivers/xf86-video-cirrus/pkg-plist | 2 - x11-drivers/xf86-video-geode/Makefile | 18 -- x11-drivers/xf86-video-geode/distinfo | 3 - .../xf86-video-geode/files/patch-src_geode.h | 34 -- .../xf86-video-geode/files/patch-src_gx__video.c | 11 - .../xf86-video-geode/files/patch-src_lx__driver.c | 11 - .../xf86-video-geode/files/patch-src_panel.c | 11 - .../xf86-video-geode/files/patch-src_panel_panel.c | 11 - x11-drivers/xf86-video-geode/pkg-descr | 1 - x11-drivers/xf86-video-geode/pkg-plist | 1 - x11-drivers/xf86-video-i128/Makefile | 14 - x11-drivers/xf86-video-i128/distinfo | 3 - x11-drivers/xf86-video-i128/pkg-descr | 1 - x11-drivers/xf86-video-i128/pkg-plist | 2 - x11-drivers/xf86-video-i740/Makefile | 14 - x11-drivers/xf86-video-i740/distinfo | 3 - x11-drivers/xf86-video-i740/pkg-descr | 1 - x11-drivers/xf86-video-i740/pkg-plist | 2 - x11-drivers/xf86-video-mach64/Makefile | 12 - x11-drivers/xf86-video-mach64/distinfo | 3 - x11-drivers/xf86-video-mach64/pkg-descr | 1 - x11-drivers/xf86-video-mach64/pkg-plist | 1 - x11-drivers/xf86-video-mga/Makefile | 16 - x11-drivers/xf86-video-mga/distinfo | 3 - .../xf86-video-mga/files/patch-src_mga__dac3026.c | 15 - .../xf86-video-mga/files/patch-src_mga__dri.c | 22 -- x11-drivers/xf86-video-mga/pkg-descr | 1 - x11-drivers/xf86-video-mga/pkg-plist | 2 - x11-drivers/xf86-video-neomagic/Makefile | 14 - x11-drivers/xf86-video-neomagic/distinfo | 3 - .../files/patch-src_neo__driver.c | 13 - x11-drivers/xf86-video-neomagic/pkg-descr | 1 - x11-drivers/xf86-video-neomagic/pkg-plist | 2 - x11-drivers/xf86-video-openchrome/Makefile | 38 --- x11-drivers/xf86-video-openchrome/distinfo | 3 - .../xf86-video-openchrome/files/patch-configure | 11 - .../xf86-video-openchrome/files/patch-edb4657.c | 41 --- x11-drivers/xf86-video-openchrome/pkg-descr | 1 - x11-drivers/xf86-video-openchrome/pkg-plist | 8 - x11-drivers/xf86-video-r128/Makefile | 17 - x11-drivers/xf86-video-r128/distinfo | 3 - .../xf86-video-r128/files/patch-src_r128__dri.c | 94 ------ x11-drivers/xf86-video-r128/pkg-descr | 1 - x11-drivers/xf86-video-r128/pkg-plist | 2 - x11-drivers/xf86-video-rendition/Makefile | 14 - x11-drivers/xf86-video-rendition/distinfo | 3 - .../files/patch-src_rendition.c | 13 - x11-drivers/xf86-video-rendition/pkg-descr | 1 - x11-drivers/xf86-video-rendition/pkg-plist | 4 - x11-drivers/xf86-video-savage/Makefile | 27 -- x11-drivers/xf86-video-savage/distinfo | 5 - .../files/patch-src_savage__dri.c | 13 - .../files/patch-src_savage__video.c | 17 - x11-drivers/xf86-video-savage/pkg-descr | 1 - x11-drivers/xf86-video-savage/pkg-plist | 2 - x11-drivers/xf86-video-siliconmotion/Makefile | 18 -- x11-drivers/xf86-video-siliconmotion/distinfo | 3 - x11-drivers/xf86-video-siliconmotion/pkg-descr | 1 - x11-drivers/xf86-video-siliconmotion/pkg-plist | 2 - x11-drivers/xf86-video-sis/Makefile | 17 - x11-drivers/xf86-video-sis/distinfo | 3 - .../xf86-video-sis/files/patch-src_init301.c | 25 -- .../xf86-video-sis/files/patch-src_initextx.c | 33 -- .../xf86-video-sis/files/patch-src_sis300__accel.c | 85 ----- .../xf86-video-sis/files/patch-src_sis__dri.c | 13 - .../xf86-video-sis/files/patch-src_sis__driver.c | 14 - x11-drivers/xf86-video-sis/pkg-descr | 1 - x11-drivers/xf86-video-sis/pkg-plist | 2 - x11-drivers/xf86-video-tdfx/Makefile | 18 -- x11-drivers/xf86-video-tdfx/distinfo | 3 - .../xf86-video-tdfx/files/patch-src_tdfx__dri.c | 13 - x11-drivers/xf86-video-tdfx/pkg-descr | 1 - x11-drivers/xf86-video-tdfx/pkg-plist | 2 - x11-drivers/xf86-video-voodoo/Makefile | 13 - x11-drivers/xf86-video-voodoo/distinfo | 2 - .../xf86-video-voodoo/files/patch-src_voodoo.h | 18 -- .../files/patch-src_voodoo__driver.c | 12 - .../files/patch-src_voodoo__hardware.c | 17 - x11-drivers/xf86-video-voodoo/pkg-descr | 1 - x11-drivers/xf86-video-voodoo/pkg-plist | 2 - x11-drivers/xorg-drivers/Makefile | 23 +- 106 files changed, 2 insertions(+), 1852 deletions(-) diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile index 1021e135a245..688416d9f60a 100644 --- a/x11-drivers/Makefile +++ b/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 diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile deleted file mode 100644 index 3695866cfecb..000000000000 --- a/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 <bsd.port.mk> diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo deleted file mode 100644 index 7fd22899a5b4..000000000000 --- a/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 diff --git a/x11-drivers/xf86-video-apm/pkg-descr b/x11-drivers/xf86-video-apm/pkg-descr deleted file mode 100644 index 0ef8131f3e5c..000000000000 --- a/x11-drivers/xf86-video-apm/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-apm driver. diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist deleted file mode 100644 index f9ac98a2d901..000000000000 --- a/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 diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile deleted file mode 100644 index 50fa13dfdeff..000000000000 --- a/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 <bsd.port.mk> diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo deleted file mode 100644 index bbd43c721722..000000000000 --- a/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 diff --git a/x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c b/x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c deleted file mode 100644 index d83c651e9f70..000000000000 --- a/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) { diff --git a/x11-drivers/xf86-video-ark/pkg-descr b/x11-drivers/xf86-video-ark/pkg-descr deleted file mode 100644 index 46a0bec750e4..000000000000 --- a/x11-drivers/xf86-video-ark/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-ark driver. diff --git a/x11-drivers/xf86-video-ark/pkg-plist b/x11-drivers/xf86-video-ark/pkg-plist deleted file mode 100644 index 4e7dfa5dde94..000000000000 --- a/x11-drivers/xf86-video-ark/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/xorg/modules/drivers/ark_drv.so diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile deleted file mode 100644 index 1d3838c689f5..000000000000 --- a/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 <bsd.port.mk> diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo deleted file mode 100644 index 44a1d1b68851..000000000000 --- a/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 diff --git a/x11-drivers/xf86-video-chips/pkg-descr b/x11-drivers/xf86-video-chips/pkg-descr deleted file mode 100644 index 089bc9a5bf98..000000000000 --- a/x11-drivers/xf86-video-chips/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This package contains the X.Org xf86-video-chips driver. diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist deleted file mode 100644 index 0bed21292b18..000000000000 --- a/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 diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile deleted file mode 100644 index e4133e4bb8a1..000000000000 --- a/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 <bsd.port.mk> diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo deleted file mode 100644 index 4360800ad435..000000000000 --- a/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 diff --git a/x11-drivers/xf86-video-cirrus/files/patch-Makefile.in b/x11-drivers/xf86-video-cirrus/files/patch-Makefile.in deleted file mode 100644 index 603fc16f49f0..000000000000 --- a/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 - diff --git a/x11-drivers/xf86-video-cirrus/files/patch-git_01_23da607 b/x11-drivers/xf86-video-cirrus/files/patch-git_01_23da607 deleted file mode 100644 index 5b814dfc35e2..000000000000 --- a/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 <sndirsch@suse.de> -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" <ajax@redhat.com> - -http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-drv-cirrus.git/tree/cirrus-1.2.0-qemu.patch?id=daccd1c8174623500eddfa297d8ea76a86d3c5d9 - -Reviewed-by: Adam Jackson <ajax@redhat.com> - -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 - diff --git a/x11-drivers/xf86-video-cirrus/files/patch-git_02_82db44f b/x11-drivers/xf86-video-cirrus/files/patch-git_02_82db44f deleted file mode 100644 index acba7295f3d6..000000000000 --- a/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 <fcrozat@suse.com> -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 <ajax@redhat.com> - -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 - diff --git a/x11-drivers/xf86-video-cirrus/files/patch-git_03_adaf1fe b/x11-drivers/xf86-video-cirrus/files/patch-git_03_adaf1fe deleted file mode 100644 index e1a0db179903..000000000000 --- a/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 <ajax@redhat.com> -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 <jcristau@debian.org> -Signed-off-by: Adam Jackson <ajax@redhat.com> - -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 - diff --git a/x11-drivers/xf86-video-cirrus/files/patch-git_04_27f85fc b/x11-drivers/xf86-video-cirrus/files/patch-git_04_27f85fc deleted file mode 100644 index 5868e8497cf1..000000000000 --- a/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 <ajax@redhat.com> -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 <jcristau@debian.org> -Signed-off-by: Adam Jackson <ajax@redhat.com> - -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 - diff --git a/x11-drivers/xf86-video-cirrus/files/patch-src_Makefile.in b/x11-drivers/xf86-video-cirrus/files/patch-src_Makefile.in deleted file mode 100644 index 4562b73db2c2..000000000000 --- a/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 \ *** 1652 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407010815.4618FCOb068553>