Major FFmpeg build improvements

 - Make build more compatible with a traditional linux environment.

Signed-off-by: Andrew Opalach <andrew@akon.city>

2 files changed, 8 insertions, 6 deletions

diff --git a/src/fruits/cmsrv/ui.c b/src/fruits/cmsrv/ui.c
index 4f1ece4..1dd5fa2 100644
--- a/src/fruits/cmsrv/ui.c
+++ b/src/fruits/cmsrv/ui.c
@@ -158,9 +158,11 @@ static void render_lists(struct cmsrv_ui *ui)
             if (resource->type == CAMU_RESOURCE_PORTAL) {
                 putnwstr_maxwidth_yx(n, y, x, max_width - x, &resource->post->title);
             } else {
+#endif
                 char *c_str = al_str_to_c_str(&entry->brief);
                 ncplane_putstr_yx(n, y, x, c_str);
                 al_free(c_str);
+#ifdef CAMU_HAVE_PORTAL
             }
 #endif
             if (++current_line >= max_height) break;
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 6875dd1..63e035d 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -49,9 +49,9 @@ static nn_thread_result NNWT_THREADCALL event_loop_thread(void *userdata)
 static bool parse_exe_name_params(str *exe_name, str *addr, struct lia_prefs *prefs)
 {
     u32 index = al_str_rfind(exe_name, '/');
-    if (index == AL_STR_NPOS) {
+    if (index == AL_STR_NO_POS) {
         index = al_str_rfind(exe_name, '\\');
-        if (index == AL_STR_NPOS) goto def;
+        if (index == AL_STR_NO_POS) goto def;
     }
 
     str sub = al_str_substr(exe_name, index + 1, exe_name->length);
@@ -62,19 +62,19 @@ static bool parse_exe_name_params(str *exe_name, str *addr, struct lia_prefs *pr
 
     // Skip version.
     index = al_str_find(&sub, '-');
-    if (index == AL_STR_NPOS) goto def;
+    if (index == AL_STR_NO_POS) goto def;
     sub = al_str_substr(&sub, index + 1, sub.length);
 
     index = al_str_find(&sub, '-');
-    if (index == AL_STR_NPOS) goto def;
+    if (index == AL_STR_NO_POS) goto def;
     *addr = al_str_substr(&sub, 0, index);
 
     for (;;) {
         sub = al_str_substr(&sub, index + 1, sub.length);
         index = al_str_find(&sub, '-');
-        if (index == AL_STR_NPOS) {
+        if (index == AL_STR_NO_POS) {
             index = al_str_find(&sub, '.');
-            if (index == AL_STR_NPOS) {
+            if (index == AL_STR_NO_POS) {
                 index = sub.length;
             } else {
                 sub.length = index;