Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 07:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated FFmpeg to 6.0 on Windows and macOS

Browse source
This commit is contained in:
Leon Styhre 2023-06-25 12:42:16 +02:00
parent 72e14d6a95
commit 1b052a174b
6 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -482,12 +482,12 @@ endif()
if(APPLE) if(APPLE)
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} set(COMMON_LIBRARIES ${COMMON_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${PROJECT_SOURCE_DIR}/libavcodec.59.dylib ${PROJECT_SOURCE_DIR}/libavcodec.60.dylib
${PROJECT_SOURCE_DIR}/libavfilter.8.dylib ${PROJECT_SOURCE_DIR}/libavfilter.9.dylib
${PROJECT_SOURCE_DIR}/libavformat.59.dylib ${PROJECT_SOURCE_DIR}/libavformat.60.dylib
${PROJECT_SOURCE_DIR}/libavutil.57.dylib ${PROJECT_SOURCE_DIR}/libavutil.58.dylib
${PROJECT_SOURCE_DIR}/libswresample.4.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}/libfreeimage.a
${PROJECT_SOURCE_DIR}/libfreetype.6.dylib ${PROJECT_SOURCE_DIR}/libfreetype.6.dylib
${PROJECT_SOURCE_DIR}/libgit2.1.6.dylib ${PROJECT_SOURCE_DIR}/libgit2.1.6.dylib
@ -513,12 +513,12 @@ elseif(WIN32)
${PROJECT_SOURCE_DIR}/SDL2.lib ${PROJECT_SOURCE_DIR}/SDL2.lib
Winmm.dll) Winmm.dll)
else() else()
set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec-59.dll set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec-60.dll
${PROJECT_SOURCE_DIR}/avfilter-8.dll ${PROJECT_SOURCE_DIR}/avfilter-9.dll
${PROJECT_SOURCE_DIR}/avformat-59.dll ${PROJECT_SOURCE_DIR}/avformat-60.dll
${PROJECT_SOURCE_DIR}/avutil-57.dll ${PROJECT_SOURCE_DIR}/avutil-58.dll
${PROJECT_SOURCE_DIR}/swresample-4.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}/FreeImage.dll
${PROJECT_SOURCE_DIR}/libgit2.dll ${PROJECT_SOURCE_DIR}/libgit2.dll
${PROJECT_SOURCE_DIR}/glew32.dll ${PROJECT_SOURCE_DIR}/glew32.dll

36
es-app/CMakeLists.txt
View file

