diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index fbf73776f00a..c01d297638b5 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,52 +1,52 @@ PORTNAME= gamescope -DISTVERSION= 3.9.5 -PORTREVISION= 1 +DISTVERSION= 3.10 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 +PATCHFILES+= 392c5be67571.patch:-p1 # https://github.com/Plagman/gamescope/pull/330 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_GITLAB= nodefault USE_SDL= sdl2 USE_XORG= x11 xcomposite xdamage xext xfixes xrender xres xtst xxf86vm GH_ACCOUNT= Plagman GH_TUPLE= nothings:stb:af1a5bc:stb/subprojects/stb GL_TUPLE= https://gitlab.freedesktop.org:emersion:libliftoff:b7a6958bcacdedf6e451d8821c807299943ef150:libliftoff/subprojects/libliftoff 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/Makefile.wlroots b/x11-wm/gamescope/Makefile.wlroots index d99985b7bdf6..6aa9a17ac668 100644 --- a/x11-wm/gamescope/Makefile.wlroots +++ b/x11-wm/gamescope/Makefile.wlroots @@ -1,16 +1,16 @@ # https://github.com/Plagman/gamescope/pull/202 BUILD_DEPENDS:= ${BUILD_DEPENDS:N*wlroots*} \ xwayland-devel>0:x11-servers/xwayland-devel LIB_DEPENDS:= ${LIB_DEPENDS:N*wlroots*} \ libudev.so:devel/libudev-devd \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput \ libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm RUN_DEPENDS+= xwayland-devel>0:x11-servers/xwayland-devel USES+= gl USE_GL+= gbm egl USE_XORG+= pixman xcb -GL_TUPLE+= https://gitlab.freedesktop.org:wlroots:wlroots:9579d62a160821a107763325a515d3aee0a1e158:wlroots/subprojects/wlroots +GL_TUPLE+= https://gitlab.freedesktop.org:wlroots:wlroots:3e801d68f2c6c64567b1f24c6d03893f32c81197:wlroots/subprojects/wlroots PLIST_FILES+= "@comment libdata/pkgconfig/wlroots.pc" diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 5bac883e71d0..ecfec396e5d9 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -1,17 +1,19 @@ -TIMESTAMP = 1634527050 -SHA256 (Plagman-gamescope-3.9.5_GH0.tar.gz) = b49c407f6db1bde0765fdab5b8aaa424cc962b8608f2fbd98873de6e3e820eab -SIZE (Plagman-gamescope-3.9.5_GH0.tar.gz) = 92411 +TIMESTAMP = 1639468049 +SHA256 (Plagman-gamescope-3.10_GH0.tar.gz) = 64b8fd4a30b3d9e0d7d54bcf20b6b9449e8818ecf1286e5671db8e234565fe94 +SIZE (Plagman-gamescope-3.10_GH0.tar.gz) = 98001 SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058 SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334 SHA256 (emersion-libliftoff-b7a6958bcacdedf6e451d8821c807299943ef150_GL0.tar.gz) = f9b7969e2f33270b8d7df1f15741cffaf8022fe80548975f823b1ce3e5df495c SIZE (emersion-libliftoff-b7a6958bcacdedf6e451d8821c807299943ef150_GL0.tar.gz) = 30754 -SHA256 (wlroots-wlroots-9579d62a160821a107763325a515d3aee0a1e158_GL0.tar.gz) = 878970564de649c81365cd3e34384309b35a848c117821837102f1ac9094c5d6 -SIZE (wlroots-wlroots-9579d62a160821a107763325a515d3aee0a1e158_GL0.tar.gz) = 524456 +SHA256 (wlroots-wlroots-3e801d68f2c6c64567b1f24c6d03893f32c81197_GL0.tar.gz) = 97365d66f40fd79d565ad4ab06fb6da7edf5728a202fbb154866b84ddc7fd55f +SIZE (wlroots-wlroots-3e801d68f2c6c64567b1f24c6d03893f32c81197_GL0.tar.gz) = 557717 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 +SHA256 (392c5be67571.patch) = 16d3aa10eb1c475e8fc974c4afa683c216fb62b19c6f5513387341771472e009 +SIZE (392c5be67571.patch) = 1436 diff --git a/x11-wm/gamescope/files/patch-src_pipewire.cpp b/x11-wm/gamescope/files/patch-src_pipewire.cpp deleted file mode 100644 index 5cc72ae179c5..000000000000 --- a/x11-wm/gamescope/files/patch-src_pipewire.cpp +++ /dev/null @@ -1,21 +0,0 @@ -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 };