På mandag 7. juli 2025 kl. 07:50, Matthieu Herrb
<matth...@openbsd.org> skrev:
> This updates wayland/grim to 1.5.0.
>
> Release notes:
> Add support for ext-image-copy-capture-v1
> Add support for toplevel capture via -T
> grim has moved to gitlab.freedesktop.org
>
> ok?
>
This built for me on current/amd64.
I used this to patch:
cd /usr/ports/wayland/grim/ && patch -l -p0 -E < grim-1.5.0.patch
'make update clean' ran with no problems. Ok.
--
Happy porting and well wishes to all!
Ha en fin ferie!
> Index: Makefile
> ===================================================================
> RCS file: /local/cvs/ports/wayland/grim/Makefile,v
> diff -u -p -u -r1.2 Makefile
> --- Makefile 23 Nov 2023 11:41:23 -0000 1.2
> +++ Makefile 7 Jul 2025 05:43:14 -0000
> @@ -1,9 +1,9 @@
> COMMENT = grab images from a Wayland compositor
>
> -V = 1.4.1
> -DISTNAME = grim-${V}
> -SITES = https://git.sr.ht/~emersion/grim/
> -DISTFILES = grim-{archive/}v${V}${EXTRACT_SUFX}
> +V = 1.5.0
> +DISTNAME = grim-v$V
> +PKGNAME = grim-$V
> +SITES = https://gitlab.freedesktop.org/emersion/grim/-/archive/v${V}/
>
> CATEGORIES = wayland
>
> Index: distinfo
> ===================================================================
> RCS file: /local/cvs/ports/wayland/grim/distinfo,v
> diff -u -p -u -r1.1.1.1 distinfo
> --- distinfo 12 Nov 2023 11:52:51 -0000 1.1.1.1
> +++ distinfo 7 Jul 2025 05:43:14 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (grim-v1.4.1.tar.gz) = XtjnD82Dp+ID6S0027gqE0LT8TrZimsDEMyX4ak0Le0=
> -SIZE (grim-v1.4.1.tar.gz) = 18372
> +SHA256 (grim-v1.5.0.tar.gz) = nnKpj3YhsfV0G0Bbjb1Ees99MA3bEmZ+xSbbHOYVTqo=
> +SIZE (grim-v1.5.0.tar.gz) = 20805
> Index: patches/patch-main_c
> ===================================================================
> RCS file: /local/cvs/ports/wayland/grim/patches/patch-main_c,v
> diff -u -p -u -r1.1.1.1 patch-main_c
> --- patches/patch-main_c 12 Nov 2023 11:52:51 -0000 1.1.1.1
> +++ patches/patch-main_c 7 Jul 2025 05:43:14 -0000
> @@ -1,7 +1,7 @@
> Index: main.c
> --- main.c.orig
> +++ main.c
> -@@ -9,8 +9,16 @@
> +@@ -8,8 +8,16 @@
> #include <string.h>
>
> #include <time.h>
>
> #include <unistd.h>
>
> @@ -19,7 +19,7 @@ Index: main.c
> #include "buffer.h"
> #include "grim.h"
> #include "output-layout.h"
> -@@ -211,7 +219,7 @@ static bool default_filename(char *filename, size_t n,
> +@@ -427,7 +435,7 @@ static bool default_filename(char *filename, size_t n,
> }
> assert(ext != NULL);
> char tmpstr[32];
> Index: patches/patch-meson_build
> ===================================================================
> RCS file: /local/cvs/ports/wayland/grim/patches/patch-meson_build,v
> diff -u -p -u -r1.1.1.1 patch-meson_build
> --- patches/patch-meson_build 12 Nov 2023 11:52:51 -0000 1.1.1.1
> +++ patches/patch-meson_build 7 Jul 2025 05:43:14 -0000
> @@ -1,16 +1,16 @@
> Index: meson.build
> --- meson.build.orig
> +++ meson.build
> -@@ -17,7 +17,7 @@ png = dependency('libpng')
> +@@ -18,7 +18,7 @@ png = dependency('libpng')
> jpeg = dependency('libjpeg', required: get_option('jpeg'))
> math = cc.find_library('m')
> pixman = dependency('pixman-1')
> -realtime = cc.find_library('rt')
> +# realtime = cc.find_library('rt')
> wayland_client = dependency('wayland-client')
> - wayland_protos = dependency('wayland-protocols', version: '>=1.14')
>
> -@@ -46,7 +46,7 @@ grim_deps = [
> + is_le = host_machine.endian() == 'little'
> +@@ -45,7 +45,7 @@ grim_deps = [
> math,
> pixman,
> png,
> @@ -19,7 +19,7 @@ Index: meson.build
> wayland_client,
> ]
>
> -@@ -54,6 +54,9 @@ if jpeg.found()
> +@@ -53,6 +53,9 @@ if jpeg.found()
> grim_files += ['write_jpg.c']
> grim_deps += [jpeg]
> endif
>
> --
> Matthieu Herrb
