Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Feb 2019 18:42:06 +0000 (UTC)
From:      Conrad Meyer <cem@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r493797 - head/graphics/libheif
Message-ID:  <201902241842.x1OIg6nx066421@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cem (src committer)
Date: Sun Feb 24 18:42:06 2019
New Revision: 493797
URL: https://svnweb.freebsd.org/changeset/ports/493797

Log:
  graphics/libheif: Correct license, OPTIONize, add jpeg support
  
  Most of this is non-functional change pulling various features out into
  options.  Part of that is correctly labeling the examples as GPL3+.  In a
  later revision, they are relicensed to MIT, but not in this version of the
  port.
  
  Functional changes including adding a JPEG option and enabling it by
  default.  libheif is the only utility we ship that can understand .heic
  images and converting photos to the more portable jpeg is a reasonable thing
  to enable by default.
  
  Approved by:	maintainer timeout
  Differential Revision:	https://reviews.freebsd.org/D18802

Modified:
  head/graphics/libheif/Makefile
  head/graphics/libheif/pkg-plist

Modified: head/graphics/libheif/Makefile
==============================================================================
--- head/graphics/libheif/Makefile	Sun Feb 24 18:39:42 2019	(r493796)
+++ head/graphics/libheif/Makefile	Sun Feb 24 18:42:06 2019	(r493797)
@@ -3,25 +3,57 @@
 PORTNAME=		libheif
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.3.2
+PORTREVISION=		1
 CATEGORIES=		graphics
 
 MAINTAINER=		me@sebastiansteinmetz.ch
 COMMENT=		Libheif is an ISO/IEC 23008-12:2017 HEIF file format de- and encoder
 
+# N.B., subsequent revisions in Git relicense examples from GPL3+ to MIT.
 LICENSE=		LGPL3+
-LICENSE_FILE=		${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3+=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=		libde265.so:multimedia/libde265 \
-			libx265.so:multimedia/x265 \
-			libpng16.so:graphics/png
-
-USES=			autoreconf libtool pkgconfig shared-mime-info \
-			shebangfix
+USES=			autoreconf libtool localbase pkgconfig shebangfix
 USE_GITHUB=		yes
 GH_ACCOUNT=		strukturag
 GH_PROJECT=		libheif
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
 SHEBANG_GLOB=		*.sh
+
+OPTIONS_DEFINE=	EXAMPLES JPEG LIBDE265 PNG THREADS X265
+OPTIONS_DEFAULT=EXAMPLES JPEG LIBDE265 PNG THREADS X265
+OPTIONS_SUB=	yes
+
+EXAMPLES_DESC=	Install example programs (heif-convert, heif-enc, heif-info, heif-thumbnailer)
+LIBDE265_DESC=	Use libde265 (support for HEVC decoding)
+X265_DESC=	Use x265 (support for HEVC encoding)
+
+THREADS_CONFIGURE_OFF=	--disable-multithreading
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+LICENSE+=		GPLv3+
+LICENSE_COMB=		multi
+LICENSE_FILE_GPLv3+=	${WRKSRC}/examples/COPYING
+USES+=			shared-mime-info
+.endif
+
+.if ${PORT_OPTIONS:MJPEG}
+USES+=			jpeg
+.endif
+
+.if ${PORT_OPTIONS:MLIBDE265}
+LIB_DEPENDS+=		libde265.so:multimedia/libde265
+.endif
+
+.if ${PORT_OPTIONS:MPNG}
+LIB_DEPENDS+=		libpng16.so:graphics/png
+.endif
+
+.if ${PORT_OPTIONS:MX265}
+LIB_DEPENDS+=		libx265.so:multimedia/x265
+.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/libheif/pkg-plist
==============================================================================
--- head/graphics/libheif/pkg-plist	Sun Feb 24 18:39:42 2019	(r493796)
+++ head/graphics/libheif/pkg-plist	Sun Feb 24 18:42:06 2019	(r493797)
@@ -1,7 +1,7 @@
-bin/heif-convert
-bin/heif-enc
-bin/heif-info
-bin/heif-thumbnailer
+%%EXAMPLES%%bin/heif-convert
+%%EXAMPLES%%bin/heif-enc
+%%EXAMPLES%%bin/heif-info
+%%EXAMPLES%%bin/heif-thumbnailer
 include/libheif/heif.h
 include/libheif/heif_cxx.h
 include/libheif/heif_plugin.h
@@ -11,5 +11,5 @@ lib/libheif.so
 lib/libheif.so.1
 lib/libheif.so.1.3.2
 libdata/pkgconfig/libheif.pc
-share/mime/packages/heif.xml
-share/thumbnailers/heif.thumbnailer
+%%EXAMPLES%%share/mime/packages/heif.xml
+%%EXAMPLES%%share/thumbnailers/heif.thumbnailer



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902241842.x1OIg6nx066421>