File osl-oslimageio-soname.patch of Package OpenShadingLanguage

Overview Repositories Revisions Requests Users Attributes Meta

File osl-oslimageio-soname.patch of Package OpenShadingLanguage (Revision a5606be5c4168514ae4ce6ae06e4ffc7)

Currently displaying revision a5606be5c4168514ae4ce6ae06e4ffc7 , Show latest

From: Dave Plater <davejplater@gmail.com>
Date: Fri 24 Apr 08:52:18 SAST 2020
Subject: input: reenable shared library build osl.imageio.so
Upstream: submitted

The build mistakes version 1.11 for > 2.1 and builds osl.imageio.so as
a plugin. This would mean relocating it to a plugin directory.Index: b/src/osl.imageio/CMakeLists.txt
===================================================================
--- a/src/osl.imageio/CMakeLists.txt	2020-03-24 07:33:42.000000000 +0200
+++ b/src/osl.imageio/CMakeLists.txt	2020-04-22 09:31:43.152642764 +0200
@@ -28,20 +28,16 @@ macro (add_oiio_plugin)
 
     # Get the name of the current directory and use it as the target name.
     get_filename_component (_plugin_name ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-    if (OPENIMAGEIO_VERSION VERSION_LESS 2.1)
         # Prior to OIIO 2.1, OIIO built plugin modules as shared libs rather
         # than "modules". On OSX, that changed its extension from ".dylib"
         # to ".so". If building against OIIO < 2.1, do it the old way.
         # This clause can disappear when OIIO 2.1 is the minimum that OSL
         # supports.
-        add_library (${_plugin_name} SHARED ${_plugin_UNPARSED_ARGUMENTS})
-        set_target_properties (${_plugin_name}
+    add_library (${_plugin_name} SHARED ${_plugin_UNPARSED_ARGUMENTS})
+    set_target_properties (${_plugin_name}
                                PROPERTIES
                                VERSION ${OSL_VERSION_MAJOR}.${OSL_VERSION_MINOR}.${OSL_VERSION_PATCH}
                                SOVERSION ${SOVERSION} )
-    else ()
-        add_library (${_plugin_name} MODULE ${_plugin_UNPARSED_ARGUMENTS})
-    endif ()
 
     target_compile_definitions (${_plugin_name} PRIVATE
                                 ${_plugin_DEFINITIONS})

Places

File osl-oslimageio-soname.patch of Package OpenShadingLanguage (Revision a5606be5c4168514ae4ce6ae06e4ffc7)

Places