Index: head/graphics/luminance/files/patch-src__HelpBrowser__LuminancePaths.cpp =================================================================== --- head/graphics/luminance/files/patch-src__HelpBrowser__LuminancePaths.cpp (revision 350784) +++ head/graphics/luminance/files/patch-src__HelpBrowser__LuminancePaths.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- ./src/HelpBrowser/LuminancePaths.cpp.orig -+++ ./src/HelpBrowser/LuminancePaths.cpp -@@ -35,8 +35,6 @@ QString LuminancePaths::HelpDir() - hf = LocalizedDirPath(QApplication::applicationDirPath() + dirsep + "../Resources/help/en" + dirsep); - #elif _WIN32 - hf = LocalizedDirPath(QApplication::applicationDirPath() + dirsep + "help" + dirsep); --#elif __FreeBSD__ -- hf = LocalizedDirPath("/usr/local/share/doc/luminance-hdr/"); - #else - // hf = LocalizedDirPath( PREFIX + dirsep + "share" + dirsep + "fontmatrix" + dirsep + "help" + dirsep ); - //hf = LocalizedDirPath("usr" + dirsep + "share" + dirsep + "luminance-hdr" + dirsep + "help" + dirsep); Property changes on: head/graphics/luminance/files/patch-src__HelpBrowser__LuminancePaths.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/luminance/Makefile =================================================================== --- head/graphics/luminance/Makefile (revision 350784) +++ head/graphics/luminance/Makefile (revision 350785) @@ -1,48 +1,62 @@ # Created by: Yinghong Liu # $FreeBSD$ PORTNAME= luminance-hdr -DISTVERSION= 2.3.0 -PORTREVISION= 6 +DISTVERSION= 2.3.1 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} MAINTAINER= h2+fbsdports@fsfe.org COMMENT= Complete open source solution for HDR photography 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) @${REINPLACE_CMD} -e '/LICENSE/d ; \ /#info files/s,share/luminance-hdr,${DOCSDIR_REL},' \ ${WRKSRC}/CMakeLists.txt # Point to the right location for program where to look for GPL text @${REINPLACE_CMD} -e 's,LICENSE,${LICENSE}, ; \ s,share/doc/luminance-hdr,share/licenses/${PKGNAME},' \ ${WRKSRC}/src/UI/UMessageBox.cpp # Allow builds from release distfile to display correct git hash in "About" # dialog window @${REINPLACE_CMD} -e \ '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 Index: head/graphics/luminance/distinfo =================================================================== --- head/graphics/luminance/distinfo (revision 350784) +++ head/graphics/luminance/distinfo (revision 350785) @@ -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 Index: head/graphics/luminance/pkg-plist =================================================================== --- head/graphics/luminance/pkg-plist (revision 350784) +++ head/graphics/luminance/pkg-plist (revision 350785) @@ -1,101 +1,103 @@ -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 %%DATADIR%%/help/en/basics.html %%DATADIR%%/help/en/color_management.html %%DATADIR%%/help/en/contributing.html %%DATADIR%%/help/en/contributing_donating.html %%DATADIR%%/help/en/contributing_programming.html %%DATADIR%%/help/en/contributing_testing.html %%DATADIR%%/help/en/contributing_translating.html %%DATADIR%%/help/en/copying_exif.html %%DATADIR%%/help/en/creating_hdr.html %%DATADIR%%/help/en/creating_hdr_batch.html %%DATADIR%%/help/en/creating_hdr_cli.html %%DATADIR%%/help/en/creating_hdr_interactive.html %%DATADIR%%/help/en/dcraw.html %%DATADIR%%/help/en/editing_hdr.html %%DATADIR%%/help/en/external.png %%DATADIR%%/help/en/faq.html %%DATADIR%%/help/en/features.html %%DATADIR%%/help/en/hints.html %%DATADIR%%/help/en/images/batch-hdr.png %%DATADIR%%/help/en/images/batch-tmo.png %%DATADIR%%/help/en/images/color_management.png %%DATADIR%%/help/en/images/copy-exif.png %%DATADIR%%/help/en/images/cropping_frame.png %%DATADIR%%/help/en/images/mainwin.png %%DATADIR%%/help/en/images/not-translated-menu-item.png %%DATADIR%%/help/en/images/preferences.png %%DATADIR%%/help/en/images/prefs-cms.png %%DATADIR%%/help/en/images/prefs-ext.png %%DATADIR%%/help/en/images/prefs-hdr.png %%DATADIR%%/help/en/images/prefs-raw.png %%DATADIR%%/help/en/images/prefs-tm.png %%DATADIR%%/help/en/images/projectiveTransformationDialog.png %%DATADIR%%/help/en/images/resize.png %%DATADIR%%/help/en/images/translated-menu-item.png %%DATADIR%%/help/en/index.html %%DATADIR%%/help/en/manual.html %%DATADIR%%/help/en/menu.xml %%DATADIR%%/help/en/news.html %%DATADIR%%/help/en/prefs.html %%DATADIR%%/help/en/prefs_cms.html %%DATADIR%%/help/en/prefs_hdr.html %%DATADIR%%/help/en/prefs_rawconversion.html %%DATADIR%%/help/en/prefs_tonemapping.html %%DATADIR%%/help/en/prefs_tools.html %%DATADIR%%/help/en/prefs_ui.html %%DATADIR%%/help/en/projective_transformation.html %%DATADIR%%/help/en/style.css %%DATADIR%%/help/en/tmap_ref.html %%DATADIR%%/help/en/tmap_ref_drago.html %%DATADIR%%/help/en/tmap_ref_durand.html %%DATADIR%%/help/en/tmap_ref_mantiuk06.html %%DATADIR%%/help/en/tonemapping.html %%DATADIR%%/help/en/tonemapping_batch.html %%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 %%DATADIR%%/i18n/lang_fr.qm %%DATADIR%%/i18n/lang_hi.qm %%DATADIR%%/i18n/lang_hu.qm %%DATADIR%%/i18n/lang_id.qm %%DATADIR%%/i18n/lang_it.qm %%DATADIR%%/i18n/lang_pl.qm %%DATADIR%%/i18n/lang_ro.qm %%DATADIR%%/i18n/lang_ru.qm %%DATADIR%%/i18n/lang_sk.qm %%DATADIR%%/i18n/lang_tr.qm %%DATADIR%%/i18n/lang_zh.qm %%DATADIR%%/i18n/qt_cs.qm %%DATADIR%%/i18n/qt_de.qm %%DATADIR%%/i18n/qt_es.qm %%DATADIR%%/i18n/qt_fi.qm %%DATADIR%%/i18n/qt_fr.qm %%DATADIR%%/i18n/qt_hu.qm %%DATADIR%%/i18n/qt_it.qm %%DATADIR%%/i18n/qt_pl.qm %%DATADIR%%/i18n/qt_ro.qm %%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%%