From 8a667c60c7503ccdb94a2fd35192e375dac5b686 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 15 Jun 2017 00:30:57 +0200 Subject: [PATCH] ffmpeg: Remove --enable-nonfree & --enable-openssl Building with either of these results in: This version of ffmpeg has nonfree parts compiled in. Therefore it is not legally redistributable." Fixes #1087. --- packages/ffmpeg/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh index 7932f05de..ef3d83c22 100644 --- a/packages/ffmpeg/build.sh +++ b/packages/ffmpeg/build.sh @@ -2,13 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://ffmpeg.org TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols" # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg. TERMUX_PKG_VERSION=3.3.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=1998de1ab32616cbf2ff86efc3f1f26e76805ec5dc51e24c041c79edd8262785 TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION # libbz2 is used by matroska decoder: # libvpx is the VP8 & VP9 video encoder for WebM, see # https://trac.ffmpeg.org/wiki/Encode/VP8 and https://trac.ffmpeg.org/wiki/Encode/VP9 -TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx" +TERMUX_PKG_DEPENDS="libbz2, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples" TERMUX_PKG_CONFLICTS="libav" @@ -58,8 +59,6 @@ termux_step_configure () { --enable-libx265 \ --enable-libxvid \ --enable-libvpx \ - --enable-nonfree \ - --enable-openssl \ --enable-shared \ --prefix=$TERMUX_PREFIX \ --target-os=android \