blob: 38b2165d40439d2479a5c6955321ca4b242fb191 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
diff --color --unified --recursive --text '--exclude=.git' '--exclude=generated' '--exclude=build' '--exclude=_build' OpenRV.clean/cmake/dependencies/ffmpeg.cmake OpenRV/cmake/dependencies/ffmpeg.cmake
--- OpenRV.clean/cmake/dependencies/ffmpeg.cmake 2023-12-08 12:48:32.604745129 -0800
+++ OpenRV/cmake/dependencies/ffmpeg.cmake 2023-12-08 14:15:59.468215871 -0800
@@ -34,6 +34,14 @@
"51ffa9de9e5b0c17cbabc0d8b780beb2"
)
+SET(_git_repository
+ "https://git.ffmpeg.org/ffmpeg.git"
+)
+
+SET(_git_tag
+ "3d69f9682f06bbf72e0cdcdc9e66c9307ed6b24f"
+)
+
SET(_base_dir
${RV_DEPS_BASE_DIR}/${_target}
)
@@ -51,6 +59,13 @@
SET(_configure_command
sh ./configure
)
+SET(_patch_command
+ git cherry-pick -n 988f2e9eb063db7c1a678729f58aab6eba59a55b &&
+ git cherry-pick -n 031f1561cd286596cdb374da32f8aa816ce3b135 &&
+ git cherry-pick -n effadce6c756247ea8bae32dc13bb3e6f464f0eb &&
+ git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f &&
+ git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500
+)
IF(${RV_OSX_EMULATION})
SET(_darwin_x86_64
@@ -254,14 +270,16 @@
EXTERNALPROJECT_ADD(
${_target}
DEPENDS ${RV_FFMPEG_DEPENDS}
- DOWNLOAD_NAME ${_target}_${_version}.zip
- DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
- DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+ # DOWNLOAD_NAME ${_target}_${_version}.zip
+ # DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
+ # DOWNLOAD_EXTRACT_TIMESTAMP TRUE
INSTALL_DIR ${_install_dir}
- URL ${_download_url}
- URL_MD5 ${_download_hash}
+ # URL ${_download_url}
+ # URL_MD5 ${_download_hash}
+ GIT_REPOSITORY ${_git_repository}
+ GIT_TAG ${_git_tag}
SOURCE_DIR ${RV_DEPS_BASE_DIR}/${_target}/src
- ${RV_FFMPEG_PATCH_COMMAND_STEP}
+ PATCH_COMMAND ${_patch_command}
CONFIGURE_COMMAND
${CMAKE_COMMAND} -E env "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${_ffmpeg_david_cmake_lib_dir_path}/pkgconfig" ${_configure_command} --prefix=${_install_dir}
${RV_FFMPEG_COMMON_CONFIG_OPTIONS} ${RV_FFMPEG_CONFIG_OPTIONS} ${RV_FFMPEG_EXTRA_C_OPTIONS} ${RV_FFMPEG_EXTRA_LIBPATH_OPTIONS} ${RV_FFMPEG_EXTERNAL_LIBS}
|