From owner-svn-ports-head@FreeBSD.ORG Sat Feb 7 08:21:47 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC826D0; Sat, 7 Feb 2015 08:21:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AC1B3949; Sat, 7 Feb 2015 08:21:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t178Ll2A051886; Sat, 7 Feb 2015 08:21:47 GMT (envelope-from mva@FreeBSD.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t178LlwP051884; Sat, 7 Feb 2015 08:21:47 GMT (envelope-from mva@FreeBSD.org) Message-Id: <201502070821.t178LlwP051884@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mva set sender to mva@FreeBSD.org using -f From: Marcus von Appen Date: Sat, 7 Feb 2015 08:21:47 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 08:21:48 -0000 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 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