From d5ecd879e6dd8c820058a8a2aa79cfde887634bc Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Thu, 10 Oct 2024 21:48:03 +0900 Subject: [PATCH] Fix builds for FFmpeg and OpenBLAS on Mac --- .../src/main/java/org/bytedeco/ffmpeg/presets/avutil.java | 3 +++ .../org/bytedeco/openblas/presets/openblas_nolapack.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java index e64b279fa5b..face2acdb77 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java @@ -65,6 +65,9 @@ link = "avutil@.59", compiler = {"default", "nodeprecated"}), @Platform(value = "linux-x86", preload = {"va@.1", "drm@.2", "va-drm@.1"}, preloadpath = {"/usr/lib32/", "/usr/lib/"}), @Platform(value = "linux-x86_64", preloadpath = {"/usr/lib64/", "/usr/lib/"}), + @Platform(value = "macosx", preload = {"atomic@.1"}, + preloadpath = {"/usr/local/lib/gcc/13/", "/usr/local/lib/gcc/12/", "/usr/local/lib/gcc/11/", "/usr/local/lib/gcc/10/", "/usr/local/lib/gcc/9/", + "/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}), @Platform(value = "windows", includepath = {"C:/MinGW/local/include/ffmpeg/", "C:/MinGW/include/ffmpeg/"}, preload = "avutil-59"), @Platform(extension = "-gpl") } diff --git a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java index 17509e24b78..4d21cfa3a6b 100644 --- a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java +++ b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java @@ -44,11 +44,11 @@ @Platform(define = {"__OPENBLAS 1", "LAPACK_COMPLEX_CPP"}, include = {"openblas_config.h", "cblas.h"}, link = "openblas_nolapack@.0", resource = {"include", "lib"}, - preload = {"gcc_s@.1", "quadmath@.0", "gfortran@.5", "gfortran@.4", "gfortran@.3", "openblas@.0#openblas_nolapack@.0"}, + preload = {"gcc_s@.1.1", "gcc_s@.1", "quadmath@.0", "gfortran@.5", "gfortran@.4", "gfortran@.3", "openblas@.0#openblas_nolapack@.0"}, preloadpath = {"/opt/intel/oneapi/mkl/latest/lib/", "/opt/intel/oneapi/compiler/latest/mac/compiler/lib/"}), @Platform(value = "android", link = "openblas", preload = ""), - @Platform(value = "macosx-x86_64", preloadpath = {"/usr/local/lib/gcc/12/", "/usr/local/lib/gcc/11/", "/usr/local/lib/gcc/10/", "/usr/local/lib/gcc/9/", - "/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}), + @Platform(value = "macosx", preloadpath = {"/usr/local/lib/gcc/13/", "/usr/local/lib/gcc/12/", "/usr/local/lib/gcc/11/", "/usr/local/lib/gcc/10/", "/usr/local/lib/gcc/9/", + "/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}), @Platform(value = "windows", preload = "libopenblas#libopenblas_nolapack"), @Platform(value = "windows-x86", preloadpath = {"C:/Program Files (x86)/Intel/oneAPI/mkl/latest/redist/ia32/", "C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/redist/ia32_win/compiler/"}),