commit: 00035ccfcaf2712ef941b37ab32c194c12bd0240 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Aug 13 08:26:53 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 11:27:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00035ccf
media-gfx/luminance-hdr: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/5399 .../files/luminance-hdr-2.2.1-docs.patch | 15 ----- .../luminance-hdr-2.2.1-openmp-automagic.patch | 41 -------------- .../files/luminance-hdr-2.3.0_beta1-no-git.patch | 65 ---------------------- 3 files changed, 121 deletions(-) diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-docs.patch deleted file mode 100644 index d44e635dd1b..00000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-docs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- luminance-hdr-2.2.1/CMakeLists.txt -+++ luminance-hdr-2.2.1/CMakeLists.txt -@@ -245,12 +245,6 @@ - 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-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.2.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-openmp-automagic.patch deleted file mode 100644 index a4fbb13fec7..00000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-openmp-automagic.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- luminance-hdr-2.2.1/CMakeLists.txt -+++ luminance-hdr-2.2.1/CMakeLists.txt -@@ -1,6 +1,8 @@ - PROJECT(luminance-hdr) - CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) - -+OPTION(USE_OPENMP "Use openmp threading support." ON) -+ - # set include path for FindXXX.cmake files - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") - -@@ -149,18 +151,20 @@ - SET(LIBS ${LIBS} ${EXIV2_LIBRARIES}) - - #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_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") -+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() - ENDIF() - ENDIF() - # END OpenMP Support diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch deleted file mode 100644 index 040cc8d82a7..00000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- luminance-hdr-2.3.0.beta1/CMakeLists.txt -+++ luminance-hdr-2.3.0.beta1/CMakeLists.txt -@@ -36,26 +36,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) -- FIND_FILE(GIT_EXECUTABLE git.exe -- $ENV{CYGWIN_DIR}\\bin -- $ENV{CYGWIN_DIR} -- ) -- IF (EXISTS ${GIT_EXECUTABLE}) -- SET(GIT_FOUND 1) -- ENDIF() --ENDIF() -- --IF(GIT_FOUND) -- include(GetGitRevisionDescription) -- get_git_head_revision(GIT_REFSPEC GIT_SHA1) -- message(STATUS "Git found") --ELSE() -- message(STATUS "Git not found") --ENDIF() -- - IF(WIN32) - # Windows Section - ---- luminance-hdr-2.3.0.beta1/src/Common/CMakeLists.txt -+++ luminance-hdr-2.3.0.beta1/src/Common/CMakeLists.txt -@@ -1,4 +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) - - SET(FILES_UI -@@ -25,8 +24,7 @@ - QT4_WRAP_UI(FILES_UI_H ${FILES_UI}) - - ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX} ${FILES_UI_H} --${CMAKE_CURRENT_BINARY_DIR}/global.hxx --${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp) -+${CMAKE_CURRENT_BINARY_DIR}/global.hxx) - - 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.0.beta1/src/UI/UMessageBox.cpp -+++ luminance-hdr-2.3.0.beta1/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();
