diff --git a/graphics/libliftoff/Makefile b/graphics/libliftoff/Makefile index 169aa80e901a..eb7d26927c01 100644 --- a/graphics/libliftoff/Makefile +++ b/graphics/libliftoff/Makefile @@ -1,21 +1,21 @@ PORTNAME= libliftoff DISTVERSIONPREFIX= v -DISTVERSION= 0.4.1 +DISTVERSION= 0.5.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Lightweight KMS plane library WWW= https://gitlab.freedesktop.org/emersion/libliftoff LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libdrm.so:graphics/libdrm USES= compiler:c11 meson pkgconfig USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= emersion .include diff --git a/graphics/libliftoff/distinfo b/graphics/libliftoff/distinfo index d04e6096835b..96035265aae7 100644 --- a/graphics/libliftoff/distinfo +++ b/graphics/libliftoff/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678041375 -SHA256 (libliftoff-v0.4.1.tar.bz2) = 2ec4a6b467dda20476acb4d6bd864538ccdaa946e8666f96efa98156bf25cfb5 -SIZE (libliftoff-v0.4.1.tar.bz2) = 30107 +TIMESTAMP = 1716848560 +SHA256 (libliftoff-v0.5.0.tar.bz2) = 2ed21be3c563b129bd8f188195a23256017e15908c195f3edcd3697584caf1c8 +SIZE (libliftoff-v0.5.0.tar.bz2) = 31999 diff --git a/graphics/libliftoff/files/patch-layer.c b/graphics/libliftoff/files/patch-layer.c new file mode 100644 index 000000000000..b26aea545b03 --- /dev/null +++ b/graphics/libliftoff/files/patch-layer.c @@ -0,0 +1,13 @@ +https://gitlab.freedesktop.org/emersion/libliftoff/-/issues/80 + +--- layer.c.orig 2024-05-27 22:22:40 UTC ++++ layer.c +@@ -73,7 +73,7 @@ layer_get_property(struct liftoff_layer *layer, const + + core_prop_idx = core_property_index(name); + if (core_prop_idx >= 0) { +- return layer_get_core_property(layer, core_prop_idx); ++ return layer_get_core_property(layer, (enum liftoff_core_property)core_prop_idx); + } + + for (i = 0; i < layer->props_len; i++) { diff --git a/graphics/libliftoff/pkg-plist b/graphics/libliftoff/pkg-plist index 5e03585a03c3..3e06ad5ce270 100644 --- a/graphics/libliftoff/pkg-plist +++ b/graphics/libliftoff/pkg-plist @@ -1,5 +1,5 @@ include/libliftoff.h lib/libliftoff.so lib/libliftoff.so.0 -lib/libliftoff.so.0.4.1 +lib/libliftoff.so.0.5.0 libdata/pkgconfig/libliftoff.pc diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index baea494c8a8b..1042b32fc9e5 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,88 +1,89 @@ PORTNAME= wlroots DISTVERSION= 0.17.0-312 DISTVERSIONSUFFIX= -gb1b34cd665 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel PATCH_SITES+= https://github.com/hyprwm/wlroots-hyprland/raw/5c1d51c5a279/patches/:hyprland PATCHFILES+= surface-nondivisible-by-scale.patch:-p1:hyprland PATCHFILES+= nvidia-hardware-cursors.patch:-p1:hyprland PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ +PATCHFILES+= cc6a7a04418f.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4697 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library (development snapshot) WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.33:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" .endif OPTIONS_DEFINE= DRM OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ hwdata>0:misc/hwdata DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ libliftoff.so:graphics/libliftoff \ libdisplay-info.so:sysutils/libdisplay-info \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput DRM_MESON_ENABLED= session DRM_VARS= BACKENDS+="drm libinput" OPENGL_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri OPENGL_USE= GL=egl,glesv2 OPENGL_VARS= RENDERERS+=gles2 VULKAN_DESC= Vulkan renderer 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_VARS= RENDERERS+=vulkan 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= evdev-proto>0:devel/evdev-proto \ Xwayland:x11-servers/xwayland X11_RUN_DEPENDS= Xwayland:x11-servers/xwayland X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 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 # XXX Drop after FreeBSD 12.4 EOL around 2023-12-31 # https://cgit.freebsd.org/src/commit/?id=d7535fb3e3cb @if [ ${OPSYS} = FreeBSD -a ${OSVERSION} -lt 1300515 ]; then \ ${REINPLACE_CMD} -e '/POSIX/s/199309/200112/' \ ${WRKSRC}/render/gles2/pass.c \ ${WRKSRC}/render/gles2/renderer.c \ ${WRKSRC}/types/wlr_presentation_time.c; \ fi .include diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index 00a5768fecd7..05e622c6953c 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,7 +1,9 @@ TIMESTAMP = 1712827443 SHA256 (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = e9eb70ecddce0030b26b595d368cee15559febe1b8121de6bc6d5ec8bf95ccef SIZE (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = 458003 SHA256 (surface-nondivisible-by-scale.patch) = e9b9f9a537090627ea4fac0b5a101d8ffedf2b399465889b225c694645b4c173 SIZE (surface-nondivisible-by-scale.patch) = 1778 SHA256 (nvidia-hardware-cursors.patch) = ed4720310d61068b24ebd4a30767556cb7590acfd5c66c95d7408a0c95539dbc SIZE (nvidia-hardware-cursors.patch) = 12545 +SHA256 (cc6a7a04418f.patch) = eb2bf98b372b668f773dbb1e3108bff16fefcc51be148775e6517ea4c9d35d83 +SIZE (cc6a7a04418f.patch) = 1291 diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index a23624eeb135..3f05abdfc85c 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,68 +1,70 @@ PORTNAME= wlroots DISTVERSION= 0.17.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits +PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github +PATCHFILES+= 7f9bc2d1e0b8.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4697 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.32:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} OPTIONS_DEFINE= DRM OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_BUILD_DEPENDS= hwdata>0:misc/hwdata DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ libliftoff.so:graphics/libliftoff \ libdisplay-info.so:sysutils/libdisplay-info \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput DRM_MESON_ENABLED= session DRM_VARS= BACKENDS+="drm libinput" OPENGL_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri OPENGL_USE= GL=egl,glesv2 OPENGL_VARS= RENDERERS+=gles2 VULKAN_DESC= Vulkan renderer 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_VARS= RENDERERS+=vulkan 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= evdev-proto>0:devel/evdev-proto \ Xwayland:x11-servers/xwayland X11_RUN_DEPENDS= Xwayland:x11-servers/xwayland X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 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 diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index dd7d2612b796..571f03c57ef7 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1714156372 SHA256 (wlroots-0.17.3.tar.bz2) = b916d9574367373d42334ea12ea3cead27ebc3b8de3bea375619e537d86b0757 SIZE (wlroots-0.17.3.tar.bz2) = 453887 +SHA256 (7f9bc2d1e0b8.patch) = 5633882f28ffe898adea6e2dbc14d9bcc73136445363957692bf1399025cae11 +SIZE (7f9bc2d1e0b8.patch) = 1257 diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 731b5aaf759c..2e82050900c3 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,103 +1,105 @@ PORTNAME= gamescope DISTVERSION= 3.13.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/ValveSoftware/gamescope/issues/120 PATCHFILES+= 4a067fb4ebe2.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/678 PATCHFILES+= 243582c0c762.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1057 +PATCHFILES+= 4a4fb1b53133.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1296 +PATCHFILES+= a9199c2097ff.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1323 MAINTAINER= jbeich@FreeBSD.org COMMENT= SteamOS session compositing window manager WWW= https://github.com/ValveSoftware/gamescope LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \ glm>0:math/glm \ hwdata>0:misc/hwdata LIB_DEPENDS= libdrm.so:graphics/libdrm \ libliftoff.so:graphics/libliftoff \ libvulkan.so:graphics/vulkan-loader \ libwayland-server.so:graphics/wayland \ libdisplay-info.so:sysutils/libdisplay-info \ libwlroots.so:x11-toolkits/wlroots \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hwdata>0:misc/hwdata USES= cmake:indirect compiler:c++11-lib meson pkgconfig sdl xorg USE_GITHUB= yes USE_SDL= sdl2 USE_XORG= x11 xcb xcomposite xdamage xext xfixes xmu xrender xres xtst xxf86vm GH_ACCOUNT= ValveSoftware GH_TUPLE= nothings:stb:5736b15:stb/subprojects/stb \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:spirv_headers/thirdparty/SPIRV-Headers \ Joshua-Ashton:reshade:v4.4.2-2572-g9fdbea68:reshade/src/reshade \ Joshua-Ashton:vkroots:d5ef31a:vkroots/subprojects/vkroots MESON_ARGS= --force-fallback-for= # allow system wlroots + libliftoff MESON_ARGS+= -Dbenchmark=disabled # gamescope_color_microbench isn't installed MESON_ARGS+= -Denable_openvr_support=false # https://github.com/ValveSoftware/openvr/pull/564 MESON_ARCH_FAMILY= ${ARCH:S/amd/x86_/:S/i3/x/:C/v[67]//:S/power/p/:S/le$//} PLIST_FILES= bin/${PORTNAME} \ lib/libVkLayer_FROG_${PORTNAME}_wsi_${MESON_ARCH_FAMILY}.so \ share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.${MESON_ARCH_FAMILY}.json CXXFLAGS+= -DGLM_ENABLE_EXPERIMENTAL # GLM_GTX_string_cast is an experimental extension # https://github.com/freebsd/drm-kmod/issues/271 PORTSCOUT= ignore:1 OPTIONS_DEFINE= PIPEWIRE OPTIONS_DEFAULT=PIPEWIRE PIPEWIRE_DESC= Screen capture via PipeWire PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_MESON_ENABLED= pipewire post-extract: # Merge patch_directory for subprojects without meson.build @(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..) .if defined(PATCHFILES) && ${PATCHFILES:M4a067fb4ebe2*} # Pretend to be a regular file for vendor patch to apply as is @${RMDIR} ${WRKSRC}/subprojects/wlroots @${ECHO_CMD} "Subproject commit 1712a7d27444d62f8da8eeedf0840b386a810e96" \ >${WRKSRC}/subprojects/wlroots .endif .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif # XXX Drop after FreeBSD 13.2 EOL around 2024-07-01 (don't forget distinfo) .if ${CXX} == c++ && exists(/usr/lib/libc++.so) .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch) BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core USES+= llvm:min=16,build,export PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" # XXX Move into separate port and standardize via USES GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 # Don't link against new libc++ as it's not necessary CXXFLAGS+= -D_LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY #LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt pre-configure: bundled-libcxx bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build .endif .endif # exists(/usr/lib/libc++.so) .include diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 74984976f64f..69b4c2051502 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -1,19 +1,23 @@ TIMESTAMP = 1700602830 SHA256 (ValveSoftware-gamescope-3.13.8_GH0.tar.gz) = 660120f41aa5fb62d4d5f467751470add3897d305dae480cf27d6d49ae2d4817 SIZE (ValveSoftware-gamescope-3.13.8_GH0.tar.gz) = 476534 SHA256 (nothings-stb-5736b15_GH0.tar.gz) = 8e18fa73396a3206129c55a3bc409401353991470245941d6ba7d8ce57df864f SIZE (nothings-stb-5736b15_GH0.tar.gz) = 1392565 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-316-gd790ced_GH0.tar.gz) = 4677f51365937acb78df4067359d32742c5c649f2beb8f8afb7e1002329cea46 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-316-gd790ced_GH0.tar.gz) = 463700 SHA256 (Joshua-Ashton-reshade-v4.4.2-2572-g9fdbea68_GH0.tar.gz) = 2a7f854ad30674ab45889aa9d1727f1904a2ee21dbf944727c31ef21e1fd0c7b SIZE (Joshua-Ashton-reshade-v4.4.2-2572-g9fdbea68_GH0.tar.gz) = 1543155 SHA256 (Joshua-Ashton-vkroots-d5ef31a_GH0.tar.gz) = 477dd5f6f6d87e842de342d4accdecdb4742cb4c842f1b8fefd6534618614edf SIZE (Joshua-Ashton-vkroots-d5ef31a_GH0.tar.gz) = 333004 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 SHA256 (a618ea074660.patch) = 346c8012489b58b1ee37e648694ca1d384de39ace61ae2771de5e166e0eec010 SIZE (a618ea074660.patch) = 2591 SHA256 (4a067fb4ebe2.patch) = fb12df8318e06a77ead4aa5752e32eec48efc70de43f069369a4c6a83a590152 SIZE (4a067fb4ebe2.patch) = 4823 SHA256 (243582c0c762.patch) = c7de00de34682207df64e43a235cbaa2fd5332b5e1bb647d6dcee668971a5249 SIZE (243582c0c762.patch) = 3710 +SHA256 (4a4fb1b53133.patch) = 5d984f71a4d60113f8096893462e7bbb7bda01d667d80055c2a2022bacef5914 +SIZE (4a4fb1b53133.patch) = 735 +SHA256 (a9199c2097ff.patch) = 55b9985b01c8b0bcbd2411fb8f6190982129fcc5f6016164fe2769ce354120b2 +SIZE (a9199c2097ff.patch) = 1061