Linux: remove oidn hack

howetuft · Jan 14, 2025 · fb15a4c · fb15a4c
1 parent c673222
commit fb15a4c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 106 deletions.
diff --git a/deps/conan/oidn/conanfile.py b/deps/conan/oidn/conanfile.py
@@ -96,16 +96,6 @@ def generate(self):
         deps.generate()
 
     def build(self):
-        if self.settings.os == "Linux":
-            # Add a reserved tag in dynamically loaded library name
-            # We'll fill it later, with the hash generated by repairing
-            replace_in_file(
-                self,
-                Path(self.source_folder) / "oidn" / "core" / "module.cpp",
-                '".so"',
-                '"-reserved.so"',
-            )
-
         cmake = CMake(self)
         cmake.configure(cli_args=[], build_script_folder=Path(self.folders.source) / "oidn")
         cmake.build(cli_args=["--verbose", "--clean-first"])
@@ -129,7 +119,6 @@ def package_info(self):
             if self.settings.os == "Linux":
                 self.cpp_info.libs = [
                     "OpenImageDenoise",
-                    f"libOpenImageDenoise_device_cpu.so.{_oidn_version}",
                     f"libOpenImageDenoise_core.so.{_oidn_version}",
                 ]
             elif self.settings.os == "Windows":

diff --git a/scripts/recompose_wheel_linux.py b/scripts/recompose_wheel_linux.py