Ticket #46748: patch-vlc-for-macports.diff

modules/lua/vlc.c

@@ -234 +234 @@
             i++;
 
 #if defined(__APPLE__)
-        if( likely(asprintf( &ppsz_dir_list[i],
+        if( strcasestr (psz_datapath, "/share") == NULL
+            && likely(asprintf( &ppsz_dir_list[i],
                              "%s"DIR_SEP"share"DIR_SEP"lua"DIR_SEP"%s",
                              psz_datapath, luadirname ) != -1) )
             i++;
+        // When installed through MacPorts (or Fink, or HomeBrew, or...?) we do have
+        // meta/reader under LibDir/lua (/opt/local/lib/vlc/lua for MacPorts's standard install prefix)
+        // so we add that location at the end.
+        char *psz_libpath = config_GetLibDir();
+        if( likely(psz_libpath != NULL) )
+        {
+            if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
+                                 psz_libpath, luadirname ) != -1) )
+                i++;
+            free( psz_libpath );
+        }
 #endif
         free( psz_datapath );
     }

src/darwin/dirs.c

@@ -42 +42 @@
 # define MAXPATHLEN 1024
 #endif
 
+// this is set to true in config_GetLibDir() if it detects we're installed
+// in a (linux-specific) posix way.
+static int libDirIsPosix = FALSE;
+
+// 20150205: we should do case-insensitive filename comparisons. HFS is case-insensitive by default,
+// and while it strives to preserve case there is no guarantee that case folding will never occur,
+// especially in directory components.
+
 static char *config_GetLibPath (void)
 {
     /* Get the full program path and name */
@@ -49 +57 @@
     for (unsigned i = 0; i < _dyld_image_count(); i++)
     {
         const char *psz_img_name = _dyld_get_image_name(i);
-        const char *p = strstr( psz_img_name, "VLCKit.framework/Versions/" );
+        const char *p = strcasestr( psz_img_name, "VLCKit.framework/Versions/" );
 
         /* Check for "VLCKit.framework/Versions/Current/VLCKit",
          * as well as "VLCKit.framework/Versions/A/VLCKit" and
@@ -61 +69 @@
             p += strcspn( p, "/" );
 
             /* If the string ends with VLC then we've found a winner */
-            if ( !strcmp( p, "/VLCKit" ) )
+            if ( !strcasecmp( p, "/VLCKit" ) )
                 return strdup( psz_img_name );
         }
 
-        /* Do we end by "VLC"? If so we are the legacy VLC.app that doesn't
+        /* Do we end in "MacOS/VLC"? If so we are the legacy (?!) VLC.app that doesn't
          * link to VLCKit. */
         size_t len = strlen(psz_img_name);
-        if( len >= 3 && !strcmp( psz_img_name + len - 3, "VLC") )
+        if( len >= 9 && !strcasecmp( psz_img_name + len - 9, "MacOS/VLC") )
             return strdup( psz_img_name );
 
-        /* Do we end by "VLC-Plugin"? oh, we must be the NPAPI plugin */
-        if( len >= 10 && !strcmp( psz_img_name + len - 10, "VLC-Plugin") )
+        /* Do we end in "VLC-Plugin"? oh, we must be the NPAPI plugin */
+        if( len >= 10 && !strcasecmp( psz_img_name + len - 10, "VLC-Plugin") )
             return strdup( psz_img_name );
     }
 
-    /* We are not linked to the VLC.framework, let's use dladdr to figure
-     * libvlc path */
+    /* We are not linked to the VLC.framework, we'rebreak not VLC.app either,
+     * so let's use dladdr to figure the libvlc path */
     Dl_info info;
     if( dladdr(system_Init, &info) )
-        return strdup(dirname( info.dli_fname ));
+        return strdup(dirname( (char*)info.dli_fname ));
 
     char path[MAXPATHLEN+1];
     uint32_t path_len = sizeof(path) - 1;
@@ -99 +107 @@
         if (p != NULL)
         {
             *p = '\0';
+            p = strrchr (path, '.');
+            if (p == NULL || !strcasestr(p, ".app/Contents/MacOS"))
+            {
+                // we're NOT running an OS X style app bundle;
+                // return the Linux/POSIX style LibDir.
+                free(path);
+                path = strdup (PKGLIBDIR);
+                libDirIsPosix = TRUE;
+            }
+            else
+            {
+                libDirIsPosix = FALSE;
+            }
             return path;
         }
         free (path);
@@ -115 +136 @@
         return strdup (path);
 
     char *vlcpath = config_GetLibDir ();
-    char *datadir;
+    char *datadir = NULL;
 
+    if (libDirIsPosix)
+    {
+        // vlcpath should point to something like /opt/local/lib/vlc
+        // if so, we can chop off the /lib/vlc bit, and then add /share
+        // like we would otherwise.
+        char *p = strcasestr (vlcpath, "/lib/");
+        if (p != NULL)
+        {
+            *p = '\0';
+        }
+        else
+        {
+            // something else ... return PKGDATADIR
+            free(vlcpath);
+            datadir = strdup(PKGDATADIR);
+            return datadir;
+        }
+    }
     if (asprintf (&datadir, "%s/share", vlcpath) == -1)
         datadir = NULL;
 

src/interface/interface.c

@@ -113 +113 @@
     char *module;
     char *psz_tmp = config_ChainCreate( &module, &p_intf->p_cfg,
                                         psz_parser );
-    free( psz_tmp );
-    free( psz_parser );
+    if (psz_tmp)
+    {
+        free( psz_tmp );
+    }
+    if (psz_parser)
+    {
+        free( psz_parser );
+    }
     p_intf->p_module = module_need( p_intf, "interface", module, true );
     free(module);
     if( p_intf->p_module == NULL )