pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vv: remove, used for updating pkgsrc
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sat Jul 4 23:45:10 2026 +0200
Changeset: 73942fd45676ae35cb19d422c30c1fa2dfd479fa
Modified Files:
Makefile
Removed Files:
vv/DESCR
vv/Makefile
vv/PLIST
vv/distinfo
vv/patches/patch-CMakeLists.txt
vv/patches/patch-cmake_git-ref.py
Log Message:
vv: remove, used for updating pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=73942fd45676ae35cb19d422c30c1fa2dfd479fa
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 3 +-
vv/DESCR | 8 -----
vv/Makefile | 66 ---------------------------------------
vv/PLIST | 6 ----
vv/distinfo | 13 --------
vv/patches/patch-CMakeLists.txt | 16 ----------
vv/patches/patch-cmake_git-ref.py | 33 --------------------
7 files changed, 2 insertions(+), 143 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 311bc772e1..accbe1b8a4 100644
--- a/Makefile
+++ b/Makefile
@@ -2193,6 +2193,7 @@ SUBDIR+= librewolf
SUBDIR+= librocket
SUBDIR+= libs-gui
SUBDIR+= libscscp
+SUBDIR+= libsdfparse
SUBDIR+= libsearpc
SUBDIR+= libseccomp
SUBDIR+= libslab
@@ -5389,6 +5390,7 @@ SUBDIR+= scx
SUBDIR+= scythe
SUBDIR+= sdd
SUBDIR+= sddm
+SUBDIR+= sdfparser
SUBDIR+= sdict-tools
SUBDIR+= sdif-git
SUBDIR+= sdl-sopwith
@@ -6028,7 +6030,6 @@ 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
deleted file mode 100644
index 70601f29a8..0000000000
--- a/vv/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index ee849703c0..0000000000
--- a/vv/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# $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-20260704
-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= c84fe419ca4be928505b0e1af67a87e61b0aa525
-
-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+= 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
-
-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
-
-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/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
deleted file mode 100644
index 2159220d01..0000000000
--- a/vv/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD$
-bin/exrconv
-bin/vv
-lib/libmcoreimage.so
-lib/libmcoreutil.so
-share/doc/vv/README.md
diff --git a/vv/distinfo b/vv/distinfo
deleted file mode 100644
index 089b55e08d..0000000000
--- a/vv/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.3 2025/02/18 10:50:36 wiz Exp $
-
-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
deleted file mode 100644
index dc3f19e6bb..0000000000
--- a/vv/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 22e1109cef..0000000000
--- a/vv/patches/patch-cmake_git-ref.py
+++ /dev/null
@@ -1,33 +0,0 @@
-$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