Date: Mon, 23 Feb 2015 14:34:46 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379680 - head/x11-drivers/xorg-drivers Message-ID: <201502231434.t1NEYkG2054730@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Mon Feb 23 14:34:45 2015 New Revision: 379680 URL: https://svnweb.freebsd.org/changeset/ports/379680 QAT: https://qat.redports.org/buildarchive/r379680/ Log: Move ATI driver to be specific to x86. This fixes the xorg build for arm and sparc64. PR: 196858 Submitted by: linimon Reviewed by: sbruno Approved by: maintainer timeout Modified: head/x11-drivers/xorg-drivers/Makefile Modified: head/x11-drivers/xorg-drivers/Makefile ============================================================================== --- head/x11-drivers/xorg-drivers/Makefile Mon Feb 23 14:34:14 2015 (r379679) +++ head/x11-drivers/xorg-drivers/Makefile Mon Feb 23 14:34:45 2015 (r379680) @@ -30,8 +30,7 @@ INPUT_DRIVERS= mouse \ void \ wacom -VIDEO_DRIVERS= ati \ - mach64 \ +VIDEO_DRIVERS= mach64 \ nv \ r128 \ vesa \ @@ -60,7 +59,6 @@ VIDEO_DRIVERS= ati \ OPTIONS_DEFAULT= MOUSE \ KEYBOARD \ - ATI \ MACH64 \ NV \ R128 \ @@ -73,8 +71,8 @@ ${a:tu}_DESC= Install ${a} ${type} drive . endfor .endfor -OPTIONS_DEFINE_i386= INTEL OPENCHROME -OPTIONS_DEFAULT_i386= INTEL OPENCHROME +OPTIONS_DEFINE_i386= ATI INTEL OPENCHROME +OPTIONS_DEFAULT_i386= ATI INTEL OPENCHROME OPTIONS_DEFINE_amd64:= ${OPTIONS_DEFINE_i386} OPTIONS_DEFAULT_amd64:= ${OPTIONS_DEFAULT_i386} @@ -85,6 +83,7 @@ OPTIONS_DEFAULT_sparc64=SUNFFB OPTIONS_DEFINE_ia64= OPENCHROME OPTIONS_DEFAULT_ia64= OPENCHROME +ATI_DESC= Install ati video driver INTEL_DESC= Install intel video driver OPENCHROME_DESC= Install openchrome video driver SUNFFB_DESC= Install sunffb video driver @@ -96,7 +95,7 @@ QUIRKS= keyboard:kbd # Manual add arch specific drivers so they be added to depend lines. .if ${ARCH}==i386 || ${ARCH}==amd64 -VIDEO_DRIVERS+= intel openchrome +VIDEO_DRIVERS+= ati intel openchrome .endif .if ${ARCH}==sparc64
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502231434.t1NEYkG2054730>