vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Mon Mar 30 08:33:30 2020 +0200| [b223467ae89e7e4838a2b4a4977a5b47075f3e0e] | committer: Steve Lhomme
tools: update meson to 0.54.0 And remove the patch that was merged upstream. (cherry picked from commit 104f07b25ae43ae9c22ca42dacb08b5b1a4726ee) (rebased) rebased: - the nasm SHA512 is not placed in the same location in this branch Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b223467ae89e7e4838a2b4a4977a5b47075f3e0e --- extras/tools/SHA512SUMS | 2 +- extras/tools/meson-shlib-undefined.patch | 21 --------------------- extras/tools/packages.mak | 2 +- extras/tools/tools.mak | 1 - 4 files changed, 2 insertions(+), 24 deletions(-) diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS index f5d893345e..466a4d492c 100644 --- a/extras/tools/SHA512SUMS +++ b/extras/tools/SHA512SUMS @@ -16,5 +16,5 @@ bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be98 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e flex-2.6.4.tar.gz 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd nasm-2.14.tar.gz d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 help2man-1.47.6.tar.xz -0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859 meson-0.53.1.tar.gz +e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7 meson-0.54.0.tar.gz 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 ninja-1.8.2.tar.gz diff --git a/extras/tools/meson-shlib-undefined.patch b/extras/tools/meson-shlib-undefined.patch deleted file mode 100644 index a10f459251..0000000000 --- a/extras/tools/meson-shlib-undefined.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- meson/mesonbuild/linkers.py.shlib 2020-01-31 11:54:36.928015800 +0100 -+++ meson/mesonbuild/linkers.py 2020-01-31 11:54:55.088659900 +0100 -@@ -659,8 +659,17 @@ class LLVMDynamicLinker(GnuLikeDynamicLi - This is only the posix-like linker. - """ - -- pass -+ def __init__(self, *args, **kwargs): -+ super().__init__(*args, **kwargs) - -+ # Some targets don't seem to support this argument (windows, wasm, ...) -+ _, _, e = mesonlib.Popen_safe(self.exelist + self._apply_prefix('--allow-shlib-undefined')) -+ self.has_allow_shlib_undefined = not ('unknown argument: --allow-shlib-undefined' in e) -+ -+ def get_allow_undefined_args(self) -> T.List[str]: -+ if self.has_allow_shlib_undefined: -+ return self._apply_prefix('--allow-shlib-undefined') -+ return [] - - class CcrxDynamicLinker(DynamicLinker): - diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak index 04c9957c4e..6ffcbf9f99 100644 --- a/extras/tools/packages.mak +++ b/extras/tools/packages.mak @@ -57,7 +57,7 @@ FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex- HELP2MAN_VERSION=1.47.6 HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz -MESON_VERSION=0.53.1 +MESON_VERSION=0.54.0 MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz NINJA_VERSION=1.8.2 diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak index 4cce9b982f..d1bbcc0956 100644 --- a/extras/tools/tools.mak +++ b/extras/tools/tools.mak @@ -388,7 +388,6 @@ meson-$(MESON_VERSION).tar.gz: meson: meson-$(MESON_VERSION).tar.gz $(UNPACK) - $(APPLY) $(TOOLS)/meson-shlib-undefined.patch $(MOVE) .buildmeson: meson _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
