From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31E7E138334 for ; Sun, 15 Sep 2019 22:23:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0037E08F3; Sun, 15 Sep 2019 22:23:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F7C4E08F3 for ; Sun, 15 Sep 2019 22:23:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E481C34B1F3 for ; Sun, 15 Sep 2019 22:23:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E2CC7EC for ; Sun, 15 Sep 2019 22:23:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1568586174.09e8558542be24aba424ef8427ab45f818ea8fac.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/files/, media-gfx/luminance-hdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/luminance-hdr/Manifest media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild X-VCS-Directories: media-gfx/luminance-hdr/files/ media-gfx/luminance-hdr/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 09e8558542be24aba424ef8427ab45f818ea8fac X-VCS-Branch: master Date: Sun, 15 Sep 2019 22:23:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 54795ecb-75fe-4c87-bcbc-1bb0b994adf1 X-Archives-Hash: 3c35467240ce8f6eb38f05382e285bde commit: 09e8558542be24aba424ef8427ab45f818ea8fac Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 15 21:27:23 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 15 22:22:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e85585 media-gfx/luminance-hdr: 2.6.0 version bump, EAPI-7 bump Closes: https://bugs.gentoo.org/688718 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/luminance-hdr/Manifest | 1 + .../files/luminance-hdr-2.6.0-cmake.patch | 22 ++++++ .../files/luminance-hdr-2.6.0-docs.patch | 15 ++++ .../files/luminance-hdr-2.6.0-no-git.patch | 15 ++++ media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild | 86 ++++++++++++++++++++++ 5 files changed, 139 insertions(+) diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest index 5a667dceda6..08af1d16280 100644 --- a/media-gfx/luminance-hdr/Manifest +++ b/media-gfx/luminance-hdr/Manifest @@ -1 +1,2 @@ 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.6.0-cmake.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch new file mode 100644 index 00000000000..5564ebadc95 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:53:19.496802424 +0200 +@@ -5,19 +5,6 @@ + CMAKE_POLICY(SET CMP0053 NEW) + PROJECT("Luminance HDR") + +-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE) +-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$") +- message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +-else() +- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n" +- "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel") +-endif() +- +-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$") +- message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT") +- add_definitions("-DQT_NO_DEBUG_OUTPUT") +-endif() +- + # assume built-in pthreads on MacOS + IF(APPLE) + enable_language(CXX) diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch new file mode 100644 index 00000000000..982c7ebfac2 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:43:41.005292354 +0200 +@@ -413,12 +413,6 @@ + INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon + INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.desktop DESTINATION share/applications) #desktop entry + INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.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/doc) #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.6.0-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch new file mode 100644 index 00000000000..95fc805e83f --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:41:24.684413834 +0200 +@@ -103,11 +103,7 @@ + set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES}) + endif() + +-FIND_PACKAGE(Git) +-IF(GIT_FOUND) +- include(GetGitRevisionDescription) +- get_git_head_revision(GIT_REFSPEC GIT_SHA1) +-ENDIF() ++SET(GIT_SHA1 "-- Gentoo build --") + + IF(WIN32) + diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild new file mode 100644 index 00000000000..e81c86dd57d --- /dev/null +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils + +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/${P/_/.}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cpu_flags_x86_sse2 fits openmp test" + +BDEPEND=" + dev-qt/linguist-tools:5 +" +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/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-gfx/exiv2:= + media-libs/ilmbase:= + media-libs/lcms:2 + media-libs/libpng:0= + media-libs/libraw:= + media-libs/openexr:= + media-libs/tiff:0 + sci-libs/fftw:3.0=[threads] + sci-libs/gsl:= + virtual/jpeg:0 + fits? ( sci-libs/cfitsio:= ) +" +DEPEND="${RDEPEND} + dev-cpp/eigen:3 + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${P}-cmake.patch + "${FILESDIR}"/${P}-no-git.patch + "${FILESDIR}"/${P}-docs.patch + "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.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=( + $(cmake-utils_use_find_package fits CFITSIO) + -DUSE_OPENMP="$(usex openmp)" + ) + cmake-utils_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +}