Update to 2.3.1. 2.4.0 requires Qt5, so we have to wait for that to get the latest version. Fix: apply patch Patch attached with submission follows: How-To-Repeat: -
Responsible Changed From-To: freebsd-bugs->freebsd-ports-bugs ports PR.
Sorry, the patch wasn't against current ports-tree. See attachment for one that applies cleanly. -- Best, Hannes
State Changed From-To: open->feedback Ask for submitter fix.
Patching fails: ===> Patching for luminance-hdr-2.3.1 ===> Applying FreeBSD patches for luminance-hdr-2.3.1 1 out of 1 hunks failed--saving rejects to ./src/HelpBrowser/LuminancePaths.cpp.rej => Patch patch-src__HelpBrowser__LuminancePaths.cpp failed to apply cleanly. *** Error code 1 Stop. make: stopped in /home/corn/luminance
On 30.03.2014 15:12, PaweÅ PÄkala wrote: > Patching fails: > > ===> Patching for luminance-hdr-2.3.1 > ===> Applying FreeBSD patches for luminance-hdr-2.3.1 > 1 out of 1 hunks failed--saving rejects to ./src/HelpBrowser/LuminancePaths.cpp.rej > => Patch patch-src__HelpBrowser__LuminancePaths.cpp failed to apply cleanly. > *** Error code 1 > > Stop. > make: stopped in /home/corn/luminance > The patches dir should not be in the new port at all, I thought the diff had taken care of this: ... Only in luminance: files ... However I am also tracking a minor, but strange plist issue on redports right now, so please hold the port... Thanks. -- Best, Hannes
On 30.03.2014 15:18, h2+fbsdports@fsfe.org wrote: > On 30.03.2014 15:12, PaweÅ PÄkala wrote: >> Patching fails: >> >> ===> Patching for luminance-hdr-2.3.1 >> ===> Applying FreeBSD patches for luminance-hdr-2.3.1 >> 1 out of 1 hunks failed--saving rejects to ./src/HelpBrowser/LuminancePaths.cpp.rej >> => Patch patch-src__HelpBrowser__LuminancePaths.cpp failed to apply cleanly. >> *** Error code 1 >> >> Stop. >> make: stopped in /home/corn/luminance >> > > The patches dir should not be in the new port at all, I thought the diff > had taken care of this: > ... > Only in luminance: files > ... > > > However I am also tracking a minor, but strange plist issue on redports > right now, so please hold the port... CC also to lme@, because I had previously been in correspondence with him about the port. The attached version succefully builds on redports with the releases 8.4, 9.2, 10.0 and 11, each i386 and amd64. Best, Hannes
Responsible Changed From-To: freebsd-ports-bugs->lme I'll take it.
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 <string> in addition to <string.h> where necessary, as this +# is required for building with libc++ + @${REINPLACE_CMD} -E '1s|^|#include \<string\>|;' \ + ${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 <bsd.port.mk> 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%% _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed, with minor changes. Thanks!