On Thu, Apr 04, 2024 at 05:19:28PM -0400, Brad Smith wrote:
> Here is an update to fmt 10.2.1.
>
>
> https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.md
Here is the fmt diff for 10.2.1 again as well as deps adjustments.
Index: devel/fmt/Makefile
===================================================================
RCS file: /cvs/ports/devel/fmt/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- devel/fmt/Makefile 7 Jun 2022 11:40:17 -0000 1.5
+++ devel/fmt/Makefile 17 Apr 2024 00:51:37 -0000
@@ -2,9 +2,9 @@ COMMENT= alternative formatting library
GH_ACCOUNT= fmtlib
GH_PROJECT= fmt
-GH_TAGNAME= 8.1.1
+GH_TAGNAME= 10.2.1
-SHARED_LIBS= fmt 1.1
+SHARED_LIBS= fmt 2.0
CATEGORIES= devel
@@ -13,17 +13,11 @@ PERMIT_PACKAGE= Yes
# C++11
COMPILER= base-clang ports-gcc
+
MODULES= devel/cmake
-WANTLIB+= ${COMPILER_LIBCXX}
+WANTLIB+= ${COMPILER_LIBCXX} m
CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=on
-
-# Fix undefined references to pthread_* symbols on clang+ld.bfd archs by
-# disabling -Wl,--as-needed.
-.include <bsd.port.arch.mk>
-.if !${PROPERTIES:Mlld} && ${PROPERTIES:Mclang}
-CONFIGURE_ARGS+= -DAS_NEEDED=off
-.endif
.include <bsd.port.mk>
Index: devel/fmt/distinfo
===================================================================
RCS file: /cvs/ports/devel/fmt/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- devel/fmt/distinfo 7 Jun 2022 11:40:17 -0000 1.3
+++ devel/fmt/distinfo 17 Apr 2024 00:51:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (fmt-8.1.1.tar.gz) = PXlNPPZ2M7NLJ3Hrnwc73ofoRuDTldJU33shHvHsc0Y=
-SIZE (fmt-8.1.1.tar.gz) = 826254
+SHA256 (fmt-10.2.1.tar.gz) = ElDkzFi/Bu5jFWdSP0iEjcRZYTPhY/AmFcl/eLq2yBE=
+SIZE (fmt-10.2.1.tar.gz) = 854665
Index: devel/fmt/patches/patch-CMakeLists_txt
===================================================================
RCS file: devel/fmt/patches/patch-CMakeLists_txt
diff -N devel/fmt/patches/patch-CMakeLists_txt
--- devel/fmt/patches/patch-CMakeLists_txt 7 Jun 2022 11:40:17 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-Allow linking without '-Wl,--as-needed', fix the build on clang+ld.bfd archs.
-It's needed to do it like this since target_link_libraries takes preference
-over LDFLAGS.
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -72,6 +72,7 @@ set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CA
- option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF)
- option(FMT_WERROR "Halt the compilation with an error on compiler warnings."
- OFF)
-+option(AS_NEEDED "Use -Wl,--as-needed for linking." ON)
-
- # Options that control generation of various targets.
- option(FMT_DOC "Generate the doc target." ${FMT_MASTER_PROJECT})
-@@ -286,7 +287,7 @@ endif ()
-
- if (BUILD_SHARED_LIBS)
- if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" AND
-- NOT EMSCRIPTEN)
-+ NOT EMSCRIPTEN AND AS_NEEDED)
- # Fix rpmlint warning:
- # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0
/lib/libm.so.6.
- target_link_libraries(fmt -Wl,--as-needed)
Index: devel/fmt/patches/patch-src_os_cc
===================================================================
RCS file: devel/fmt/patches/patch-src_os_cc
diff -N devel/fmt/patches/patch-src_os_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/fmt/patches/patch-src_os_cc 17 Apr 2024 00:51:37 -0000
@@ -0,0 +1,24 @@
+Fix handling of the fileno macro
+38881e5acfbac830bdf68ad1c101ae420ac5bc92
+
+Index: src/os.cc
+--- src/os.cc.orig
++++ src/os.cc
+@@ -182,12 +182,12 @@ void buffered_file::close() {
+ }
+
+ int buffered_file::descriptor() const {
+-#if !defined(fileno)
++#ifdef FMT_HAS_SYSTEM
++ // fileno is a macro on OpenBSD.
++# ifdef fileno
++# undef fileno
++# endif
+ int fd = FMT_POSIX_CALL(fileno(file_));
+-#elif defined(FMT_HAS_SYSTEM)
+- // fileno is a macro on OpenBSD so we cannot use FMT_POSIX_CALL.
+-# define FMT_DISABLE_MACRO
+- int fd = FMT_SYSTEM(fileno FMT_DISABLE_MACRO(file_));
+ #else
+ int fd = fileno(file_);
+ #endif
Index: devel/fmt/patches/patch-test_gtest-extra-test_cc
===================================================================
RCS file: /cvs/ports/devel/fmt/patches/patch-test_gtest-extra-test_cc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-test_gtest-extra-test_cc
--- devel/fmt/patches/patch-test_gtest-extra-test_cc 11 Mar 2022 18:50:03
-0000 1.3
+++ devel/fmt/patches/patch-test_gtest-extra-test_cc 17 Apr 2024 00:51:37
-0000
@@ -1,7 +1,7 @@
Index: test/gtest-extra-test.cc
--- test/gtest-extra-test.cc.orig
+++ test/gtest-extra-test.cc
-@@ -345,6 +345,10 @@ TEST(output_redirect_test, flush_error_in_ctor) {
+@@ -347,6 +347,10 @@ TEST(output_redirect_test, flush_error_in_ctor) {
write_copy.dup2(write_fd); // "undo" close or dtor will fail
}
@@ -11,8 +11,8 @@ Index: test/gtest-extra-test.cc
+// out for now while i work on figuring it out.
TEST(output_redirect_test, dup_error_in_ctor) {
buffered_file f = open_buffered_file();
- int fd = (f.fileno)();
-@@ -356,6 +360,7 @@ TEST(output_redirect_test, dup_error_in_ctor) {
+ int fd = (f.descriptor)();
+@@ -358,6 +362,7 @@ TEST(output_redirect_test, dup_error_in_ctor) {
fmt::format("cannot duplicate file descriptor {}", fd));
copy.dup2(fd); // "undo" close or dtor will fail
}
Index: devel/fmt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/fmt/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- devel/fmt/pkg/PLIST 11 Mar 2022 18:50:03 -0000 1.3
+++ devel/fmt/pkg/PLIST 17 Apr 2024 00:51:37 -0000
@@ -6,11 +6,11 @@ include/fmt/compile.h
include/fmt/core.h
include/fmt/format-inl.h
include/fmt/format.h
-include/fmt/locale.h
include/fmt/os.h
include/fmt/ostream.h
include/fmt/printf.h
include/fmt/ranges.h
+include/fmt/std.h
include/fmt/xchar.h
lib/cmake/
lib/cmake/fmt/
Index: emulators/dolphin/Makefile
===================================================================
RCS file: /cvs/ports/emulators/dolphin/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- emulators/dolphin/Makefile 16 Apr 2024 17:21:57 -0000 1.20
+++ emulators/dolphin/Makefile 17 Apr 2024 01:22:39 -0000
@@ -5,9 +5,9 @@ ONLY_FOR_ARCHS = aarch64 amd64
COMMENT-main = Nintendo GameCube and Wii emulator with GUI
COMMENT-nogui = Nintendo GameCube and Wii emulator
-PKGNAME = dolphin-5.0.0.20230920
+PKGNAME = dolphin-5.0.0.20230924
DIST_TUPLE += github dolphin-emu dolphin \
- c0f4825a97f7ee03f0e6242b4ddf1a6a1b13c8ef . # GPLv2
+ 1a9d946a3337317d288b94b093f1e385e6989335 . # GPLv2
# Externals/
DIST_TUPLE += github dolphin-emu ext-win-qt \
@@ -83,7 +83,7 @@ LIB_DEPENDS-nogui = archivers/lzo2 \
archivers/zstd \
comms/libhidapi \
converters/libiconv \
- devel/fmt \
+ devel/fmt>=10.2.1 \
devel/libusb1 \
devel/sdl2 \
graphics/ffmpeg \
Index: emulators/dolphin/distinfo
===================================================================
RCS file: /cvs/ports/emulators/dolphin/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- emulators/dolphin/distinfo 16 Apr 2024 17:21:57 -0000 1.4
+++ emulators/dolphin/distinfo 17 Apr 2024 01:22:39 -0000
@@ -2,7 +2,7 @@ SHA256 (GPUOpen-LibrariesAndSDKs-VulkanM
SHA256
(KhronosGroup-SPIRV-Cross-06407561ece7d7e78544112189f3eee13adf9959.tar.gz) =
fgDvqwGuXx07Ade1ZVCyTYcZjhNO27WH63TyrJYFrts=
SHA256
(RetroAchievements-rcheevos-0cdc7f8e9592e0741c07729a34d49a55e6c5e290.tar.gz) =
tz13fq0l4yJWMR3XVe00/obTYiEEHHo25+T1Ohhu5pM=
SHA256 (bylaws-libadrenotools-deec5f75ee1a8ccbe32c8780b1d17284fc87b0f1.tar.gz)
= o6augsMi1ZiwdoJ9EIZTT0f5/s7Xs2eDiQFTy6+e2YA=
-SHA256 (dolphin-emu-dolphin-c0f4825a97f7ee03f0e6242b4ddf1a6a1b13c8ef.tar.gz) =
SIqQEYJQniJnhl1nYtLFGrgVXV5f66Pja+i+cC7dxuo=
+SHA256 (dolphin-emu-dolphin-1a9d946a3337317d288b94b093f1e385e6989335.tar.gz) =
zVhoIyyDMLE4yg+tRON2qV53+bDj6iFygIxmhe1u8cM=
SHA256
(dolphin-emu-ext-win-ffmpeg-9bc087fbca36ce5a85eb4fd73f0c73813593e5a2.tar.gz) =
yYzYdIDrLVja3JYdx5JWlmlN5KIR0wiSEn/h3HwJJ4U=
SHA256
(dolphin-emu-ext-win-qt-495517af2b922c10c24f543e0fd6ea3ddf774e50.tar.gz) =
0l6BYA4Uxz8Ikq/C93dfENrESO0KCSSYLMdnc1udUv0=
SHA256 (epezent-implot-85573fe04ad27f912074a2e7cde889fdf912b0c6.tar.gz) =
ZIufjg26zzHPgR61YdD2EG3leyMhKwgwHQLrs6pXvSA=
@@ -17,7 +17,7 @@ SIZE (GPUOpen-LibrariesAndSDKs-VulkanMem
SIZE
(KhronosGroup-SPIRV-Cross-06407561ece7d7e78544112189f3eee13adf9959.tar.gz) =
1794731
SIZE
(RetroAchievements-rcheevos-0cdc7f8e9592e0741c07729a34d49a55e6c5e290.tar.gz) =
610547
SIZE (bylaws-libadrenotools-deec5f75ee1a8ccbe32c8780b1d17284fc87b0f1.tar.gz) =
88081
-SIZE (dolphin-emu-dolphin-c0f4825a97f7ee03f0e6242b4ddf1a6a1b13c8ef.tar.gz) =
20092780
+SIZE (dolphin-emu-dolphin-1a9d946a3337317d288b94b093f1e385e6989335.tar.gz) =
19861005
SIZE
(dolphin-emu-ext-win-ffmpeg-9bc087fbca36ce5a85eb4fd73f0c73813593e5a2.tar.gz) =
14871857
SIZE (dolphin-emu-ext-win-qt-495517af2b922c10c24f543e0fd6ea3ddf774e50.tar.gz)
= 100540982
SIZE (epezent-implot-85573fe04ad27f912074a2e7cde889fdf912b0c6.tar.gz) = 137967
Index: graphics/openimageio/Makefile
===================================================================
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- graphics/openimageio/Makefile 4 Apr 2024 09:45:30 -0000 1.72
+++ graphics/openimageio/Makefile 17 Apr 2024 01:22:39 -0000
@@ -7,6 +7,7 @@ GH_ACCOUNT = AcademySoftwareFoundation
GH_PROJECT = OpenImageIO
GH_TAGNAME = v2.5.10.1
PKGNAME = ${DISTNAME:L}
+REVISION = 0
SHARED_LIBS += OpenImageIO 15.0 # 2.4.10
SHARED_LIBS += OpenImageIO_Util 10.0 # 2.4.10
@@ -31,7 +32,7 @@ MODULES = devel/cmake \
COMPILER = base-clang ports-gcc
-BUILD_DEPENDS = devel/fmt \
+BUILD_DEPENDS = devel/fmt>=10.2.1 \
devel/py-pybind11${MODPY_FLAVOR} \
devel/robin-map \
textproc/txt2man
Index: graphics/openimageio/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/openimageio/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 PLIST
--- graphics/openimageio/pkg/PLIST 4 Apr 2024 09:34:04 -0000 1.22
+++ graphics/openimageio/pkg/PLIST 17 Apr 2024 01:22:39 -0000
@@ -27,6 +27,7 @@ include/OpenImageIO/detail/fmt/format-in
include/OpenImageIO/detail/fmt/format.h
include/OpenImageIO/detail/fmt/ostream.h
include/OpenImageIO/detail/fmt/printf.h
+include/OpenImageIO/detail/fmt/std.h
include/OpenImageIO/errorhandler.h
include/OpenImageIO/export.h
include/OpenImageIO/filesystem.h
