File tree Expand file tree Collapse file tree 5 files changed +6
-4
lines changed
Expand file tree Collapse file tree 5 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ include(base/android)
22
33[settings]
44arch=armv7
5- os.api_level=19
5+ os.api_level=21
66
77[conf]
88# remove after switching to API level >= 24
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ include(common)
66compiler=clang
77compiler.cppstd={{ vars.cppstd }}
88compiler.libcxx=c++_shared
9- compiler.version=14
9+ compiler.version=21
1010os=Android
1111
1212[conf]
Original file line number Diff line number Diff line change 11[tool_requires]
2- android-ndk/r25c
2+ android-ndk/r29
Original file line number Diff line number Diff line change @@ -9,6 +9,8 @@ ninja/1.12.1
99# TODO: remove after https://github.com/conan-io/conan-center-index/pull/27125 is merged
1010# Qt 5 depends on 0.4.8, but it doesn't build for iOS
1111md4c/0.4.8: md4c/0.5.2
12+ # Fix for Version conflict: Conflict between opus/1.4 and opus/1.5.2 in the graph. Conflict originates from ffmpeg/7.1.1
13+ opus/*: opus/1.5.2
1214
1315[conf]
1416tools.cmake.cmaketoolchain:generator=Ninja
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ def config_options(self):
5353 def requirements (self ):
5454 # lib
5555 # boost::filesystem removed support for Windows < 10 in v1.87
56- boostMinVersion = "1.69 "
56+ boostMinVersion = "1.74 "
5757 if self .options .get_safe ("target_pre_windows10" , False ):
5858 self .requires (f"boost/[>={ boostMinVersion } <1.87]" )
5959 else :
You can’t perform that action at this time.
0 commit comments