Merge branch 'patch-minizip-import' into luabind-0.9.1-forked

Author: Architector4

.github/actions/osxcross/macports.patch

@@ -24,3 +24,12 @@ index 3e87735..5c48e4e 100755
      "$CACHE/$file.rmd160" "$CACHE/$file" 1>/dev/null
 
    if [ $? -ne 0 ]; then
+@@ -360,7 +362,7 @@ getPkgUrl()
+                grep -o -E '"version":"[^"]+"' | \
+                cut -d'"' -f4)
+ 
+-  pkgs=$(getFileStdout "$MIRROR/$pkgname/?C=M;O=A" | \
++  pkgs=$(getFileStdout "$MIRROR/$pkgname/?C=M;O=D" | \
+          grep -o -E 'href="([^"#]+)"' | \
+          cut -d'"' -f2 | grep '.tbz2$' | uniq)
+ 

.github/workflows/meson.yml

@@ -178,7 +178,7 @@ jobs:
           echo "::group::Installing pkg-config"
           sudo apt install pkg-config
           echo "::group::Installing mac deps"
-          omp install SDL3 onetbb lz4 libpng minizip luajit flac
+          omp --x86_64 install SDL3 onetbb lz4 libpng minizip luajit flac
           echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
           echo "::endgroup::"
           echo "::group::Installing meson"

Source/Managers/ActivityMan.cpp

@@ -25,8 +25,13 @@
 
 #include "MusicMan.h"
 
-#include "minizip/zip.h"
-#include "minizip/unzip.h"
+#ifdef SYSTEM_MINIZIP
+#include <minizip/zip.h>
+#include <minizip/unzip.h>
+#else
+#include "zip.h"
+#include "unzip.h"
+#endif
 
 #include "tracy/Tracy.hpp"
 

Source/Menus/SaveLoadMenuGUI.cpp

@@ -21,8 +21,13 @@
 
 #include <execution>
 
-#include "minizip/zip.h"
-#include "minizip/unzip.h"
+#ifdef SYSTEM_MINIZIP
+#include <minizip/zip.h>
+#include <minizip/unzip.h>
+#else
+#include "zip.h"
+#include "unzip.h"
+#endif
 
 using namespace RTE;
 

Source/System/System.cpp

@@ -1,7 +1,11 @@
 #include "System.h"
 
 #include "RTETools.h"
-#include "minizip/unzip.h"
+#ifdef SYSTEM_MINIZIP
+#include <minizip/unzip.h>
+#else
+#include "unzip.h"
+#endif
 
 #include "RTEError.h"
 

meson.build

@@ -185,6 +185,7 @@ if host_machine.system() in ['linux','darwin']
     dependency('tbb'),
     dependency('gl')
   ]
+  preprocessor_flags+=['-DSYSTEM_MINIZIP']
   if host_machine.system()=='darwin'
     deps += dependency('appleframeworks', modules: ['Foundation'])  
   endif