From owner-svn-ports-all@FreeBSD.ORG Thu Apr 10 07:47:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 581EE87C; Thu, 10 Apr 2014 07:47:19 +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 382101FFA; Thu, 10 Apr 2014 07:47:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3A7lJVP005893; Thu, 10 Apr 2014 07:47:19 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3A7lIDY005889; Thu, 10 Apr 2014 07:47:18 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201404100747.s3A7lIDY005889@svn.freebsd.org> From: Lars Engels Date: Thu, 10 Apr 2014 07:47:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350785 - in head/graphics/luminance: . files 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.17 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: Thu, 10 Apr 2014 07:47:19 -0000 Author: lme Date: Thu Apr 10 07:47:18 2014 New Revision: 350785 URL: http://svnweb.freebsd.org/changeset/ports/350785 QAT: https://qat.redports.org/buildarchive/r350785/ Log: - Update to 2.3.1 - Stagify - Use new LIB_DEPENDS syntax - USES tar:bzip2 - Fix build with libc++ - Remove no longer needed patch PR: ports/187858 Submitted by: maintainer Deleted: head/graphics/luminance/files/ Modified: head/graphics/luminance/Makefile head/graphics/luminance/distinfo head/graphics/luminance/pkg-plist Modified: head/graphics/luminance/Makefile ============================================================================== --- head/graphics/luminance/Makefile Thu Apr 10 07:31:54 2014 (r350784) +++ head/graphics/luminance/Makefile Thu Apr 10 07:47:18 2014 (r350785) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= luminance-hdr -DISTVERSION= 2.3.0 -PORTREVISION= 6 +DISTVERSION= 2.3.1 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} @@ -13,21 +12,20 @@ COMMENT= Complete open source solution f LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 -LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float \ - exiv2:${PORTSDIR}/graphics/exiv2 \ - jpeg:${PORTSDIR}/graphics/jpeg \ - IlmImf:${PORTSDIR}/graphics/OpenEXR \ - tiff:${PORTSDIR}/graphics/tiff \ - gsl:${PORTSDIR}/math/gsl \ - raw_r:${PORTSDIR}/graphics/libraw +LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float \ + libexiv2.so:${PORTSDIR}/graphics/exiv2 \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libgsl.so:${PORTSDIR}/math/gsl \ + libraw_r.so:${PORTSDIR}/graphics/libraw \ + libboost_system.so:${PORTSDIR}/devel/boost-libs -USE_BZIP2= yes -USES= cmake +USES= cmake tar:bzip2 USE_QT4= gui sql webkit xml linguist_build moc_build qmake_build \ rcc_build uic_build imageformats_run INSTALLS_ICONS= yes -NO_STAGE= yes post-patch: # Do not install yet another copy of GPL (we use license framework instead) # and fix installation path for docs (but not for internal help files) @@ -45,4 +43,20 @@ post-patch: 's,@GIT_SHA1@,be5409f2ed028b0a509d3f4cd44a970a09d2ef6c,' \ ${WRKSRC}/src/Common/GitSHA1.cpp.in +# Include in addition to where necessary, as this +# is required for building with libc++ + @${REINPLACE_CMD} -E '1s|^|#include \|;' \ + ${WRKSRC}/src/TonemappingOperators/drago03/pfstmo_drago03.cpp \ + ${WRKSRC}/src/TonemappingOperators/reinhard02/pfstmo_reinhard02.cpp \ + ${WRKSRC}/src/TonemappingOperators/reinhard05/pfstmo_reinhard05.cpp \ + ${WRKSRC}/src/TonemappingOperators/mantiuk08/display_function.cpp \ + ${WRKSRC}/src/TonemappingOperators/mantiuk08/display_size.cpp \ + ${WRKSRC}/src/TonemappingOperators/mantiuk08/pfstmo_mantiuk08.cpp \ + ${WRKSRC}/src/TonemappingOperators/fattal02/pfstmo_fattal02.cpp \ + ${WRKSRC}/src/TonemappingOperators/durand02/pfstmo_durand02.cpp \ + ${WRKSRC}/src/TonemappingOperators/pattanaik00/pfstmo_pattanaik00.cpp \ + ${WRKSRC}/src/Libpfs/io/pfsreader.cpp \ + ${WRKSRC}/src/Libpfs/io/rgbereader.cpp \ + ${WRKSRC}/src/Libpfs/colorspace/colorspace.cpp + .include Modified: head/graphics/luminance/distinfo ============================================================================== --- head/graphics/luminance/distinfo Thu Apr 10 07:31:54 2014 (r350784) +++ head/graphics/luminance/distinfo Thu Apr 10 07:47:18 2014 (r350785) @@ -1,2 +1,2 @@ -SHA256 (luminance-hdr-2.3.0.tar.bz2) = dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676 -SIZE (luminance-hdr-2.3.0.tar.bz2) = 5398576 +SHA256 (luminance-hdr-2.3.1.tar.bz2) = c2a4764986bf8860d448530f3c8d76143d7504cebb07b3e58e37eb0db5347722 +SIZE (luminance-hdr-2.3.1.tar.bz2) = 10323806 Modified: head/graphics/luminance/pkg-plist ============================================================================== --- head/graphics/luminance/pkg-plist Thu Apr 10 07:31:54 2014 (r350784) +++ head/graphics/luminance/pkg-plist Thu Apr 10 07:47:18 2014 (r350785) @@ -1,6 +1,9 @@ -bin/luminance-hdr -bin/luminance-hdr-cli +%%QT_BINDIR%%/luminance-hdr +%%QT_BINDIR%%/luminance-hdr-cli share/applications/luminance-hdr.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/Changelog +%%PORTDOCS%%%%DOCSDIR%%/README share/icons/hicolor/48x48/apps/luminance-hdr.png %%DATADIR%%/help/en/README %%DATADIR%%/help/en/additional.html @@ -60,13 +63,8 @@ share/icons/hicolor/48x48/apps/luminance %%DATADIR%%/help/en/tonemapping_cli.html %%DATADIR%%/help/en/tonemapping_interactive.html %%DATADIR%%/help/en/workflow.html -%%DATADIR%%/help/js/jquery.js -%%DATADIR%%/help/js/jquery.jtabs.pack.js -@dirrm %%DATADIR%%/help/js -@dirrm %%DATADIR%%/help/en/images -@dirrm %%DATADIR%%/help/en -@dirrm %%DATADIR%%/help %%DATADIR%%/i18n/lang_cs.qm +%%DATADIR%%/i18n/lang_da.qm %%DATADIR%%/i18n/lang_de.qm %%DATADIR%%/i18n/lang_es.qm %%DATADIR%%/i18n/lang_fi.qm @@ -93,9 +91,13 @@ share/icons/hicolor/48x48/apps/luminance %%DATADIR%%/i18n/qt_ru.qm %%DATADIR%%/i18n/qt_tr.qm %%DATADIR%%/i18n/qt_zh.qm -@dirrm %%DATADIR%%/i18n -@dirrm %%DATADIR%% -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/Changelog -%%DOCSDIR%%/README -@dirrm %%DOCSDIR%% +@dirrmtry %%DATADIR%%/i18n +@dirrmtry %%DATADIR%%/help/en/images +@dirrmtry %%DATADIR%%/help/en +@dirrmtry %%DATADIR%%/help +@dirrmtry %%DATADIR%% +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +%%PORTDOCS%%@dirrm %%DOCSDIR%%