Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5843 from antonlacon/ffmpeg

Browse source 
ffmpeg: fixup for patent related changes
This commit is contained in:
Ted Hess 2018-04-03 14:45:06 -04:00 committed by GitHub
commit 3733cea389
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
multimedia/ffmpeg/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2017 Ian Leonard <antonlacon@gmail.com> # Copyright (C) 2017-2018 Ian Leonard <antonlacon@gmail.com>
# Copyright (C) 2018 Ted Hess <thess@kitschensync.net> # Copyright (C) 2018 Ted Hess <thess@kitschensync.net>
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=3.2.10 PKG_VERSION:=3.2.10
PKG_RELEASE:=1 PKG_RELEASE:=2
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/
@ -202,9 +202,14 @@ FFMPEG_PATENTED_DECODERS:= \
hevc \ hevc \
vc1 \ vc1 \
FFMPEG_PATENTED_ENCODERS:=$(FFMPEG_PATENDED_DECODERS)
FFMPEG_PATENTED_MUXERS:= \ FFMPEG_PATENTED_MUXERS:= \
h264 \ h264 \
hevc \ hevc \
vc1 \
FFMPEG_PATENTED_DEMUXERS:=$(FFMPEG_PATENTED_MUXERS)
FFMPEG_PATENTED_PARSERS:= \ FFMPEG_PATENTED_PARSERS:= \
h264 \ h264 \
@ -452,7 +457,9 @@ ifeq ($(BUILD_VARIANT),full)
--enable-avresample \ --enable-avresample \
$(if $(CONFIG_BUILD_PATENTED),, \ $(if $(CONFIG_BUILD_PATENTED),, \
$(call FFMPEG_DISABLE,decoder,$(FFMPEG_PATENTED_DECODERS)) \ $(call FFMPEG_DISABLE,decoder,$(FFMPEG_PATENTED_DECODERS)) \
$(call FFMPEG_DISABLE,encoder,$(FFMPEG_PATENTED_ENCODERS)) \
$(call FFMPEG_DISABLE,muxer,$(FFMPEG_PATENTED_MUXERS)) \ $(call FFMPEG_DISABLE,muxer,$(FFMPEG_PATENTED_MUXERS)) \
$(call FFMPEG_DISABLE,demuxer,$(FFMPEG_PATENTED_DEMUXERS)) \
$(call FFMPEG_DISABLE,parser,$(FFMPEG_PATENTED_PARSERS))) \ $(call FFMPEG_DISABLE,parser,$(FFMPEG_PATENTED_PARSERS))) \
$(if $(CONFIG_PACKAGE_libopus),--enable-libopus) $(if $(CONFIG_PACKAGE_libopus),--enable-libopus)
ifeq ($(CONFIG_SOFT_FLOAT),y) ifeq ($(CONFIG_SOFT_FLOAT),y)
@ -469,7 +476,7 @@ ifeq ($(BUILD_VARIANT),full)
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--enable-gpl \ --enable-gpl \
$(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \ $(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \
$(if $(CONFIG_PACKAGE_libx264),--enable-libx264 --enable-nonfree) $(if $(CONFIG_PACKAGE_libx264),--enable-libx264)
endif endif
endif endif