Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Feb 2015 08:21:47 +0000 (UTC)
From:      Marcus von Appen <mva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r378574 - in head/graphics: sdl2_image sdl_image
Message-ID:  <201502070821.t178LlwP051884@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mva
Date: Sat Feb  7 08:21:46 2015
New Revision: 378574
URL: https://svnweb.freebsd.org/changeset/ports/378574
QAT: https://qat.redports.org/buildarchive/r378574/

Log:
  - Provide OPTION knobs for the LIB_DEPENDS of sdl_image and sdl2_image
  
  PR:		195987
  Submitted by:	jbeich@

Modified:
  head/graphics/sdl2_image/Makefile
  head/graphics/sdl_image/Makefile

Modified: head/graphics/sdl2_image/Makefile
==============================================================================
--- head/graphics/sdl2_image/Makefile	Sat Feb  7 07:58:08 2015	(r378573)
+++ head/graphics/sdl2_image/Makefile	Sat Feb  7 08:21:46 2015	(r378574)
@@ -12,11 +12,6 @@ COMMENT=	Simple library to load images o
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libwebp.so:${PORTSDIR}/graphics/webp
-
 USES=		pkgconfig:build pathfix gmake libtool
 USE_SDL=	sdl2
 GNU_CONFIGURE=	yes
@@ -24,4 +19,16 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lm
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	JPEG PNG TIFF WEBP
+OPTIONS_DEFAULT=JPEG PNG TIFF WEBP
+
+JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+JPEG_CONFIGURE_ENABLE=	jpg
+PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_CONFIGURE_ENABLE=	png
+TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_CONFIGURE_ENABLE=	tif
+WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_CONFIGURE_ENABLE=	webp
+
 .include <bsd.port.mk>

Modified: head/graphics/sdl_image/Makefile
==============================================================================
--- head/graphics/sdl_image/Makefile	Sat Feb  7 07:58:08 2015	(r378573)
+++ head/graphics/sdl_image/Makefile	Sat Feb  7 08:21:46 2015	(r378574)
@@ -13,11 +13,6 @@ COMMENT=	Simple library to load images o
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libwebp.so:${PORTSDIR}/graphics/webp
-
 USES=		gmake libtool pkgconfig pathfix
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
@@ -25,6 +20,18 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lm
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	JPEG PNG TIFF WEBP
+OPTIONS_DEFAULT=JPEG PNG TIFF WEBP
+
+JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+JPEG_CONFIGURE_ENABLE=	jpg
+PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_CONFIGURE_ENABLE=	png
+TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_CONFIGURE_ENABLE=	tif
+WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_CONFIGURE_ENABLE=	webp
+
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/.libs/showimage ${STAGEDIR}${PREFIX}/bin
 



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