contrib/libs/libpng: Cleanup sysincls

commit_hash:f87590c2825ce66cc2ae7825386cec730e8230b7

7 files changed, 33 insertions, 6 deletions

diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index 700a1fe7bd..e5424141ee 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -219,7 +219,7 @@
   includes:
     - lzo/lzo1x.h
 
-- source_filter: "^contrib/libs/(libpng|opencv)"
+- source_filter: "^contrib/libs/opencv"
   includes:
     - mem.h
 
diff --git a/build/sysincl/unsorted.yml b/build/sysincl/unsorted.yml
index 5efc4dba35..1ee2f7202b 100644
--- a/build/sysincl/unsorted.yml
+++ b/build/sysincl/unsorted.yml
@@ -103,7 +103,6 @@
   - opcdef.h
   - paper.h
   - pire/config.h
-  - pngusr.h
   - pth.h
   - rtl.h
   - shlib-compat.h
diff --git a/contrib/libs/libpng/.yandex_meta/__init__.py b/contrib/libs/libpng/.yandex_meta/__init__.py
index 2453137e9c..47a1b39885 100644
--- a/contrib/libs/libpng/.yandex_meta/__init__.py
+++ b/contrib/libs/libpng/.yandex_meta/__init__.py
@@ -40,6 +40,8 @@ libpng = GNUMakeNixProject(
     ],
     disable_includes=[
         "config.h",
+        "pngusr.h",
+        "mem.h",
         "PNG_MIPS_MSA_FILE",
         "PNG_POWERPC_VSX_FILE",
         "PNG_ARM_NEON_FILE",
diff --git a/contrib/libs/libpng/patches/clang-18.patch b/contrib/libs/libpng/patches/clang-18.patch
new file mode 100644
index 0000000000..16f2cda4d9
--- /dev/null
+++ b/contrib/libs/libpng/patches/clang-18.patch
@@ -0,0 +1,26 @@
+commit 242ab0166e0b3ae29fd381117df005246a4e4eb9
+merge: 3c801a723b9f0eca043275e810f76c9286a7e0ab 6626b8f9a0ad0f481d29b698fbe42d5158b49aae
+author: robot-brewer
+date: 2024-11-11T09:16:28+03:00
+revision: 15280800
+
+    Release clang18 #3
+    
+    https://github.com/yandex/toolchain-registry/releases/tag/clang18-v3
+    
+    REVIEW: 7167654
+
+--- contrib/libs/libpng/pngpriv.h	(3c801a723b9f0eca043275e810f76c9286a7e0ab)
++++ contrib/libs/libpng/pngpriv.h	(242ab0166e0b3ae29fd381117df005246a4e4eb9)
+@@ -514,6 +514,11 @@
+     */
+ #  include <float.h>
+ 
++#if defined(__clang__) && __clang_major__ >= 17
++#include <math.h>
++#define __MATH_H__
++#endif
++
+ #  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
+     defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
+    /* We need to check that <math.h> hasn't already been included earlier
diff --git a/contrib/libs/libpng/patches/pnglibconf.patch b/contrib/libs/libpng/patches/pnglibconf.patch
index 1e53a02e9b..c70fc8634a 100644
--- a/contrib/libs/libpng/patches/pnglibconf.patch
+++ b/contrib/libs/libpng/patches/pnglibconf.patch
@@ -4,5 +4,5 @@
 -#define PNG_USER_CHUNK_CACHE_MAX 1000
 +#define PNG_USER_CHUNK_CACHE_MAX 32765
 @@ -209,1 +209,1 @@
--#define PNG_ZLIB_VERNUM 0x12d0
+-#define PNG_ZLIB_VERNUM 0x1310
 +#define PNG_ZLIB_VERNUM ZLIB_VERNUM
diff --git a/contrib/libs/libpng/pngpriv.h b/contrib/libs/libpng/pngpriv.h
index d226cb9a1e..b48ba2ebc8 100644
--- a/contrib/libs/libpng/pngpriv.h
+++ b/contrib/libs/libpng/pngpriv.h
@@ -78,7 +78,7 @@
 #endif
 
 #ifdef PNG_USER_CONFIG
-#  include "pngusr.h"
+#  error #include "pngusr.h"
    /* These should have been defined in pngusr.h */
 #  ifndef PNG_USER_PRIVATEBUILD
 #    define PNG_USER_PRIVATEBUILD "Custom libpng build"
@@ -541,7 +541,7 @@
 
 /* This provides the non-ANSI (far) memory allocation routines. */
 #if defined(__TURBOC__) && defined(__MSDOS__)
-#  include <mem.h>
+#  error #include <mem.h>
 #  include <alloc.h>
 #endif
 
diff --git a/contrib/libs/libpng/ya.make b/contrib/libs/libpng/ya.make
index bc5cea0b89..3533cb1e4b 100644
--- a/contrib/libs/libpng/ya.make
+++ b/contrib/libs/libpng/ya.make
@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs 22.11.
+# Generated by devtools/yamaker from nixpkgs 24.05.
 
 LIBRARY()