From 517a32e96d0ab0501b75a5d15c9bde724d5c530b Mon Sep 17 00:00:00 2001 From: Sryder Date: Sun, 20 Jan 2019 18:49:46 +0000 Subject: [PATCH] Disable the APNG code if the version of libpng is greater than 1.4. Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have. It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people. I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted. --- src/m_misc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/m_misc.c b/src/m_misc.c index 7dd0d822c..c99fa1736 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -93,7 +93,9 @@ typedef off_t off64_t; #ifdef PNG_WRITE_SUPPORTED #define USE_PNG // Only actually use PNG if write is supported. #if defined (PNG_WRITE_APNG_SUPPORTED) //|| !defined(PNG_STATIC) - #define USE_APNG + #if (PNG_LIBPNG_VER_MAJOR) == 1 && (PNG_LIBPNG_VER_MINOR <= 4) // Supposedly, the current APNG code can't work on newer versions as is + #define USE_APNG + #endif #endif // See hardware/hw_draw.c for a similar check to this one. #endif