[deps] replace zlib with zlib-ng

Signed-off-by: lizzie <lizzie@eden-emu.dev>

CMakeLists.txt

@@ -460,9 +460,8 @@ AddJsonPackage(nlohmann)
 if (NOT YUZU_STATIC_ROOM)
     # zlib
     AddJsonPackage(zlib)
-
-    if (ZLIB_ADDED)
-        add_library(ZLIB::ZLIB ALIAS zlibstatic)
+    if (NOT TARGET ZLIB::ZLIB)
+        add_library(ZLIB::ZLIB ALIAS zlib-ng)
     endif()
 
     # Opus

cpmfile.json

@@ -378,16 +378,16 @@
         "version": "7.35.2"
     },
     "zlib": {
-        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
-        "min_version": "1.2",
+        "hash": "e2057c764f1d5aaee738edee7e977182c5b097e3c95489dcd8de813f237d92a05daaa86d68d44b331d9fec5d1802586a8f6cfb658ba849874aaa14e72a8107f5",
         "options": [
-            "ZLIB_BUILD_SHARED OFF",
-            "ZLIB_INSTALL OFF"
+            "ZLIB_COMPAT ON",
+            "ZLIB_ALIASES ON",
+            "BUILD_SHARED_LIBS OFF"
         ],
         "package": "ZLIB",
-        "repo": "madler/zlib",
-        "tag": "v%VERSION%",
-        "version": "1.3.2"
+        "repo": "zlib-ng/zlib-ng",
+        "tag": "%VERSION%",
+        "version": "2.3.3"
     },
     "zstd": {
         "find_args": "MODULE",

externals/ffmpeg/CMakeLists.txt

@@ -58,24 +58,16 @@ endif()
 
 if (PLATFORM_PS4 OR PLATFORM_MANAGARM)
     # Doesn't support VA-API, don't go thru the embarrassment of trying to enable it
-    list(APPEND FFmpeg_HWACCEL_FLAGS
-        --disable-vaapi
-        --disnable-cuvid
-        --disnable-ffnvcodec
-        --disnable-nvdec
-        --disable-vulkan
-        --disable-libdrm)
-elseif (UNIX)
+    list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
+elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING AND NOT ANDROID)
     find_package(PkgConfig REQUIRED)
+    pkg_check_modules(LIBVA libva)
+    pkg_check_modules(CUDA cuda)
+    pkg_check_modules(FFNVCODEC ffnvcodec)
+    pkg_check_modules(VDPAU vdpau)
 
-    # X11 is "optional", some distros may opt for a super-fully wayland install...
     find_package(X11)
     if(X11_FOUND)
-        # Include X11 if possible, some APIs such as VDPAU heavily depend
-        # upon it's existence!
-        list(APPEND FFmpeg_HWACCEL_LIBRARIES ${X11_LIBRARIES})
-        list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${X11_INCLUDE_DIRS})
-        list(APPEND FFmpeg_HWACCEL_LDFLAGS ${X11_LDFLAGS})
         if (NOT APPLE)
             # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
             if(PLATFORM_SUN)
@@ -84,37 +76,32 @@ elseif (UNIX)
                     "${CMAKE_SYSROOT}/usr/lib/xorg/amd64/libdrm.so")
             else()
                 pkg_check_modules(LIBDRM libdrm REQUIRED)
-                list(APPEND FFmpeg_HWACCEL_LIBRARIES ${LIBDRM_LIBRARIES})
-                list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${LIBDRM_INCLUDE_DIRS})
-                list(APPEND FFmpeg_HWACCEL_LDFLAGS ${LIBDRM_LDFLAGS})
+                list(APPEND FFmpeg_HWACCEL_LIBRARIES
+                    ${LIBDRM_LIBRARIES})
+                list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
+                    ${LIBDRM_INCLUDE_DIRS})
             endif()
-            list(APPEND FFmpeg_HWACCEL_FLAGS --enable-libdrm)
+            list(APPEND FFmpeg_HWACCEL_FLAGS
+                --enable-libdrm)
         endif()
-
-        pkg_check_modules(LIBVA libva)
         if(LIBVA_FOUND)
