From owner-svn-ports-all@freebsd.org Thu Sep 17 09:22:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6F0DE3D98BD; Thu, 17 Sep 2020 09:22:30 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BsWhQ2D2Wz3TB6; Thu, 17 Sep 2020 09:22:30 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30CCD27DC5; Thu, 17 Sep 2020 09:22:30 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08H9MU02070517; Thu, 17 Sep 2020 09:22:30 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08H9MTIx070513; Thu, 17 Sep 2020 09:22:29 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202009170922.08H9MTIx070513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Thu, 17 Sep 2020 09:22:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548829 - in head/graphics: mesa-dri mesa-libs X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/graphics: mesa-dri mesa-libs X-SVN-Commit-Revision: 548829 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2020 09:22:30 -0000 Author: manu Date: Thu Sep 17 09:22:29 2020 New Revision: 548829 URL: https://svnweb.freebsd.org/changeset/ports/548829 Log: mesa*: Only add x11 dependancy if it's requested This allow to have a full setup without any x11 deps. PR: 247029 Reviewed by: zeising Approved by: x11 (zeising@) Differential Revision: https://reviews.freebsd.org/D26438 Modified: head/graphics/mesa-dri/Makefile head/graphics/mesa-dri/Makefile.common head/graphics/mesa-libs/Makefile head/graphics/mesa-libs/pkg-plist Modified: head/graphics/mesa-dri/Makefile ============================================================================== --- head/graphics/mesa-dri/Makefile Thu Sep 17 08:58:51 2020 (r548828) +++ head/graphics/mesa-dri/Makefile Thu Sep 17 09:22:29 2020 (r548829) @@ -8,9 +8,6 @@ CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ -USES= xorg -USE_XORG= xorgproto x11 xdamage xext xfixes xshmfence - OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_DRM PLATFORM_SURFACELESS PLATFORM_X11_DESC= Enable X11 support for GBM/EGL @@ -54,8 +51,8 @@ DRI_DRIVERS+= R100 R200 GALLIUM_DRIVERS+= R300 R600 RADEONSI VULKAN_DRIVERS+= AMD . if ${PORT_OPTIONS:MPLATFORM_X11} -USE_XORG+= xv xvmc MESON_ARGS+= -Dgallium-xvmc=true +USE_XORG+= xvmc . endif .endif .if ${ARCH} == amd64 || ${ARCH} == i386 @@ -67,14 +64,14 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_mesa_drivers_dri VULKAN_DRIVERS+= INTEL .endif -.if defined(VULKAN_DRIVERS) -USE_XORG+= xcb xrandr -.endif - LDFLAGS_i386= -Wl,-znotext .if ${PORT_OPTIONS:MPLATFORM_X11} MESA_PLATFORMS+= x11 +USE_XORG+= xorgproto x11 xdamage xext xfixes xshmfence xv +.if defined(VULKAN_DRIVERS) +USE_XORG+= xcb xrandr +.endif .endif .if ${PORT_OPTIONS:MPLATFORM_DRM} Modified: head/graphics/mesa-dri/Makefile.common ============================================================================== --- head/graphics/mesa-dri/Makefile.common Thu Sep 17 08:58:51 2020 (r548828) +++ head/graphics/mesa-dri/Makefile.common Thu Sep 17 09:22:29 2020 (r548829) @@ -33,7 +33,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS+= libexpat.so:textproc/expat2 .if ${COMPONENT} != clover -USES+= xorg +.if ${PORT_OPTIONS:MPLATFORM_X11} +USES+= xorg +.endif .endif .if ${COMPONENT} != osmesa LIB_DEPENDS+= libdrm.so:graphics/libdrm Modified: head/graphics/mesa-libs/Makefile ============================================================================== --- head/graphics/mesa-libs/Makefile Thu Sep 17 08:58:51 2020 (r548828) +++ head/graphics/mesa-libs/Makefile Thu Sep 17 09:22:29 2020 (r548829) @@ -10,10 +10,6 @@ COMMENT= OpenGL libraries that support GLX and EGL cli CONFLICTS_INSTALL= libglvnd # include/GL/gl.h -USES= xorg -USE_XORG= xorgproto x11 xcb xdamage xext \ - xfixes xshmfence xxf86vm xrandr - OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_DRM PLATFORM_SURFACELESS PLATFORM_X11_DESC= Enable X11 support for GBM/EGL @@ -52,6 +48,12 @@ MESON_ARGS+= -Ddri-drivers="swrast" .if ${PORT_OPTIONS:MPLATFORM_X11} MESA_PLATFORMS+= x11 +USE_XORG+= xorgproto x11 xcb xdamage xext \ + xfixes xshmfence xxf86vm xrandr +PLIST_SUB+= GLX="" +.else +MESON_ARGS+= -Dglx=disabled +PLIST_SUB+= GLX="@comment " .endif .if ${PORT_OPTIONS:MPLATFORM_WAYLAND} && ${PORT_OPTIONS:MWAYLAND} Modified: head/graphics/mesa-libs/pkg-plist ============================================================================== --- head/graphics/mesa-libs/pkg-plist Thu Sep 17 08:58:51 2020 (r548828) +++ head/graphics/mesa-libs/pkg-plist Thu Sep 17 09:22:29 2020 (r548829) @@ -7,9 +7,9 @@ include/GL/gl.h include/GL/gl_mangle.h include/GL/glcorearb.h include/GL/glext.h -include/GL/glx.h -include/GL/glx_mangle.h -include/GL/glxext.h +%%GLX%%include/GL/glx.h +%%GLX%%include/GL/glx_mangle.h +%%GLX%%include/GL/glxext.h @comment include/GL/internal/dri_interface.h include/GLES2/gl2.h include/GLES2/gl2ext.h @@ -25,9 +25,9 @@ include/gbm.h lib/libEGL.so lib/libEGL.so.1 lib/libEGL.so.1.0.0 -lib/libGL.so -lib/libGL.so.1 -lib/libGL.so.1.2.0 +%%GLX%%lib/libGL.so +%%GLX%%lib/libGL.so.1 +%%GLX%%lib/libGL.so.1.2.0 lib/libGLESv2.so lib/libGLESv2.so.2 lib/libGLESv2.so.2.0.0 @@ -40,6 +40,6 @@ lib/libglapi.so.0.0.0 @comment libdata/pkgconfig/dri.pc libdata/pkgconfig/egl.pc libdata/pkgconfig/gbm.pc -libdata/pkgconfig/gl.pc +%%GLX%%libdata/pkgconfig/gl.pc libdata/pkgconfig/glesv2.pc @comment share/drirc.d/00-mesa-defaults.conf