From: Andreas Sturmlechner Date: Wed, 13 Nov 2019 19:36:25 +0000 (+0100) Subject: media-gfx/luminance-hdr: Drop 2.5.1-r1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=218b73f64d95677b66183a5025f0a8c9df3f7a9a;p=gentoo.git media-gfx/luminance-hdr: Drop 2.5.1-r1 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner --- diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest index 08af1d162806..ef8d09c6f1ef 100644 --- a/media-gfx/luminance-hdr/Manifest +++ b/media-gfx/luminance-hdr/Manifest @@ -1,2 +1 @@ -DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch deleted file mode 100644 index 48c156a382e3..000000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch +++ /dev/null @@ -1,17 +0,0 @@ -Don't install extra docs and fix install dir. - ---- luminance-hdr-2.3.1/CMakeLists.txt -+++ luminance-hdr-2.3.1/CMakeLists.txt -@@ -281,12 +281,6 @@ - INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/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}/luminance-hdr.appdata.xml DESTINATION share/appdata) #appstream -- INSTALL(FILES -- ${CMAKE_SOURCE_DIR}/AUTHORS -- ${CMAKE_SOURCE_DIR}/README.md -- ${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 - INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory - # Microsoft Windows diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch deleted file mode 100644 index 16b5256e935d..000000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8c3f1571bfa7bb702228bb283e37e58c8b322d5b Mon Sep 17 00:00:00 2001 -From: Benitoite -Date: Fri, 26 Apr 2019 18:07:52 -0700 -Subject: [PATCH] ExifOperations: include exiv2/exiv2.hpp - -Because type `AnyError` requires definition in the exiv2 namespace. ---- - src/Exif/ExifOperations.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp -index 07ca742c..dd3d22a6 100644 ---- a/src/Exif/ExifOperations.cpp -+++ b/src/Exif/ExifOperations.cpp -@@ -35,6 +35,7 @@ - #include - - #include -+#include - #include - - #include "Common/config.h" \ No newline at end of file diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch deleted file mode 100644 index 7b52c883e40b..000000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e733c24baf0c87e0b3c45351ff916c5f3a652826 Mon Sep 17 00:00:00 2001 -From: Benitoite -Date: Sun, 16 Dec 2018 22:18:37 -0800 -Subject: [PATCH] Define EXIV2_TEST_VERSION by including exiv2.hpp - -AppleClang 10 did not allow compilation without exiv2/exiv2.hpp or exiv2/version.hpp -Also, version.hpp says use exiv2.hpp - -* 2018-12-29 asturm@gentoo.org: Backported to 2.5.1 ---- - src/TransplantExif/TransplantExifDialog.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp -index c38a51e4..1fac2e0f 100644 ---- a/src/TransplantExif/TransplantExifDialog.cpp -+++ b/src/TransplantExif/TransplantExifDialog.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include "Common/global.h" - #include "Common/config.h" diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch deleted file mode 100644 index c3b57861671b..000000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 36cf008..1b75700 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -132,7 +132,11 @@ INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR} ${GSLCBLAS_INCLUDE_DIR}) - FIND_PACKAGE(JPEG REQUIRED) - INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR}) - --FIND_PACKAGE(CFITSIO) -+OPTION(USE_FITS "Enable FITS support." ON) -+IF(USE_FITS) -+ FIND_PACKAGE(CFITSIO REQUIRED) -+ENDIF() -+ - IF(CFITSIO_FOUND) - INCLUDE_DIRECTORIES(${CFITSIO_INCLUDE_DIR}) - SET(LIBS ${LIBS} ${CFITSIO_LIBRARIES}) diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch deleted file mode 100644 index 8665785736ee..000000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e8975f..2e5ea5b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,11 +59,7 @@ set(LIBS ${LIBS} - ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} - ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES}) - --FIND_PACKAGE(Git) --IF(GIT_FOUND) -- include(GetGitRevisionDescription) -- get_git_head_revision(GIT_REFSPEC GIT_SHA1) --ENDIF() -+SET(GIT_SHA1 "-- gentoo build --") - - IF(WIN32) - # Windows Section diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild deleted file mode 100644 index 33c04975b7fb..000000000000 --- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils - -MY_P=${P/_/.} -DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging" -HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR" -SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh" -IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / l10n_}" - -RDEPEND=" - dev-libs/boost:0= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtwebengine:5[widgets] - >=media-gfx/exiv2-0.14:0= - media-libs/lcms:2 - media-libs/libpng:0= - >=media-libs/libraw-0.13.4:= - media-libs/ilmbase:= - >=media-libs/openexr-1.2.2-r2:= - >=media-libs/tiff-3.8.2-r2:0 - sci-libs/fftw:3.0=[threads] - fits? ( sci-libs/cfitsio:= ) - sci-libs/gsl - virtual/jpeg:0 -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - test? ( dev-cpp/gtest ) -" - -DOCS=( AUTHORS BUGS Changelog README.md TODO ) - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.1-no-git.patch - "${FILESDIR}"/${PN}-2.5.1-docs.patch - "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch - "${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch - "${FILESDIR}"/${PN}-2.5.1-exiv2-0.27{,.1}.patch -) - -pkg_pretend() { - if use cpu_flags_x86_sse2 ; then - append-flags -msse2 - else - eerror "This package requires a CPU supporting the SSE2 instruction set." - die "SSE2 support missing" - fi - - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_configure() { - local mycmakeargs=( - -DUSE_OPENMP="$(usex openmp)" - -DUSE_FITS="$(usex fits)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - for lang in ${LANGS} ; do - if ! use l10n_${lang} ; then - rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die - fi - done -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -}