diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 6212d7f8e6ac..2800301aecba 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,50 +1,50 @@ PORTNAME= gamescope -DISTVERSION= 3.9.2 +DISTVERSION= 3.9.3 CATEGORIES= x11-wm PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= ec8e547be135.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 PATCHFILES+= ea415ae28442.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 PATCHFILES+= 7c188b24afaa.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/Plagman/gamescope/issues/120 MAINTAINER= jbeich@FreeBSD.org COMMENT= Micro-compositor from SteamOS LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= glslangValidator:graphics/glslang \ evdev-proto>0:devel/evdev-proto \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \ wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libdrm.so:graphics/libdrm \ libvulkan.so:graphics/vulkan-loader \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c++11-lib meson pkgconfig sdl xorg USE_GITHUB= yes USE_SDL= sdl2 USE_XORG= x11 xcomposite xdamage xext xfixes xrender xres xtst xxf86vm GH_ACCOUNT= Plagman -GH_TUPLE= emersion:libliftoff:v0.1.0-3-g516cf94:libliftoff/subprojects/libliftoff \ +GH_TUPLE= emersion:libliftoff:v0.1.0-22-gaa30b8f:libliftoff/subprojects/libliftoff \ nothings:stb:af1a5bc:stb/subprojects/stb PLIST_FILES= bin/${PORTNAME} 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} . ..) .include "${.CURDIR}/Makefile.wlroots" .include diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 746dcdbb86ac..04b28c81d421 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -1,17 +1,17 @@ -TIMESTAMP = 1631728967 -SHA256 (Plagman-gamescope-3.9.2_GH0.tar.gz) = 1ea332cd57fe1cde6b76e21e3e568f73b4d6b7b85db24d76b5ca9fbd3107ece6 -SIZE (Plagman-gamescope-3.9.2_GH0.tar.gz) = 87957 -SHA256 (emersion-libliftoff-v0.1.0-3-g516cf94_GH0.tar.gz) = 6577292c106aaec29db5296f37c6e796171cb7bad9a5316a5b65b9e9cd8139bc -SIZE (emersion-libliftoff-v0.1.0-3-g516cf94_GH0.tar.gz) = 29766 +TIMESTAMP = 1633384829 +SHA256 (Plagman-gamescope-3.9.3_GH0.tar.gz) = 8f330e0b9707c2830895141cabad04aeef62c8bf94bb1e32fbd8680c719dce75 +SIZE (Plagman-gamescope-3.9.3_GH0.tar.gz) = 88096 +SHA256 (emersion-libliftoff-v0.1.0-22-gaa30b8f_GH0.tar.gz) = 84a2e1bca203a761d6b0105726bb67632edeacd58d1d2b4c58610ddd8e379d5d +SIZE (emersion-libliftoff-v0.1.0-22-gaa30b8f_GH0.tar.gz) = 30657 SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058 SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334 SHA256 (swaywm-wlroots-0.14.0-239-g9579d62a_GH0.tar.gz) = 84b288330b95d2b1d4e1881b7b220e25535990a5c695dc5bd65cb77e68804105 SIZE (swaywm-wlroots-0.14.0-239-g9579d62a_GH0.tar.gz) = 524413 SHA256 (ec8e547be135.patch) = ce94c159342cf57764154a89a3428427b35626c90ff793533675c0c35440015c SIZE (ec8e547be135.patch) = 2857 SHA256 (ea415ae28442.patch) = 6f248271d9ba0d782affbbd2376a1ea08130d25b747ef52d20672d1f17cab130 SIZE (ea415ae28442.patch) = 1594 SHA256 (7c188b24afaa.patch) = e5018c1ae688f159dcc00ac3c3cef177732b36663f2c07cd8941451c887b787f SIZE (7c188b24afaa.patch) = 1132 SHA256 (a618ea074660.patch) = 8d0f5d4414b9df2ad2b1f24a9add1628eee273b36f4b8f62533a0bcacbc68740 SIZE (a618ea074660.patch) = 2585 diff --git a/x11-wm/gamescope/files/patch-src_pipewire.cpp b/x11-wm/gamescope/files/patch-src_pipewire.cpp index 35c061cf3505..5cc72ae179c5 100644 --- a/x11-wm/gamescope/files/patch-src_pipewire.cpp +++ b/x11-wm/gamescope/files/patch-src_pipewire.cpp @@ -1,19 +1,21 @@ +Drop after FreeBSD 12.2 EOL around 2022-03-01 + ../src/pipewire.cpp:16:17: error: redefinition of 'log' as different kind of symbol static LogScope log("pipewire"); ^ /usr/include/c++/v1/math.h:1007:1: note: previous definition is here log(_A1 __lcpp_x) _NOEXCEPT {return ::log((double)__lcpp_x);} ^ --- src/pipewire.cpp.orig 2021-09-03 00:18:13 UTC +++ src/pipewire.cpp @@ -13,6 +13,9 @@ #include "pipewire.hpp" #include "log.hpp" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 11000 +#define log gamescope_log +#endif static LogScope log("pipewire"); static struct pipewire_state pipewire_state = { .stream_node_id = SPA_ID_INVALID };