From owner-svn-ports-all@freebsd.org Thu Nov 8 20:31:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2222C11046E7; Thu, 8 Nov 2018 20:31:10 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6BE7B6B12E; Thu, 8 Nov 2018 20:31:09 +0000 (UTC) (envelope-from zeising@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 4D2F7197B; Thu, 8 Nov 2018 20:31:09 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8KV9EK049215; Thu, 8 Nov 2018 20:31:09 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8KV8BJ049212; Thu, 8 Nov 2018 20:31:08 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201811082031.wA8KV8BJ049212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 8 Nov 2018 20:31:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484475 - in head/graphics: libepoxy mesa-libs X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/graphics: libepoxy mesa-libs X-SVN-Commit-Revision: 484475 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6BE7B6B12E X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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, 08 Nov 2018 20:31:10 -0000 Author: zeising Date: Thu Nov 8 20:31:08 2018 New Revision: 484475 URL: https://svnweb.freebsd.org/changeset/ports/484475 Log: Enable libEGL for all platforms Enable libEGL build for all platforms, even those without llvm. Previously it was disabled on those platforms. This has been tested on sparc64. Remove the EGL option completely. PR: 232729 Submitted by: jbeich Tested by: Yoshihiko Iwama (sparc64 support) Modified: head/graphics/libepoxy/Makefile head/graphics/libepoxy/pkg-plist head/graphics/mesa-libs/Makefile head/graphics/mesa-libs/pkg-plist Modified: head/graphics/libepoxy/Makefile ============================================================================== --- head/graphics/libepoxy/Makefile Thu Nov 8 20:09:36 2018 (r484474) +++ head/graphics/libepoxy/Makefile Thu Nov 8 20:31:08 2018 (r484475) @@ -13,18 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= localbase meson pkgconfig python:3.3+,build tar:xz USE_XORG= x11 -USE_GL= gl glesv2 +USE_GL= gl glesv2 egl USE_LDCONFIG= yes - -OPTIONS_SUB= yes -OPTIONS_DEFINE= EGL -OPTIONS_DEFAULT=EGL - -OPTIONS_EXCLUDE_sparc64= EGL -OPTIONS_EXCLUDE_mips= EGL - -EGL_DESC= Build EGL support -EGL_USE= GL=egl -EGL_MESON_YES= egl .include Modified: head/graphics/libepoxy/pkg-plist ============================================================================== --- head/graphics/libepoxy/pkg-plist Thu Nov 8 20:09:36 2018 (r484474) +++ head/graphics/libepoxy/pkg-plist Thu Nov 8 20:31:08 2018 (r484475) @@ -1,6 +1,6 @@ include/epoxy/common.h -%%EGL%%include/epoxy/egl.h -%%EGL%%include/epoxy/egl_generated.h +include/epoxy/egl.h +include/epoxy/egl_generated.h include/epoxy/gl.h include/epoxy/gl_generated.h include/epoxy/glx.h Modified: head/graphics/mesa-libs/Makefile ============================================================================== --- head/graphics/mesa-libs/Makefile Thu Nov 8 20:09:36 2018 (r484474) +++ head/graphics/mesa-libs/Makefile Thu Nov 8 20:31:08 2018 (r484475) @@ -3,7 +3,7 @@ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients @@ -24,21 +24,9 @@ WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/way CONFIGURE_ARGS+= --with-dri-drivers="" --with-gallium-drivers="" -# libEGL needs gallium enabled which depends on llvm -.if "${MESA_LLVM_VER}" != "" .if ${PORT_OPTIONS:MWAYLAND} CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm,wayland -.else -CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm .endif -PLIST_SUB+= EGL="" -.else -CONFIGURE_ARGS+= --disable-egl -PLIST_SUB+= EGL="@comment " -.if ${PORT_OPTIONS:MWAYLAND} -IGNORE= option WAYLAND is only valid on platforms with LLVM -.endif -.endif MESA_BUILD_WRKSRC= src/mapi src/util MESA_INSTALL_WRKSRC= src/mapi @@ -51,10 +39,8 @@ MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl MESA_BUILD_WRKSRC+= src/gbm src/glx MESA_INSTALL_WRKSRC+= src/gbm src/glx -.if "${MESA_LLVM_VER}" != "" MESA_BUILD_WRKSRC+= src/egl MESA_INSTALL_WRKSRC+= src/egl -.endif .if ${ARCH} == "i386" # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set Modified: head/graphics/mesa-libs/pkg-plist ============================================================================== --- head/graphics/mesa-libs/pkg-plist Thu Nov 8 20:09:36 2018 (r484474) +++ head/graphics/mesa-libs/pkg-plist Thu Nov 8 20:31:08 2018 (r484475) @@ -1,9 +1,9 @@ @comment etc/drirc -%%EGL%%include/EGL/egl.h -%%EGL%%include/EGL/eglext.h -%%EGL%%include/EGL/eglextchromium.h -%%EGL%%include/EGL/eglmesaext.h -%%EGL%%include/EGL/eglplatform.h +include/EGL/egl.h +include/EGL/eglext.h +include/EGL/eglextchromium.h +include/EGL/eglmesaext.h +include/EGL/eglplatform.h include/GL/gl.h include/GL/gl_mangle.h include/GL/glcorearb.h @@ -19,11 +19,11 @@ include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3ext.h include/GLES3/gl3platform.h -%%EGL%%include/KHR/khrplatform.h +include/KHR/khrplatform.h include/gbm.h -%%EGL%%lib/libEGL.so -%%EGL%%lib/libEGL.so.1 -%%EGL%%lib/libEGL.so.1.0.0 +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 @@ -39,7 +39,7 @@ lib/libglapi.so.0.0.0 @comment %%WAYLAND%%lib/libwayland-egl.so @comment %%WAYLAND%%lib/libwayland-egl.so.1 @comment %%WAYLAND%%lib/libwayland-egl.so.1.0.0 -%%EGL%%libdata/pkgconfig/egl.pc +libdata/pkgconfig/egl.pc libdata/pkgconfig/gbm.pc libdata/pkgconfig/gl.pc libdata/pkgconfig/glesv2.pc