[DO-1345] fixed windows packages (!16)
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/16 Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team> Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
This commit is contained in:
committed by
Aleksandr Vodyanov
parent
3759e1163f
commit
a82e89a1bc
@@ -1,13 +1,13 @@
|
||||
sources:
|
||||
"1.4.3":
|
||||
url: "http://code.videolan.org/videolan/dav1d/-/archive/1.4.3/dav1d-1.4.3.tar.gz"
|
||||
url: "http://nexus.avroid.tech/repository/all-raw-proxy-code_videolan_org/videolan/dav1d/-/archive/1.4.3/dav1d-1.4.3.tar.gz"
|
||||
sha256: "88a023e58d955e0886faf49c72940e0e90914a948a8e60c1326ce3e09e7a6099"
|
||||
"1.4.1":
|
||||
url: "http://code.videolan.org/videolan/dav1d/-/archive/1.4.1/dav1d-1.4.1.tar.gz"
|
||||
url: "http://nexus.avroid.tech/repository/all-raw-proxy-code_videolan_org/videolan/dav1d/-/archive/1.4.1/dav1d-1.4.1.tar.gz"
|
||||
sha256: "8d407dd5fe7986413c937b14e67f36aebd06e1fa5cfec679d10e548476f2d5f8"
|
||||
"1.3.0":
|
||||
url: "http://code.videolan.org/videolan/dav1d/-/archive/1.3.0/dav1d-1.3.0.tar.gz"
|
||||
url: "http://nexus.avroid.tech/repository/all-raw-proxy-code_videolan_org/videolan/dav1d/-/archive/1.3.0/dav1d-1.3.0.tar.gz"
|
||||
sha256: "6d8be2741c505c47f8f1ced3c9cc427759243436553d01d1acce201f87b39e71"
|
||||
"1.2.1":
|
||||
url: "http://code.videolan.org/videolan/dav1d/-/archive/1.2.1/dav1d-1.2.1.tar.gz"
|
||||
url: "http://nexus.avroid.tech/repository/all-raw-proxy-code_videolan_org/videolan/dav1d/-/archive/1.2.1/dav1d-1.2.1.tar.gz"
|
||||
sha256: "4e33eb61ec54c768a16da0cf8fa0928b4c4593f5f804a3c887d4a21c318340b2"
|
||||
|
||||
@@ -60,7 +60,7 @@ class Dav1dConan(ConanFile):
|
||||
self.output.warning("The 'with_avx512' option is deprecated and has no effect")
|
||||
|
||||
def build_requirements(self):
|
||||
# self.tool_requires("meson/1.4.0")
|
||||
self.tool_requires("meson/[>=1.4.0<2]")
|
||||
if self.options.assembly:
|
||||
self.tool_requires("nasm/2.16.01")
|
||||
|
||||
@@ -87,6 +87,12 @@ class Dav1dConan(ConanFile):
|
||||
|
||||
def build(self):
|
||||
self._patch_sources()
|
||||
if self.settings.os == "Windows" and self.settings.compiler == "gcc":
|
||||
replace_in_file(self,
|
||||
os.path.join(self.source_folder, "meson.build"),
|
||||
"find_program('nasm'",
|
||||
"find_program('nasm.exe'",
|
||||
)
|
||||
meson = Meson(self)
|
||||
meson.configure()
|
||||
meson.build()
|
||||
|
||||
Reference in New Issue
Block a user