media-gfx/luminance-hdr: remove unused patches
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>
Sun, 13 Aug 2017 08:26:53 +0000 (10:26 +0200)
committerDavid Seifert <soap@gentoo.org>
Sun, 13 Aug 2017 11:27:56 +0000 (13:27 +0200)
Closes: https://github.com/gentoo/gentoo/pull/5399

media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-docs.patch [deleted file]
media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-openmp-automagic.patch [deleted file]
media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch [deleted file]

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 (file)
index d44e635..0000000
+++ /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\r
-     INSTALL(FILES ${CMAKE_SOURCE_DIR}/images/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon\r
-     INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION share/applications) #desktop entry\r
--    INSTALL(FILES\r
--    ${CMAKE_SOURCE_DIR}/AUTHORS\r
--    ${CMAKE_SOURCE_DIR}/README\r
--    ${CMAKE_SOURCE_DIR}/LICENSE\r
--    ${CMAKE_SOURCE_DIR}/Changelog\r
--    DESTINATION share/luminance-hdr) #info files\r
-     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory\r
- # Microsoft Windows\r
- ELSEIF(WIN32)\r
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 (file)
index a4fbb13..0000000
+++ /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)\r
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)\r
\r
-+OPTION(USE_OPENMP "Use openmp threading support." ON)\r
-+\r
- # set include path for FindXXX.cmake files\r
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")\r
\r
-@@ -149,18 +151,20 @@
- SET(LIBS ${LIBS} ${EXIV2_LIBRARIES})\r
\r
- #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3\r
--IF(MSVC)\r
--    FIND_PACKAGE(OpenMP REQUIRED)\r
--    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")\r
--    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")\r
--ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)\r
--    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)\r
--    #MESSAGE(STATUS ${GCC_VERSION})\r
--    IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)\r
--        MESSAGE(STATUS "GCC >= 4.3")\r
-+IF(USE_OPENMP)\r
-+    IF(MSVC)\r
-         FIND_PACKAGE(OpenMP REQUIRED)\r
-         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")\r
-         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")\r
-+    ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)\r
-+        EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)\r
-+        #MESSAGE(STATUS ${GCC_VERSION})\r
-+        IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)\r
-+            MESSAGE(STATUS "GCC >= 4.3")\r
-+            FIND_PACKAGE(OpenMP REQUIRED)\r
-+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")\r
-+            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")\r
-+        ENDIF()\r
-     ENDIF()\r
- ENDIF()\r
- # END OpenMP Support\r
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 (file)
index 040cc8d..0000000
+++ /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 @@
\r
- set(LIBS ${LIBS} ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})\r
\r
--FIND_PACKAGE(Git)\r
--#FIND_PACKAGE(Git QUIET)\r
--IF(NOT GIT_FOUND)\r
--    FIND_FILE(GIT_EXECUTABLE git.exe \r
--        $ENV{CYGWIN_DIR}\\bin\r
--        $ENV{CYGWIN_DIR}\r
--    )\r
--    IF (EXISTS ${GIT_EXECUTABLE})\r
--        SET(GIT_FOUND 1)\r
--    ENDIF()\r
--ENDIF()\r
--\r
--IF(GIT_FOUND)\r
--    include(GetGitRevisionDescription)\r
--    get_git_head_revision(GIT_REFSPEC GIT_SHA1)\r
--    message(STATUS "Git found")\r
--ELSE()\r
--    message(STATUS "Git not found")\r
--ENDIF()\r
--\r
- IF(WIN32)\r
-     # Windows Section\r
-     \r
---- 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();