diff options
| author | Ted Hess <thess@kitschensync.net> | 2018-06-28 19:53:19 -0400 |
|---|---|---|
| committer | Ted Hess <thess@kitschensync.net> | 2018-06-28 19:54:09 -0400 |
| commit | 75f049946928a9569bd855298dab58fe43aec326 (patch) | |
| tree | 76b4f02bfe542657b8aa10b168219fd4f9b93e1d /multimedia/ffmpeg | |
| parent | 50ce6735f8fc79b1509dad0f15f81ab6f2600e0f (diff) | |
ffmpeg/libx264: Replacing YASM with NASM and fixing ffmpeg/x264 module dependency
Both libraries on X86 platforms require NASM instead of YASM going forward.
Signed-off-by: Ted Hess <thess@kitschensync.net>
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 2f862d094..4f29945fc 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg PKG_VERSION:=3.2.10 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ @@ -442,9 +442,12 @@ ifeq ($(ARCH),x86_64) FFMPEG_CONFIGURE+= --enable-lto endif -ifneq ($(CONFIG_YASM),y) -FFMPEG_CONFIGURE+= --disable-yasm - +ifneq ($(CONFIG_TARGET_x86),) +ifeq ($(CONFIG_NASM),y) + FFMPEG_CONFIGURE += --yasmexe=nasm +else + FFMPEG_CONFIGURE += --disable-yasm +endif endif ifeq ($(BUILD_VARIANT),full) @@ -477,7 +480,7 @@ ifeq ($(BUILD_VARIANT),full) FFMPEG_CONFIGURE+= $(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) # x264 support and fdk-aac support can't coexist and be distributed. # Prioritize x264 over fdk-aac in default builds (maintain status-quo). - ifeq ($(CONFIG_PACKAGE_libx264),y) + ifneq ($(CONFIG_PACKAGE_libx264),) FFMPEG_CONFIGURE+= \ --enable-gpl \ --enable-libx264 @@ -555,7 +558,7 @@ ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_libshine),y) --enable-libshine --enable-encoder=libshine endif -ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_libx264),y) +ifneq ($(CONFIG_FFMPEG_CUSTOM_SELECT_libx264),) FFMPEG_CONFIGURE+= \ --enable-libx264 --enable-encoder=libx264 endif @@ -640,7 +643,7 @@ define Build/InstallDev/full $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avresample,avutil,swresample,swscale} $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avresample,avutil,swresample,swscale}.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avresample,avutil,swresample,swscale}.pc $(1)/usr/lib/pkgconfig/ -ifeq ($(CONFIG_PACKAGE_libx264),y) +ifneq ($(CONFIG_PACKAGE_libx264),) $(CP) $(PKG_INSTALL_DIR)/usr/include/libpostproc $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpostproc.pc $(1)/usr/lib/pkgconfig/ @@ -706,7 +709,7 @@ endef define Package/libffmpeg-full/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avresample,avutil,swresample,swscale}.so.* $(1)/usr/lib/ -ifeq ($(CONFIG_PACKAGE_libx264),y) +ifneq ($(CONFIG_PACKAGE_libx264),) $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.so.* $(1)/usr/lib/ endif endef |