pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vv: add wip update, doesn't build, reported upstream



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Jul 4 11:07:13 2026 +0200
Changeset:	dee4c4eefdbc9b1f86e07030b5df45971921d383

Modified Files:
	Makefile
Added Files:
	vv/DESCR
	vv/Makefile
	vv/PLIST
	vv/TODO
	vv/distinfo

Log Message:
vv: add wip update, doesn't build, reported upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dee4c4eefdbc9b1f86e07030b5df45971921d383

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

diffstat:
 Makefile    |  1 +
 vv/DESCR    |  8 ++++++++
 vv/Makefile | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 vv/PLIST    |  3 +++
 vv/TODO     | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 vv/distinfo | 11 +++++++++++
 6 files changed, 140 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index c5a5e2ae47..6ceea103bd 100644
--- a/Makefile
+++ b/Makefile
@@ -6028,6 +6028,7 @@ SUBDIR+=	vpnc
 SUBDIR+=	vpr
 SUBDIR+=	vscode
 SUBDIR+=	vsearch
+SUBDIR+=	vv
 SUBDIR+=	w3c-httpd
 SUBDIR+=	wackamole
 SUBDIR+=	wadgadget
diff --git a/vv/DESCR b/vv/DESCR
new file mode 100644
index 0000000000..70601f29a8
--- /dev/null
+++ b/vv/DESCR
@@ -0,0 +1,8 @@
+vv - terminal image viewer
+
+With vv you can display image files directly in your terminal. This
+works both locally and over remote connections. An extensive range
+of modern image formats is supported. Image data is displayed in
+full color, without any color space reduction or dithering. Images
+are scaled to fit the available space in the terminal. Small images
+can be upscaled.
diff --git a/vv/Makefile b/vv/Makefile
new file mode 100644
index 0000000000..6a4a72bc50
--- /dev/null
+++ b/vv/Makefile
@@ -0,0 +1,63 @@
+# $NetBSD: Makefile,v 1.19 2026/06/23 09:37:02 wiz Exp $
+
+# not a release, but we want the change to allow disabling iv
+DISTNAME=	moderncore-20260504
+PKGNAME=	${DISTNAME:S/moderncore-/vv-3.2./}
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_GITHUB:=wolfpld/}
+GITHUB_PROJECT=	moderncore
+#GITHUB_TAG=	${DISTNAME:S/moderncore-//}
+GITHUB_TAG=	48305c3954cce830720b8b3f6826a36b12ae7e9b
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/wolfpld/moderncore/
+COMMENT=	View images in your terminal
+LICENSE=	modified-bsd
+
+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+=		git pkg-config
+INSTALLATION_DIRS+=	bin share/doc/vv
+
+# https://github.com/wolfpld/vv/issues/14#issuecomment-2660992164
+JPEG_ACCEPTED=		libjpeg-turbo
+
+# '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 f1c79c02822848a9bed4315b12c8c8f3761e1296 stb
+CMAKE_CONFIGURE_ARGS+=	-DCPM_stb_SOURCE=${WRKSRC}/stb
+
+# 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
+	${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"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/libheif/buildlink3.mk"
+.include "../../graphics/libjxl/buildlink3.mk"
+.include "../../graphics/libraw/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/libsixel/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../textproc/pugixml/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/vv/PLIST b/vv/PLIST
new file mode 100644
index 0000000000..6a3d25c970
--- /dev/null
+++ b/vv/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2025/02/04 11:25:45 wiz Exp $
+bin/vv
+share/doc/vv/README.md
diff --git a/vv/TODO b/vv/TODO
new file mode 100644
index 0000000000..61b5f4bb48
--- /dev/null
+++ b/vv/TODO
@@ -0,0 +1,54 @@
+Two build problems:
+
+FAILED: [code=1] CMakeFiles/mcoreimage.dir/src/image/JxlLoader.cpp.o
+/tmp/graphics/vv/work/.cwrapper/bin/c++ -Dmcoreimage_EXPORTS -I/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/cmake-pkgsrc-build -I/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a
+36b12ae7e9b -I/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src -I/usr/pkg/include/cairo -I/usr/pkg/include -I/usr/pkg/include/freetype2 -I/usr/pkg/include/libpng16 -I/usr/pkg/include/pixman-1
+ -I/usr/pkg/include/OpenEXR -I/usr/pkg/include/Imath -I/usr/pkg/include/libraw -I/usr/pkg/include/librsvg-2.0 -I/usr/pkg/include/gdk-pixbuf-2.0 -I/usr/pkg/include/libxml2 -I/usr/pkg/include/pango-1.0 -I/usr/pkg/include/f
+ribidi -I/usr/pkg/include/harfbuzz -I/usr/pkg/include/glib-2.0 -I/usr/pkg/lib/glib-2.0/include -I/usr/pkg/include/webp -I/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/stb -isystem /tmp/graphic
+s/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/tracy/public -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 -std=gnu++20 -fPIC -fdiagnostics-color=always -MD -MT CMakeFiles/mcoreimage.dir/src/image/JxlLoader.cpp.o -MF CMakeFiles
+/mcoreimage.dir/src/image/JxlLoader.cpp.o.d -fmodules-ts -fmodule-mapper=CMakeFiles/mcoreimage.dir/src/image/JxlLoader.cpp.o.modmap -MD -fdeps-format=p1689r5 -x c++ -o CMakeFiles/mcoreimage.dir/src/image/JxlLoader.cpp.o
+-c /tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/image/JxlLoader.cpp
+In file included from /tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/image/JxlLoader.cpp:7:
+/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/image/JxlLoader.hpp:15:33: error: conflicting declaration 'typedef struct JxlDecoderStruct JxlDecoder'
+   15 | typedef struct JxlDecoderStruct JxlDecoder;
+      |                                 ^~~~~~~~~~
+In file included from /tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/image/JxlLoader.cpp:3:
+/tmp/graphics/vv/work/.buildlink/include/jxl/decode.h:84:27: note: previous declaration as 'typedef struct JxlDecoder JxlDecoder'
+   84 | typedef struct JxlDecoder JxlDecoder;
+      |                           ^~~~~~~~~~
+[101/135] Building CXX object CMakeFiles/mcoreimage.dir/src/image/ExrLoader.cpp.o
+In file included from /tmp/graphics/vv/work/.buildlink/include/OpenEXR/ImfFrameBuffer.h:16,
+                 from /tmp/graphics/vv/work/.buildlink/include/OpenEXR/ImfRgbaFile.h:23,
+                 from /tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/image/ExrLoader.cpp:4:
+/tmp/graphics/vv/work/.buildlink/include/OpenEXR/ImfForward.h:25:51: warning: type attributes ignored after type is already defined [-Wattributes]
+   25 | struct IMF_EXPORT_TYPE                            Chromaticities;
+      |                                                   ^~~~~~~~~~~~~~
+
+[89/135] Building CXX object CMakeFiles/mcoreutil.dir/src/util/Bitmap.cpp.o
+FAILED: [code=1] CMakeFiles/mcoreutil.dir/src/util/Bitmap.cpp.o
+/tmp/graphics/vv/work/.cwrapper/bin/c++ -Dmcoreutil_EXPORTS -I/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/cmake-pkgsrc-build -I/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a3
+6b12ae7e9b -I/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src -I/usr/pkg/include -I/usr/pkg/include/OpenEXR -I/usr/pkg/include/Imath -I/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3
+f6826a36b12ae7e9b/stb -I/usr/pkg/include/libpng16 -isystem /tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/tracy/public -O2 -g -fstack-clash-protection -I/usr/pkg/include -I/usr/include -I/usr/p
+kg/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 -std=gnu++20 -fPIC -fdiagnostics-color=always -MD
+ -MT CMakeFiles/mcoreutil.dir/src/util/Bitmap.cpp.o -MF CMakeFiles/mcoreutil.dir/src/util/Bitmap.cpp.o.d -fmodules-ts -fmodule-mapper=CMakeFiles/mcoreutil.dir/src/util/Bitmap.cpp.o.modmap -MD -fdeps-format=p1689r5 -x c++
+ -o CMakeFiles/mcoreutil.dir/src/util/Bitmap.cpp.o -c /tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/util/Bitmap.cpp
+In file included from /usr/include/gcc-14/immintrin.h:37,
+                 from /usr/include/gcc-14/x86intrin.h:32,
+                 from /tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/util/Bitmap.cpp:14:
+/usr/include/gcc-14/tmmintrin.h: In member function 'void Bitmap::BgrToRgb()':
+/usr/include/gcc-14/tmmintrin.h:136:1: error: inlining failed in call to 'always_inline' '__m128i _mm_shuffle_epi8(__m128i, __m128i)': target specific option mismatch
+  136 | _mm_shuffle_epi8 (__m128i __X, __m128i __Y)
+      | ^~~~~~~~~~~~~~~~
+/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/util/Bitmap.cpp:416:29: note: called from here
+  416 |         v = _mm_shuffle_epi8( v, _mm_set_epi64x( 0x0f0c0d0e0b08090a, 0x0704050603000102 ) );
+      |             ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/gcc-14/tmmintrin.h:136:1: error: inlining failed in call to 'always_inline' '__m128i _mm_shuffle_epi8(__m128i, __m128i)': target specific option mismatch
+  136 | _mm_shuffle_epi8 (__m128i __X, __m128i __Y)
+      | ^~~~~~~~~~~~~~~~
+/tmp/graphics/vv/work/moderncore-48305c3954cce830720b8b3f6826a36b12ae7e9b/src/util/Bitmap.cpp:416:29: note: called from here
+  416 |         v = _mm_shuffle_epi8( v, _mm_set_epi64x( 0x0f0c0d0e0b08090a, 0x0704050603000102 ) );
+      |             ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+https://github.com/wolfpld/moderncore/issues/5
diff --git a/vv/distinfo b/vv/distinfo
new file mode 100644
index 0000000000..10dd4104fb
--- /dev/null
+++ b/vv/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.3 2025/02/18 10:50:36 wiz Exp $
+
+BLAKE2s (moderncore-20260504-48305c3954cce830720b8b3f6826a36b12ae7e9b.tar.gz) = c9c1aefbccecd7a2b66ef40de4ba5d9cc3ce78c636ee58acf54990b052422a05
+SHA512 (moderncore-20260504-48305c3954cce830720b8b3f6826a36b12ae7e9b.tar.gz) = d32f821b98c3fcd7705fc319e19a7faba2642954f512985b5284175b5b3cb40b3754323827e1008be7b275e045aaa7c1830d268fd65d2241799ad3c7e9d27c99
+Size (moderncore-20260504-48305c3954cce830720b8b3f6826a36b12ae7e9b.tar.gz) = 2702876 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


Home | Main Index | Thread Index | Old Index