Fix SLPlugin bundle needlessly linking in SDL2

Author: Rye

indra/cmake/PluginAPI.cmake

@@ -13,4 +13,6 @@ if (WINDOWS)
       )
 endif (WINDOWS)
 
+target_include_directories( ll::pluginlibraries INTERFACE ${CMAKE_SOURCE_DIR}/llimage ${CMAKE_SOURCE_DIR}/llrender)
+
 

indra/llplugin/CMakeLists.txt

@@ -35,6 +35,6 @@ list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
 
 add_library (llplugin ${llplugin_SOURCE_FILES})
 target_include_directories( llplugin  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries( llplugin llcommon llmath llrender llmessage )
+target_link_libraries( llplugin llcommon llmath llmessage llxml)
 add_subdirectory(slplugin)
 

indra/llplugin/llpluginclassmedia.h

@@ -29,7 +29,6 @@
 #ifndef LL_LLPLUGINCLASSMEDIA_H
 #define LL_LLPLUGINCLASSMEDIA_H
 
-#include "llgltypes.h"
 #include "llpluginprocessparent.h"
 #include "llrect.h"
 #include "llpluginclassmediaowner.h"
@@ -355,9 +354,9 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner
 
     bool        mTextureParamsReceived;     // the mRequestedTexture* fields are only valid when this is true
     S32         mRequestedTextureDepth;
-    LLGLenum    mRequestedTextureInternalFormat;
-    LLGLenum    mRequestedTextureFormat;
-    LLGLenum    mRequestedTextureType;
+    U32         mRequestedTextureInternalFormat;
+    U32         mRequestedTextureFormat;
+    U32         mRequestedTextureType;
     bool        mRequestedTextureSwapBytes;
     bool        mRequestedTextureCoordsOpenGL;
 

indra/media_plugins/base/CMakeLists.txt

@@ -27,5 +27,5 @@ add_library(media_plugin_base
     ${media_plugin_base_SOURCE_FILES}
         )
 
-target_link_libraries( media_plugin_base llplugin )
+target_link_libraries( media_plugin_base llplugin ll::pluginlibraries)
 target_include_directories( media_plugin_base  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})

indra/newview/viewer_manifest.py

@@ -1036,12 +1036,6 @@ def path_optional(src, dst):
                                 ):
                         dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
 
-                # SDL2
-                for libfile in (
-                            'libSDL2-2.0.dylib',
-                            ):
-                    dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
-
                 # our apps
                 executable_path = {}
                 embedded_apps = [ (os.path.join("llplugin", "slplugin"), "SLPlugin.app") ]