CVS commit: pkgsrc/graphics/vv

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/vv
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 4 Jul 2026 21:44:31 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul  4 21:44:31 UTC 2026

Modified Files:
        pkgsrc/graphics/vv: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/vv/patches: patch-CMakeLists.txt patch-cmake_git-ref.py

Log Message:
vv: update to 3.2.20260704.

Fixes build with latest libjxl.

No upstream summary of changes found; repository
moved and new tool is now installed.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/vv/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/vv/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/vv/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/vv/patches/patch-CMakeLists.txt \
    pkgsrc/graphics/vv/patches/patch-cmake_git-ref.py

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

Modified files:

Index: pkgsrc/graphics/vv/Makefile
diff -u pkgsrc/graphics/vv/Makefile:1.19 pkgsrc/graphics/vv/Makefile:1.20
--- pkgsrc/graphics/vv/Makefile:1.19    Tue Jun 23 09:37:02 2026
+++ pkgsrc/graphics/vv/Makefile Sat Jul  4 21:44:30 2026
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.19 2026/06/23 09:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2026/07/04 21:44:30 wiz Exp $
 
-DISTNAME=      vv-3.2
-PKGREVISION=   12
+# not a release, but we want the change fixing the build with libjxl 0.12.0
+DISTNAME=      moderncore-20260704
+PKGNAME=       ${DISTNAME:S/moderncore-/vv-3.2./}
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wolfpld/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+GITHUB_PROJECT=        moderncore
+#GITHUB_TAG=   ${DISTNAME:S/moderncore-//}
+GITHUB_TAG=    c84fe419ca4be928505b0e1af67a87e61b0aa525
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/wolfpld/vv/
+HOMEPAGE=      https://github.com/wolfpld/moderncore/
 COMMENT=       View images in your terminal
 LICENSE=       modified-bsd
 
@@ -15,24 +18,31 @@ USE_LANGUAGES=              c c++
 USE_CXX_FEATURES+=     c++20
 # needs <format> which was added in 13, despite being in C++ 20
 GCC_REQD+=             13
-USE_TOOLS+=            pkg-config
-INSTALLATION_DIRS+=    bin share/doc/vv
+USE_TOOLS+=            git pkg-config
+INSTALLATION_DIRS+=    share/doc/vv
 
 # https://github.com/wolfpld/vv/issues/14#issuecomment-2660992164
 JPEG_ACCEPTED=         libjpeg-turbo
 
-# 'master' as of 2025-02-08
-GITHUB_SUBMODULES+=    wolfpld tracy 9b7d53a979f0734deebb07d0135f5400af12a576 tracy
+# 'master' as of 2026-07-04
+GITHUB_SUBMODULES+=    wolfpld tracy 853fff614eb2deffd7c86853b517c8021a3efd1f tracy
 CMAKE_CONFIGURE_ARGS+= -DCPM_tracy_SOURCE=${WRKSRC}/tracy
 # hash from CMakeLists.txt
-GITHUB_SUBMODULES+=    nothings stb 2e2bef463a5b53ddf8bb788e25da6b8506314c08 stb
+GITHUB_SUBMODULES+=    nothings stb f1c79c02822848a9bed4315b12c8c8f3761e1296 stb
 CMAKE_CONFIGURE_ARGS+= -DCPM_stb_SOURCE=${WRKSRC}/stb
 
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SKIP_RPATH=OFF
+# don't build wayland-using iv viewer
+CMAKE_CONFIGURE_ARGS+= -DBUILD_IV=OFF
+
 # Turn off -march=native that is enabled by default.
 CMAKE_CONFIGURE_ARGS+= -DMARCH_NATIVE:BOOL=OFF
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/${CMAKE_BUILD_DIR}/vv ${DESTDIR}${PREFIX}/bin
+pre-configure:
+       ${ECHO} ${GITHUB_TAG:C/(.......).*/\1/} > ${WRKSRC}/git-commit-id
+
+post-install:
        ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/vv/
 
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/graphics/vv/PLIST
diff -u pkgsrc/graphics/vv/PLIST:1.1 pkgsrc/graphics/vv/PLIST:1.2
--- pkgsrc/graphics/vv/PLIST:1.1        Tue Feb  4 11:25:45 2025
+++ pkgsrc/graphics/vv/PLIST    Sat Jul  4 21:44:30 2026
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2025/02/04 11:25:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/07/04 21:44:30 wiz Exp $
+bin/exrconv
 bin/vv
