diff --git a/graphics/egl-wayland/Makefile b/graphics/egl-wayland/Makefile index 13480b03c596..b787cd9a382e 100644 --- a/graphics/egl-wayland/Makefile +++ b/graphics/egl-wayland/Makefile @@ -1,32 +1,30 @@ PORTNAME= egl-wayland DISTVERSION= 1.1.8 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= EGLStream-based Wayland external platform LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= eglexternalplatform>=1.1:graphics/eglexternalplatform \ wayland-protocols>=1.8:graphics/wayland-protocols LIB_DEPENDS= libwayland-server.so:graphics/wayland USES= gl meson pkgconfig USE_GITHUB= yes USE_GL= egl USE_LDCONFIG= yes GH_ACCOUNT= NVIDIA -GH_TUPLE= KhronosGroup:EGL-Registry:745e9ad:egl_registry -CPPFLAGS+= -I${WRKSRC_egl_registry}/api -isystem${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e "/install/s/datadir')/prefix'), 'libdata'/" \ ${WRKSRC}/meson.build post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/egl/egl_external_platform.d ${INSTALL_DATA} ${FILESDIR}/10_nvidia_wayland.json \ ${STAGEDIR}${PREFIX}/share/egl/egl_external_platform.d .include diff --git a/graphics/egl-wayland/distinfo b/graphics/egl-wayland/distinfo index 8fe347ee882f..10df7a0f4bfa 100644 --- a/graphics/egl-wayland/distinfo +++ b/graphics/egl-wayland/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1630704333 SHA256 (NVIDIA-egl-wayland-1.1.8_GH0.tar.gz) = 12bee9accf121987b0f0d6fb1a4e3b1fc5855b116c50d8d9e035edd02c82f88c SIZE (NVIDIA-egl-wayland-1.1.8_GH0.tar.gz) = 53776 -SHA256 (KhronosGroup-EGL-Registry-745e9ad_GH0.tar.gz) = 062ee7f4e30a867c6d6657bfe8b605536a176c8856136dfb26c9b96f326aeb07 -SIZE (KhronosGroup-EGL-Registry-745e9ad_GH0.tar.gz) = 3359483 diff --git a/graphics/libglvnd/Makefile b/graphics/libglvnd/Makefile index b800d65cecf4..a9519a8472cb 100644 --- a/graphics/libglvnd/Makefile +++ b/graphics/libglvnd/Makefile @@ -1,41 +1,39 @@ PORTNAME= libglvnd -DISTVERSION= 1.3.3 +DISTVERSION= 1.3.4 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org COMMENT= GL Vendor-Neutral Dispatch library LICENSE= APACHE20 MIT LICENSE_COMB= multi USES= localbase meson pkgconfig USE_LDCONFIG= yes USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= glvnd -GL_COMMIT= 0f0d49f0f3707f26f68bc44f4cd83144f5f4de86 +GL_COMMIT= dc084876b411366c3785b7584c216356169bb45e OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 OPTIONS_SUB= yes X11_USES= xorg X11_USE= XORG=x11,xext,xorgproto X11_MESON_ENABLED= x11 glx .include .if ${ARCH:Mpowerpc64*} USES+= compiler:gcc-c++11-lib .else USES+= compiler:c++11-lib .endif # Lots of software expects gl.pc even when it can build with EGL only post-install-X11-off: ${LN} -s opengl.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gl.pc - ${REINPLACE_CMD} -e '/Cflags:/s/$$/ -DEGL_NO_X11/' \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/egl.pc .include diff --git a/graphics/libglvnd/distinfo b/graphics/libglvnd/distinfo index 610d503982e8..93226dff4d7d 100644 --- a/graphics/libglvnd/distinfo +++ b/graphics/libglvnd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624059166 -SHA256 (glvnd-libglvnd-0f0d49f0f3707f26f68bc44f4cd83144f5f4de86_GL0.tar.gz) = 43cf21a51b7a61fb026c159a465cb3b03e2c36738d49fa75cfe2308061f4d4f1 -SIZE (glvnd-libglvnd-0f0d49f0f3707f26f68bc44f4cd83144f5f4de86_GL0.tar.gz) = 1032700 +TIMESTAMP = 1630808413 +SHA256 (glvnd-libglvnd-dc084876b411366c3785b7584c216356169bb45e_GL0.tar.gz) = 9a9ac76b6302d2b58abb9c6df76164c8f7ede4beaccadd450569055694c00490 +SIZE (glvnd-libglvnd-dc084876b411366c3785b7584c216356169bb45e_GL0.tar.gz) = 1033875 diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 05f8024822ed..02aaa96d3ba1 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,103 +1,104 @@ PORTNAME= wlroots DISTVERSION= 0.14.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 7c0e2a271a4c.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064 PATCHFILES+= 55a8d225cf8c.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland>=1.18:graphics/wayland \ wayland-protocols>=1.17:graphics/wayland-protocols LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= libudev-devd>=0.4.1:devel/libudev-devd USES= compiler:c11 gl meson pkgconfig xorg USE_GITHUB= yes USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GH_ACCOUNT= swaywm MESON_ARGS= -Dexamples=false -Drenderers=${RENDERERS:ts,} OPTIONS_DEFINE= NVIDIA OPENGL VULKAN X11 OPTIONS_DEFAULT=OPENGL VULKAN X11 OPTIONS_SUB= yes NVIDIA_DESC= EGLStreams support for DRM backend (experimental) NVIDIA_PATCH_SITES= https://github.com/danvd/${GH_PROJECT}-eglstreams/commit/:nvidia NVIDIA_PATCHFILES= d9acdb6b21ec.patch:-p1:nvidia # https://github.com/swaywm/wlroots/pull/2769 NVIDIA_IMPLIES= OPENGL .if make(makesum) .MAKEFLAGS: WITH+=NVIDIA .endif OPENGL_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri OPENGL_USE= GL=egl,glesv2 OPENGL_VARS= RENDERERS+=gles2 VULKAN_DESC= Vulkan renderer (experimental) VULKAN_PATCHFILES+= 8c700c534556.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 0464af8573f9.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= e3e9250ea6d8.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 1af1d1694195.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 93319aa2b633.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 0028938735d1.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 6885b636508c.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 76534695a8d3.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 445142e6a1f9.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= f029ae1dac4b.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= ad1fab0b3704.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 4407b8e5a3a7.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= e021c068d02f.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 2cc710bda83c.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= f0888604d6ce.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 4fdd5efc9260.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 59c119829f1c.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= cfbd8aa6cf24.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 3f6dbe428e8b.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= a83943798aef.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= f64a98d49d25.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 9885ccb4b0b1.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 71f9f33e3bf2.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= bd8c520dbd9a.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 2d89dc9b8651.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 8f9aeda46d8a.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= e3d16970433f.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 79f10d929b72.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= 1a16e8fc56a9.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_PATCHFILES+= dd039c56d93a.patch:-p1 # https://github.com/swaywm/wlroots/pull/2771 VULKAN_BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri VULKAN_USES= localbase # Silence -Werror=undef in VULKAN_VARS= RENDERERS+=vulkan VULKAN_PLIST_FILES= include/wlr/types/wlr_drm.h \ %%VULKAN%%include/wlr/render/vulkan.h X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm X11_BUILD_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel X11_USE= XORG=xcb X11_MESON_ENABLED= x11-backend xwayland post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} "/STR/s/meson.project_version()/'${DISTVERSIONFULL}'/" \ ${WRKSRC}/include/wlr/meson.build .include