From 50b76be7487ab1efe96775e24eafe1cda65e4fec Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 27 Mar 2018 17:58:19 -0700 Subject: [PATCH] ffmpeg: fixup for patent related changes Have encoders and demuxers selectively disabled for patents in libffmpeg-full too. Assume same codecs covered as decoders and muxers, respectively. Include vc1 in muxer's too. Don't invoke --enable-nonfree in libffmpeg-full. It results in: License: nonfree and unredistributable Signed-off-by: Ian Leonard --- multimedia/ffmpeg/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 023144a576..018945e782 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2017 Ian Leonard +# Copyright (C) 2017-2018 Ian Leonard # Copyright (C) 2018 Ted Hess # # This is free software, licensed under the GNU General Public License v2. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg PKG_VERSION:=3.2.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ @@ -202,9 +202,14 @@ FFMPEG_PATENTED_DECODERS:= \ hevc \ vc1 \ +FFMPEG_PATENTED_ENCODERS:=$(FFMPEG_PATENDED_DECODERS) + FFMPEG_PATENTED_MUXERS:= \ h264 \ hevc \ + vc1 \ + +FFMPEG_PATENTED_DEMUXERS:=$(FFMPEG_PATENTED_MUXERS) FFMPEG_PATENTED_PARSERS:= \ h264 \ @@ -452,7 +457,9 @@ ifeq ($(BUILD_VARIANT),full) --enable-avresample \ $(if $(CONFIG_BUILD_PATENTED),, \ $(call FFMPEG_DISABLE,decoder,$(FFMPEG_PATENTED_DECODERS)) \ + $(call FFMPEG_DISABLE,encoder,$(FFMPEG_PATENTED_ENCODERS)) \ $(call FFMPEG_DISABLE,muxer,$(FFMPEG_PATENTED_MUXERS)) \ + $(call FFMPEG_DISABLE,demuxer,$(FFMPEG_PATENTED_DEMUXERS)) \ $(call FFMPEG_DISABLE,parser,$(FFMPEG_PATENTED_PARSERS))) \ $(if $(CONFIG_PACKAGE_libopus),--enable-libopus) ifeq ($(CONFIG_SOFT_FLOAT),y) @@ -469,7 +476,7 @@ ifeq ($(BUILD_VARIANT),full) FFMPEG_CONFIGURE+= \ --enable-gpl \ $(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \ - $(if $(CONFIG_PACKAGE_libx264),--enable-libx264 --enable-nonfree) + $(if $(CONFIG_PACKAGE_libx264),--enable-libx264) endif endif