Browse Source

ffmpeg: update to 3.2.6, correct arm optimization check

mpfu=neon implies neon-vfpv3, so enable vfp when just neon is found.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
lilik-openwrt-22.03
Ian Leonard 7 years ago
parent
commit
12c706bc0e
1 changed files with 12 additions and 5 deletions
  1. +12
    -5
      multimedia/ffmpeg/Makefile

+ 12
- 5
multimedia/ffmpeg/Makefile View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=3.2.5
PKG_VERSION:=3.2.6
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/ PKG_SOURCE_URL:=https://ffmpeg.org/releases/
PKG_MD5SUM:=b53ecfcbafca973f92bfb77815cce01e
PKG_HASH:=0c0c15e999c66003b969c7a5d61c4a7e1d3dfbf3c809c23ff5537d583dd93323
PKG_MD5SUM:=7a35bd97bd7253305bf5c0af5f9dd3ce
PKG_HASH:=3751cebb5c71a861288267769114d12b966a7703a686a325d90a93707f3a6d9f
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
Ian Leonard <antonlacon@gmail.com> Ian Leonard <antonlacon@gmail.com>
@ -431,11 +431,18 @@ endif
# selectively disable optimizations according to arch/cpu type # selectively disable optimizations according to arch/cpu type
ifneq ($(findstring arm,$(CONFIG_ARCH)),) ifneq ($(findstring arm,$(CONFIG_ARCH)),)
ifeq (,$(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)))
ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),)
FFMPEG_CONFIGURE+= \
--enable-vfp
else
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--disable-vfp --disable-vfp
endif endif
ifeq (,$(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)))
ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
FFMPEG_CONFIGURE+= \
--enable-neon \
--enable-vfp
else
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--disable-neon --disable-neon
endif endif


Loading…
Cancel
Save