| Submitter | Luca Ceresoli |
|---|---|
| Date | Feb. 6, 2013, 4:24 p.m. |
| Message ID | <1360167853-7177-1-git-send-email-luca@lucaceresoli.net> |
| Download | mbox | patch |
| Permalink | /patch/218684/ |
| State | Superseded |
| Headers | show |
Comments
On 06/02/13 17:24, Luca Ceresoli wrote: > How about making it more "automagic", such as: > > ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) > FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license > FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 > else > FFMPEG_LICENSE = LGPLv2.1+, libjpeg license > FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 > endif Sounds good to me! Regards, Arnout
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes: Arnout> On 06/02/13 17:24, Luca Ceresoli wrote: >> How about making it more "automagic", such as: >> >> ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) >> FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license >> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 >> else >> FFMPEG_LICENSE = LGPLv2.1+, libjpeg license >> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 >> endif Arnout> Sounds good to me! Or even better: FFMPEG_LICENSE = LGPLv2.1+, libjpeg license FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) FFMPEG_LICENSE += GPLv2+ FFMPEG_LICENSE += COPYING.GPLv2 endif
Peter Korsgaard wrote: >>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes: > > Arnout> On 06/02/13 17:24, Luca Ceresoli wrote: > >> How about making it more "automagic", such as: > >> > >> ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) > >> FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license > >> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 > >> else > >> FFMPEG_LICENSE = LGPLv2.1+, libjpeg license > >> FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 > >> endif > > Arnout> Sounds good to me! > > Or even better: > > FFMPEG_LICENSE = LGPLv2.1+, libjpeg license > FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 > > ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) > FFMPEG_LICENSE += GPLv2+ > FFMPEG_LICENSE += COPYING.GPLv2 > endif > Fine, will do and resend. Luca
Patch
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index b018ea0..ea43eeb 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -8,6 +8,8 @@ FFMPEG_VERSION = 0.8.12 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES +FFMPEG_LICENSE = LGPLv2.1+, GPLv2+ (optional components), libjpeg license +FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 FFMPEG_CONF_OPT = \ --prefix=/usr \
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> --- This patch defines the license in a very simple way. How about making it more "automagic", such as: ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 else FFMPEG_LICENSE = LGPLv2.1+, libjpeg license FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 endif --- package/multimedia/ffmpeg/ffmpeg.mk | 2 ++ 1 file changed, 2 insertions(+)