pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vv: finish update
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sat Jul 4 23:42:45 2026 +0200
Changeset: 7d2000500daaff418c764e76f3b98656cc4d3fe7
Modified Files:
vv/Makefile
vv/PLIST
vv/distinfo
Added Files:
vv/patches/patch-CMakeLists.txt
vv/patches/patch-cmake_git-ref.py
Removed Files:
vv/TODO
Log Message:
vv: finish update
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7d2000500daaff418c764e76f3b98656cc4d3fe7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
vv/Makefile | 13 ++++++++-----
vv/PLIST | 5 ++++-
vv/TODO | 4 ----
vv/distinfo | 8 +++++---
vv/patches/patch-CMakeLists.txt | 16 ++++++++++++++++
vv/patches/patch-cmake_git-ref.py | 33 +++++++++++++++++++++++++++++++++
6 files changed, 66 insertions(+), 13 deletions(-)
diffs:
diff --git a/vv/Makefile b/vv/Makefile
index c32995a2b8..ee849703c0 100644
--- a/vv/Makefile
+++ b/vv/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=wolfpld/}
GITHUB_PROJECT= moderncore
#GITHUB_TAG= ${DISTNAME:S/moderncore-//}
-GITHUB_TAG= 5058c9d55e13c1c5047b1129f7c1f069d10a84a1
+GITHUB_TAG= c84fe419ca4be928505b0e1af67a87e61b0aa525
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/wolfpld/moderncore/
@@ -19,7 +19,7 @@ USE_CXX_FEATURES+= c++20
# needs <format> which was added in 13, despite being in C++ 20
GCC_REQD+= 13
USE_TOOLS+= git pkg-config
-INSTALLATION_DIRS+= bin share/doc/vv
+INSTALLATION_DIRS+= share/doc/vv
# https://github.com/wolfpld/vv/issues/14#issuecomment-2660992164
JPEG_ACCEPTED= libjpeg-turbo
@@ -31,20 +31,23 @@ CMAKE_CONFIGURE_ARGS+= -DCPM_tracy_SOURCE=${WRKSRC}/tracy
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"
.include "../../archivers/lz4/buildlink3.mk"
.include "../../converters/aklomp-base64/buildlink3.mk"
-.include "../../devel/catch2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
diff --git a/vv/PLIST b/vv/PLIST
index 6a3d25c970..2159220d01 100644
--- a/vv/PLIST
+++ b/vv/PLIST
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2025/02/04 11:25:45 wiz Exp $
+@comment $NetBSD$
+bin/exrconv
bin/vv
+lib/libmcoreimage.so
+lib/libmcoreutil.so
share/doc/vv/README.md
diff --git a/vv/TODO b/vv/TODO
deleted file mode 100644
index 919817fa78..0000000000
--- a/vv/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-127/135] Linking CXX executable exrconv
-FAILED: [code=1] exrconv
-: && /tmp/wip/vv/work/.cwrapper/bin/c++ -O2 -g -fstack-clash-protection -I/usr/pkg/include -I/usr/include -I/usr/pkg/include/glib-2.0 -I/usr/pkg/include/gio-unix-2.0 -I/usr/pkg/lib/glib-2.0/include -I/usr/pkg/include/freetype2 -I/usr/pkg/include/harfbuzz -I/usr/pkg/include/libxml2 -g -Wl,-zrelro -Wl,-znow -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib -Wl,--dependency-file=CMakeFiles/exrconv.dir/link.d CMakeFiles/exrconv.dir/src/tools/exrconv/exrconv.cpp.o -o exrconv libmcoreimage.so _deps/tracy-build/libTracyClient.a libmcoreutil.so -lpthread && :
-ld: libmcoreutil.so: undefined reference to `backtrace'
diff --git a/vv/distinfo b/vv/distinfo
index 6d1c0d1c87..089b55e08d 100644
--- a/vv/distinfo
+++ b/vv/distinfo
@@ -1,11 +1,13 @@
$NetBSD: distinfo,v 1.3 2025/02/18 10:50:36 wiz Exp $
-BLAKE2s (moderncore-20260704-5058c9d55e13c1c5047b1129f7c1f069d10a84a1.tar.gz) = 29e36396b209a41344bed90fecd143f3b678a21a34f3514f03b4da424156c392
-SHA512 (moderncore-20260704-5058c9d55e13c1c5047b1129f7c1f069d10a84a1.tar.gz) = bdf0719751d1b460d9d19f596e67651bd2d0568c3d89bc99d11fc475fdab57a2b1f9dd7542acdad4093f6fbb094469030f808dc268b75c7058fe03f5f3296963
-Size (moderncore-20260704-5058c9d55e13c1c5047b1129f7c1f069d10a84a1.tar.gz) = 2702838 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
diff --git a/vv/patches/patch-CMakeLists.txt b/vv/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..dc3f19e6bb
--- /dev/null
+++ b/vv/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+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
+ )
+
diff --git a/vv/patches/patch-cmake_git-ref.py b/vv/patches/patch-cmake_git-ref.py
new file mode 100644
index 0000000000..22e1109cef
--- /dev/null
+++ b/vv/patches/patch-cmake_git-ref.py
@@ -0,0 +1,33 @@
+$NetBSD$
+
+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:
Home |
Main Index |
Thread Index |
Old Index