diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 990ddd821046..79e06fdd6e6b 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,58 +1,64 @@ PORTNAME= gamescope -DISTVERSION= 3.8.4 +DISTVERSION= 3.9 CATEGORIES= x11-wm PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 8fae1ff56a62.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 -PATCHFILES+= f36133f27fbc.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 -PATCHFILES+= 01ac6a8e2699.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 -PATCHFILES+= 43f743fcfbd0.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 -PATCHFILES+= 9ebb1c16d3ad.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 +PATCHFILES+= 98bc90ecf55c.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 +PATCHFILES+= acc8a1bed4e8.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 +PATCHFILES+= afa1c085ebbf.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 PATCHFILES+= d59836199ebe.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.13.0<0.14.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:b08bbaa:libliftoff/subprojects/libliftoff +GH_TUPLE= emersion:libliftoff:v0.1.0-3-g516cf94:libliftoff/subprojects/libliftoff \ + nothings:stb:c0c9826:stb/subprojects/stb CPPFLAGS+= -D_WITH_DPRINTF # XXX Remove after FreeBSD 11 EOL 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 + # Bundle wlroots due to breaking changes: # https://github.com/swaywm/wlroots/commit/9ecfa4343a6d # https://github.com/swaywm/wlroots/commit/a109a80dca50 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 USE_XORG+= pixman xcb USE_GL+= gbm egl GH_TUPLE+= swaywm:wlroots:0.13.0:wlroots/subprojects/wlroots PLIST_FILES+= "@comment libdata/pkgconfig/wlroots.pc" .include diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 43a46796152d..992e476762fe 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -1,19 +1,17 @@ -TIMESTAMP = 1625025715 -SHA256 (Plagman-gamescope-3.8.4_GH0.tar.gz) = 761d0baa20b683cb3f3bb0126229a05b2912e016970a24c3beba12468d7df6ae -SIZE (Plagman-gamescope-3.8.4_GH0.tar.gz) = 72030 -SHA256 (emersion-libliftoff-b08bbaa_GH0.tar.gz) = bc689419a96d5e2428b77d3cf9e95f532ae89295345bdaf288df24adc4803a04 -SIZE (emersion-libliftoff-b08bbaa_GH0.tar.gz) = 27461 +TIMESTAMP = 1630628293 +SHA256 (Plagman-gamescope-3.9_GH0.tar.gz) = f84caba2cf6b65d382f41716c0dee5cfeba22e1c06b2539ad0cdae59fa8fcac1 +SIZE (Plagman-gamescope-3.9_GH0.tar.gz) = 84424 +SHA256 (emersion-libliftoff-v0.1.0-3-g516cf94_GH0.tar.gz) = 6577292c106aaec29db5296f37c6e796171cb7bad9a5316a5b65b9e9cd8139bc +SIZE (emersion-libliftoff-v0.1.0-3-g516cf94_GH0.tar.gz) = 29766 +SHA256 (nothings-stb-c0c9826_GH0.tar.gz) = fc0d6eb72f1b44ace232208c6daf456a80e80dd28e9fa6decebd58bf3c1746d0 +SIZE (nothings-stb-c0c9826_GH0.tar.gz) = 1386315 SHA256 (swaywm-wlroots-0.13.0_GH0.tar.gz) = f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3 SIZE (swaywm-wlroots-0.13.0_GH0.tar.gz) = 503575 -SHA256 (8fae1ff56a62.patch) = 7a636fec88d914047abed0c91268ae1b7779f48e36c74efd37868f2c7ba3955e -SIZE (8fae1ff56a62.patch) = 2778 -SHA256 (f36133f27fbc.patch) = e4aa6245782f96387c7083c749da6a3cd84f4a320ec70b448984572c37f76962 -SIZE (f36133f27fbc.patch) = 2719 -SHA256 (01ac6a8e2699.patch) = 5bea002c034878c1e991cf3efff19f70a666e681966d6361bbc7220c9e93fdd1 -SIZE (01ac6a8e2699.patch) = 1606 -SHA256 (43f743fcfbd0.patch) = e1d6f39d07b704f7b031e57d3d4b6c8092f14015385a9e297a7b7c279cd7449d -SIZE (43f743fcfbd0.patch) = 1111 -SHA256 (9ebb1c16d3ad.patch) = 8e7c1a46c10d9909d85a673a5a629f293596a5f97d48ad322a8da5e7f24100be -SIZE (9ebb1c16d3ad.patch) = 3540 +SHA256 (98bc90ecf55c.patch) = b904097410bfd604b2d0550f25a82c72e119cf91ac67b9d6a2e32f5975b5005c +SIZE (98bc90ecf55c.patch) = 2836 +SHA256 (acc8a1bed4e8.patch) = 3a2fb132c2d23cb0456d5e5d7a8889d6c68752437970d068ffede66750e5a57c +SIZE (acc8a1bed4e8.patch) = 1595 +SHA256 (afa1c085ebbf.patch) = aa2d0a443e705a11b9e197c88dfd3f64edc4af49237eccc706c06cce6a70612c +SIZE (afa1c085ebbf.patch) = 1108 SHA256 (d59836199ebe.patch) = 40b519ef847b979ba088325cdd7170bed91936b79d845c65d2126b2b25166a1e SIZE (d59836199ebe.patch) = 2586 diff --git a/x11-wm/gamescope/files/patch-src_pipewire.cpp b/x11-wm/gamescope/files/patch-src_pipewire.cpp new file mode 100644 index 000000000000..35c061cf3505 --- /dev/null +++ b/x11-wm/gamescope/files/patch-src_pipewire.cpp @@ -0,0 +1,19 @@ +../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 };