summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg
diff options
context:
space:
mode:
authorJeffery To <jeffery.to@gmail.com>2020-05-11 03:02:05 +0800
committerJeffery To <jeffery.to@gmail.com>2020-05-11 03:10:20 +0800
commit2d99ee3004a1b3aa099d90bff4eae627d11c53e8 (patch)
treeb28771d6b1d994e92c2e53799d1d6f905561e0b8 /multimedia/ffmpeg
parentb7c59c390f0b739403ae9099e1affe94d214b51d (diff)
treewide: Update ARM NEON/VFP detection
With openwrt/openwrt@8dcc1087602e2dd606e4f6e81a06aee62cfd4f4c, the ARM FPU compiler options are no longer part of CONFIG_TARGET_OPTIMIZATION. This updates various packages that look for NEON/VFP support to search CONFIG_CPU_TYPE instead. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'multimedia/ffmpeg')
-rw-r--r--multimedia/ffmpeg/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index a5025d73a..269946991 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg
PKG_VERSION:=4.2.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@@ -424,12 +424,12 @@ endif
ifneq ($(findstring arm,$(CONFIG_ARCH)),)
FFMPEG_CONFIGURE+= --enable-lto
- ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),)
+ ifneq ($(findstring vfp,$(CONFIG_CPU_TYPE)),)
FFMPEG_CONFIGURE+= --enable-vfp
else
FFMPEG_CONFIGURE+= --disable-vfp
endif
- ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
+ ifneq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
FFMPEG_CONFIGURE+= \
--enable-neon \
--enable-vfp