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

(macOS) Updated FFmpeg to 5.0 and SDL to 2.0.20.

Browse source
This commit is contained in:
Leon Styhre 2022-04-15 11:30:41 +02:00
parent 86c67ad256
commit fd5e618296
4 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -398,12 +398,12 @@ endif()
if(APPLE) if(APPLE)
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} set(COMMON_LIBRARIES ${COMMON_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${PROJECT_SOURCE_DIR}/libavcodec.58.dylib ${PROJECT_SOURCE_DIR}/libavcodec.59.dylib
${PROJECT_SOURCE_DIR}/libavfilter.7.dylib ${PROJECT_SOURCE_DIR}/libavfilter.8.dylib
${PROJECT_SOURCE_DIR}/libavformat.58.dylib ${PROJECT_SOURCE_DIR}/libavformat.59.dylib
${PROJECT_SOURCE_DIR}/libavutil.56.dylib ${PROJECT_SOURCE_DIR}/libavutil.57.dylib
${PROJECT_SOURCE_DIR}/libswresample.3.dylib ${PROJECT_SOURCE_DIR}/libswresample.4.dylib
${PROJECT_SOURCE_DIR}/libswscale.5.dylib ${PROJECT_SOURCE_DIR}/libswscale.6.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}/libpugixml.a ${PROJECT_SOURCE_DIR}/libpugixml.a

14
es-app/CMakeLists.txt
View file

@ -187,19 +187,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.58.dylib install(FILES ${CMAKE_SOURCE_DIR}/libavcodec.59.dylib
PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) 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) 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) 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) 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) 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) 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) 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)

28
tools/macOS_dependencies_build.sh
View file

@ -123,19 +123,19 @@ 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.58.dylib install_name_tool -rpath /usr/local/lib @executable_path libavcodec/libavcodec.59.dylib
cp libavcodec/libavcodec.58.dylib ../.. cp libavcodec/libavcodec.59.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libavfilter/libavfilter.7.dylib install_name_tool -rpath /usr/local/lib @executable_path libavfilter/libavfilter.8.dylib
cp libavfilter/libavfilter.7.dylib ../.. cp libavfilter/libavfilter.8.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libavformat/libavformat.58.dylib install_name_tool -rpath /usr/local/lib @executable_path libavformat/libavformat.59.dylib
cp libavformat/libavformat.58.dylib ../.. cp libavformat/libavformat.59.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libavutil/libavutil.56.dylib install_name_tool -rpath /usr/local/lib @executable_path libavutil/libavutil.57.dylib
cp libavutil/libavutil.56.dylib ../.. cp libavutil/libavutil.57.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libpostproc/libpostproc.55.dylib install_name_tool -rpath /usr/local/lib @executable_path libpostproc/libpostproc.56.dylib
cp libpostproc/libpostproc.55.dylib ../.. cp libpostproc/libpostproc.56.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libswresample/libswresample.3.dylib install_name_tool -rpath /usr/local/lib @executable_path libswresample/libswresample.4.dylib
cp libswresample/libswresample.3.dylib ../.. cp libswresample/libswresample.4.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libswscale/libswscale.5.dylib install_name_tool -rpath /usr/local/lib @executable_path libswscale/libswscale.6.dylib
cp libswscale/libswscale.5.dylib ../.. cp libswscale/libswscale.6.dylib ../..
unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH

4
tools/macOS_dependencies_setup.sh
View file

@ -157,7 +157,7 @@ echo "\nSetting up SDL"
rm -rf SDL rm -rf SDL
git clone https://github.com/libsdl-org/SDL.git git clone https://github.com/libsdl-org/SDL.git
cd SDL cd SDL
git checkout release-2.0.18 git checkout release-2.0.20
ln -s include SDL2 ln -s include SDL2
mkdir build mkdir build
cd .. cd ..
@ -194,4 +194,4 @@ echo "\nSetting up FFmpeg"
rm -rf FFmpeg rm -rf FFmpeg
git clone https://github.com/FFmpeg/FFmpeg.git git clone https://github.com/FFmpeg/FFmpeg.git
cd FFmpeg cd FFmpeg
git checkout n4.4.1 git checkout n5.0.1