diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index cc0b9d4f6bb5..39c862930839 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,51 +1,51 @@ PORTNAME= gamescope DISTVERSION= 3.10.8 +PORTREVISION= 1 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 \ + libliftoff.so:graphics/libliftoff \ 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:2e1dd93b60224e77f6a49ad8fb36d184e3a9a3bc:libliftoff/subprojects/libliftoff PLIST_FILES= bin/${PORTNAME} -MESON_ARGS= --force-fallback-for=libliftoff # allow system wlroots +MESON_ARGS= --force-fallback-for= # allow system wlroots + libliftoff 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 diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 4f47a934505e..43f48ceb8452 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -1,15 +1,13 @@ TIMESTAMP = 1643426679 SHA256 (Plagman-gamescope-3.10.8_GH0.tar.gz) = 4109b549870b28a1af98aedc94f66594fb3e305e11170c95c7f2cc13cd96a37f SIZE (Plagman-gamescope-3.10.8_GH0.tar.gz) = 99561 SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058 SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334 -SHA256 (emersion-libliftoff-2e1dd93b60224e77f6a49ad8fb36d184e3a9a3bc_GL0.tar.gz) = 487a09a299b178797d93fd1938a4513f02f7d562cdc534dd44561d4751300daf -SIZE (emersion-libliftoff-2e1dd93b60224e77f6a49ad8fb36d184e3a9a3bc_GL0.tar.gz) = 31198 SHA256 (ec8e547be135.patch) = c0568f97611b3fe023a17d01f6ae6023f050fb4eb8be6ad4c6fa739456bed297 SIZE (ec8e547be135.patch) = 2861 SHA256 (ea415ae28442.patch) = 4ec00a765409d266262e1198d9f7f9650db299c0d0c0b929506ce6c0b81fae01 SIZE (ea415ae28442.patch) = 1596 SHA256 (7c188b24afaa.patch) = 3f7e8e7eb87ca9513465864410d7492c456b6875d38a7305ea99ff6e192722cf SIZE (7c188b24afaa.patch) = 1134 SHA256 (a618ea074660.patch) = 5cffe848f1bc6b5555c75a0d0588c9b97390ce31ac25b71de528f55ae0c99562 SIZE (a618ea074660.patch) = 2587 diff --git a/x11-wm/gamescope/files/patch-private-libs b/x11-wm/gamescope/files/patch-private-libs deleted file mode 100644 index e2961b1e65e9..000000000000 --- a/x11-wm/gamescope/files/patch-private-libs +++ /dev/null @@ -1,27 +0,0 @@ -libliftoff is untagged and has no other consumers. Keep it private to -gamescope package for now. - ---- subprojects/libliftoff/meson.build.orig 2020-05-26 19:30:31 UTC -+++ subprojects/libliftoff/meson.build -@@ -38,7 +38,7 @@ liftoff_lib = library( - include_directories: liftoff_inc, - version: meson.project_version(), - dependencies: liftoff_deps, -- install: true, -+ install: not meson.is_subproject(), - ) - - liftoff = declare_dependency( -@@ -47,6 +47,7 @@ liftoff = declare_dependency( - dependencies: liftoff_deps, - ) - -+if not meson.is_subproject() - install_headers('include/libliftoff.h') - - pkgconfig = import('pkgconfig') -@@ -60,3 +61,4 @@ pkgconfig.generate( - - subdir('example') - subdir('test') -+endif