-            list(APPEND FFmpeg_HWACCEL_LIBRARIES ${LIBVA_LIBRARIES})
-            list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${LIBVA_INCLUDE_DIRS})
-            list(APPEND FFmpeg_HWACCEL_LDFLAGS ${LIBVA_LDFLAGS})
-
-            # Logically, they can only exist if libva itself exists
             pkg_check_modules(LIBVA-DRM libva-drm REQUIRED)
             pkg_check_modules(LIBVA-X11 libva-x11 REQUIRED)
-            if (LIBVA-DRM_FOUND)
-                list(APPEND FFmpeg_HWACCEL_LIBRARIES ${LIBVA-DRM_LIBRARIES})
-                list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${LIBVA-DRM_INCLUDE_DIRS})
-                list(APPEND FFmpeg_HWACCEL_LDFLAGS ${LIBVA-DRM_LDFLAGS})
-            endif()
-            if (LIBVA-X11_FOUND)
-                list(APPEND FFmpeg_HWACCEL_LIBRARIES ${LIBVA-X11_LIBRARIES})
-                list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${LIBVA-X11_INCLUDE_DIRS})
-                list(APPEND FFmpeg_HWACCEL_LDFLAGS ${LIBVA-X11_LDFLAGS})
-            endif()
-
+            list(APPEND FFmpeg_HWACCEL_LIBRARIES
+                ${X11_LIBRARIES}
+                ${LIBVA-DRM_LIBRARIES}
+                ${LIBVA-X11_LIBRARIES}
+                ${LIBVA_LIBRARIES})
             list(APPEND FFmpeg_HWACCEL_FLAGS
                 --enable-hwaccel=h264_vaapi
                 --enable-hwaccel=vp8_vaapi
                 --enable-hwaccel=vp9_vaapi)
+            list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
+                ${X11_INCLUDE_DIRS}
+                ${LIBVA-DRM_INCLUDE_DIRS}
+                ${LIBVA-X11_INCLUDE_DIRS}
+                ${LIBVA_INCLUDE_DIRS}
+            )
             message(STATUS "ffmpeg: va-api libraries version ${LIBVA_VERSION} found")
         else()
             list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
@@ -125,12 +112,6 @@ elseif (UNIX)
         message(WARNING "ffmpeg: X11 libraries not found, disabling VA-API...")
     endif()
 
-    pkg_check_modules(CUDA cuda)
-    pkg_check_modules(FFNVCODEC ffnvcodec)
-    pkg_check_modules(VDPAU vdpau)
-    pkg_check_modules(VULKAN vulkan)
-    find_package(spirv-headers)
-
     if (FFNVCODEC_FOUND)
         list(APPEND FFmpeg_HWACCEL_FLAGS
             --enable-cuvid
@@ -138,7 +119,8 @@ elseif (UNIX)
             --enable-nvdec
             --enable-hwaccel=h264_nvdec
             --enable-hwaccel=vp8_nvdec
-            --enable-hwaccel=vp9_nvdec)
+            --enable-hwaccel=vp9_nvdec
+        )
         list(APPEND FFmpeg_HWACCEL_LIBRARIES ${FFNVCODEC_LIBRARIES})
         list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${FFNVCODEC_INCLUDE_DIRS})
         list(APPEND FFmpeg_HWACCEL_LDFLAGS ${FFNVCODEC_LDFLAGS})
@@ -159,7 +141,8 @@ elseif (UNIX)
         list(APPEND FFmpeg_HWACCEL_FLAGS
             --enable-vdpau
             --enable-hwaccel=h264_vdpau
-            --enable-hwaccel=vp9_vdpau)
+            --enable-hwaccel=vp9_vdpau
+        )
         list(APPEND FFmpeg_HWACCEL_LIBRARIES ${VDPAU_LIBRARIES})
         list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${VDPAU_INCLUDE_DIRS})
         list(APPEND FFmpeg_HWACCEL_LDFLAGS ${VDPAU_LDFLAGS})
@@ -168,24 +151,6 @@ elseif (UNIX)
         list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vdpau)
         message(WARNING "ffmpeg: libvdpau-dev not found, disabling Video Decode and Presentation API for Unix (VDPAU)...")
     endif()
