From fd5e6182961e65596297eaa2895671a2f18beb2d Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Fri, 15 Apr 2022 11:30:41 +0200 Subject: [PATCH] (macOS) Updated FFmpeg to 5.0 and SDL to 2.0.20. --- CMakeLists.txt | 12 ++++++------ es-app/CMakeLists.txt | 14 +++++++------- tools/macOS_dependencies_build.sh | 28 ++++++++++++++-------------- tools/macOS_dependencies_setup.sh | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a140b388..bbc938a52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -398,12 +398,12 @@ endif() if(APPLE) set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${CURL_LIBRARIES} - ${PROJECT_SOURCE_DIR}/libavcodec.58.dylib - ${PROJECT_SOURCE_DIR}/libavfilter.7.dylib - ${PROJECT_SOURCE_DIR}/libavformat.58.dylib - ${PROJECT_SOURCE_DIR}/libavutil.56.dylib - ${PROJECT_SOURCE_DIR}/libswresample.3.dylib - ${PROJECT_SOURCE_DIR}/libswscale.5.dylib + ${PROJECT_SOURCE_DIR}/libavcodec.59.dylib + ${PROJECT_SOURCE_DIR}/libavfilter.8.dylib + ${PROJECT_SOURCE_DIR}/libavformat.59.dylib + ${PROJECT_SOURCE_DIR}/libavutil.57.dylib + ${PROJECT_SOURCE_DIR}/libswresample.4.dylib + ${PROJECT_SOURCE_DIR}/libswscale.6.dylib ${PROJECT_SOURCE_DIR}/libfreeimage.a ${PROJECT_SOURCE_DIR}/libfreetype.6.dylib ${PROJECT_SOURCE_DIR}/libpugixml.a diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index f6a211b43..afaef18f0 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -187,19 +187,19 @@ elseif(APPLE) GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - install(FILES ${CMAKE_SOURCE_DIR}/libavcodec.58.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libavcodec.59.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libavfilter.7.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libavfilter.8.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libavformat.58.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libavformat.59.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libavutil.56.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libavutil.57.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libpostproc.55.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libpostproc.56.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libswresample.3.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libswresample.4.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libswscale.5.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libswscale.6.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libvorbis.0.4.9.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) diff --git a/tools/macOS_dependencies_build.sh b/tools/macOS_dependencies_build.sh index 02021bd3a..d72069768 100755 --- a/tools/macOS_dependencies_build.sh +++ b/tools/macOS_dependencies_build.sh @@ -123,19 +123,19 @@ PKG_CONFIG_PATH=$(pwd)/../local_install/lib/pkgconfig ./configure --prefix=/usr/ make clean make -j${JOBS} -install_name_tool -rpath /usr/local/lib @executable_path libavcodec/libavcodec.58.dylib -cp libavcodec/libavcodec.58.dylib ../.. -install_name_tool -rpath /usr/local/lib @executable_path libavfilter/libavfilter.7.dylib -cp libavfilter/libavfilter.7.dylib ../.. -install_name_tool -rpath /usr/local/lib @executable_path libavformat/libavformat.58.dylib -cp libavformat/libavformat.58.dylib ../.. -install_name_tool -rpath /usr/local/lib @executable_path libavutil/libavutil.56.dylib -cp libavutil/libavutil.56.dylib ../.. -install_name_tool -rpath /usr/local/lib @executable_path libpostproc/libpostproc.55.dylib -cp libpostproc/libpostproc.55.dylib ../.. -install_name_tool -rpath /usr/local/lib @executable_path libswresample/libswresample.3.dylib -cp libswresample/libswresample.3.dylib ../.. -install_name_tool -rpath /usr/local/lib @executable_path libswscale/libswscale.5.dylib -cp libswscale/libswscale.5.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libavcodec/libavcodec.59.dylib +cp libavcodec/libavcodec.59.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libavfilter/libavfilter.8.dylib +cp libavfilter/libavfilter.8.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libavformat/libavformat.59.dylib +cp libavformat/libavformat.59.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libavutil/libavutil.57.dylib +cp libavutil/libavutil.57.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libpostproc/libpostproc.56.dylib +cp libpostproc/libpostproc.56.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libswresample/libswresample.4.dylib +cp libswresample/libswresample.4.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libswscale/libswscale.6.dylib +cp libswscale/libswscale.6.dylib ../.. unset PKG_CONFIG_PATH diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index b987e6d18..df9645ead 100755 --- a/tools/macOS_dependencies_setup.sh +++ b/tools/macOS_dependencies_setup.sh @@ -157,7 +157,7 @@ echo "\nSetting up SDL" rm -rf SDL git clone https://github.com/libsdl-org/SDL.git cd SDL -git checkout release-2.0.18 +git checkout release-2.0.20 ln -s include SDL2 mkdir build cd .. @@ -194,4 +194,4 @@ echo "\nSetting up FFmpeg" rm -rf FFmpeg git clone https://github.com/FFmpeg/FFmpeg.git cd FFmpeg -git checkout n4.4.1 +git checkout n5.0.1