diff --git a/graphics/libliftoff/Makefile b/graphics/libliftoff/Makefile index 4e27c5106cf8..a8a7bba87755 100644 --- a/graphics/libliftoff/Makefile +++ b/graphics/libliftoff/Makefile @@ -1,22 +1,28 @@ PORTNAME= libliftoff DISTVERSIONPREFIX= v -DISTVERSION= 0.3.0 +DISTVERSION= 0.4.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Lightweight KMS plane library WWW= https://gitlab.freedesktop.org/emersion/libliftoff LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libdrm.so:graphics/libdrm USES= compiler:c11 meson pkgconfig USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= emersion -GL_COMMIT= c4488eeff94f511aa4d93ef93a042e471c1b2705 +GL_COMMIT= 40834142e1ab25cf0fc8e5461e51f08562294f11 + +# https://gitlab.freedesktop.org/emersion/libliftoff/-/issues/75 +CFLAGS_armv6= -Wno-error=sign-compare -Wno-error=sign-conversion +CFLAGS_armv7= -Wno-error=sign-compare -Wno-error=sign-conversion +CFLAGS_i386= -Wno-error=sign-compare -Wno-error=sign-conversion +CFLAGS_powerpc= -Wno-error=sign-compare -Wno-error=sign-conversion .include diff --git a/graphics/libliftoff/distinfo b/graphics/libliftoff/distinfo index 9f5a1dbd5319..4a0049257fc7 100644 --- a/graphics/libliftoff/distinfo +++ b/graphics/libliftoff/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660807069 -SHA256 (emersion-libliftoff-c4488eeff94f511aa4d93ef93a042e471c1b2705_GL0.tar.gz) = e66ea169484d6c7f61cf3e617737083dfa0b273658ef49b3938819f52bea95df -SIZE (emersion-libliftoff-c4488eeff94f511aa4d93ef93a042e471c1b2705_GL0.tar.gz) = 31690 +TIMESTAMP = 1676927062 +SHA256 (emersion-libliftoff-40834142e1ab25cf0fc8e5461e51f08562294f11_GL0.tar.gz) = 73db89515450af439983806e0cf4d05164e9b26874285e341929e78ea963b3d5 +SIZE (emersion-libliftoff-40834142e1ab25cf0fc8e5461e51f08562294f11_GL0.tar.gz) = 36355 diff --git a/graphics/libliftoff/pkg-plist b/graphics/libliftoff/pkg-plist index 3e96836b8824..92f7f79b5ef9 100644 --- a/graphics/libliftoff/pkg-plist +++ b/graphics/libliftoff/pkg-plist @@ -1,5 +1,5 @@ include/libliftoff.h lib/libliftoff.so lib/libliftoff.so.0 -lib/libliftoff.so.0.3.0 +lib/libliftoff.so.0.4.0 libdata/pkgconfig/libliftoff.pc diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 7783b60e6589..8fe44d04c4bd 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,57 +1,57 @@ PORTNAME= gamescope DISTVERSION= 3.11.51 PORTREVISION= 1 CATEGORIES= x11-wm # wayland: depends on https://github.com/Plagman/gamescope/issues/543 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 2a84a44f6897.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 PATCHFILES+= e0927f7bce95.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 WWW= https://github.com/Plagman/gamescope LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= glslangValidator:graphics/glslang \ evdev-proto>0:devel/evdev-proto \ - libliftoff>=0.3.0<0.4.0:graphics/libliftoff \ + libliftoff>=0.4.0<0.5.0:graphics/libliftoff \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \ hwdata>0:misc/hwdata \ wlroots>=0.16.0<0.17.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 RUN_DEPENDS= hwdata>0:misc/hwdata 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= nothings:stb:af1a5bc:stb/subprojects/stb \ Joshua-Ashton:vkroots:e6b8949:vkroots/subprojects/vkroots PLIST_FILES= bin/${PORTNAME} \ lib/libVkLayer_FROG_${PORTNAME}_wsi.so \ share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.json 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/files/patch-meson.build b/x11-wm/gamescope/files/patch-meson.build new file mode 100644 index 000000000000..8e50063b56c6 --- /dev/null +++ b/x11-wm/gamescope/files/patch-meson.build @@ -0,0 +1,13 @@ +https://github.com/Plagman/gamescope/commit/9600bbaadf9c + +--- meson.build.orig 2022-12-07 18:47:54 UTC ++++ meson.build +@@ -109,7 +109,7 @@ liftoff_dep = dependency( + + liftoff_dep = dependency( + 'libliftoff', +- version: ['>= 0.3.0', '< 0.4.0'], ++ version: ['>= 0.4.0', '< 0.5.0'], + fallback: ['libliftoff', 'liftoff'], + default_options: ['default_library=static'], + )