From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C98AD1580E0 for ; Tue, 28 Jan 2025 16:11:32 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B4DDD3430A0 for ; Tue, 28 Jan 2025 16:11:32 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BA2561103B6; Tue, 28 Jan 2025 16:11:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id AC6CE1103B6 for ; Tue, 28 Jan 2025 16:11:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D3B9342FF1 for ; Tue, 28 Jan 2025 16:11:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D214EC7 for ; Tue, 28 Jan 2025 16:11:29 +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: <1738080622.00d418aa73e0ede09624503978a28dfc2a6d4dc0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/, media-gfx/luminance-hdr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.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: 00d418aa73e0ede09624503978a28dfc2a6d4dc0 X-VCS-Branch: master Date: Tue, 28 Jan 2025 16:11:29 +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: a1753590-72fa-4f8a-8e85-60570c18f7e6 X-Archives-Hash: 74cd61056b806fe2e43f4cdb25e1d7d1 commit: 00d418aa73e0ede09624503978a28dfc2a6d4dc0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 27 23:26:17 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 28 16:10:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d418aa media-gfx/luminance-hdr: drop 2.6.1.1-r1 Closes: https://bugs.gentoo.org/926664 Signed-off-by: Andreas Sturmlechner gentoo.org> .../luminance-hdr-2.5.1-openmp-automagic.patch | 32 ------- .../luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild | 103 --------------------- 2 files changed, 135 deletions(-) diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch deleted file mode 100644 index f0399d271a59..000000000000 --- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake -index f55c130..81e1916 100644 ---- a/build_files/Modules/CompilerSettings.cmake -+++ b/build_files/Modules/CompilerSettings.cmake -@@ -45,16 +45,19 @@ else() - message(WARNING "Your C++ compiler does not support C++11.") - endif() - #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_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) -- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) -- MESSAGE(STATUS "GCC >= 4.3") -+OPTION(USE_OPENMP "Use openmp threading support." ON) -+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_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE 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() diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild deleted file mode 100644 index 31a315e6724e..000000000000 --- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake 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="https://downloads.sourceforge.net/qtpfsgui/${P/_/.}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="cpu_flags_x86_sse2 fits openmp test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:= - 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/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libraw:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sci-libs/fftw:3.0=[threads] - sci-libs/gsl:= - fits? ( sci-libs/cfitsio:= ) -" -DEPEND="${RDEPEND} - dev-cpp/eigen:3 - test? ( dev-cpp/gtest ) -" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}"/${P}-openexr3.patch - "${FILESDIR}"/${P}-fixheaders.patch - "${FILESDIR}"/${PN}-2.6.0-cmake.patch - "${FILESDIR}"/${PN}-2.6.0-no-git.patch - "${FILESDIR}"/${PN}-2.6.0-docs.patch - "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch - "${FILESDIR}"/${PN}-2.6.1.1-boost-1.85.patch - # patch by ArchLinux - "${FILESDIR}"/${P}-exiv2-0.28.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - 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 - - append-flags -std=c++17 - - local mycmakeargs=( - $(cmake_use_find_package fits CFITSIO) - -DUSE_OPENMP="$(usex openmp)" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - mkdir -p "${D}/usr/share/metainfo" || die - mv "${D}/usr/share/appdata/"* "${D}/usr/share/metainfo/" || die - rmdir "${D}/usr/share/appdata" || die -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -}