From 0992451dfe67a4ea288b156d01fc6039fd171b4f Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 19 Jan 2025 17:31:26 +0100
Subject: [PATCH] ogre3d: remove freeimage plugin

freeimage is unmaintained and dangerous, see
https://gitlab.archlinux.org/archlinux/packaging/packages/freeimage/-/issues/1

The plugin was already deprecated in ogre3d, so hopefully not a big loss.
---
 mingw-w64-ogre3d/002-link-shared-freeimage.patch | 13 -------------
 mingw-w64-ogre3d/PKGBUILD                        |  8 ++------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 mingw-w64-ogre3d/002-link-shared-freeimage.patch

diff --git a/mingw-w64-ogre3d/002-link-shared-freeimage.patch b/mingw-w64-ogre3d/002-link-shared-freeimage.patch
deleted file mode 100644
index 93f62e54e196b..0000000000000
--- a/mingw-w64-ogre3d/002-link-shared-freeimage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ogre-1.11.1/PlugIns/FreeImageCodec/CMakeLists.txt.orig	2018-07-20 15:54:05.023608000 +0300
-+++ ogre-1.11.1/PlugIns/FreeImageCodec/CMakeLists.txt	2018-07-20 15:54:35.318861300 +0300
-@@ -11,7 +11,9 @@
- list(APPEND HEADER_FILES ${CMAKE_BINARY_DIR}/include/OgreFreeImageCodecExports.h)
- set(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreFreeImageCodec.cpp")
- 
--add_definitions(-DFREEIMAGE_LIB)
-+if (NOT MINGW)
-+  add_definitions(-DFREEIMAGE_LIB)
-+endif ()
- add_library(Codec_FreeImage ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCES})
- target_link_libraries(Codec_FreeImage PUBLIC OgreMain "${FreeImage_LIBRARIES}")
- target_include_directories(Codec_FreeImage PUBLIC 
diff --git a/mingw-w64-ogre3d/PKGBUILD b/mingw-w64-ogre3d/PKGBUILD
index a1b559e66e07a..565fae50a59a3 100644
--- a/mingw-w64-ogre3d/PKGBUILD
+++ b/mingw-w64-ogre3d/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=14.3.2
 _imgui_ver=1.91.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform 3D game engine (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -22,7 +22,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-doxygen"
              "${MINGW_PACKAGE_PREFIX}-swig"
              "${MINGW_PACKAGE_PREFIX}-assimp"
-             "${MINGW_PACKAGE_PREFIX}-freeimage"
              #"${MINGW_PACKAGE_PREFIX}-openexr" https://github.com/OGRECave/ogre/issues/2179
              "${MINGW_PACKAGE_PREFIX}-pugixml"
              "${MINGW_PACKAGE_PREFIX}-qt6-base")
@@ -36,7 +35,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-winpthreads"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 optdepends=("${MINGW_PACKAGE_PREFIX}-assimp"
-            "${MINGW_PACKAGE_PREFIX}-freeimage"
             #"${MINGW_PACKAGE_PREFIX}-openexr"
             "${MINGW_PACKAGE_PREFIX}-python: python bindings"
             "${MINGW_PACKAGE_PREFIX}-pugixml: XML converter"
@@ -45,7 +43,6 @@ options=('!strip')
 source=("https://github.com/OGRECave/ogre/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         https://github.com/ocornut/imgui/archive/v${_imgui_ver}/imgui-${_imgui_ver}.tar.gz
         001-use-soversion.patch
-        002-link-shared-freeimage.patch
         004-use-mingw-w64-directx.patch
         010-missing-include.patch
         015-export-symbols-samples-plugin.patch
@@ -53,7 +50,6 @@ source=("https://github.com/OGRECave/ogre/archive/v${pkgver}/${_realname}-${pkgv
 sha256sums=('a3a052dc14e7ce273e86e18c900be4b8c35f9b90bd4613843dc18b0650b19ae2'
             'a3c4fd857a0a48f6edad3e25de68fa1e96d2437f1665039714d1de9ad579b8d0'
             '81fbe2f951be7f5b5bded24a3050be3188e164d321df9124b5abfb543234a128'
-            '67966d6e0791c5804ed5cbec116594ebb72e9633118c31458dfa16181fdd01b2'
             'c7ca64dbd9a8f3f0271c12739807021a5c0782d254c4142c6e86746a96a44438'
             '2850af66e34003415e86b4f17c24e117b221f64ab98e1cef45b5102c9c48350d'
             '004842e88cbbc76d09356fbddf5bc123b1b0fc7b2e64b8677b2a2316df7d9099'
@@ -71,7 +67,6 @@ apply_patch_with_msg() {
 prepare() {
   cd "${srcdir}/ogre-${pkgver}"
   apply_patch_with_msg \
-    002-link-shared-freeimage.patch \
     004-use-mingw-w64-directx.patch \
     010-missing-include.patch \
     015-export-symbols-samples-plugin.patch \
@@ -111,6 +106,7 @@ build() {
     -DOGRE_BUILD_COMPONENT_PROPERTY=ON \
     -DOGRE_BUILD_COMPONENT_PYTHON=ON \
     -DOGRE_BUILD_COMPONENT_CSHARP=OFF \
+    -DOGRE_BUILD_PLUGIN_FREEIMAGE=OFF \
     -DOGRE_CONFIG_DOUBLE=OFF \
     -DOGRE_BUILD_COMPONENT_JAVA=OFF \
     -DOGRE_BUILD_SAMPLES=ON \