summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/luminance-hdr/files')
-rw-r--r--media-gfx/luminance-hdr/files/luminance-hdr-2.1.0-libraw.patch10
-rw-r--r--media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-docs.patch21
-rw-r--r--media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-no-git.patch72
-rw-r--r--media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-openmp-automagic.patch50
4 files changed, 0 insertions, 153 deletions
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.1.0-libraw.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.1.0-libraw.patch
deleted file mode 100644
index 8472a7422221..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.1.0-libraw.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig
-+++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp
-@@ -94,7 +94,6 @@
- RawProcessor.set_progress_handler(cb, callback_data);
- int ret;
-
-- OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
- OUT.output_bps = 16;
-
- //OUT.gamm[0] = 1/2.4; //sRGB
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-docs.patch
deleted file mode 100644
index 4b4bb63b5a83..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- luminance-hdr-2.2.0/CMakeLists.txt.orig
-+++ luminance-hdr-2.2.0/CMakeLists.txt
-@@ -564,16 +564,10 @@
-
- # make install directivies
- INSTALL(TARGETS luminance-hdr RUNTIME DESTINATION bin) # main exec
-- INSTALL(FILES ${LUMINANCE_QM} DESTINATION share/luminance/i18n) # i18n
-+ INSTALL(FILES ${LUMINANCE_QM} DESTINATION share/luminance-hdr/i18n) # i18n
- 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) #info files
-- INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance) # help directory
-+ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory
-
- ELSEIF(WIN32)
-
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-no-git.patch
deleted file mode 100644
index 627e0e88ad31..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-no-git.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- luminance-hdr-2.2.0.orig/CMakeLists.txt
-+++ luminance-hdr-2.2.0/CMakeLists.txt
-@@ -27,30 +27,6 @@
-
- set(LIBS ${LIBS} ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
-
--FIND_PACKAGE(Git)
--#FIND_PACKAGE(Git QUIET)
--IF(NOT GIT_FOUND)
-- message(STATUS "Git not found")
-- FIND_FILE(GIT_EXECUTABLE git.exe
-- $ENV{CYGWIN_DIR}\\bin
-- $ENV{CYGWIN_DIR}
-- )
-- IF (EXISTS ${GIT_EXECUTABLE})
-- SET(GIT_FOUND 1)
-- ENDIF()
-- FIND_FILE(GIT_EXE git
-- $ENV{/usr/bin}
-- )
-- IF (EXISTS ${GIT_EXE})
-- SET(GIT_FOUND 1)
-- ENDIF()
--ENDIF()
--
--IF(GIT_FOUND)
-- include(GetGitRevisionDescription)
-- get_git_head_revision(GIT_REFSPEC GIT_SHA1)
--ENDIF()
--
- IF(WIN32)
- # Windows Section
- SET(OPENEXR_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../DEPs/include/OpenEXR")
-@@ -318,7 +294,6 @@
- src/UI/UMessageBox.h
- src/Viewers/Histogram.h
- src/Common/global.h
-- src/Common/GitSHA1.h
- src/Common/config.h
-
- # new viewer
-@@ -408,11 +383,8 @@
- src/TonemappingEngine/TonemapOperator.cpp
-
- src/main.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/src/Common/GitSHA1.cpp # for actual git version
- )
-
--CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/Common/GitSHA1.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/Common/GitSHA1.cpp" @ONLY)
--
- SET(LUMINANCE_HDR_MOC
- src/BatchHDR/BatchHDRDialog.h
- src/BatchTM/BatchTMDialog.h
---- luminance-hdr-2.2.0.orig/src/UI/UMessageBox.cpp
-+++ luminance-hdr-2.2.0/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"
-@@ -78,7 +77,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.2.0-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-openmp-automagic.patch
deleted file mode 100644
index 20baab7316e7..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-openmp-automagic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- luminance-hdr-2.2.0/CMakeLists.txt.orig
-+++ luminance-hdr-2.2.0/CMakeLists.txt
-@@ -2,6 +2,7 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-
- OPTION(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files (WARNING: make clean will delete the source .ts files! Danger!)")
-+OPTION(USE_OPENMP "Use openmp threading support." ON)
-
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
-
-@@ -141,24 +142,26 @@
- SET(LIBS ${LIBS} ${EXIV2_LIBRARIES})
-
- #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3
--IF(MSVC)
-+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_C_COMPILER} -dumpversion
-- OUTPUT_VARIABLE GCC_VERSION)
-- #MESSAGE(STATUS ${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()
-
-+ ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)
-+
-+ execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+ OUTPUT_VARIABLE GCC_VERSION)
-+ #MESSAGE(STATUS ${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()
- # END OpenMP Support
-