From 99030361422ac320c5228feb8c6fe236a8c78b5a Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 10 Jun 2020 10:53:45 +0200 Subject: [PATCH] libav: enable arm 64bit Fixes #211 --- lib/mk/spec/arm_64/avcodec.mk | 5 +++++ lib/mk/spec/arm_64/avutil.mk | 8 ++++++++ recipes/src/libav/content.mk | 2 +- recipes/src/libav/hash | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 lib/mk/spec/arm_64/avcodec.mk create mode 100644 lib/mk/spec/arm_64/avutil.mk diff --git a/lib/mk/spec/arm_64/avcodec.mk b/lib/mk/spec/arm_64/avcodec.mk new file mode 100644 index 0000000..53d688b --- /dev/null +++ b/lib/mk/spec/arm_64/avcodec.mk @@ -0,0 +1,5 @@ +CC_C_OPT += -DARCH_AARCH64=1 + +include $(REP_DIR)/lib/mk/avcodec.inc + +-include $(LIBAVCODEC_DIR)/aarch64/Makefile diff --git a/lib/mk/spec/arm_64/avutil.mk b/lib/mk/spec/arm_64/avutil.mk new file mode 100644 index 0000000..36594b2 --- /dev/null +++ b/lib/mk/spec/arm_64/avutil.mk @@ -0,0 +1,8 @@ +# must be defined before the inclusion of the libavutil 'Makefile' +ARCH_ARM=yes + +CC_C_OPT += -DARCH_AARCH64=1 + +include $(REP_DIR)/lib/mk/avutil.inc + +-include $(LIBAVUTIL_DIR)/aarch64/Makefile diff --git a/recipes/src/libav/content.mk b/recipes/src/libav/content.mk index abb975f..746b511 100644 --- a/recipes/src/libav/content.mk +++ b/recipes/src/libav/content.mk @@ -18,7 +18,7 @@ lib/import: lib/mk: mkdir -p $@ cp $(addprefix $(REP_DIR)/$@/,av* swscale.mk) $@ - for spec in x86 x86_32 x86_64 arm; do \ + for spec in x86 x86_32 x86_64 arm arm_64; do \ mkdir -p $@/spec/$$spec; \ cp $(addprefix $(REP_DIR)/$@/spec/$$spec/,av*) $@/spec/$$spec/; done diff --git a/recipes/src/libav/hash b/recipes/src/libav/hash index 180dd96..cd1a1ec 100644 --- a/recipes/src/libav/hash +++ b/recipes/src/libav/hash @@ -1 +1 @@ -2020-04-28 d0b2291a03af52f9d7fb220e2c393d77bdb97215 +2020-06-10 2836c8c56d33a022ede61123481aec42ceb3ef09