-
-    if (VULKAN_FOUND AND NOT APPLE)
-        list(APPEND FFmpeg_HWACCEL_FLAGS
-            --enable-vulkan
-            --enable-hwaccel=h264_vulkan
-            --enable-hwaccel=vp9_vulkan)
-        list(APPEND FFmpeg_HWACCEL_LIBRARIES ${VULKAN_LIBRARIES})
-        list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${VULKAN_INCLUDE_DIRS})
-        list(APPEND FFmpeg_HWACCEL_LDFLAGS ${VULKAN_LDFLAGS})
-        message(STATUS "ffmpeg: vulkan libraries version ${VULKAN_VERSION} found")
-    endif()
-
-    if (SPIRV_HEADERS_FOUND)
-        list(APPEND FFmpeg_HWACCEL_LIBRARIES ${SPIRV_HEADERS_LIBRARIES})
-        list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${SPIRV_HEADERS_INCLUDE_DIRS})
-        list(APPEND FFmpeg_HWACCEL_LDFLAGS ${SPIRV_HEADERS_LDFLAGS})
-        message(STATUS "ffmpeg: spirv-headers libraries version ${SPIRV_HEADERS_VERSION} found")
-    endif()
 endif()
 
 if (PLATFORM_PS4)
@@ -204,7 +169,7 @@ if (PLATFORM_PS4)
     )
 elseif (PLATFORM_MANAGARM)
     # Required for proper stuff
-    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS 
+    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
         --disable-pthreads
         --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
     )
@@ -282,14 +247,8 @@ else()
 
     # `configure` parameters builds only exactly what yuzu needs from FFmpeg
     # `--disable-vdpau` is needed to avoid linking issues
-    set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER} ${CMAKE_C_COMPILER})
-    set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER} ${CMAKE_CXX_COMPILER})
-    if (FFmpeg_IS_CROSS_COMPILING)
-        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS --ld=${CMAKE_LINKER})
-    endif ()
-    # TODO: This is a bit fragile, it depends on FFmpeg_HWACCEL_LDFLAGS being a list
-    # whereas CMAKE_C_FLAGS (and likewise) is meant to NOT be a list, but rather
-    # an elongated piece of string
+    set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER}  ${CMAKE_C_COMPILER})
+    set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER}  ${CMAKE_CXX_COMPILER})
     add_custom_command(
         OUTPUT
             ${FFmpeg_MAKEFILE}
@@ -303,7 +262,6 @@ else()
                 --disable-ffprobe
                 --disable-network
                 --disable-swresample
-                --disable-iconv
                 --enable-decoder=h264
                 --enable-decoder=vp8
                 --enable-decoder=vp9
@@ -311,9 +269,10 @@ else()
                 --enable-pic
                 --cc=${FFmpeg_CC}
                 --cxx=${FFmpeg_CXX}
+                --ld=${CMAKE_LINKER}
                 --extra-cflags=${CMAKE_C_FLAGS}
                 --extra-cxxflags=${CMAKE_CXX_FLAGS}
-                --extra-ldflags="${FFmpeg_HWACCEL_LDFLAGS}"
+                --extra-ldflags=${CMAKE_C_LINK_FLAGS}
                 ${FFmpeg_HWACCEL_FLAGS}
                 ${FFmpeg_CROSS_COMPILE_FLAGS}
         WORKING_DIRECTORY
@@ -321,7 +280,6 @@ else()
     )
     unset(FFmpeg_CC)
     unset(FFmpeg_CXX)
-    unset(FFmpeg_LD)
     unset(FFmpeg_HWACCEL_FLAGS)
     unset(FFmpeg_CROSS_COMPILE_FLAGS)
 
@@ -336,7 +294,7 @@ else()
     set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES})
 
     # BSD make or Solaris make don't support ffmpeg make-j8
-    if (DEFINED SYSTEM_THREADS AND (PLATFORM_LINUX OR ANDROID OR APPLE OR WIN32 OR PLATFORM_FREEBSD))
+    if (PLATFORM_LINUX OR ANDROID OR APPLE OR WIN32 OR PLATFORM_FREEBSD)
         set(FFmpeg_MAKE_ARGS -j${SYSTEM_THREADS})
     else()
         set(FFmpeg_MAKE_ARGS "")