Date: Thu, 2 Jan 2020 06:01:57 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521798 - head/emulators/wine-devel Message-ID: <202001020601.00261vYr014404@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Thu Jan 2 06:01:57 2020 New Revision: 521798 URL: https://svnweb.freebsd.org/changeset/ports/521798 Log: Make sure we employ USES=xorg only when X11/Xorg are actually used, much as we have had this for USE_XORG and USE_GL for a while. Without this building with option X11 off actually fails now due to increased checks in the FreeBSD ports infrastructure. PR: 242996 Reported by: Patrick McMunn <doctorwhoguy@gmail.com> Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Thu Jan 2 05:52:17 2020 (r521797) +++ head/emulators/wine-devel/Makefile Thu Jan 2 06:01:57 2020 (r521798) @@ -24,7 +24,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ LIB_DEPENDS= libFAudio.so:audio/faudio \ libxml2.so:textproc/libxml2 -USES= bison desktop-file-utils gmake localbase shebangfix tar:xz xorg +USES= bison desktop-file-utils gmake localbase shebangfix tar:xz CONFLICTS_INSTALL= wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* @@ -113,7 +113,7 @@ VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loade WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML X11_CONFIGURE_WITH= x cms fontconfig freetype glu jpeg opengl png xinerama xinput2 xrandr xrender -X11_USES= gl jpeg +X11_USES= gl jpeg xorg X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001020601.00261vYr014404>