From 1b052a174b3127d6de60db2d9ffde0e7d3a0c721 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 25 Jun 2023 12:42:16 +0200 Subject: [PATCH] Updated FFmpeg to 6.0 on Windows and macOS --- CMakeLists.txt | 20 ++++++------- es-app/CMakeLists.txt | 36 +++++++++++------------ tools/Windows_dependencies_setup_MSVC.bat | 24 +++++++-------- tools/Windows_dependencies_setup_MinGW.sh | 20 ++++++------- tools/macOS_dependencies_build.sh | 24 +++++++-------- tools/macOS_dependencies_setup.sh | 2 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7db3fe2a..3dddd9e40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -482,12 +482,12 @@ endif() if(APPLE) set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${CURL_LIBRARIES} - ${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}/libavcodec.60.dylib + ${PROJECT_SOURCE_DIR}/libavfilter.9.dylib + ${PROJECT_SOURCE_DIR}/libavformat.60.dylib + ${PROJECT_SOURCE_DIR}/libavutil.58.dylib ${PROJECT_SOURCE_DIR}/libswresample.4.dylib - ${PROJECT_SOURCE_DIR}/libswscale.6.dylib + ${PROJECT_SOURCE_DIR}/libswscale.7.dylib ${PROJECT_SOURCE_DIR}/libfreeimage.a ${PROJECT_SOURCE_DIR}/libfreetype.6.dylib ${PROJECT_SOURCE_DIR}/libgit2.1.6.dylib @@ -513,12 +513,12 @@ elseif(WIN32) ${PROJECT_SOURCE_DIR}/SDL2.lib Winmm.dll) else() - set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec-59.dll - ${PROJECT_SOURCE_DIR}/avfilter-8.dll - ${PROJECT_SOURCE_DIR}/avformat-59.dll - ${PROJECT_SOURCE_DIR}/avutil-57.dll + set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec-60.dll + ${PROJECT_SOURCE_DIR}/avfilter-9.dll + ${PROJECT_SOURCE_DIR}/avformat-60.dll + ${PROJECT_SOURCE_DIR}/avutil-58.dll ${PROJECT_SOURCE_DIR}/swresample-4.dll - ${PROJECT_SOURCE_DIR}/swscale-6.dll + ${PROJECT_SOURCE_DIR}/swscale-7.dll ${PROJECT_SOURCE_DIR}/FreeImage.dll ${PROJECT_SOURCE_DIR}/libgit2.dll ${PROJECT_SOURCE_DIR}/glew32.dll diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 2d2bcd0ca..eec608187 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -133,13 +133,13 @@ if(WIN32) install(TARGETS EmulationStation RUNTIME DESTINATION .) install(TARGETS es-pdf-convert RUNTIME DESTINATION es-pdf-converter) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) - install(FILES ../avcodec-59.dll - ../avfilter-8.dll - ../avformat-59.dll - ../avutil-57.dll - ../postproc-56.dll + install(FILES ../avcodec-60.dll + ../avfilter-9.dll + ../avformat-60.dll + ../avutil-58.dll + ../postproc-57.dll ../swresample-4.dll - ../swscale-6.dll + ../swscale-7.dll ../FreeImage.dll ../freetype.dll ../git2.dll @@ -176,13 +176,13 @@ if(WIN32) ../es-pdf-converter/zstd.dll DESTINATION es-pdf-converter) else() - install(FILES ../avcodec-59.dll - ../avfilter-8.dll - ../avformat-59.dll - ../avutil-57.dll - ../postproc-56.dll + install(FILES ../avcodec-60.dll + ../avfilter-9.dll + ../avformat-60.dll + ../avutil-58.dll + ../postproc-57.dll ../swresample-4.dll - ../swscale-6.dll + ../swscale-7.dll ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll @@ -271,19 +271,19 @@ elseif(APPLE) GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - install(FILES ${CMAKE_SOURCE_DIR}/libavcodec.59.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libavcodec.60.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libavfilter.8.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libavfilter.9.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libavformat.59.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libavformat.60.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libavutil.57.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libavutil.58.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libpostproc.56.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libpostproc.57.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libswresample.4.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libswscale.6.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libswscale.7.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/Windows_dependencies_setup_MSVC.bat b/tools/Windows_dependencies_setup_MSVC.bat index 2098097dc..fd06cbb0e 100644 --- a/tools/Windows_dependencies_setup_MSVC.bat +++ b/tools/Windows_dependencies_setup_MSVC.bat @@ -244,8 +244,8 @@ copy /Y SDL2\lib\x64\SDL2main.lib .. echo: echo Setting up FFmpeg -if exist ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\ ( - rmdir /S /Q ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1 +if exist ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0\ ( + rmdir /S /Q ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0 ) if exist ffmpeg\ ( @@ -253,24 +253,24 @@ if exist ffmpeg\ ( ) :: This package should be available for download for two years. -curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-09-30-12-41/ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip -7z x ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip +curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2023-05-31-12-47/ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0.zip +7z x ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0.zip -if not exist ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\ ( +if not exist ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0\ ( echo FFmpeg directory is missing, aborting. cd .. goto end ) -rename ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1 ffmpeg +rename ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0 ffmpeg -copy /Y ffmpeg\bin\avcodec-59.dll .. -copy /Y ffmpeg\bin\avfilter-8.dll .. -copy /Y ffmpeg\bin\avformat-59.dll .. -copy /Y ffmpeg\bin\avutil-57.dll .. -copy /Y ffmpeg\bin\postproc-56.dll .. +copy /Y ffmpeg\bin\avcodec-60.dll .. +copy /Y ffmpeg\bin\avfilter-9.dll .. +copy /Y ffmpeg\bin\avformat-60.dll .. +copy /Y ffmpeg\bin\avutil-58.dll .. +copy /Y ffmpeg\bin\postproc-57.dll .. copy /Y ffmpeg\bin\swresample-4.dll .. -copy /Y ffmpeg\bin\swscale-6.dll .. +copy /Y ffmpeg\bin\swscale-7.dll .. copy /Y ffmpeg\lib\avcodec.lib .. copy /Y ffmpeg\lib\avfilter.lib .. copy /Y ffmpeg\lib\avformat.lib .. diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh index caa61b5b2..fab8b8724 100644 --- a/tools/Windows_dependencies_setup_MinGW.sh +++ b/tools/Windows_dependencies_setup_MinGW.sh @@ -141,23 +141,23 @@ echo -e "\nSetting up FFmpeg" rm -rf ffmpeg* # This package should be available for download for two years. -curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-09-30-12-41/ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip -unzip ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip +curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2023-05-31-12-47/ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0.zip +unzip ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0.zip -if [ ! -d ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1 ]; then +if [ ! -d ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0 ]; then echo "FFmpeg directory is missing, aborting." exit fi -mv ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1 ffmpeg +mv ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0 ffmpeg -cp -p ffmpeg/bin/avcodec-59.dll .. -cp -p ffmpeg/bin/avfilter-8.dll .. -cp -p ffmpeg/bin/avformat-59.dll .. -cp -p ffmpeg/bin/avutil-57.dll .. -cp -p ffmpeg/bin/postproc-56.dll .. +cp -p ffmpeg/bin/avcodec-60.dll .. +cp -p ffmpeg/bin/avfilter-9.dll .. +cp -p ffmpeg/bin/avformat-60.dll .. +cp -p ffmpeg/bin/avutil-58.dll .. +cp -p ffmpeg/bin/postproc-57.dll .. cp -p ffmpeg/bin/swresample-4.dll .. -cp -p ffmpeg/bin/swscale-6.dll .. +cp -p ffmpeg/bin/swscale-7.dll .. echo -e "\nSetting up OpenSSL" diff --git a/tools/macOS_dependencies_build.sh b/tools/macOS_dependencies_build.sh index 3370ad27c..a8c5d45c0 100755 --- a/tools/macOS_dependencies_build.sh +++ b/tools/macOS_dependencies_build.sh @@ -299,20 +299,20 @@ 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.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 libavcodec/libavcodec.60.dylib +cp libavcodec/libavcodec.60.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libavfilter/libavfilter.9.dylib +cp libavfilter/libavfilter.9.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libavformat/libavformat.60.dylib +cp libavformat/libavformat.60.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libavutil/libavutil.58.dylib +cp libavutil/libavutil.58.dylib ../.. +install_name_tool -rpath /usr/local/lib @executable_path libpostproc/libpostproc.57.dylib +cp libpostproc/libpostproc.57.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 ../.. +install_name_tool -rpath /usr/local/lib @executable_path libswscale/libswscale.7.dylib +cp libswscale/libswscale.7.dylib ../.. unset PKG_CONFIG_PATH diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index ac4471cec..85f4d8b5a 100755 --- a/tools/macOS_dependencies_setup.sh +++ b/tools/macOS_dependencies_setup.sh @@ -352,7 +352,7 @@ if [ ! -d FFmpeg ]; then fi cd FFmpeg -git checkout n5.1.2 +git checkout n6.0 echo echo "Done setting up all dependencies."