public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/
Date: Thu, 17 Feb 2022 17:36:43 +0000 (UTC)	[thread overview]
Message-ID: <1645119366.16eed5e9bebcc5bc18b50fec839c9ae14f70a013.conikost@gentoo> (raw)

commit:     16eed5e9bebcc5bc18b50fec839c9ae14f70a013
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Feb 17 06:58:16 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 17:36:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16eed5e9

media-gfx/prusaslicer: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/24229
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/prusaslicer-2.4.0-openexr-3.patch        | 76 ----------------------
 1 file changed, 76 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-openexr-3.patch b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-openexr-3.patch
deleted file mode 100644
index cf22b66c7d69..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-openexr-3.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://src.fedoraproject.org/rpms/prusa-slicer/raw/rawhide/f/prusa-slicer-openexr3.patch
---- a/cmake/modules/FindOpenVDB.cmake
-+++ b/cmake/modules/FindOpenVDB.cmake
-@@ -326,28 +326,10 @@ macro(just_fail msg)
-   return()
- endmacro()
- 
--find_package(IlmBase QUIET COMPONENTS Half)
--if(NOT IlmBase_FOUND)
--  pkg_check_modules(IlmBase QUIET IlmBase)
--endif()
--if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
--  message(STATUS "Falling back to IlmBase found by pkg-config...")
--
--  find_library(IlmHalf_LIBRARY NAMES Half)
--  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
--    just_fail("IlmBase::Half can not be found!")
--  endif()
--  
--  add_library(IlmBase::Half UNKNOWN IMPORTED)
--  set_target_properties(IlmBase::Half PROPERTIES
--    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
--    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
--elseif(NOT IlmBase_FOUND)
--  just_fail("IlmBase::Half can not be found!")
--endif()
- find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
- find_package(ZLIB ${_quiet} ${_required})
- find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
-+find_package(Imath CONFIG)
- 
- # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
- # which we can query for optional deps. This basically runs ldd/otoll/objdump
-@@ -398,7 +380,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST})
-     set(OpenVDB_USES_LOG4CPLUS ON)
-   endif()
- 
--  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
-+  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
-   if(NOT ${_HAS_DEP} EQUAL -1)
-     set(OpenVDB_USES_ILM ON)
-   endif()
-@@ -429,11 +411,7 @@ if(OpenVDB_USES_LOG4CPLUS)
-   find_package(Log4cplus ${_quiet} ${_required})
- endif()
- 
--if(OpenVDB_USES_ILM)
--  find_package(IlmBase ${_quiet} ${_required})
--endif()
--
--if(OpenVDB_USES_EXR)
-+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
-   find_package(OpenEXR ${_quiet} ${_required})
- endif()
- 
-@@ -450,7 +428,7 @@ endif()
- set(_OPENVDB_VISIBLE_DEPENDENCIES
-   Boost::iostreams
-   Boost::system
--  IlmBase::Half
-+  Imath::Imath
- )
- 
- set(_OPENVDB_DEFINITIONS)
-@@ -460,10 +438,7 @@ endif()
- 
- if(OpenVDB_USES_EXR)
-   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
--    IlmBase::IlmThread
--    IlmBase::Iex
--    IlmBase::Imath
--    OpenEXR::IlmImf
-+    OpenEXR::OpenEXR
-   )
-   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
- endif()


             reply	other threads:[~2022-02-17 17:36 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-17 17:36 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-25 12:40 [gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/ Miroslav Šulc
2024-06-22  9:45 Miroslav Šulc
2023-02-23 21:03 Alfredo Tupone
2022-08-31 18:26 Dennis Lamm
2021-11-01 10:00 Dennis Lamm
2021-02-14 11:17 Dennis Lamm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1645119366.16eed5e9bebcc5bc18b50fec839c9ae14f70a013.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox