1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-14 07:43:06 +00:00

x11-wm/gamescope: unbundle libliftoff after 929a40f5e1

This reverts commit 8947b5348e.
This commit is contained in:
Jan Beich 2022-02-11 12:09:55 +00:00
parent 929a40f5e1
commit ef2d0a35dd
3 changed files with 2 additions and 32 deletions

View File

@ -20,6 +20,7 @@ BUILD_DEPENDS= glslangValidator:graphics/glslang \
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 \
@ -27,14 +28,12 @@ LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \
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:378ccb4f84a2473fe73dbdc56fe35a0d2ee661cc: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

View File

@ -3,8 +3,6 @@ SHA256 (Plagman-gamescope-3.11.10_GH0.tar.gz) = c353cb9dd310ea74be25ec96104ff1bb
SIZE (Plagman-gamescope-3.11.10_GH0.tar.gz) = 153805
SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058
SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334
SHA256 (emersion-libliftoff-378ccb4f84a2473fe73dbdc56fe35a0d2ee661cc_GL0.tar.gz) = 7f296842c84e536432c38d069518c705be04c4c44937bc19a28e887e84ee9103
SIZE (emersion-libliftoff-378ccb4f84a2473fe73dbdc56fe35a0d2ee661cc_GL0.tar.gz) = 31371
SHA256 (2a84a44f6897.patch) = fd892d4477885926b0ef5793d5222764afa2ba334fd25c4cc671c89812e100b5
SIZE (2a84a44f6897.patch) = 2931
SHA256 (e0927f7bce95.patch) = 6bbab2f37d7e76a1eade6d81bc0b441cc09f0020143bafb53555b767bf056600

View File

@ -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