Skip to content
Snippets Groups Projects
Commit 5a75966b authored by Steve Lhomme's avatar Steve Lhomme
Browse files

contrib: png: fix update from older installed version

When you have an old png+zlib in your path, it was using that
to detect the PNG/ZLIB incompatibility instead of using the
local pnglibconf.h
parent a7ede0f0
No related branches found
No related tags found
1 merge request!4281contrib: png: fix update from older installed version
Pipeline #388335 canceled with stage
in 1 hour, 12 minutes, and 18 seconds
From a8bcf31c3503815cd62449feacb188f00f0396b9 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 21 Sep 2023 13:10:53 +0200
Subject: [PATCH] Put the build include include before the CMake/Platform flags
If the CMake flags have some include directory with an old
pnglibconf.h it will use that one instead of ours
---
scripts/genout.cmake.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/genout.cmake.in b/scripts/genout.cmake.in
index ec685d900..f6d478723 100644
--- a/scripts/genout.cmake.in
+++ b/scripts/genout.cmake.in
@@ -59,11 +59,11 @@ if ("${INPUTEXT}" STREQUAL ".c" AND "${OUTPUTEXT}" STREQUAL ".out")
endif()
execute_process(COMMAND "${CMAKE_C_COMPILER}" "-E"
+ ${INCLUDES}
${CMAKE_C_FLAGS}
${PLATFORM_C_FLAGS}
"-I${SRCDIR}"
"-I${BINDIR}"
- ${INCLUDES}
"-DPNGLIB_LIBNAME=PNG${PNGLIB_MAJOR}${PNGLIB_MINOR}_0"
"-DPNGLIB_VERSION=${PNGLIB_VERSION}"
"-DSYMBOL_PREFIX=${SYMBOL_PREFIX}"
--
2.38.1.windows.1
......@@ -14,6 +14,7 @@ $(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
png: libpng-$(PNG_VERSION).tar.xz .sum-png
$(UNPACK)
$(APPLY) $(SRC)/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch
$(call pkg_static,"libpng.pc.in")
$(MOVE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment