From 1b2d80d386861ee40d0d02e6fb9f36872e28a7b8 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 26 Feb 2025 07:57:39 -0800
Subject: [PATCH] Removed duplicated fixup of SDL2_image.pc in mingw install
---
external/libpng | 2 +-
external/libtiff | 2 +-
external/libwebp | 2 +-
mingw/pkg-support/Makefile | 9 +++------
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/external/libpng b/external/libpng
index d5f3b7303..f98df89f1 160000
--- a/external/libpng
+++ b/external/libpng
@@ -1 +1 @@
-Subproject commit d5f3b730390cbbf9f1086a4aa97b7d44e42919ae
+Subproject commit f98df89f110248450c1552e69c6346b1c901a453
diff --git a/external/libtiff b/external/libtiff
index 5201ffee7..f0b67bbb5 160000
--- a/external/libtiff
+++ b/external/libtiff
@@ -1 +1 @@
-Subproject commit 5201ffee79beb91f38c57171bafe79c11271c01a
+Subproject commit f0b67bbb55584c7c48dd2e0a20823c3c3ed0dc75
diff --git a/external/libwebp b/external/libwebp
index 05b15cb85..fa992316e 160000
--- a/external/libwebp
+++ b/external/libwebp
@@ -1 +1 @@
-Subproject commit 05b15cb850e7bed3b4fed1d360873de352411659
+Subproject commit fa992316e4517b25a4e667a3668b930170becd56
diff --git a/mingw/pkg-support/Makefile b/mingw/pkg-support/Makefile
index 0b7cc1f21..77bf32101 100644
--- a/mingw/pkg-support/Makefile
+++ b/mingw/pkg-support/Makefile
@@ -23,12 +23,9 @@ install-package:
(cd $(arch) && cp -rv bin include lib $(prefix)/); \
sed "s|^prefix=.*|prefix=$(prefix)|" <$(arch)/lib/pkgconfig/SDL2_image.pc >$(prefix)/lib/pkgconfig/SDL2_image.pc; \
sed "s|^libdir=.*|libdir=\'$(prefix)/lib\'|" <$(arch)/lib/libSDL2_image.la >$(prefix)/lib/libSDL2_image.la; \
- sed -e "s|^set[(]bindir \".*|set(bindir \"$(prefix)/bin\")|" \
- -e "s|^set[(]includedir \".*|set(includedir \"$(prefix)/include\")|" \
- -e "s|^set[(]libdir \".*|set(libdir \"$(prefix)/lib\")|" <$(arch)/lib/cmake/SDL2_image/sdl2_image-config.cmake >$(prefix)/lib/cmake/SDL2_image/sdl2_image-config.cmake; \
- sed -e "s|^prefix=.*|prefix=$(prefix)|" \
- -e "s|^includedir=.*|includedir=$(prefix)/include|" \
- -e "s|^libdir=.*|libdir=$(prefix)/lib|" <$(arch)/lib/pkgconfig/SDL2_image.pc >$(prefix)/lib/pkgconfig/SDL2_image.pc; \
+ sed -e "s|^set[(]bindir \".*|set(bindir \"$(prefix)/bin\")|" \
+ -e "s|^set[(]includedir \".*|set(includedir \"$(prefix)/include\")|" \
+ -e "s|^set[(]libdir \".*|set(libdir \"$(prefix)/lib\")|" <$(arch)/lib/cmake/SDL2_image/sdl2_image-config.cmake >$(prefix)/lib/cmake/SDL2_image/sdl2_image-config.cmake; \
else \
echo "*** ERROR: $(arch) or $(prefix) does not exist!"; \
exit 1; \