CVS commit: pkgsrc/graphics/imv

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Feb  3 10:43:42 UTC 2021

Modified Files:
        pkgsrc/graphics/imv: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/graphics/imv/patches: patch-meson.build patch-src_imv.c

Log Message:
imv: update to 4.2.0. #nice

v4.2.0 - 2020-12-17

* Switched to meson build system
* Added HEIF backend
* Added rotate and flip commands
* Added colour support for overlay
* Added some missing command/config documentation
* Read directories in alphabetical order
* Fixed several memory leaks
* Improved compatibility with non glibc systems
* Fixed several window management bugs for Wayland
* Fixed bug when selecting first/last image


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/imv/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/imv/PLIST \
    pkgsrc/graphics/imv/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/imv/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/imv/patches/patch-meson.build \
    pkgsrc/graphics/imv/patches/patch-src_imv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/imv/Makefile
diff -u pkgsrc/graphics/imv/Makefile:1.7 pkgsrc/graphics/imv/Makefile:1.8
--- pkgsrc/graphics/imv/Makefile:1.7    Thu Nov  5 09:08:23 2020
+++ pkgsrc/graphics/imv/Makefile        Wed Feb  3 10:43:42 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2020/11/05 09:08:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/03 10:43:42 nia Exp $
 
-DISTNAME=      imv-4.1.0
-PKGREVISION=   6
+DISTNAME=      imv-4.2.0
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=eXeC64/}
 GITHUB_PROJECT=        imv
@@ -14,20 +13,31 @@ LICENSE=    mit
 
 TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
 
-USE_TOOLS+=    gmake pkg-config
+USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c99
 
-MAKE_FLAGS+=   MANPREFIX=${PREFIX}/${PKGMANDIR}
+# alphasort
+CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
 
-MAKE_FLAGS+=   BACKEND_LIBTIFF="yes"
-MAKE_FLAGS+=   BACKEND_LIBPNG="yes"
+MESON_ARGS+=   -Dlibtiff=enabled
+MESON_ARGS+=   -Dlibpng=enabled
+
+CONF_FILES+=   ${PREFIX}/share/examples/imv/imv_config \
+               ${PKG_SYSCONFDIR}/imv_config
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     src/imv.c
+SUBST_VARS.paths=      PKG_SYSCONFDIR
 
 .include "options.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freeimage/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/inih/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/imv/PLIST
diff -u pkgsrc/graphics/imv/PLIST:1.1 pkgsrc/graphics/imv/PLIST:1.2
--- pkgsrc/graphics/imv/PLIST:1.1       Sat Jan 11 15:18:46 2020
+++ pkgsrc/graphics/imv/PLIST   Wed Feb  3 10:43:42 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/01/11 15:18:46 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/02/03 10:43:42 nia Exp $
 bin/imv
 bin/imv-msg
 ${PLIST.all}bin/imv-wayland
@@ -7,3 +7,4 @@ man/man1/imv-msg.1
 man/man1/imv.1
 man/man5/imv.5
 share/applications/imv.desktop
+share/examples/imv/imv_config
Index: pkgsrc/graphics/imv/distinfo
diff -u pkgsrc/graphics/imv/distinfo:1.1 pkgsrc/graphics/imv/distinfo:1.2
--- pkgsrc/graphics/imv/distinfo:1.1    Sat Jan 11 15:18:46 2020
+++ pkgsrc/graphics/imv/distinfo        Wed Feb  3 10:43:42 2021
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1 2020/01/11 15:18:46 nia Exp $
+$NetBSD: distinfo,v 1.2 2021/02/03 10:43:42 nia Exp $
 
-SHA1 (imv-4.1.0.tar.gz) = 2c2bc59aab63e237178cc1cbac6d9f0d386f9b69
-RMD160 (imv-4.1.0.tar.gz) = b33143fa7595f81dbe16a3e15f4d114b40568d8c
-SHA512 (imv-4.1.0.tar.gz) = 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
-Size (imv-4.1.0.tar.gz) = 77341 bytes
+SHA1 (imv-4.2.0.tar.gz) = b1c087469780287a3e78233004194ef3a78e1676
+RMD160 (imv-4.2.0.tar.gz) = 28b918f037d154486c86f1a334d9be1e195f632e
+SHA512 (imv-4.2.0.tar.gz) = 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
+Size (imv-4.2.0.tar.gz) = 77809 bytes
+SHA1 (patch-meson.build) = bd0ae99fc71416486f6ba855ff3635540e5916cf
+SHA1 (patch-src_imv.c) = 75c3931a5b315174cb66d78e1c62593e8bacc96a

