From owner-svn-ports-all@FreeBSD.ORG Wed Oct 23 06:02:40 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 52CF5D7C; Wed, 23 Oct 2013 06:02:40 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2589B23E8; Wed, 23 Oct 2013 06:02:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9N62ew5034762; Wed, 23 Oct 2013 06:02:40 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9N62dwJ034761; Wed, 23 Oct 2013 06:02:40 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201310230602.r9N62dwJ034761@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 23 Oct 2013 06:02:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331350 - head/graphics/devil X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 06:02:40 -0000 Author: amdmi3 Date: Wed Oct 23 06:02:39 2013 New Revision: 331350 URL: http://svnweb.freebsd.org/changeset/ports/331350 Log: - Disable squish option for now: it breaks dependent ports, at least devel/love07 Modified: head/graphics/devil/Makefile Modified: head/graphics/devil/Makefile ============================================================================== --- head/graphics/devil/Makefile Wed Oct 23 05:40:00 2013 (r331349) +++ head/graphics/devil/Makefile Wed Oct 23 06:02:39 2013 (r331350) @@ -4,7 +4,7 @@ PORTNAME= devil PORTVERSION= 1.7.8 PORTEPOCH= 1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= SF/openil/DevIL/${PORTVERSION} DISTNAME= DevIL-${PORTVERSION} @@ -17,7 +17,8 @@ USE_AUTOTOOLS= aclocal autoheader automa ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing --copy --force-missing CONFIGURE_ARGS= --enable-ILU \ - --disable-allegro --disable-directx8 --disable-directx9 + --disable-allegro --disable-directx8 --disable-directx9 \ + --without-libsquish USE_LDCONFIG= yes USE_GCC= any @@ -28,8 +29,8 @@ LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= * -OPTIONS_DEFINE= JPEG JASPER LCMS MNG PNG TIFF EXR X11 SDL SQUISH NVTT SIMD DOCS -OPTIONS_DEFAULT=JPEG JASPER LCMS MNG PNG TIFF EXR X11 SDL SQUISH NVTT DOCS +OPTIONS_DEFINE= JPEG JASPER LCMS MNG PNG TIFF EXR X11 SDL NVTT SIMD DOCS +OPTIONS_DEFAULT=JPEG JASPER LCMS MNG PNG TIFF EXR X11 SDL NVTT DOCS OPTIONS_DEFAULT_amd64=SIMD JPEG_DESC= Enable JPEG support @@ -59,8 +60,8 @@ TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR} TIFF_CONFIGURE_ENABLE= tiff EXR_LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR EXR_CONFIGURE_ENABLE= exr -SQUISH_BUILD_DEPENDS= ${LOCALBASE}/lib/libsquish.a:${PORTSDIR}/graphics/squish -SQUISH_CONFIGURE_WITH= libsquish +#SQUISH_BUILD_DEPENDS= ${LOCALBASE}/lib/libsquish.a:${PORTSDIR}/graphics/squish +#SQUISH_CONFIGURE_WITH= libsquish NVTT_LIB_DEPENDS= libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools NVTT_CONFIGURE_WITH= nvtt