From cd94feb5f3a0d7c8a56b2469f70087f0149c6f54 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 23 Jan 2024 15:32:06 -0800 Subject: [PATCH] freeimage: fix building on musl --- srcpkgs/freeimage/patches/fix-musl.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/freeimage/patches/fix-musl.patch diff --git a/srcpkgs/freeimage/patches/fix-musl.patch b/srcpkgs/freeimage/patches/fix-musl.patch new file mode 100644 index 00000000000..8d815c4cb8c --- /dev/null +++ b/srcpkgs/freeimage/patches/fix-musl.patch @@ -0,0 +1,19 @@ +Fixes following compile error due to musl using nullptr instead of __null: + +Source/FreeImage/PluginPSD.cpp: In function ‘BOOL Save(FreeImageIO*, FIBITMAP*, fi_handle, int, int, void*)’: +Source/FreeImage/PluginPSD.cpp:130:10: error: cannot convert ‘std::nullptr_t’ to ‘BOOL’ {aka ‘int’} in return + 130 | return NULL; + | ^~~~ + +diff -rup Source/FreeImage/PluginPSD.cpp.orig Source/FreeImage/PluginPSD.cpp +--- a/Source/FreeImage/PluginPSD.cpp ++++ b/Source/FreeImage/PluginPSD.cpp +@@ -127,7 +127,7 @@ Load(FreeImageIO *io, fi_handle handle, + static BOOL DLL_CALLCONV + Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) { + if(!handle) { +- return NULL; ++ return FALSE; + } + try { + psdParser parser;