Skip to content

Commit

Permalink
openimageio: drop patches for v2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Oct 31, 2023
1 parent 124a28d commit 51e78c2
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 437 deletions.
8 changes: 0 additions & 8 deletions recipes/openimageio/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,3 @@ sources:
"2.4.16.0":
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v2.4.16.0.tar.gz"
sha256: "a8cea8b6087610e5154fbbe028548ab4fc773eb36531eef44ffb42351bc0b0f0"
patches:
"2.4.16.0":
- patch_file: "patches/2.4.7.1-cmake-targets.patch"
patch_description: "Ensure project builds correctly with Conan (don't pick up disabled dependencies from the system, fix different spelling of libraries)"
patch_type: "conan"
- patch_file: "patches/2.4.7.1-fix-msvc2017.patch"
patch_description: "Fix compile error with MSVC 2017"
patch_type: "official"
4 changes: 1 addition & 3 deletions recipes/openimageio/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from conan.errors import ConanInvalidConfiguration
from conan.tools.build import check_min_cppstd
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir, replace_in_file
from conan.tools.files import copy, get, rmdir, replace_in_file
from conan.tools.microsoft import is_msvc_static_runtime

required_conan_version = ">=1.53.0"
Expand Down Expand Up @@ -68,7 +68,6 @@ class OpenImageIOConan(ConanFile):

def export_sources(self):
copy(self, "CMakeLists.txt", src=self.recipe_folder, dst=self.export_sources_folder)
export_conandata_patches(self)

def config_options(self):
if self.settings.os == "Windows":
Expand Down Expand Up @@ -198,7 +197,6 @@ def generate(self):
tc.generate()

def _patch_sources(self):
apply_conandata_patches(self)
# Disable custom Find*.cmake modules
rmdir(self, os.path.join(self.source_folder, "src", "cmake", "modules"))
# Fix root CMakeLists.txt not being the actual root
Expand Down
Loading

0 comments on commit 51e78c2

Please sign in to comment.