diff --git a/app-misc/fastfetch/fastfetch-2.36.0.recipe b/app-misc/fastfetch/fastfetch-2.37.0.recipe similarity index 69% rename from app-misc/fastfetch/fastfetch-2.36.0.recipe rename to app-misc/fastfetch/fastfetch-2.37.0.recipe index 9bc3b2e27..3dc7b1936 100644 --- a/app-misc/fastfetch/fastfetch-2.36.0.recipe +++ b/app-misc/fastfetch/fastfetch-2.37.0.recipe @@ -7,10 +7,9 @@ HOMEPAGE="https://github.com/fastfetch-cli/fastfetch" COPYRIGHT="2021-2023 Linus Dierheimer 2022-2025 Carter Li" LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="bdbe5c7672aeacfec15ec7539f718e666c5206b1a3de9bbf8bd1b3d3c9c997e7" -PATCHES="fastfetch-$portVersion.patchset" +CHECKSUM_SHA256="a5739be74686fefc731f7ce1669c645ca98172ae3ed5e7c3d48176df43aea5af" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -29,12 +28,25 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + hwdata + lib:libGL$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libdbus_1$secondaryArchSuffix + devel:libEGL$secondaryArchSuffix + devel:libelf$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libMagick++_7.Q16HDRI$secondaryArchSuffix + devel:libopencl$secondaryArchSuffix + devel:libopencl_headers$secondaryArchSuffix + devel:libvulkan$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + hwdata + requests_python310 cmd:cmake cmd:g++$secondaryArchSuffix cmd:make @@ -46,7 +58,8 @@ BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -DCMAKE_INSTALL_BINDIR=$commandBinDir + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ + -DENABLE_EMBEDDED_AMDGPUIDS=ON make -C build $jobArgs } diff --git a/app-misc/fastfetch/patches/fastfetch-2.36.0.patchset b/app-misc/fastfetch/patches/fastfetch-2.36.0.patchset deleted file mode 100644 index 671346c41..000000000 --- a/app-misc/fastfetch/patches/fastfetch-2.36.0.patchset +++ /dev/null @@ -1,38 +0,0 @@ -From c452d0ca4b622f20e523bbc02d185e7b71d79265 Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Mon, 10 Feb 2025 20:06:55 +0100 -Subject: Add _GNU_SOURCE, should fix memmem error on buildmaster - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 426cd0e..5016ec1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1275,6 +1275,8 @@ elseif(DragonFly) - target_compile_definitions(libfastfetch PUBLIC __FreeBSD__) - elseif(SunOS) - target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE __STDC_WANT_LIB_EXT1__ _FILE_OFFSET_BITS=64 __EXTENSIONS__ _POSIX_C_SOURCE) -+elseif(HAIKU) -+ target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE) - elseif(NetBSD) - target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-char-subscripts") -diff --git a/src/detection/gpu/gpu_pci.c b/src/detection/gpu/gpu_pci.c -index f063582..40b793b 100644 ---- a/src/detection/gpu/gpu_pci.c -+++ b/src/detection/gpu/gpu_pci.c -@@ -1,6 +1,11 @@ - #include "gpu.h" - #include "common/io/io.h" - -+#ifdef __HAIKU__ -+#include -+#include -+#endif -+ - #include - #ifdef __FreeBSD__ - #include --- -2.45.2 -