diff --git a/devel/apitrace/Makefile b/devel/apitrace/Makefile index 37db1c0e94bf..8734b2765059 100644 --- a/devel/apitrace/Makefile +++ b/devel/apitrace/Makefile @@ -1,52 +1,53 @@ PORTNAME= apitrace -DISTVERSION= 13.0 +DISTVERSION= 14.0 CATEGORIES= devel MAINTAINER= freebsd@sysctl.cz COMMENT= Tools for tracing OpenGL and other graphics APIs WWW= https://apitrace.github.io LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= brotli>0:archivers/brotli \ - googletest>0:devel/googletest \ - libbacktrace>0:devel/libbacktrace \ - png>0:graphics/png \ - vulkan-headers>0:graphics/vulkan-headers \ - snappy>0:archivers/snappy - -LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ - libbacktrace.so:devel/libbacktrace \ +BUILD_DEPENDS= googletest>0:devel/googletest \ + vulkan-headers>0:graphics/vulkan-headers +LIB_DEPENDS= libbacktrace.so:devel/libbacktrace \ + libbrotlidec.so:archivers/brotli \ + libbrotlienc.so:archivers/brotli \ libpng.so:graphics/png \ - libsnappy.so:archivers/snappy - -USES= cmake compiler:c++17-lang desktop-file-utils localbase:ldflags pkgconfig python qt:6 shebangfix xorg -USE_XORG= x11 + libsnappy.so:archivers/snappy \ + libzstd.so:archivers/zstd +USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig python \ + qt:6 shebangfix xorg USE_GITHUB= yes -GH_TUPLE= microsoft:DirectXMath:e95d848:DirectXMath/thirdparty/directxmath +GH_TUPLE= microsoft:DirectXMath:apr2025:DirectXMath/thirdparty/directxmath \ + facebook:zstd:v1.5.7:zstd/thirdparty/zstd +USE_GL= opengl +USE_QT= base +USE_XORG= x11 SHEBANG_FILES= scripts/*.py +CMAKE_ON= ENABLE_QT6 + OPTIONS_DEFINE= DOCS WAFFLE OPTIONS_DEFAULT= WAFFLE OPTIONS_SUB= yes -USE_QT= base -USE_GL= gl opengl -CMAKE_ON= ENABLE_QT6 - WAFFLE_DESC= Use Waffle library to allow retrace on Wayland, headless etc. WAFFLE_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols WAFFLE_LIB_DEPENDS= libwaffle-1.so:graphics/waffle WAFFLE_CMAKE_BOOL= ENABLE_WAFFLE post-patch: - ${REINPLACE_CMD} -e 's|__linux__|__unix__|' ${WRKSRC}/retrace/glstate_images.cpp + ${REINPLACE_CMD} 's|__linux__|__unix__|' \ + ${WRKSRC}/retrace/glstate_images.cpp + ${REINPLACE_CMD} 's/0.0-unknown/${DISTVERSION}/g' \ + ${WRKSRC}/cmake/GenerateVersion.cmake post-install: ${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt - ${INSTALL_DATA} ${FILESDIR}/qapitrace.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${FILESDIR}/qapitrace.desktop ${STAGEDIR}${DESKTOPDIR} .include diff --git a/devel/apitrace/distinfo b/devel/apitrace/distinfo index 5e7228e0cfa0..993d1138b822 100644 --- a/devel/apitrace/distinfo +++ b/devel/apitrace/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1751019549 -SHA256 (apitrace-apitrace-13.0_GH0.tar.gz) = 843f34ad3859519644c82628ac6e6405e1a497fc5f227d06591c5dc4a643c00a -SIZE (apitrace-apitrace-13.0_GH0.tar.gz) = 2274587 -SHA256 (microsoft-DirectXMath-e95d848_GH0.tar.gz) = efc8fe6c7cebe8e90d5d29020e2f09e7af41570959ec7ab501b55a7d36aad318 -SIZE (microsoft-DirectXMath-e95d848_GH0.tar.gz) = 219785 +TIMESTAMP = 1774968214 +SHA256 (apitrace-apitrace-14.0_GH0.tar.gz) = 53469052b28ca56dc0d28153d218dee6c2c128c53b2aa32d6e7f906f7a5c6c7a +SIZE (apitrace-apitrace-14.0_GH0.tar.gz) = 2281429 +SHA256 (microsoft-DirectXMath-apr2025_GH0.tar.gz) = 8ac7f060d7fcc971d77c5a9f3ff98548ecf119c144a7c2dd9d21f4b66ba94cd4 +SIZE (microsoft-DirectXMath-apr2025_GH0.tar.gz) = 236461 +SHA256 (facebook-zstd-v1.5.7_GH0.tar.gz) = 37d7284556b20954e56e1ca85b80226768902e2edabd3b649e9e72c0c9012ee3 +SIZE (facebook-zstd-v1.5.7_GH0.tar.gz) = 2451884 diff --git a/devel/apitrace/files/patch-lib_trace_CMakeLists.txt b/devel/apitrace/files/patch-lib_trace_CMakeLists.txt index a9cc6dc9ccbd..6700d985b769 100644 --- a/devel/apitrace/files/patch-lib_trace_CMakeLists.txt +++ b/devel/apitrace/files/patch-lib_trace_CMakeLists.txt @@ -1,19 +1,17 @@ ---- lib/trace/CMakeLists.txt.orig 2025-06-26 12:43:44 UTC +--- lib/trace/CMakeLists.txt.orig 2026-01-30 15:43:06 UTC +++ lib/trace/CMakeLists.txt -@@ -27,13 +27,15 @@ add_convenience_library (common - trace_ostream_zlib.cpp +@@ -30,11 +30,13 @@ add_convenience_library (common + trace_ostream_zstd.cpp ) +find_package(Snappy REQUIRED) + - target_link_libraries (common + target_link_libraries(common guids highlight os - Snappy::snappy ++ ${Snappy_LIBRARIES} ZLIB::ZLIB PkgConfig::BROTLIDEC -+ ${Snappy_LIBRARIES} - ) - - if (BUILD_TESTING) + PkgConfig::ZSTD diff --git a/devel/apitrace/files/patch-thirdparty_CMakeLists.txt b/devel/apitrace/files/patch-thirdparty_CMakeLists.txt index e470b7dc1a18..b655c945a16f 100644 --- a/devel/apitrace/files/patch-thirdparty_CMakeLists.txt +++ b/devel/apitrace/files/patch-thirdparty_CMakeLists.txt @@ -1,117 +1,147 @@ ---- thirdparty/CMakeLists.txt.orig 2025-06-26 12:43:44 UTC +--- thirdparty/CMakeLists.txt.orig 2026-01-30 15:43:06 UTC +++ thirdparty/CMakeLists.txt -@@ -16,56 +16,70 @@ endfunction () +@@ -16,50 +16,50 @@ endfunction () include (${ARGV}) endfunction () -set (SUBMODULES_MISSING FALSE) -foreach (path IN ITEMS - brotli/LICENSE - gtest/LICENSE - libbacktrace/LICENSE - libpng/LICENSE - snappy/COPYING - zlib/README +- zstd/LICENSE - directxmath/LICENSE -) - if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${path}") - message (SEND_ERROR "error: ${CMAKE_CURRENT_SOURCE_DIR}/${path} does not exist") - set (SUBMODULES_MISSING TRUE) - endif () -endforeach () -if (SUBMODULES_MISSING) - message (FATAL_ERROR "Update Git submodules by running\ngit submodule update --init --depth 1 --recursive") -endif () +#set (SUBMODULES_MISSING FALSE) +#foreach (path IN ITEMS +# brotli/LICENSE +# gtest/LICENSE +# libbacktrace/LICENSE +# libpng/LICENSE +# snappy/COPYING +# zlib/README ++# zstd/LICENSE +# directxmath/LICENSE +#) +# if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${path}") +# message (SEND_ERROR "error: ${CMAKE_CURRENT_SOURCE_DIR}/${path} does not exist") +# set (SUBMODULES_MISSING TRUE) +# endif () +#endforeach () +#if (SUBMODULES_MISSING) +# message (FATAL_ERROR "Update Git submodules by running\ngit submodule update --init --depth 1 --recursive") +#endif () -if (ENABLE_STATIC_SNAPPY OR NOT Snappy_FOUND) - message (STATUS "Using bundled Snappy") - include_with_scope (snappy.cmake) -endif () +#if (ENABLE_STATIC_SNAPPY OR NOT Snappy_FOUND) +# message (STATUS "Using bundled Snappy") +# include_with_scope (snappy.cmake) +#endif () -if (NOT ZLIB_FOUND) - message (STATUS "Using bundled ZLIB") - include_with_scope (zlib.cmake) -endif () +#if (NOT ZLIB_FOUND) +# message (STATUS "Using bundled ZLIB") +# include_with_scope (zlib.cmake) +#endif () -if (NOT PNG_FOUND) - message (STATUS "Using bundled PNG") - include_with_scope (libpng.cmake) -endif () +#if (NOT PNG_FOUND) +# message (STATUS "Using bundled PNG") +# include_with_scope (libpng.cmake) +#endif () -if (NOT BROTLIDEC_FOUND OR NOT BROTLIENC_FOUND) - message (STATUS "Using bundled Brotli") - include_with_scope (brotli.cmake) -endif () +#if (NOT BROTLIDEC_FOUND OR NOT BROTLIENC_FOUND) +# message (STATUS "Using bundled Brotli") +# include_with_scope (brotli.cmake) +#endif () +-if (NOT ZSTD_FOUND) +- message (STATUS "Using bundled zstd") +- include_with_scope (zstd.cmake) +-endif () ++#if (NOT ZSTD_FOUND) ++# message (STATUS "Using bundled zstd") ++# include_with_scope (zstd.cmake) ++#endif () + + # Seekable format (builds on top of Zstd -- included in the source but not part + # of the shipped library) +@@ -72,28 +72,43 @@ target_include_directories(zstd_seekable PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/zstd/lib/common + ${CMAKE_CURRENT_SOURCE_DIR}/zstd/contrib/seekable_format + ) ++ + target_link_libraries (zstd_seekable PUBLIC + PkgConfig::ZSTD + ) + + if(NOT MSVC) +- # Disable specific warnings that are common in zstd ++ # Disable specific warnings that are common in zstd + target_compile_options(zstd_seekable PRIVATE -Wno-uninitialized) + endif() + + target_optimize(zstd_seekable) + -if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF") - include_with_scope (libbacktrace.cmake) -endif () +#if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF") +# include_with_scope (libbacktrace.cmake) +#endif () -if (BUILD_TESTING) - # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt - if (NOT GTEST_FOUND) - message (STATUS "Using bundled GTest") - include_with_scope (gtest.cmake) - endif () -endif () +#if (BUILD_TESTING) +# # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt +# if (NOT GTEST_FOUND) +# message (STATUS "Using bundled GTest") +# include_with_scope (gtest.cmake) +# endif () +#endif () + +find_path(Snappy_INCLUDE_DIR NAMES snappy.h + PATHS ${Snappy_ROOT_DIR} ${Snappy_ROOT_DIR}/include /usr/local/include) + +find_library(Snappy_LIBRARIES NAMES snappy + PATHS ${Snappy_ROOT_DIR} ${Snappy_ROOT_DIR}/lib /usr/local/lib) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Snappy DEFAULT_MSG Snappy_INCLUDE_DIR Snappy_LIBRARIES) + +if(SNAPPY_FOUND) + message(STATUS "Found Snappy (include: ${Snappy_INCLUDE_DIR}, library: ${Snappy_LIBRARIES})") + mark_as_advanced(Snappy_INCLUDE_DIR Snappy_LIBRARIES) +endif() if (MSVC) add_subdirectory (getopt)