src/darwin/dirs.m

@@ -35,6 +35,7 @@
 #include <dlfcn.h>
 
 #include <Foundation/Foundation.h>
+#include <TargetConditionals.h>
 
 static bool config_isBundle()
 {
@@ -104,6 +105,13 @@ char *config_GetSysPath(vlc_sysdir_t type, const char *filename)
 
         case VLC_PKG_LIB_DIR:
             dir = config_getLibraryDirReal(PKGLIBDIR);
+            /* On iOS and tvOS, dylibs must be located in frameworks and
+             * frameworks must be flatten in the frameworks/ directory.
+             * To respect that, redirect plugins directory to flatten it. */
+#if TARGET_OS_IPHONE
+            if (filename && strcmp("plugins", filename) == 0)
+                return dir;
+#endif
             break;
         case VLC_LIB_DIR:
             dir = config_getLibraryDirReal(LIBDIR);

src/modules/bank.c

@@ -358,6 +358,56 @@ static int AllocatePluginFile (module_bank_t *bank, const char *abspath,
     return  0;
 }
 
+#ifdef __APPLE__
+/* Apple specific framework library browsing */
+
+static int AllocatePluginFramework (module_bank_t *bank, const char *file,
+                                    const char *relpath, const char *abspath)
+{
+    int i_ret = VLC_EGENERIC;
+    size_t len_name = strlen (file);
+
+    /* Skip frameworks not matching plugins naming conventions. */
+    if (len_name < sizeof "_plugin.framework"
+      || strncmp(file + len_name - sizeof "_plugin.framework" + 1,
+                 "_plugin", sizeof "_plugin" - 1) != 0)
+    {
+        /* The framework doesn't contain plugins, there's no need to
+         * browse the rest of the framework folder. */
+        return VLC_EGENERIC;
+    }
+
+    /* The framework is a plugin, extract the dylib from it. */
+    int filename_len = len_name - sizeof ".framework" - 1;
+
+    char *framework_relpath = NULL, *framework_abspath = NULL;
+    /* Compute absolute path */
+    if (asprintf (&framework_abspath, "%s"DIR_SEP"%.*s",
+                  abspath, filename_len, file) == -1)
+    {
+        framework_abspath = NULL;
+        goto end;
+    }
+
+    struct stat framework_st;
+    if (vlc_stat (framework_abspath, &framework_st) == -1
+     || !S_ISREG (framework_st.st_mode))
+        goto end;
+
+    if (asprintf (&framework_relpath, "%s"DIR_SEP"%.*s",
+                  relpath, filename_len, file) == -1)
+        framework_relpath = NULL;
+
+    i_ret = AllocatePluginFile (bank, framework_abspath, framework_relpath, &framework_st);
+
+end:
+    free(framework_relpath);
+    free(framework_abspath);
+    return i_ret;
+}
+#endif
+
+
 /**
  * Recursively browses a directory to look for plug-ins.
  */
@@ -426,8 +476,24 @@ static void AllocatePluginDir (module_bank_t *bank, unsigned maxdepth,
                 AllocatePluginFile (bank, abspath, relpath, &st);
         }
         else if (S_ISDIR (st.st_mode))
+        {
+#ifdef __APPLE__
+            size_t len_name = strlen (file);
+            const char *framework_extension =
+                file + len_name - sizeof ".framework" + 1;
+
+            if (len_name > sizeof ".framework" - 1
+             && strcmp(framework_extension, ".framework") == 0)
+            {
+                AllocatePluginFramework (bank, file, abspath, relpath);
+                /* Don't browse framework directories. */
+                goto skip;
+            }
+#endif
+
             /* Recurse into another directory */
             AllocatePluginDir (bank, maxdepth, abspath, relpath);
+        }
     skip:
         free (relpath);
         free (abspath);