@ -133,13 +133,13 @@ if(WIN32)
install(TARGETS EmulationStation RUNTIME DESTINATION .) install(TARGETS EmulationStation RUNTIME DESTINATION .)
install(TARGETS es-pdf-convert RUNTIME DESTINATION es-pdf-converter) install(TARGETS es-pdf-convert RUNTIME DESTINATION es-pdf-converter)
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
install(FILES ../avcodec-59.dll install(FILES ../avcodec-60.dll
../avfilter-8.dll ../avfilter-9.dll
../avformat-59.dll ../avformat-60.dll
../avutil-57.dll ../avutil-58.dll
../postproc-56.dll ../postproc-57.dll
../swresample-4.dll ../swresample-4.dll
../swscale-6.dll ../swscale-7.dll
../FreeImage.dll ../FreeImage.dll
../freetype.dll ../freetype.dll
../git2.dll ../git2.dll
@ -176,13 +176,13 @@ if(WIN32)
../es-pdf-converter/zstd.dll ../es-pdf-converter/zstd.dll
DESTINATION es-pdf-converter) DESTINATION es-pdf-converter)
else() else()
install(FILES ../avcodec-59.dll install(FILES ../avcodec-60.dll
../avfilter-8.dll ../avfilter-9.dll
../avformat-59.dll ../avformat-60.dll
../avutil-57.dll ../avutil-58.dll
../postproc-56.dll ../postproc-57.dll
../swresample-4.dll ../swresample-4.dll
../swscale-6.dll ../swscale-7.dll
../FreeImage.dll ../FreeImage.dll
../glew32.dll ../glew32.dll
../libcrypto-1_1-x64.dll ../libcrypto-1_1-x64.dll
@ -271,19 +271,19 @@ elseif(APPLE)
GROUP_READ GROUP_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_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) 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) 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) 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) 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) PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
install(FILES ${CMAKE_SOURCE_DIR}/libswresample.4.dylib install(FILES ${CMAKE_SOURCE_DIR}/libswresample.4.dylib
PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) 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) PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
install(FILES ${CMAKE_SOURCE_DIR}/libvorbis.0.4.9.dylib install(FILES ${CMAKE_SOURCE_DIR}/libvorbis.0.4.9.dylib
PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)

24
tools/Windows_dependencies_setup_MSVC.bat
View file

@ -244,8 +244,8 @@ copy /Y SDL2\lib\x64\SDL2main.lib ..
echo: echo:
echo Setting up FFmpeg echo Setting up FFmpeg
if exist 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-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1 rmdir /S /Q ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0
) )
if exist ffmpeg\ ( if exist ffmpeg\ (
@ -253,24 +253,24 @@ if exist ffmpeg\ (
) )
:: This package should be available for download for two years. :: 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 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-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.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. echo FFmpeg directory is missing, aborting.
cd .. cd ..
goto end 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\avcodec-60.dll ..
copy /Y ffmpeg\bin\avfilter-8.dll .. copy /Y ffmpeg\bin\avfilter-9.dll ..
copy /Y ffmpeg\bin\avformat-59.dll .. copy /Y ffmpeg\bin\avformat-60.dll ..
copy /Y ffmpeg\bin\avutil-57.dll .. copy /Y ffmpeg\bin\avutil-58.dll ..
copy /Y ffmpeg\bin\postproc-56.dll .. copy /Y ffmpeg\bin\postproc-57.dll ..
copy /Y ffmpeg\bin\swresample-4.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\avcodec.lib ..
copy /Y ffmpeg\lib\avfilter.lib .. copy /Y ffmpeg\lib\avfilter.lib ..
copy /Y ffmpeg\lib\avformat.lib .. copy /Y ffmpeg\lib\avformat.lib ..

20
tools/Windows_dependencies_setup_MinGW.sh
View file

@ -141,23 +141,23 @@ echo -e "\nSetting up FFmpeg"
rm -rf ffmpeg* rm -rf ffmpeg*
# This package should be available for download for two years. # 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 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-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.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." echo "FFmpeg directory is missing, aborting."
exit exit
fi 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/avcodec-60.dll ..
cp -p ffmpeg/bin/avfilter-8.dll .. cp -p ffmpeg/bin/avfilter-9.dll ..
cp -p ffmpeg/bin/avformat-59.dll .. cp -p ffmpeg/bin/avformat-60.dll ..
cp -p ffmpeg/bin/avutil-57.dll .. cp -p ffmpeg/bin/avutil-58.dll ..
cp -p ffmpeg/bin/postproc-56.dll .. cp -p ffmpeg/bin/postproc-57.dll ..
cp -p ffmpeg/bin/swresample-4.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" echo -e "\nSetting up OpenSSL"

24
tools/macOS_dependencies_build.sh
View file

@ -299,20 +299,20 @@ PKG_CONFIG_PATH=$(pwd)/../local_install/lib/pkgconfig ./configure --prefix=/usr/
make clean make clean
make -j${JOBS} make -j${JOBS}
install_name_tool -rpath /usr/local/lib @executable_path libavcodec/libavcodec.59.dylib install_name_tool -rpath /usr/local/lib @executable_path libavcodec/libavcodec.60.dylib
cp libavcodec/libavcodec.59.dylib ../.. cp libavcodec/libavcodec.60.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libavfilter/libavfilter.8.dylib install_name_tool -rpath /usr/local/lib @executable_path libavfilter/libavfilter.9.dylib
cp libavfilter/libavfilter.8.dylib ../.. cp libavfilter/libavfilter.9.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libavformat/libavformat.59.dylib install_name_tool -rpath /usr/local/lib @executable_path libavformat/libavformat.60.dylib
cp libavformat/libavformat.59.dylib ../.. cp libavformat/libavformat.60.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libavutil/libavutil.57.dylib install_name_tool -rpath /usr/local/lib @executable_path libavutil/libavutil.58.dylib
cp libavutil/libavutil.57.dylib ../.. cp libavutil/libavutil.58.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libpostproc/libpostproc.56.dylib install_name_tool -rpath /usr/local/lib @executable_path libpostproc/libpostproc.57.dylib
cp libpostproc/libpostproc.56.dylib ../.. cp libpostproc/libpostproc.57.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libswresample/libswresample.4.dylib install_name_tool -rpath /usr/local/lib @executable_path libswresample/libswresample.4.dylib
cp libswresample/libswresample.4.dylib ../.. cp libswresample/libswresample.4.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libswscale/libswscale.6.dylib install_name_tool -rpath /usr/local/lib @executable_path libswscale/libswscale.7.dylib
cp libswscale/libswscale.6.dylib ../.. cp libswscale/libswscale.7.dylib ../..
unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH

2
tools/macOS_dependencies_setup.sh
View file

@ -352,7 +352,7 @@ if [ ! -d FFmpeg ]; then
fi fi
cd FFmpeg cd FFmpeg
git checkout n5.1.2 git checkout n6.0
echo echo
echo "Done setting up all dependencies." echo "Done setting up all dependencies."