[149188] trunk/dports/aqua
mcalhoun at macports.org
mcalhoun at macports.org
Sat Jun 4 15:59:56 PDT 2016
Revision: 149188
https://trac.macports.org/changeset/149188
Author: mcalhoun at macports.org
Date: 2016-06-04 15:59:56 -0700 (Sat, 04 Jun 2016)
Log Message:
-----------
luminance-hdr: major update and rename of qtpfsgui
Modified Paths:
--------------
trunk/dports/aqua/qtpfsgui/Portfile
Added Paths:
-----------
trunk/dports/aqua/luminance-hdr/
trunk/dports/aqua/luminance-hdr/Portfile
trunk/dports/aqua/luminance-hdr/files/patch-CMakeLists.txt.diff
trunk/dports/aqua/luminance-hdr/files/patch-HelpBrowser_CMakeLists.txt.diff
trunk/dports/aqua/luminance-hdr/files/patch-PackagingApple.cmake_01.diff
trunk/dports/aqua/luminance-hdr/files/patch-PackagingApple.cmake_02.diff
trunk/dports/aqua/luminance-hdr/files/patch-Version.cmake.diff
Removed Paths:
-------------
trunk/dports/aqua/luminance-hdr/Portfile
trunk/dports/aqua/luminance-hdr/files/patch-project.pro.diff
trunk/dports/aqua/qtpfsgui/files/
Deleted: trunk/dports/aqua/luminance-hdr/Portfile
===================================================================
--- trunk/dports/aqua/qtpfsgui/Portfile 2016-05-26 13:08:42 UTC (rev 149046)
+++ trunk/dports/aqua/luminance-hdr/Portfile 2016-06-04 22:59:56 UTC (rev 149188)
@@ -1,49 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-PortGroup qt4 1.0
-
-name qtpfsgui
-version 1.9.3
-revision 6
-categories aqua graphics
-license GPL-2+
-maintainers nomaintainer
-description GUI for HDR imaging workflow
-long_description Qtpfsgui is an open source graphical user interface \
- application that aims to provide a workflow for HDR imaging.
-platforms darwin
-homepage http://qtpfsgui.sourceforge.net/
-master_sites sourceforge
-
-depends_lib-append \
- port:exiv2 port:openexr \
- port:ilmbase port:fftw-3-single port:tiff
-
-checksums md5 5a6421391e373c912e4a793e131151c8 \
- sha1 adf037c54f55be50d931fa484cca169c01d0384d \
- rmd160 5188b2f1679d6788358067fe761d0c72c475bfe9
-
-patchfiles patch-project.pro.diff
-
-# set arch type(s); done is a stage to make sure the 'options
-# qt_arch_types' is evaluated -after- +universal (if selected).
-pre-configure {
- configure.pre_args CONFIG+="${qt_arch_types}"
-}
-
-configure.args APPLICATIONS_DIR="${applications_dir}" \
- DOCDIR="${prefix}/share/doc/${name}" \
- PREFIX="${prefix}" CONFIG+="release" \
- LOCALSOFT="${prefix}"
-configure.cmd ${qt_qmake_cmd}
-configure.post_args
-configure.universal_args
-
-# allow ccache, if specified by the user
-pre-build {
- if {[tbool configure.ccache]} {
- build.post_args "CCACHE=ccache"
- }
-}
Copied: trunk/dports/aqua/luminance-hdr/Portfile (from rev 149176, trunk/dports/aqua/qtpfsgui/Portfile)
===================================================================
--- trunk/dports/aqua/luminance-hdr/Portfile (rev 0)
+++ trunk/dports/aqua/luminance-hdr/Portfile 2016-06-04 22:59:56 UTC (rev 149188)
@@ -0,0 +1,90 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+PortGroup cmake 1.0
+PortGroup qt5 1.0
+
+name luminance-hdr
+version 2.4.0
+#revision 0
+categories aqua graphics
+license GPL-2+
+maintainers mcalhoun openmaintainer
+description GUI for HDR imaging workflow
+long_description Qtpfsgui is an open source graphical user interface \
+ application that aims to provide a workflow for HDR imaging.
+platforms darwin
+homepage http://qtpfsgui.sourceforge.net/
+master_sites sourceforge:project/qtpfsgui/luminance/${version}
+
+use_bzip2 yes
+
+depends_lib-append \
+ port:exiv2 \
+ port:openexr \
+ port:ilmbase \
+ port:fftw-3 \
+ port:fftw-3-single \
+ port:tiff \
+ port:libraw \
+ port:gsl \
+ port:jpeg \
+ port:lcms2 \
+ port:boost \
+ port:libpng \
+ port:cfitsio \
+ port:ccfits \
+ port:qt5-qtwebkit \
+ port:qt5-qtquick1 \
+ port:qt5-qttools
+
+checksums \
+ rmd160 41fbd29ececa8f8de89dccabd6b48a66cc870307 \
+ sha256 14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401
+
+cmake.out_of_source yes
+
+# allow Portfile to set install location
+patchfiles-append patch-CMakeLists.txt.diff
+
+# HelpBrowser implicitly requires Qt's Print Support
+# src/HelpBrowser/helpbrowser.cpp:48:10: fatal error: 'QPrinter' file not found
+# #include <QPrinter>
+# ^
+patchfiles-append patch-HelpBrowser_CMakeLists.txt.diff
+
+# do not attempt to copy any Qt component into application directory
+patchfiles-append patch-PackagingApple.cmake_01.diff
+
+# see ${worksrcpath}/cmake/Version.cmake for LHDR_NAME and LHDR_OSX_EXECUTABLE_NAME values
+set ldhr_name "Luminance HDR"
+# do not put version in name
+patchfiles-append patch-Version.cmake.diff
+set executable_name ${ldhr_name}
+
+# ensure that installed file has correct file permissions
+patchfiles-append patch-PackagingApple.cmake_02.diff
+
+configure.args-append \
+ -DCMAKE_INSTALL_PREFIX=${applications_dir}
+
+variant external description {use external programs provided by MacPorts instead of packaged binaries} {
+ depends_run-append port:hugin-app
+ post-destroot {
+ foreach bin {align_image_stack} {
+ file delete "${destroot}${applications_dir}/${executable_name}.app/Contents/MacOS/${bin}"
+ ln -s ${prefix}/bin/${bin} "${destroot}${applications_dir}/${executable_name}.app/Contents/MacOS/"
+ }
+ }
+}
+default_variants-append +external
+
+post-destroot {
+ ln -s "${applications_dir}/${executable_name}.app/Contents/MacOS/luminance-hdr-cli" ${destroot}${prefix}/bin/
+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
+ ln -s "${applications_dir}/${executable_name}.app/Contents/Resources/html" ${destroot}${prefix}/share/doc/${name}
+
+}
+
+livecheck.regex {/qtpfsgui/files/luminance/([a-zA-Z0-9.]+\.[a-zA-Z0-9.]+)/}
Added: trunk/dports/aqua/luminance-hdr/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/aqua/luminance-hdr/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/aqua/luminance-hdr/files/patch-CMakeLists.txt.diff 2016-06-04 22:59:56 UTC (rev 149188)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2014-01-27 13:20:46.000000000 -0700
++++ CMakeLists.txt 2016-05-22 03:44:12.000000000 -0700
+@@ -194,8 +194,6 @@
+
+ # Apple Mac OS X
+ IF(APPLE)
+- SET(CMAKE_INSTALL_PREFIX "/Applications")
+-
+ # Set Bundle settings
+ set(MACOSX_BUNDLE_INFO_STRING "${LHDR_NAME} ${LHDR_VERSION}")
+ set(MACOSX_BUNDLE_BUNDLE_VERSION "${LHDR_NAME} ${LHDR_VERSION}")
Added: trunk/dports/aqua/luminance-hdr/files/patch-HelpBrowser_CMakeLists.txt.diff
===================================================================
--- trunk/dports/aqua/luminance-hdr/files/patch-HelpBrowser_CMakeLists.txt.diff (rev 0)
+++ trunk/dports/aqua/luminance-hdr/files/patch-HelpBrowser_CMakeLists.txt.diff 2016-06-04 22:59:56 UTC (rev 149188)
@@ -0,0 +1,11 @@
+--- src/HelpBrowser/CMakeLists.txt.orig 2014-01-27 13:20:46.000000000 -0700
++++ src/HelpBrowser/CMakeLists.txt 2016-05-21 23:47:59.000000000 -0700
+@@ -29,7 +29,7 @@
+
+
+ ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
+-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets)
++qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
+
+ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)
Added: trunk/dports/aqua/luminance-hdr/files/patch-PackagingApple.cmake_01.diff
===================================================================
--- trunk/dports/aqua/luminance-hdr/files/patch-PackagingApple.cmake_01.diff (rev 0)
+++ trunk/dports/aqua/luminance-hdr/files/patch-PackagingApple.cmake_01.diff 2016-06-04 22:59:56 UTC (rev 149188)
@@ -0,0 +1,41 @@
+--- build/PackagingApple.cmake.orig 2014-01-27 13:20:46.000000000 -0700
++++ build/PackagingApple.cmake 2016-05-22 04:16:52.000000000 -0700
+@@ -13,13 +13,6 @@
+ SET(APPS "\${CMAKE_INSTALL_PREFIX}/${LHDR_OSX_EXECUTABLE_NAME}.app")
+
+ #--------------------------------------------------------------------------------
+-# Install needed Qt plugins by copying directories from the qt installation
+-# One can cull what gets copied by using 'REGEX "..." EXCLUDE'
+-install(DIRECTORY "${QT_PLUGINS_DIR}/sqldrivers"
+- DESTINATION ${plugin_dest_dir} COMPONENT Runtime)
+-install(FILES ${LIBS}
+- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS)
+-
+ # install align_image_stack
+ install(FILES ${CMAKE_SOURCE_DIR}/build/macosx/align_image_stack
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS)
+@@ -30,10 +23,6 @@
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/html
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
+
+-# install a qt.conf file
+-install(FILES ${CMAKE_SOURCE_DIR}/build/macosx/qt.conf
+- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
+-
+ # install README and other files
+ install(FILES
+ ${CMAKE_SOURCE_DIR}/AUTHORS
+@@ -48,13 +37,6 @@
+ # directories to look for dependencies
+ set(DIRS ${QT_LIBRARY_DIRS})
+
+-INSTALL(CODE "
+- file(GLOB_RECURSE QTPLUGINS
+- \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+- include(BundleUtilities)
+- fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
+- " COMPONENT Runtime)
+-
+ # create drag and drop installer
+ set(CPACK_BINARY_DRAGNDROP ON)
+ include(CPack)
Added: trunk/dports/aqua/luminance-hdr/files/patch-PackagingApple.cmake_02.diff
===================================================================
--- trunk/dports/aqua/luminance-hdr/files/patch-PackagingApple.cmake_02.diff (rev 0)
+++ trunk/dports/aqua/luminance-hdr/files/patch-PackagingApple.cmake_02.diff 2016-06-04 22:59:56 UTC (rev 149188)
@@ -0,0 +1,10 @@
+--- build/PackagingApple.cmake.orig 2016-06-04 12:52:43.000000000 -0700
++++ build/PackagingApple.cmake 2016-06-04 12:53:39.000000000 -0700
+@@ -15,6 +15,7 @@
+ #--------------------------------------------------------------------------------
+ # install align_image_stack
+ install(FILES ${CMAKE_SOURCE_DIR}/build/macosx/align_image_stack
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS)
+
+ # install help
Added: trunk/dports/aqua/luminance-hdr/files/patch-Version.cmake.diff
===================================================================
--- trunk/dports/aqua/luminance-hdr/files/patch-Version.cmake.diff (rev 0)
+++ trunk/dports/aqua/luminance-hdr/files/patch-Version.cmake.diff 2016-06-04 22:59:56 UTC (rev 149188)
@@ -0,0 +1,11 @@
+--- cmake/Version.cmake.orig 2014-01-27 13:20:46.000000000 -0700
++++ cmake/Version.cmake 2016-05-28 10:35:26.000000000 -0700
+@@ -10,7 +10,7 @@
+ SET(LHDR_VENDOR "Luminance HDR Development Team")
+ SET(LHDR_COPYRIGHT_YEAR "2006-2014")
+
+-SET(LHDR_OSX_EXECUTABLE_NAME "${LHDR_NAME} ${LHDR_VERSION}")
++SET(LHDR_OSX_EXECUTABLE_NAME "${LHDR_NAME}")
+ SET(LHDR_OSX_EXECUTABLE_TARGET "Luminance_HDR_${LHDR_VERSION}")
+
+ SET(LHDR_DOMAIN_FIRST "luminance-hdr")
Deleted: trunk/dports/aqua/luminance-hdr/files/patch-project.pro.diff
===================================================================
--- trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff 2016-05-26 13:08:42 UTC (rev 149046)
+++ trunk/dports/aqua/luminance-hdr/files/patch-project.pro.diff 2016-06-04 22:59:56 UTC (rev 149188)
@@ -1,119 +0,0 @@
---- project.pro.orig 2010-11-05 12:17:22.000000000 -0400
-+++ project.pro 2010-11-05 12:18:44.000000000 -0400
-@@ -1,5 +1,5 @@
- TEMPLATE = app
--CONFIG += release qt thread
-+CONFIG += qt thread
- DEFINES += QT_NO_DEBUG_OUTPUT
-
- # Assume openmp-capable g++ (>=4.2)
-@@ -192,7 +192,7 @@
- message ( "Detecting exiv2:" )
- #I think these are the only paths where we have to search for.
- #If your system is more exotic let me know.
--EXIV2IMAGEHPP = /usr/include/exiv2/image.hpp /usr/local/include/exiv2/image.hpp $$(LOCALSOFT)/include/exiv2/image.hpp
-+EXIV2IMAGEHPP = /usr/include/exiv2/image.hpp /usr/local/include/exiv2/image.hpp $${LOCALSOFT}/include/exiv2/image.hpp
- for(path, EXIV2IMAGEHPP) {
- exists($$path) {
- EXIV2PATH = $$dirname(path)
-@@ -218,7 +218,7 @@
- message ( "Detecting OpenEXR:" )
- #I think these are the only paths where we have to search for.
- #If your system is more exotic let me know.
--OPENEXRHEADER = /usr/include/OpenEXR/ImfHeader.h /usr/local/include/OpenEXR/ImfHeader.h /usr/local/include/ilmbase/ImfHeader.h /usr/include/ilmbase/ImfHeader.h $$(LOCALSOFT)/include/OpenEXR/ImfHeader.h
-+OPENEXRHEADER = /usr/include/OpenEXR/ImfHeader.h /usr/local/include/OpenEXR/ImfHeader.h /usr/local/include/ilmbase/ImfHeader.h /usr/include/ilmbase/ImfHeader.h $${LOCALSOFT}/include/OpenEXR/ImfHeader.h
- for(path, OPENEXRHEADER) {
- exists($$path) {
- OPENEXRDIR = $$dirname(path)
-@@ -244,7 +244,7 @@
- message ( "Detecting fftw3:" )
- #I think these are the only paths where we have to search for.
- #If your system is more exotic let me know.
--FFTW3HEADER = /usr/include/fftw3.h /usr/local/include/fftw3.h $$(LOCALSOFT)/include/fftw3.h
-+FFTW3HEADER = /usr/include/fftw3.h /usr/local/include/fftw3.h $${LOCALSOFT}/include/fftw3.h
- for(path, FFTW3HEADER) {
- exists($$path) {
- FFTW3DIR = $$dirname(path)
-@@ -271,7 +271,7 @@
- message ( "Detecting libtiff:" )
- #I think these are the only paths where we have to search for.
- #If your system is more exotic let me know.
--LIBTIFFHEADER = /usr/include/tiffio.h /usr/local/include/tiffio.h $$(LOCALSOFT)/include/tiffio.h
-+LIBTIFFHEADER = /usr/include/tiffio.h /usr/local/include/tiffio.h $${LOCALSOFT}/include/tiffio.h
- for(path, LIBTIFFHEADER) {
- exists($$path) {
- LIBTIFFDIR = $$dirname(path)
-@@ -295,8 +295,12 @@
-
- ############################## required by "make install" ########################################
- isEmpty(PREFIX) {
-- PREFIX = /usr/local
-+ error( "PREFIX must be set before executing this script; fatal error, bailing out." )
- }
-+isEmpty(LOCALSOFT) {
-+ error( "LOCALSOFT must be set before executing this script; fatal error, bailing out." )
-+}
-+
- isEmpty(I18NDIR) {
- mac {
- #I18NDIR=(QCoreApplication::applicationDirPath()+\"/i18n\")
-@@ -315,7 +319,11 @@
- HTMLDIR = $${DOCDIR}
- }
-
--target.path = $${PREFIX}/bin
-+mac {
-+ target.path = $${APPLICATIONS_DIR}
-+} else {
-+ target.path = $${PREFIX}/bin
-+}
- menu.files = qtpfsgui.desktop
- menu.path = $${PREFIX}/share/applications
- icon.files = images/qtpfsgui.png
-@@ -365,37 +373,8 @@
- #TODO we have to complete this.
- LIBS+=-lIlmThread
-
--# Enable universal (requires a universal Qt)? Default = non-universal
--# If you wish to build a Universal Binary please un-comment the following line
--#CONFIG += x86 ppc
--
--# Warn user what type of binary is being built and what the possible implications are
--contains(CONFIG, "x86"):contains(CONFIG, "ppc") {
-- message ("Building an OS X Universal Binary:")
-- message ("Please ensure all dependencies and Qt are also Universal")
-- message ("********************************************************************")
--} else {
-- # Test what architecture we are on (Intel or PPC)
-- # 'arch' returns "i386" on Intel-Tiger is this true on Intel-Leopard?
-- # What does 'arch' return on PPC machines? Presumably "ppc"?
-- MAC_ARCH = $$system(arch)
-- contains(MAC_ARCH, i386) {
-- message ("This is an Intel Mac - Building an Intel specific OS X binary")
-- message ("Please refer to the documentation if you require a Universal Binary")
-- message ("********************************************************************")
-- # Is this next line strictly necessary? gcc should compile for the correct architecture by default.
-- CONFIG += x86
-- } else {
-- message ("This is a PPC Mac - Building a PPC specific OS X binary")
-- message ("Please refer to the documentation if you require a Universal Binary")
-- message ("********************************************************************")
-- # Is this next line strictly necessary? gcc should compile for the correct architecture by default.
-- CONFIG += ppc
-- }
--}
--
- # We like to search the LOCALSOFT/lib explicitly on MacOSX
--LIBS += -L$$(LOCALSOFT)/lib
-+LIBS += -L$${LOCALSOFT}/lib
- # Libtiff depends on jpeg, but it is not searched for automatically on MacOSX
- LIBS += -ljpeg
- # Exiv also depend on libexpat and libiconv, so same as above:
-@@ -418,7 +397,6 @@
-
- # this is just how my MinGW installation is. You gotta change it if you want to compile it in windows.
- CONFIG += windows
--#CONFIG += debug
- CONFIG += console
-
- #OpenEXR available in win32
Modified: trunk/dports/aqua/qtpfsgui/Portfile
===================================================================
--- trunk/dports/aqua/qtpfsgui/Portfile 2016-06-04 21:57:58 UTC (rev 149187)
+++ trunk/dports/aqua/qtpfsgui/Portfile 2016-06-04 22:59:56 UTC (rev 149188)
@@ -2,59 +2,16 @@
# $Id$
PortSystem 1.0
-PortGroup qmake 1.0
+replaced_by luminance-hdr
+PortGroup obsolete 1.0
+
+
name qtpfsgui
version 1.9.3
-revision 7
+revision 8
+
categories aqua graphics
license GPL-2+
-maintainers nomaintainer
-description GUI for HDR imaging workflow
-long_description Qtpfsgui is an open source graphical user interface \
- application that aims to provide a workflow for HDR imaging.
-platforms darwin
-homepage http://qtpfsgui.sourceforge.net/oldsite/
-master_sites sourceforge
-set target Qtpfsgui
-
-depends_lib-append \
- port:exiv2 \
- port:openexr \
- port:ilmbase \
- port:fftw-3 \
- port:fftw-3-single \
- port:tiff
-
-depends_run-append \
- port:dcraw \
- port:hugin-app
-
-checksums \
- rmd160 5188b2f1679d6788358067fe761d0c72c475bfe9 \
- sha256 016aaa339ede405bfa55d531069bd64f45fd6139836b6ea9b4d655e2734b8fd6
-
-patchfiles patch-project.pro.diff
-
-post-extract {
- # generate translation files
- system -W ${worksrcpath} "${qt_bins_dir}/lrelease project.pro"
-}
-
-configure.args-append \
- LOCALSOFT="${prefix}" \
- DOCDIR="${prefix}/share/doc/${name}" \
- APPLICATIONS_DIR="${applications_dir}" \
- TARGET=${target} \
- I18NDIR=${applications_dir}/${target}.app/Contents/Resources/i18n
-
-post-destroot {
- # allow app to find external binaries (#16524)
- foreach bin {dcraw align_image_stack} {
- ln -s ${prefix}/bin/${bin} ${destroot}${applications_dir}/${target}.app/Contents/MacOS/
- }
-
- # allow help menu to find documentation
- ln -s ${prefix}/share/doc/${name}/html ${destroot}${applications_dir}/${target}.app/Contents/Resources/
-}
+homepage http://qtpfsgui.sourceforge.net/oldsite/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160604/9f9e502f/attachment.html>
More information about the macports-changes
mailing list