Use osdep/io.h, and make Meson partial dependency

Author: CrendKing

meson.build

@@ -772,11 +772,13 @@ if features['uchardet']
 endif
 
 vapoursynth = dependency('vapoursynth', version: '>= 56', required: get_option('vapoursynth'))
-vapoursynth_script = dependency('vapoursynth-script', version: '>= 56',
-                                required: get_option('vapoursynth'))
+vapoursynth_script = dependency('vapoursynth-script', version: '>= 56', required: get_option('vapoursynth'))
 features += {'vapoursynth': vapoursynth.found() and vapoursynth_script.found()}
 if features['vapoursynth']
-    dependencies += [vapoursynth, vapoursynth_script]
+    vapoursynth_headers = vapoursynth.partial_dependency(compile_args: true, includes: true)
+    vapoursynth_script_headers = vapoursynth_script.partial_dependency(compile_args: true, includes: true)
+
+    dependencies += [vapoursynth_headers, vapoursynth_script_headers]
     sources += files('video/filter/vf_vapoursynth.c')
 endif
 

video/filter/vf_vapoursynth.c

@@ -42,7 +42,7 @@
 #include "video/sws_utils.h"
 
 #ifdef _WIN32
-#include <Windows.h>
+#include "osdep/io.h"
 #else
 #include <dlfcn.h>
 #endif
@@ -809,57 +809,56 @@ static const m_option_t vf_opts_fields[] = {
 
 static int drv_vss_init(struct priv *p)
 {
-    typedef VS_CC const VSSCRIPTAPI *(*getVSScriptAPI_fn)(int);
-    typedef VS_CC const char *(*getVSScriptAPILastError_fn)(void);
-
-    getVSScriptAPI_fn getVSScriptAPI_func = NULL;
-    getVSScriptAPILastError_fn getVSScriptAPILastError_func = NULL;
+    const char *vsscript_path = getenv("VSSCRIPT_PATH");
+    const int dl_mode = RTLD_NOW | RTLD_LOCAL;
+    void *vsscript_lib = NULL;
 
 #ifdef _WIN32
-    const wchar_t *vsscript_path = _wgetenv(L"VSSCRIPT_PATH");
-    const HMODULE lib = LoadLibraryExW(vsscript_path ? vsscript_path : L"VSScript.dll", NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    if (lib) {
-        getVSScriptAPI_func = (getVSScriptAPI_fn) GetProcAddress(lib, "getVSScriptAPI");
-        getVSScriptAPILastError_func = (getVSScriptAPILastError_fn) GetProcAddress(lib, "getVSScriptAPILastError");
-    }
-#else
-
+    vsscript_lib = dlopen(vsscript_path ? vsscript_path : "VSScript.dll", dl_mode);
+#else // _WIN32
+    if (vsscript_path) {
+        vsscript_lib = dlopen(vsscript_path, dl_mode);
+    } else {
 #ifdef __APPLE__
     const char *lib_name_r74 = "libvsscript.4.dylib";
     const char *lib_name_old = "libvapoursynth-script.4.dylib";
-#else
+#else // __APPLE__
     const char *lib_name_r74 = "libvsscript.so.4";
     const char *lib_name_old = "libvapoursynth-script.so.4";
-#endif
+#endif // __APPLE__
 
-    const char *vsscript_path = getenv("VSSCRIPT_PATH");
-    const int dl_mode = RTLD_LAZY | RTLD_GLOBAL;
-    void *lib;
-
-    if (vsscript_path) {
-        lib = dlopen(vsscript_path, dl_mode);
-    } else {
-        lib = dlopen(lib_name_r74, dl_mode);
-        if (!lib) {
-            lib = dlopen(lib_name_old, dl_mode);
+        vsscript_lib = dlopen(lib_name_r74, dl_mode);
+        if (!vsscript_lib) {
+            vsscript_lib = dlopen(lib_name_old, dl_mode);
         }
     }
+#endif // _WIN32
+
+    typedef VS_CC const VSSCRIPTAPI *(*getVSScriptAPI_fn)(int);
+    typedef VS_CC const char *(*getVSScriptAPILastError_fn)(void);
+
+    getVSScriptAPI_fn getVSScriptAPI_func = NULL;
+    getVSScriptAPILastError_fn getVSScriptAPILastError_func = NULL;
 
-    if (lib) {
-        getVSScriptAPI_func = (getVSScriptAPI_fn) dlsym(lib, "getVSScriptAPI");
-        getVSScriptAPILastError_func = (getVSScriptAPILastError_fn) dlsym(lib, "getVSScriptAPILastError");
+    if (vsscript_lib) {
+        getVSScriptAPI_func = (getVSScriptAPI_fn) dlsym(vsscript_lib, "getVSScriptAPI");
+        getVSScriptAPILastError_func = (getVSScriptAPILastError_fn) dlsym(vsscript_lib, "getVSScriptAPILastError");
     }
-#endif
+
+    const char *unknown_error_msg = "Last error unknown";
 
     if (getVSScriptAPI_func) {
         p->vs_script_api = getVSScriptAPI_func(VSSCRIPT_API_VERSION);
         if (!p->vs_script_api) {
-            const char *last_error_msg = getVSScriptAPILastError_func ? getVSScriptAPILastError_func() : "Last error unknown";
+            const char *vs_error_msg = getVSScriptAPILastError_func ? getVSScriptAPILastError_func() : NULL;
+            const char *last_error_msg = vs_error_msg ? vs_error_msg : unknown_error_msg;
             MP_FATAL(p, "Failed to initialize VapourSynth VSScript library: %s\n", last_error_msg);
             return -1;
         }
     } else {
-        MP_FATAL(p, "Failed to load VapourSynth VSScript library\n");
+        const char *dl_error_msg = dlerror();
+        const char *last_error_msg = dl_error_msg ? dl_error_msg : unknown_error_msg;
+        MP_FATAL(p, "Failed to load VapourSynth VSScript library: %s\n", last_error_msg);
         return -1;
     }