From patchwork Thu Feb 7 21:02:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 218990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 1982D2C0087 for ; Fri, 8 Feb 2013 08:11:57 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CCA3A8C8EE; Thu, 7 Feb 2013 21:11:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u1DdCVB168fl; Thu, 7 Feb 2013 21:11:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E0ABF8C8F0; Thu, 7 Feb 2013 21:11:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CC8EE8F7A0 for ; Thu, 7 Feb 2013 21:11:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 81C208C8E1 for ; Thu, 7 Feb 2013 21:11:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8uNbGD-vwYzB for ; Thu, 7 Feb 2013 21:11:17 +0000 (UTC) X-Greylist: delayed 00:08:29 by SQLgrey-1.7.6 Received: from smtpi4.ngi.it (smtpi4.ngi.it [88.149.128.104]) by whitealder.osuosl.org (Postfix) with ESMTP id DAB4D8C8E6 for ; Thu, 7 Feb 2013 21:11:16 +0000 (UTC) Received: from localhost.localdomain (unknown [81.174.41.154]) by smtpi4.ngi.it (Postfix) with ESMTP id 933A942181; Thu, 7 Feb 2013 22:02:44 +0100 (CET) From: Luca Ceresoli To: buildroot@busybox.net Date: Thu, 7 Feb 2013 22:02:33 +0100 Message-Id: <1360270956-8896-1-git-send-email-luca@lucaceresoli.net> X-Mailer: git-send-email 1.7.10.4 Cc: Luca Ceresoli Subject: [Buildroot] [PATCH v2 1/4] ffmpeg: define license X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Luca Ceresoli --- Changed since v1: - automagically add GPL license (Arnout/Peter suggestion). package/multimedia/ffmpeg/ffmpeg.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index b018ea0..f63eb35 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -9,6 +9,13 @@ FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES +FFMPEG_LICENSE = LGPLv2.1+, libjpeg license +FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 +ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) +FFMPEG_LICENSE += and GPLv2+ +FFMPEG_LICENSE_FILES += COPYING.GPLv2 +endif + FFMPEG_CONF_OPT = \ --prefix=/usr \ --disable-avfilter \