svn commit: r302163 - in head/multimedia: ffmpeg ffmpeg-devel
Martin Matuska
mm at FreeBSD.org
Mon Aug 6 11:32:28 UTC 2012
Author: mm
Date: Mon Aug 6 11:32:27 2012
New Revision: 302163
URL: http://svn.freebsd.org/changeset/ports/302163
Log:
Reorder ffmpeg licensing knobs
Modified:
head/multimedia/ffmpeg-devel/Makefile
head/multimedia/ffmpeg/Makefile
Modified: head/multimedia/ffmpeg-devel/Makefile
==============================================================================
--- head/multimedia/ffmpeg-devel/Makefile Mon Aug 6 11:26:25 2012 (r302162)
+++ head/multimedia/ffmpeg-devel/Makefile Mon Aug 6 11:32:27 2012 (r302163)
@@ -15,6 +15,7 @@ DISTNAME= ffmpeg-${GIT_SUFFIX}
MAINTAINER= mm at FreeBSD.org
COMMENT= Realtime audio/video encoder/converter and streaming server
+LICENSE_COMB= multi
LICENSE= GPLv2 LGPL21
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1
@@ -457,17 +458,13 @@ CONFIGURE_ARGS+= --disable-libxvid
LICENSE=
RESTRICTED= linking to libfaac or libaacplus restricts redistribution
CONFIGURE_ARGS+= --enable-nonfree
-. if defined(FFMPEG_LICENSE_GPL3)
-CONFIGURE_ARGS+= --enable-version3
-. endif
-.else
-LICENSE_COMB= multi
-. if defined(FFMPEG_LICENSE_GPL3)
+.endif
+
+.if defined(FFMPEG_LICENSE_GPL3)
CONFIGURE_ARGS+= --enable-version3
LICENSE= GPLv3 LGPL3
LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3
LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
-. endif
.endif
do-fetch:
Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile Mon Aug 6 11:26:25 2012 (r302162)
+++ head/multimedia/ffmpeg/Makefile Mon Aug 6 11:32:27 2012 (r302163)
@@ -14,6 +14,11 @@ MASTER_SITES= http://ffmpeg.org/releases
MAINTAINER= mm at FreeBSD.org
COMMENT= Realtime audio/video encoder/converter and streaming server
+LICENSE_COMB= multi
+LICENSE= GPLv2 LGPL21
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2
+LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1
+
BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
@@ -377,21 +382,13 @@ CONFIGURE_ARGS+= --disable-libxvid
.if defined(FFMPEG_NONFREE)
RESTRICTED= linking to libfaac or libaacplus restricts redistribution
CONFIGURE_ARGS+= --enable-nonfree
-. if defined(FFMPEG_LICENSE_GPL3)
-CONFIGURE_ARGS+= --enable-version3
-. endif
-.else
-LICENSE_COMB= multi
-. if defined(FFMPEG_LICENSE_GPL3)
+.endif
+
+.if defined(FFMPEG_LICENSE_GPL3)
LICENSE= GPLv3 LGPL3
LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3
LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
CONFIGURE_ARGS+= --enable-version3
-. else
-LICENSE= GPLv2 LGPL21
-LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2
-LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1
-. endif
.endif
post-patch:
More information about the svn-ports-all
mailing list