vlc | branch: master | Steve Lhomme <[email protected]> | Fri May 20 11:14:28 2016 +0200| [fa22f471c19df1dcec6bf43793e746d70e44b6c0] | committer: Thomas Guillem
contrib: vpx: fix ARM compilation Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa22f471c19df1dcec6bf43793e746d70e44b6c0 --- contrib/src/vpx/libvpx-arm.patch | 10 ++++++++++ contrib/src/vpx/rules.mak | 1 + 2 files changed, 11 insertions(+) diff --git a/contrib/src/vpx/libvpx-arm.patch b/contrib/src/vpx/libvpx-arm.patch new file mode 100644 index 0000000..6736f82 --- /dev/null +++ b/contrib/src/vpx/libvpx-arm.patch @@ -0,0 +1,10 @@ +--- libvpx/vpx_ports/arm_cpudetect.c 2015-04-03 20:49:19.000000000 +0200 ++++ libvpx.ok/vpx_ports/arm_cpudetect.c 2016-05-20 09:57:06.066241700 +0200 +@@ -84,7 +84,6 @@ int arm_cpu_caps(void) { + } __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) { + /*Ignore exception.*/ + } +-} + #endif /* HAVE_MEDIA */ + #if HAVE_NEON || HAVE_NEON_ASM + if (mask &HAS_NEON) { diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index 4b94389..4074e83 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -14,6 +14,7 @@ libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx $(APPLY) $(SRC)/vpx/libvpx-no-cross.patch $(APPLY) $(SRC)/vpx/libvpx-mac.patch $(APPLY) $(SRC)/vpx/libvpx-ios.patch + $(APPLY) $(SRC)/vpx/libvpx-arm.patch $(MOVE) DEPS_vpx = _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
