git: 8176a00a7832 - main - x11-wm/gamescope: update to 3.10
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Dec 2021 17:12:01 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8176a00a7832c24f5b31477a117cf7d2299c311d
commit 8176a00a7832c24f5b31477a117cf7d2299c311d
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-14 07:47:29 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-14 17:11:58 +0000
x11-wm/gamescope: update to 3.10
Changes: https://github.com/Plagman/gamescope/compare/3.9.5...3.10
Reported by: portscout
---
x11-wm/gamescope/Makefile | 4 ++--
x11-wm/gamescope/Makefile.wlroots | 2 +-
x11-wm/gamescope/distinfo | 12 +++++++-----
x11-wm/gamescope/files/patch-src_pipewire.cpp | 21 ---------------------
4 files changed, 10 insertions(+), 29 deletions(-)
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,6 +1,5 @@
PORTNAME= gamescope
-DISTVERSION= 3.9.5
-PORTREVISION= 1
+DISTVERSION= 3.10
CATEGORIES= x11-wm
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -8,6 +7,7 @@ PATCHFILES+= ec8e547be135.patch:-p1 # https://github.com/Plagman/gamescope/pull/
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
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
@@ -12,5 +12,5 @@ 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,12 +1,12 @@
-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
@@ -15,3 +15,5 @@ SHA256 (7c188b24afaa.patch) = e5018c1ae688f159dcc00ac3c3cef177732b36663f2c07cd89
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 };