+lib/libmcoreimage.so
+lib/libmcoreutil.so
 share/doc/vv/README.md

Index: pkgsrc/graphics/vv/distinfo
diff -u pkgsrc/graphics/vv/distinfo:1.3 pkgsrc/graphics/vv/distinfo:1.4
--- pkgsrc/graphics/vv/distinfo:1.3     Tue Feb 18 10:50:36 2025
+++ pkgsrc/graphics/vv/distinfo Sat Jul  4 21:44:30 2026
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.3 2025/02/18 10:50:36 wiz Exp $
+$NetBSD: distinfo,v 1.4 2026/07/04 21:44:30 wiz Exp $
 
-BLAKE2s (nothings-stb-2e2bef463a5b53ddf8bb788e25da6b8506314c08.tar.gz) = abec19494d8c7a652c22a2941984fa7e1aad4004fb60d9c9ff1e74ae9b48f31e
-SHA512 (nothings-stb-2e2bef463a5b53ddf8bb788e25da6b8506314c08.tar.gz) = 
c63bd95f97e3985e6de43b6a4091044e7e19a32dcdd21181918d1350cb363238d4685c13773954c3942ad9d3cddaef5bf6605e9c0c8a2f5ec09d23a459ccde28
-Size (nothings-stb-2e2bef463a5b53ddf8bb788e25da6b8506314c08.tar.gz) = 1512470 bytes
-BLAKE2s (vv-3.2.tar.gz) = b654583974c9ebe120010339acfa555a0f9c2170f8bc5019adb3ea63bdea010a
-SHA512 (vv-3.2.tar.gz) = f0747254aa66507eb0005320ccf693ba47e040d71b5bb98c364f124c3d0e9e27ee928885fbd5d4fd1e3ffd6750a4f7f50eb467aa0ddabcab0135f36763167372
-Size (vv-3.2.tar.gz) = 2269969 bytes
-BLAKE2s (wolfpld-tracy-9b7d53a979f0734deebb07d0135f5400af12a576.tar.gz) = 84c027d39175971ff03e3ecd914f3861a919eabc286584e3154b05b93bbaea2a
-SHA512 (wolfpld-tracy-9b7d53a979f0734deebb07d0135f5400af12a576.tar.gz) = 
099b6ed830900c4885f8889e6ca98beed60f04974825b4c7accc542f4e9423621c28ae57f885c9167c6db16de3a095183afaa5b231124c1f8e0dc938449a11d6
-Size (wolfpld-tracy-9b7d53a979f0734deebb07d0135f5400af12a576.tar.gz) = 5255182 bytes
+BLAKE2s (moderncore-20260704-c84fe419ca4be928505b0e1af67a87e61b0aa525.tar.gz) = 891d5dbaa4a82a570b495789ade71b4507ac1e4d24f46d53d0f94238595dd307
+SHA512 (moderncore-20260704-c84fe419ca4be928505b0e1af67a87e61b0aa525.tar.gz) = 
a2544590f486e72de2b37652d444552097e6f9421f776201f9b9c3f9f2b43a3e09b6f6e0be163251fbea1ee0c072ce1b6e32ecdb799bb964bd5b8c7f78a3fe1f
+Size (moderncore-20260704-c84fe419ca4be928505b0e1af67a87e61b0aa525.tar.gz) = 2702889 bytes
+BLAKE2s (nothings-stb-f1c79c02822848a9bed4315b12c8c8f3761e1296.tar.gz) = e75500be9da9423033d87c96acb9532a6738b6317efceaae03487c5857b250a1
+SHA512 (nothings-stb-f1c79c02822848a9bed4315b12c8c8f3761e1296.tar.gz) = 
21375dcdc277d0c279cd5258441aaf79b02a1365ce2d37fa5acb016c2f80e7f8156c7da1d41892cc6640414391c30301778359a37f3eea18de9d12acbf2c21b0
+Size (nothings-stb-f1c79c02822848a9bed4315b12c8c8f3761e1296.tar.gz) = 1514727 bytes
+BLAKE2s (wolfpld-tracy-853fff614eb2deffd7c86853b517c8021a3efd1f.tar.gz) = bec059d573559be72087408aaa63435fa064ee4b7da7552fbd74ac5106c0f2af
+SHA512 (wolfpld-tracy-853fff614eb2deffd7c86853b517c8021a3efd1f.tar.gz) = 
d7aa161030dc8b792f4b2f4ba173446371b35d055d343b5024b770911a0495a25d440bc8350575136c85abb48353c91f5f9444f46dd58f6f9de5542341fac83c
+Size (wolfpld-tracy-853fff614eb2deffd7c86853b517c8021a3efd1f.tar.gz) = 6122641 bytes
+SHA1 (patch-CMakeLists.txt) = e973eaaac47a125578487456016a3105e86270e1
+SHA1 (patch-cmake_git-ref.py) = 4bed94f3dd71dff142f81a63ec3079daf4f4b195