Index: pkgsrc/graphics/imv/options.mk
diff -u pkgsrc/graphics/imv/options.mk:1.2 pkgsrc/graphics/imv/options.mk:1.3
--- pkgsrc/graphics/imv/options.mk:1.2  Sat Jan 11 16:24:11 2020
+++ pkgsrc/graphics/imv/options.mk      Wed Feb  3 10:43:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/01/11 16:24:11 nia Exp $
+# $NetBSD: options.mk,v 1.3 2021/02/03 10:43:42 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.imv
 PKG_SUPPORTED_OPTIONS=         svg
@@ -17,19 +17,19 @@ PKG_SUGGESTED_OPTIONS=      svg x11
 
 .if !empty(PKG_OPTIONS:Msvg)
 .  include "../../graphics/librsvg/buildlink3.mk"
-MAKE_FLAGS+=           BACKEND_LIBRSVG="yes"
+MESON_ARGS+=           -Dlibrsvg=enabled
 .else
-MAKE_FLAGS+=           BACKEND_LIBRSVG="no"
+MESON_ARGS+=           -Dlibrsvg=disabled
 .endif
 
 PLIST_VARS+=           all
 .if !empty(PKG_OPTIONS:Mwayland) && !empty(PKG_OPTIONS:Mx11)
 PLIST.all=             yes
-MAKE_FLAGS+=           WINDOWS="all"
+MESON_ARGS+=           -Dwindows=all
 .elif !empty(PKG_OPTIONS:Mwayland)
-MAKE_FLAGS+=           WINDOWS="wayland"
+MESON_ARGS+=           -Dwindows=wayland
 .elif !empty(PKG_OPTIONS:Mx11)
-MAKE_FLAGS+=           WINDOWS="x11"
+MESON_ARGS+=           -Dwindows=x11
 .endif
 
 .if !empty(PKG_OPTIONS:Mwayland)

Added files:

Index: pkgsrc/graphics/imv/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/imv/patches/patch-meson.build:1.1
--- /dev/null   Wed Feb  3 10:43:42 2021
+++ pkgsrc/graphics/imv/patches/patch-meson.build       Wed Feb  3 10:43:42 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-meson.build,v 1.1 2021/02/03 10:43:42 nia Exp $
+
+Install example config file to examples.
+
+--- meson.build.orig   2020-12-17 20:30:42.000000000 +0000
++++ meson.build
+@@ -165,7 +165,7 @@ install_data(
+ 
+ install_data(
+   files('files/imv_config'),
+-  install_dir: get_option('sysconfdir'),
++  install_dir: get_option('datadir') + '/examples/imv',
+   install_mode: 'rw-r--r--',
+ )
+ 
Index: pkgsrc/graphics/imv/patches/patch-src_imv.c
diff -u /dev/null pkgsrc/graphics/imv/patches/patch-src_imv.c:1.1
--- /dev/null   Wed Feb  3 10:43:42 2021
+++ pkgsrc/graphics/imv/patches/patch-src_imv.c Wed Feb  3 10:43:42 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_imv.c,v 1.1 2021/02/03 10:43:42 nia Exp $
+
+Allow the proper configuration path to be substituted.
+
+--- src/imv.c.orig     2020-12-17 20:30:42.000000000 +0000
++++ src/imv.c
+@@ -1370,8 +1370,7 @@ static char *get_config_path(void)
+     "$HOME/.config/imv/config",
+     "$HOME/.imv_config",
+     "$HOME/.imv/config",
+-    "/usr/local/etc/imv_config",
+-    "/etc/imv_config",
++    "@PKG_SYSCONFDIR@/imv_config",
+   };
+ 
+   for (size_t i = 0; i < sizeof(config_paths) / sizeof(char*); ++i) {