Date: Mon, 23 Jan 2017 22:47:24 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432302 - in head/x11-drivers/xf86-video-cirrus: . files Message-ID: <201701232247.v0NMlOnb066156@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jan 23 22:47:24 2017 New Revision: 432302 URL: https://svnweb.freebsd.org/changeset/ports/432302 Log: Import few patches from upstream to allow building with newer xorg Note that those drivers are barely maintained and might disappear in the futur PR: 216281 Submitted by: matthew@reztek.cz Added: head/x11-drivers/xf86-video-cirrus/files/ head/x11-drivers/xf86-video-cirrus/files/patch-Makefile.in (contents, props changed) head/x11-drivers/xf86-video-cirrus/files/patch-git_01_23da607 (contents, props changed) head/x11-drivers/xf86-video-cirrus/files/patch-git_02_82db44f (contents, props changed) head/x11-drivers/xf86-video-cirrus/files/patch-git_03_adaf1fe (contents, props changed) head/x11-drivers/xf86-video-cirrus/files/patch-git_04_27f85fc (contents, props changed) head/x11-drivers/xf86-video-cirrus/files/patch-src_Makefile.in (contents, props changed) head/x11-drivers/xf86-video-cirrus/files/patch-src_alp__driver.c (contents, props changed) head/x11-drivers/xf86-video-cirrus/files/patch-src_lg__driver.c (contents, props changed) Modified: head/x11-drivers/xf86-video-cirrus/Makefile head/x11-drivers/xf86-video-cirrus/pkg-plist Modified: head/x11-drivers/xf86-video-cirrus/Makefile ============================================================================== --- head/x11-drivers/xf86-video-cirrus/Makefile Mon Jan 23 22:43:23 2017 (r432301) +++ head/x11-drivers/xf86-video-cirrus/Makefile Mon Jan 23 22:47:24 2017 (r432302) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-cirrus PORTVERSION= 1.5.3 +PORREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Added: head/x11-drivers/xf86-video-cirrus/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-cirrus/files/patch-Makefile.in Mon Jan 23 22:47:24 2017 (r432302) @@ -0,0 +1,127 @@ +# 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 + Added: head/x11-drivers/xf86-video-cirrus/files/patch-git_01_23da607 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-cirrus/files/patch-git_01_23da607 Mon Jan 23 22:47:24 2017 (r432302) @@ -0,0 +1,37 @@ +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 + Added: head/x11-drivers/xf86-video-cirrus/files/patch-git_02_82db44f ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-cirrus/files/patch-git_02_82db44f Mon Jan 23 22:47:24 2017 (r432302) @@ -0,0 +1,50 @@ +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 + Added: head/x11-drivers/xf86-video-cirrus/files/patch-git_03_adaf1fe ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-cirrus/files/patch-git_03_adaf1fe Mon Jan 23 22:47:24 2017 (r432302) @@ -0,0 +1,87 @@ +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 + Added: head/x11-drivers/xf86-video-cirrus/files/patch-git_04_27f85fc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-cirrus/files/patch-git_04_27f85fc Mon Jan 23 22:47:24 2017 (r432302) @@ -0,0 +1,152 @@ +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 + Added: head/x11-drivers/xf86-video-cirrus/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-cirrus/files/patch-src_Makefile.in Mon Jan 23 22:47:24 2017 (r432302) @@ -0,0 +1,356 @@ +# 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. Added: head/x11-drivers/xf86-video-cirrus/files/patch-src_alp__driver.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-cirrus/files/patch-src_alp__driver.c Mon Jan 23 22:47:24 2017 (r432302) @@ -0,0 +1,13 @@ +# 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) { Added: head/x11-drivers/xf86-video-cirrus/files/patch-src_lg__driver.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-cirrus/files/patch-src_lg__driver.c Mon Jan 23 22:47:24 2017 (r432302) @@ -0,0 +1,13 @@ +# 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 ); Modified: head/x11-drivers/xf86-video-cirrus/pkg-plist ============================================================================== --- head/x11-drivers/xf86-video-cirrus/pkg-plist Mon Jan 23 22:43:23 2017 (r432301) +++ head/x11-drivers/xf86-video-cirrus/pkg-plist Mon Jan 23 22:47:24 2017 (r432302) @@ -1,4 +1,2 @@ -lib/xorg/modules/drivers/cirrus_alpine.so lib/xorg/modules/drivers/cirrus_drv.so -lib/xorg/modules/drivers/cirrus_laguna.so man/man4/cirrus.4x.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701232247.v0NMlOnb066156>