Added files:

Index: pkgsrc/graphics/vv/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/vv/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Jul  4 21:44:31 2026
+++ pkgsrc/graphics/vv/patches/patch-CMakeLists.txt     Sat Jul  4 21:44:31 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2026/07/04 21:44:31 wiz Exp $
+
+Pass in commit id.
+https://github.com/wolfpld/moderncore/issues/5
+
+--- CMakeLists.txt.orig        2026-07-04 21:27:09.225353916 +0000
++++ CMakeLists.txt
+@@ -136,7 +136,7 @@ add_custom_target(git-ref
+ 
+ find_package(Python3 COMPONENTS Interpreter REQUIRED)
+ add_custom_target(git-ref
+-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/cmake/git-ref.py
++    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/cmake/git-ref.py ${PROJECT_SOURCE_DIR}/git-commit-id
+     BYPRODUCTS GitRef.hpp
+ )
+ 
Index: pkgsrc/graphics/vv/patches/patch-cmake_git-ref.py
diff -u /dev/null pkgsrc/graphics/vv/patches/patch-cmake_git-ref.py:1.1
--- /dev/null   Sat Jul  4 21:44:31 2026
+++ pkgsrc/graphics/vv/patches/patch-cmake_git-ref.py   Sat Jul  4 21:44:31 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-cmake_git-ref.py,v 1.1 2026/07/04 21:44:31 wiz Exp $
+
+Pass in commit id.
+https://github.com/wolfpld/moderncore/issues/5
+
+--- cmake/git-ref.py.orig      2026-07-04 20:57:10.000000000 +0000
++++ cmake/git-ref.py
+@@ -3,14 +3,21 @@ import os
+ import filecmp
+ import subprocess
+ import os
++import sys
+ 
+ out = "GitRef.hpp"
+ tmp = f"{out}.tmp"
+ 
+-try:
+-    ref = subprocess.run(["git", "rev-parse", "--short", "HEAD"], check=True, capture_output=True).stdout.decode().strip()
+-except subprocess.CalledProcessError:
+-    ref = "unknown"
++filename = sys.argv[1] if len(sys.argv) > 1 else None
++if filename and os.path.exists(filename):
++    with open(filename, "r") as fh:
++        for line in fh:
++            ref = line.rstrip()
++else:
++    try:
++        ref = subprocess.run(["git", "rev-parse", "--short", "HEAD"], check=True, capture_output=True).stdout.decode().strip()
++    except subprocess.CalledProcessError:
++        ref = "unknown"
+ 
+ if not os.path.exists(out):
+     with open(out, "w") as f:

Prev by Date: CVS commit: pkgsrc/textproc/jose
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/textproc/jose
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index