Date: Sat, 26 Oct 2024 17:40:57 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4eecaf5e738f - main - sysutils/dtc: Update to 1.7.1 Message-ID: <202410261740.49QHeveC089901@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4eecaf5e738fb2a1722b6c85e79b9d4836df4cb0 commit 4eecaf5e738fb2a1722b6c85e79b9d4836df4cb0 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2024-10-26 17:12:21 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2024-10-26 17:13:54 +0000 sysutils/dtc: Update to 1.7.1 * Convert to Meson * Import upstream PR 141 [1] 1: https://github.com/dgibson/dtc/pull/141 Changelog: https://github.com/dgibson/dtc/releases/tag/v1.7.1 PR: 281891 Approved by: portmgr (maintainer timeout, 2+ weeks) --- sysutils/dtc/Makefile | 22 ++++++++++++---------- sysutils/dtc/distinfo | 10 +++++----- sysutils/dtc/files/patch-libfdt_fdt__rw.c | 11 ----------- sysutils/dtc/pkg-plist | 4 ++-- 4 files changed, 19 insertions(+), 28 deletions(-) diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile index 96f931c46845..0040f8907708 100644 --- a/sysutils/dtc/Makefile +++ b/sysutils/dtc/Makefile @@ -1,10 +1,10 @@ PORTNAME= dtc -PORTVERSION= 1.6.0 DISTVERSIONPREFIX= v +DISTVERSION= 1.7.1 CATEGORIES= sysutils PATCH_SITES= https://github.com/dgibson/dtc/commit/ -PATCHFILES+= ca19c3db2b.patch:-p1 # https://github.com/dgibson/dtc/pull/41 +PATCHFILES= 1b75550436433e150164715dedb417e4d234df6c.patch:-p1 MAINTAINER= uboot@FreeBSD.org COMMENT= Device Tree Compiler @@ -14,18 +14,20 @@ LICENSE= GPLv2 LIB_DEPENDS= libyaml.so:textproc/libyaml -USES= bison compiler:c11 cpe gmake pkgconfig shebangfix +USES= bison compiler:c11 cpe meson pkgconfig shebangfix CPE_VENDOR= ${PORTNAME}_project +SHEBANG_FILES= dtdiff +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= dgibson -USE_LDCONFIG= yes -SHEBANG_FILES= dtdiff -TEST_TARGET= check -TEST_ENV= STATSZ="stat -f %Uz" +MESON_ARGS= --default-library=shared \ + -Dpython=disabled \ + -Dvalgrind=disabled + +OPTIONS_DEFINE= TEST -MAKE_ARGS+= PREFIX=${PREFIX} NO_PYTHON=yes \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_LIB="${INSTALL_LIB}" +TEST_MESON_TRUE= tests .include <bsd.port.mk> diff --git a/sysutils/dtc/distinfo b/sysutils/dtc/distinfo index 7c9335d884be..c1df5c295394 100644 --- a/sysutils/dtc/distinfo +++ b/sysutils/dtc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1598352412 -SHA256 (dgibson-dtc-v1.6.0_GH0.tar.gz) = 3d15dee7126a6c4a015ab47ec908cab13e39774b0315efaaebb223cb4a4d349c -SIZE (dgibson-dtc-v1.6.0_GH0.tar.gz) = 200316 -SHA256 (ca19c3db2b.patch) = 0026f5ece39859bbd5ad7a9bc6d7c4dd3fb2ff85b35bf88c2dd227cfdb28c9b4 -SIZE (ca19c3db2b.patch) = 735 +TIMESTAMP = 1728145110 +SHA256 (dgibson-dtc-v1.7.1_GH0.tar.gz) = c4c4a47b8af98ad81c488d934da051f28bd2d0143a4622ea14d1920bc8c90f75 +SIZE (dgibson-dtc-v1.7.1_GH0.tar.gz) = 216960 +SHA256 (1b75550436433e150164715dedb417e4d234df6c.patch) = 01ce4fcd2b0101a582bde67f372a29d9470e7ebb86f8e98785a90435f520047c +SIZE (1b75550436433e150164715dedb417e4d234df6c.patch) = 4569 diff --git a/sysutils/dtc/files/patch-libfdt_fdt__rw.c b/sysutils/dtc/files/patch-libfdt_fdt__rw.c deleted file mode 100644 index 2c0bc333f16f..000000000000 --- a/sysutils/dtc/files/patch-libfdt_fdt__rw.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libfdt/fdt_rw.c.orig 2020-03-04 06:14:58 UTC -+++ libfdt/fdt_rw.c -@@ -435,7 +435,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufs - return struct_size; - } - -- if (can_assume(LIBFDT_ORDER) | -+ if (can_assume(LIBFDT_ORDER) || - !fdt_blocks_misordered_(fdt, mem_rsv_size, struct_size)) { - /* no further work necessary */ - err = fdt_move(fdt, buf, bufsize); diff --git a/sysutils/dtc/pkg-plist b/sysutils/dtc/pkg-plist index 2d81f6ff28b2..89e3963467dc 100644 --- a/sysutils/dtc/pkg-plist +++ b/sysutils/dtc/pkg-plist @@ -8,7 +8,7 @@ bin/fdtput include/fdt.h include/libfdt.h include/libfdt_env.h -lib/libfdt-1.6.0.so -lib/libfdt.a lib/libfdt.so lib/libfdt.so.1 +lib/libfdt.so.1.7.1 +libdata/pkgconfig/libfdt.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410261740.49QHeveC089901>