[vlc-commits] [Git][videolan/vlc][master] contrib: png: fix update from older installed version

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
5a75966b by Steve Lhomme at 2023-09-25T00:49:53+00:00
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

- - - - -


2 changed files:

- + contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch
- contrib/src/png/rules.mak


Changes:

=====================================
contrib/src/png/0001-Put-the-build-include-include-before-the-CMake-Platf.patch
=====================================
@@ -0,0 +1,31 @@
+From a8bcf31c3503815cd62449feacb188f00f0396b9 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at 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
+


=====================================
contrib/src/png/rules.mak
=====================================
@@ -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)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5a75966b395d13cab0fa082e50e34b36a554840a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5a75966b395d13cab0fa082e50e34b36a554840a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance