From 5c4adc6c1d5e04e44fcc87752fd4931e7e8d0448 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Dec 2017 05:12:59 +0000 Subject: [PATCH] ffmpeg/ffmpegx: disable lzma and alsa as ffmpeg has no dependency on xz or alsa ffmpeg[x] will auto-detect lzma (from xz, built by vfs.libarchive) and alsa, however these packages are built after ffmpeg so that when ffmpeg is rebuilt these libraries are now found, resulting in a different binary than when clean. Solution: don't auto-detect. --- packages/addons/addon-depends/ffmpegx/package.mk | 2 ++ packages/multimedia/ffmpeg/package.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk index 7992ac12d7..695f1c7aa7 100644 --- a/packages/addons/addon-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/ffmpegx/package.mk @@ -149,6 +149,8 @@ configure_target() { \ `#General options` \ --enable-avresample \ + --disable-lzma \ + --disable-alsa \ \ `#Toolchain options` \ --arch="$TARGET_ARCH" \ diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index e6f665bd03..c203364dc1 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -179,6 +179,8 @@ configure_target() { --enable-filters \ --disable-avisynth \ --enable-bzlib \ + --disable-lzma \ + --disable-alsa \ --disable-frei0r \ --disable-libopencore-amrnb \ --disable-libopencore-amrwb \