På onsdag 30. juli 2025 kl. 22:21, <yaydn@protonmail.com> skrev:

> På onsdag 30. juli 2025 kl. 20:03, Matthieu Herrb
> matthieu@herrb.eu skrev:
> 
> > On Tue, Jun 10, 2025 at 06:00:03AM +0000, yaydn@protonmail.com wrote:
> > 
> > > Here is an update for swayimg. I also attached a copy.
> > > This is in preparation for wayland/wlroots-1.19.0 and wayland/sway-1.11
> > > Please ok. Commenting or testing welcome.
> > > 
> > > Changelogs:
> > > https://github.com/artemsen/swayimg/releases/tag/v4.0
> > > https://github.com/artemsen/swayimg/releases/tag/v4.1
> > > https://github.com/artemsen/swayimg/releases/tag/v4.2
> > 
> > Hi,
> > 
> > again, new versions available : 4.5
> > 
> > Struggling to get libinotify WANTLIB / LIB_DEPENDS right. I'm not sure
> > there's a clean solution (looking at other ports)
> 
> 
> 
> Tested on current/amd64.
> 
> I had a similar patch, but had left it on the wayside due to health
> issues I've been dealing with.
> 
> Used
> 
> cd /usr/ports/wayland/swayimg/ && patch -l -p0 -E -C < /tmp/swayimg-4.5p0.patch
> 
> removing '-C' after checking it patched correctly.
> 
> After a
> 
> cd /usr/ports/wayland/swayimg/ && make clean=all clean
> 
> to remove my previous build a
> 
> cd /usr/ports/wayland/swayimg/ && make update clean
> 
> ran/built fine. Thank you.
> 
> I have been testing swayimg 4.5 since July 23 if my draft email's date
> is correct.
> 
> So yes and looks good from me.
> 
> Have a good day, well wishes, and hopefully happy porting!
> 
> 


Noticed minor whitespace corrections?

Not sure if important.


> > Index: Makefile
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/swayimg/Makefile,v
> > diff -u -p -u -r1.14 Makefile
> > --- Makefile 24 Mar 2025 20:07:39 -0000 1.14
> > +++ Makefile 30 Jul 2025 17:58:26 -0000
> > @@ -5,7 +5,7 @@ COMMENT = image display utility for Wayl
> > 
> > GH_ACCOUNT = artemsen
> > GH_PROJECT = swayimg
> > -GH_TAGNAME = v3.9
> > +GH_TAGNAME = v4.5
> > 
> > CATEGORIES = wayland
> > 
> > @@ -20,13 +20,14 @@ MODULES = devel/meson
> > WANTLIB = OpenEXRCore-3_3 avif cairo epoll-shim exif fontconfig freetype
> > WANTLIB += gif gobject-2.0 heif jpeg json-c jxl png raw rsvg-2 sixel tiff
> > WANTLIB += wayland-client webp webpdemux xkbcommon
> > -WANTLIB += pthread c m
> > +WANTLIB += lib/inotify/inotify drm pthread c m
> > 
> > CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> > LDFLAGS="-L${LOCALBASE}/lib -pthread"
> > 
> > LIB_DEPENDS = devel/epoll-shim \
> > devel/json-c \
> > + devel/libinotify \
> > graphics/cairo \
> > graphics/giflib \
> > graphics/jpeg \
> > Index: distinfo
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/swayimg/distinfo,v
> > diff -u -p -u -r1.9 distinfo
> > --- distinfo 24 Mar 2025 20:07:39 -0000 1.9
> > +++ distinfo 30 Jul 2025 17:58:26 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (swayimg-3.9.tar.gz) = 0hp8qe9NIc+FKImTKZnp7dTs8sWHMhEg9bTWFHWA58s=
> > -SIZE (swayimg-3.9.tar.gz) = 756909
> > +SHA256 (swayimg-4.5.tar.gz) = TwxJH4c+N7hTQqktmw7MVwoFm7lxBAwjB11MOrQBaAs=
> > +SIZE (swayimg-4.5.tar.gz) = 788904
> > Index: patches/patch-meson_build
> > ===================================================================
> > RCS file: /local/cvs/ports/wayland/swayimg/patches/patch-meson_build,v
> > diff -u -p -u -r1.8 patch-meson_build
> > --- patches/patch-meson_build 24 Mar 2025 20:07:39 -0000 1.8
> > +++ patches/patch-meson_build 30 Jul 2025 17:58:26 -0000
> > @@ -5,7 +5,7 @@ make sure rpath is set in the resulting
> > Index: meson.build
> > --- meson.build.orig
> > +++ meson.build
> > -@@ -42,7 +42,7 @@ xkb = dependency('xkbcommon')
> > +@@ -40,7 +40,7 @@ xkb = dependency('xkbcommon')
> > fontconfig = dependency('fontconfig')
> > freetype = dependency('freetype2')
> > threads = dependency('threads')
> > @@ -13,20 +13,20 @@ Index: meson.build
> > +# rt = cc.find_library('rt')
> > m = cc.find_library('m')
> > 
> > - # optional dependencies: file formats support
> > -@@ -263,7 +263,7 @@ executable(
> > - dependencies: [
> > - # runtime
> > - m,
> > -- rt,
> > -+ # rt,
> > - threads,
> > - wlcln,
> > - epoll,
> > -@@ -287,5 +287,6 @@ executable(
> > - raw,
> > - webp, webp_demux,
> > - ],
> > -+ install_rpath : '${LOCALBASE}/lib/inotify',
> > - install: true
> > + # wayland support
> > +@@ -333,7 +333,7 @@ executable(
> > + dependencies: [
> > + # runtime
> > + m,
> > +- rt,
> > ++ # rt,
> > + threads,
> > + wlcln,
> > + epoll,
> > +@@ -359,5 +359,6 @@ executable(
> > + webp,
> > + webp_demux,
> > + ],
> > ++ install_rpath : '/usr/local/lib/inotify',
> > + install: true,
> > )
> > Index: patches/patch-src_application_c
> > ===================================================================
> > RCS file: patches/patch-src_application_c
> > diff -N patches/patch-src_application_c
> > --- patches/patch-src_application_c 24 Mar 2025 20:07:39 -0000 1.5
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,13 +0,0 @@
> > -required for WEXITSTATUS macro
> > -
> > -Index: src/application.c
> > ---- src/application.c.orig
> > -+++ src/application.c
> > -@@ -23,6 +23,7 @@
> > - #include <stdlib.h>
> > 
> > - #include <string.h>
> > 
> > - #include <unistd.h>
> > 
> > -+#include <sys/wait.h>
> > 
> > -
> > - // Special ids for windows size and position
> > - #define SIZE_FULLSCREEN SIZE_MAX
> > 
> > --
> > Matthieu Herrb

• swayimg-4.5p1.patch (4K)