diff options
Diffstat (limited to 'media-gfx/luminance-hdr/files')
6 files changed, 259 insertions, 0 deletions
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch new file mode 100644 index 000000000000..514ded782204 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch @@ -0,0 +1,17 @@ +Don't install extra docs and fix install dir. + +--- luminance-hdr-2.3.1/CMakeLists.txt ++++ luminance-hdr-2.3.1/CMakeLists.txt +@@ -250,12 +250,6 @@ + + INSTALL(FILES ${CMAKE_SOURCE_DIR}/images/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon + INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION share/applications) #desktop entry +- INSTALL(FILES +- ${CMAKE_SOURCE_DIR}/AUTHORS +- ${CMAKE_SOURCE_DIR}/README +- ${CMAKE_SOURCE_DIR}/LICENSE +- ${CMAKE_SOURCE_DIR}/Changelog +- DESTINATION share/luminance-hdr) #info files + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory + # Microsoft Windows + ELSEIF(WIN32) diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch new file mode 100644 index 000000000000..fe95265a6849 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch @@ -0,0 +1,54 @@ +Don't try to define the git version of the release. + +--- luminance-hdr-2.3.1/CMakeLists.txt ++++ luminance-hdr-2.3.1/CMakeLists.txt +@@ -32,12 +32,6 @@ + ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} + ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES}) + +-FIND_PACKAGE(Git) +-IF(GIT_FOUND) +- include(GetGitRevisionDescription) +- get_git_head_revision(GIT_REFSPEC GIT_SHA1) +-ENDIF() +- + IF(WIN32) + # Windows Section + +--- luminance-hdr-2.3.1.orig/src/Common/CMakeLists.txt ++++ luminance-hdr-2.3.1/src/Common/CMakeLists.txt +@@ -1,5 +1,3 @@ +-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in +- ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp @ONLY) + CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/global.hxx.in + ${CMAKE_CURRENT_BINARY_DIR}/global.hxx @ONLY) + CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in +@@ -32,8 +30,7 @@ + + ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX} ${FILES_UI_H} + ${CMAKE_CURRENT_BINARY_DIR}/global.hxx +- ${CMAKE_CURRENT_BINARY_DIR}/config.h +- ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp) ++ ${CMAKE_CURRENT_BINARY_DIR}/config.h) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} common PARENT_SCOPE) +--- luminance-hdr-2.3.1.orig/src/UI/UMessageBox.cpp ++++ luminance-hdr-2.3.1/src/UI/UMessageBox.cpp +@@ -28,7 +28,6 @@ + + #include "UI/UMessageBox.h" + +-#include "Common/GitSHA1.h" + #include "Common/config.h" + #include "Common/archs.h" + #include "ui_about.h" +@@ -92,7 +91,7 @@ + ui.authorsBox->setOpenExternalLinks(true); + ui.thanksToBox->setOpenExternalLinks(true); + ui.GPLbox->setTextInteractionFlags(Qt::TextSelectableByMouse); +- ui.label_version->setText(ui.label_version->text().append(QString(LUMINANCEVERSION)).append(" [Build ").append(QString(g_GIT_SHA1).left(6)).append("]")); ++ ui.label_version->setText(ui.label_version->text().append(QString(LUMINANCEVERSION))); + + bool license_file_not_found=true; + QString docDir = QCoreApplication::applicationDirPath(); diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch new file mode 100644 index 000000000000..69fa0324c6ad --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch @@ -0,0 +1,40 @@ +Only use openmp support if explicitly enabled. + +--- luminance-hdr-2.3.1/cmake/CompilerSettings.cmake ++++ luminance-hdr-2.3.1/cmake/CompilerSettings.cmake +@@ -8,6 +8,8 @@ + ENDIF() + ENDIF() + ++OPTION(USE_OPENMP "Use openmp threading support." ON) ++ + #Activate C++11 support, when available + if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") + execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) +@@ -39,16 +41,18 @@ + endif() + + #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3 +-IF(MSVC) +- FIND_PACKAGE(OpenMP REQUIRED) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) +- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) +- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) +- MESSAGE(STATUS "GCC >= 4.3") ++IF(USE_OPENMP) ++ IF(MSVC) + FIND_PACKAGE(OpenMP REQUIRED) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) ++ MESSAGE(STATUS "GCC >= 4.3") ++ FIND_PACKAGE(OpenMP REQUIRED) ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ENDIF() + ENDIF() + ENDIF() diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch new file mode 100644 index 000000000000..e586c400e42e --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch @@ -0,0 +1,36 @@ +Only use FITS support if explicitly enabled. + +--- luminance-hdr-2.4.0/CMakeLists.txt ++++ luminance-hdr-2.4.0/CMakeLists.txt +@@ -10,6 +10,8 @@ + include(cmake/CompilerSettings.cmake) + include(cmake/Internationalization.cmake) + ++OPTION(USE_FITS "Enable FITS support." ON) ++ + # find and setup Qt5 for this project + + # Tell CMake to run moc when necessary: +@@ -122,13 +124,15 @@ + INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR}) + INCLUDE_DIRECTORIES(${LCMS2_INCLUDE_DIR}) + +-FIND_PACKAGE(CCfits) +-IF(CCFITS_FOUND) +- INCLUDE_DIRECTORIES(${CCFITS_INCLUDE_DIRS}) +- SET(LIBS ${LIBS} ${CCFITS_LIBRARIES}) +- ADD_DEFINITIONS(-DHAVE_CCFITS) +-ELSE() +- message(WARNING "CCfits not found! Building without FITS support!") ++IF(USE_FITS) ++ FIND_PACKAGE(CCfits REQUIRED) ++ IF(CCFITS_FOUND) ++ INCLUDE_DIRECTORIES(${CCFITS_INCLUDE_DIRS}) ++ SET(LIBS ${LIBS} ${CCFITS_LIBRARIES}) ++ ADD_DEFINITIONS(-DHAVE_CCFITS) ++ ELSE() ++ MESSAGE(FATAL_ERROR "CCfits not found!") ++ ENDIF() + ENDIF() + + SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES}) diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch new file mode 100644 index 000000000000..c619308f8134 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch @@ -0,0 +1,99 @@ +From 07e36ef892343b01bf13545866823e6a55044382 Mon Sep 17 00:00:00 2001 +From: Davide Anastasia <davide.anastasia@gmail.com> +Date: Mon, 29 Sep 2014 08:06:15 +0100 +Subject: [PATCH] Fix QPrinter support + +--- + CMakeLists.txt | 25 +++++++++++++------------ + src/HelpBrowser/CMakeLists.txt | 3 +-- + src/HelpBrowser/helpbrowser.cpp | 8 +++++--- + 3 files changed, 19 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b07692..8a60ad4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,19 +18,20 @@ include(cmake/Internationalization.cmake) + # to always look for includes there: + #set(CMAKE_INCLUDE_CURRENT_DIR ON) + +-find_package(Qt5Core) +-find_package(Qt5Concurrent) +-find_package(Qt5Widgets) +-find_package(Qt5Gui) +-find_package(Qt5Declarative) +-find_package(Qt5WebKit) +-find_package(Qt5WebKitWidgets) +-find_package(Qt5Xml) +-find_package(Qt5Sql) +-find_package(Qt5Network) +-find_package(Qt5LinguistTools) ++find_package(Qt5Core REQUIRED) ++find_package(Qt5Concurrent REQUIRED) ++find_package(Qt5Widgets REQUIRED) ++find_package(Qt5Gui REQUIRED) ++find_package(Qt5Declarative REQUIRED) ++find_package(Qt5WebKit REQUIRED) ++find_package(Qt5WebKitWidgets REQUIRED) ++find_package(Qt5Xml REQUIRED) ++find_package(Qt5Sql REQUIRED) ++find_package(Qt5Network REQUIRED) ++find_package(Qt5LinguistTools REQUIRED) ++find_package(Qt5PrintSupport REQUIRED) + IF(WIN32) +- find_package(Qt5WinExtras) ++ find_package(Qt5WinExtras) + ENDIF() + + # Include the qtmain lib if we are on the windows platform +diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt +index 04319a8..2f4916a 100644 +--- a/src/HelpBrowser/CMakeLists.txt ++++ b/src/HelpBrowser/CMakeLists.txt +@@ -27,9 +27,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + QT5_WRAP_CPP(FILES_MOC ${FILES_H}) + QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + +- + 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) +diff --git a/src/HelpBrowser/helpbrowser.cpp b/src/HelpBrowser/helpbrowser.cpp +index bfd2820..ce7f984 100644 +--- a/src/HelpBrowser/helpbrowser.cpp ++++ b/src/HelpBrowser/helpbrowser.cpp +@@ -30,6 +30,7 @@ for which a new license (GPL+exception) is in place. + #include "ui_HelpBrowser.h" + #include "ui_HelpSideBar.h" + ++#include <QDebug> + #include <QAction> + #include <QBuffer> + #include <QDir> +@@ -45,8 +46,6 @@ for which a new license (GPL+exception) is in place. + #include <QModelIndex> + #include <QModelIndexList> + #include <QPainter> +-#include <QPrinter> +-#include <QPrintDialog> + #include <QProcess> + #include <QPushButton> + #include <QString> +@@ -56,7 +55,10 @@ for which a new license (GPL+exception) is in place. + #include <QXmlDefaultHandler> + #include <QDesktopServices> + +-#include <QDebug> ++#include <QtPrintSupport/QPrinter> ++#include <QtPrintSupport/QPrintDialog> ++ ++ + + #include "Common/global.h" + #include "HelpBrowser/schelptreemodel.h" +-- +2.2.2 + diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch new file mode 100644 index 000000000000..6e1fc2f16ea0 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch @@ -0,0 +1,13 @@ +Gentoo has a Qt5Quick cmake module instead of a Qt5Declarative one. + +--- luminance-hdr-2.4.0/CMakeLists.txt ++++ luminance-hdr-2.4.0/CMakeLists.txt +@@ -22,7 +22,7 @@ + find_package(Qt5Concurrent REQUIRED) + find_package(Qt5Widgets REQUIRED) + find_package(Qt5Gui REQUIRED) +-find_package(Qt5Declarative REQUIRED) ++find_package(Qt5Quick REQUIRED) + find_package(Qt5WebKit REQUIRED) + find_package(Qt5WebKitWidgets REQUIRED) + find_package(Qt5Xml REQUIRED) |