@@ -1,4 +1,15 @@

 -------------------------------------------------------------------

+Wed Oct 21 17:46:52 UTC 2015 - avvissu@yandex.ru

+

+- Update to 15.10:

+  * adds support of cubemaps in format 3:2 (two rows per 3 quad 

+    sides)

+  * adds button to activate 360 panorama view on toolbar

+  * adds Czech translation files

+  * adds option to automatically workaround aspect ratio of 

+    anamorphic 1080p and 720p videos

+

+-------------------------------------------------------------------

 Sat May 19 00:00:00 UTC 2015 - avvissu@yandex.ru

 - Initial package

​

@@ -16,9 +16,10 @@

 #

-%define src_ver 15_08

+%define src_ver 15_10

+%define src_name sView

 Name:           sview

-Version:        15.08

+Version:        15.10

 Release:        0

 Summary:        Stereoscopic media player

 License:        GPL-3.0+ and LGPL-3.0+

@@ -59,7 +60,7 @@

 %build

 sed -i '/^CXXFLAGS/s/$/\ %{optflags}/' Makefile

 # Remove %%_smp_mflags to avoid compilation errors

-make V=1 -j1 EXTRA_LDFLAGS="-Wl,-rpath,%{_libdir}/sView"

+make V=1 -j1 EXTRA_LDFLAGS="-Wl,-rpath,%{_libdir}/%{src_name}"

 %install

 %make_install USR_LIB=%{_lib}

@@ -71,15 +72,15 @@

 # It's not necessary

 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/%{name}.png

 # Use the installation in pixmaps

-rm -rf %{buildroot}%{_datadir}/sView/icons/menu.xpm

-install -Dm 0644 share/sView/icons/menu.xpm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm

+rm -rf %{buildroot}%{_datadir}/%{src_name}/icons/menu.xpm

+install -Dm 0644 share/%{src_name}/icons/menu.xpm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm

 # Libraries used by the app must be placed into subdirectory

-mv %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/sView

+mv %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/%{src_name}

 %fdupes -s %{buildroot}%{_datadir}

-%suse_update_desktop_file -r sViewIV Graphics Viewer

-%suse_update_desktop_file -r sViewMP AudioVideo Video Player

+%suse_update_desktop_file -r %{src_name}IV Graphics Viewer

+%suse_update_desktop_file -r %{src_name}MP AudioVideo Video Player

 %post

 %icon_theme_cache_post

@@ -92,12 +93,12 @@

 %files

 %defattr(-,root,root)

 %doc LICENSE license-gpl* license-lgpl*

-%{_bindir}/sView

-%{_libdir}/sView/

-%{_datadir}/applications/sViewIV.desktop

-%{_datadir}/applications/sViewMP.desktop

+%{_bindir}/%{src_name}

+%{_libdir}/%{src_name}/

+%{_datadir}/applications/%{src_name}IV.desktop

+%{_datadir}/applications/%{src_name}MP.desktop

 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

 %{_datadir}/pixmaps/%{name}.xpm

-%{_datadir}/sView/

+%{_datadir}/%{src_name}/

 %changelog

​

@@ -1,77 +0,0 @@

-/**

- * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>

- *

- * Distributed under the Boost Software License, Version 1.0.

- * See accompanying file license-boost.txt or copy at

- * http://www.boost.org/LICENSE_1_0.txt

- */

-

-#include <StGLWidgets/StGLImageFlatProgram.h>

-#include <StGL/StGLResources.h>

-#include <StFile/StRawFile.h>

-

-StGLImageFlatProgram::StGLImageFlatProgram()

-: StGLImageProgram("StGLImageFlatProgram") {

-    const char V_SHADER_FLAT[] =

-       "uniform mat4 uProjMat;\n"

-       "uniform mat4 uModelMat;\n"

-       "uniform vec4 uTexData;\n"

-       "uniform vec4 uTexUVData;\n"

-

-       "attribute vec4 vVertex;\n"

-       "attribute vec2 vTexCoord;\n"

-

-       "varying vec3 fTexCoord;\n"

-       "varying vec3 fTexUVCoord;\n"

-

-       "void main(void) {\n"

-       "    fTexCoord   = vec3(uTexData.xy   + vTexCoord * uTexData.zw,   0.0);\n"

-       "    fTexUVCoord = vec3(uTexUVData.xy + vTexCoord * uTexUVData.zw, 0.0);\n"

-       "    gl_Position = uProjMat * uModelMat * vVertex;\n"

-       "}\n";

-

-    const char V_SHADER_CUBEMAP[] =

-       "uniform mat4 uProjMat;\n"

-       "uniform mat4 uModelMat;\n"

-       "uniform vec4 uTexData;\n"

-       "uniform vec4 uTexUVData;\n"

-

-       "attribute vec4 vVertex;\n"

-       "attribute vec2 vTexCoord;\n"

-

-       "varying vec3 fTexCoord;\n"

-       "varying vec3 fTexUVCoord;\n"

-

-       "void main(void) {\n"

-       "    gl_Position = vec4(vVertex.x, vVertex.y, 0.0, 1.0);\n"

-       "    fTexCoord   = (uProjMat * gl_Position).xyz;"

-       "    fTexUVCoord = (uProjMat * gl_Position).xyz;"

-       "}\n";

-

-    const char F_SHADER_FLAT[] =

-       "varying vec3 fTexCoord;\n"

-       "varying vec3 fTexUVCoord;\n"

-        // we split these functions for two reasons:

-        // - to change function code (like color conversion);

-        // - to optimize rendering on old hardware not supported conditions (GeForce FX for example).

-       "vec4 getColor(in vec3 texCoord);\n"

-       "void convertToRGB(inout vec4 theColor, in vec3 theTexUVCoord);\n"

-       "void applyCorrection(inout vec4 theColor);\n"

-       "void applyGamma(inout vec4 theColor);\n"

-

-       "void main(void) {\n"

-            // extract color from main texture

-       "    vec4 aColor = getColor(fTexCoord);\n"

-            // convert from alien color model (like YUV) to RGB

-       "    convertToRGB(aColor, fTexUVCoord);\n"

-            // color processing (saturation, brightness, etc)

-       "    applyCorrection(aColor);\n"

-            // gamma correction

-       "    applyGamma(aColor);\n"

-       "    gl_FragColor = aColor;\n"

-       "}";

-

-    registerVertexShaderPart  (0, VertMain_Normal,  V_SHADER_FLAT);

-    registerVertexShaderPart  (0, VertMain_Cubemap, V_SHADER_CUBEMAP);

-    registerFragmentShaderPart(FragSection_Main, 0, F_SHADER_FLAT);

-}

​

@@ -1,92 +0,0 @@

-/**

- * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>

- *

- * Distributed under the Boost Software License, Version 1.0.

- * See accompanying file license-boost.txt or copy at

- * http://www.boost.org/LICENSE_1_0.txt

- */

-

-#include <StGLWidgets/StGLImageSphereProgram.h>

-

-#include <StGL/StGLResources.h>

-#include <StGLCore/StGLCore20.h>

-#include <StFile/StRawFile.h>

-

-#if defined(GL_ES_VERSION_2_0)

-    #define THE_UTEXT_DATA "uniform mediump vec4 uTexData;\n"

-#else

-    #define THE_UTEXT_DATA "uniform vec4 uTexData;\n"

-#endif

-

-StGLImageSphereProgram::StGLImageSphereProgram()

-: StGLImageProgram("StGLImageSphereProgram") {

-    const char V_SHADER[] =

-       "uniform mat4 uProjMat;\n"

-       "uniform mat4 uModelMat;\n"

-       "uniform vec4 uTexUVData;\n"

-       THE_UTEXT_DATA

-

-       "attribute vec4 vVertex;\n"

-       "attribute vec2 vTexCoord;\n"

-

-       "varying vec3 fTexCoord;\n"

-       "varying vec3 fTexUVCoord;\n"

-

-       "void main(void) {\n"

-       "    fTexCoord   = vec3(uTexData.xy   + vTexCoord * uTexData.zw,   0.0);\n"

-       "    fTexUVCoord = vec3(uTexUVData.xy + vTexCoord * uTexUVData.zw, 0.0);\n"

-       "    gl_Position = uProjMat * uModelMat * vVertex;\n"

-       "}\n";

-

-    const char F_SHADER[] =

-       "varying vec3 fTexCoord;\n"

-       "varying vec3 fTexUVCoord;\n"

-

-       "vec4 getColor(in vec3 texCoord);\n"

-       "void convertToRGB(inout vec4 color, in vec3 texUVCoord);\n"

-       "void applyGamma(inout vec4 color);\n"

-

-       "void main(void) {\n"

-       "    vec4 color = getColor(fTexCoord);\n"

-       "    convertToRGB(color, fTexUVCoord);\n"

-       "    applyGamma(color);\n"

-       "    gl_FragColor = color;\n"

-       "}\n\n";

-

-    const char F_SHADER_COLOR[] =

-       "uniform sampler2D uTexture;\n"

-       "uniform vec2 uTexSizePx;\n"

-       "uniform vec2 uTexelSize;\n"

-       THE_UTEXT_DATA

-

-       "vec4 getColor(in vec3 texCoord) {\n"

-       "    vec2 txCoord_CC = floor(uTexSizePx * texCoord.xy) / uTexSizePx;\n"

-       "    vec2 aDiff = (texCoord.xy - txCoord_CC) * uTexSizePx;\n"

-       "    if(txCoord_CC.y >= (uTexData.w - uTexelSize.y)) {\n"

-       "        aDiff.y = 0.0;\n"

-       "    }\n"

-       "    vec2 diffSign = sign(aDiff);\n"

-       "    vec2 diffAbs  = abs(aDiff);\n"

-       "    vec2 txCoord_R = txCoord_CC + diffSign * vec2(uTexelSize.x, 0.0);\n"

-       "    if(txCoord_R.x > (uTexData.z - uTexelSize.x)) {\n"

-       "        txCoord_R.x = uTexelSize.x;\n"

-       "    } else if(txCoord_R.x < uTexelSize.x) {\n"

-       "        txCoord_R.x = uTexData.z - uTexelSize.x;\n"

-       "    }\n"

-       "    vec4 color_CC = texture2D(uTexture, txCoord_CC);\n"

-       "    vec4 colorXX1 = mix(color_CC,\n"

-       "                        texture2D(uTexture,\n"

-       "                                  txCoord_R),\n"

-       "                        diffAbs.x);\n"

-       "    vec4 colorXX2 = mix(texture2D(uTexture,\n"

-       "                                  txCoord_CC + diffSign * vec2(0.0, uTexelSize.y)),\n"

-       "                        texture2D(uTexture,\n"

-       "                                  txCoord_R + diffSign * vec2(0.0, uTexelSize.y)),\n"

-       "                        diffAbs.x);\n"

-       "    return mix(colorXX1, colorXX2, diffAbs.y);\n"

-       "}\n\n";

-

-    registerVertexShaderPart  (0,                    VertMain_Normal, V_SHADER);

-    registerFragmentShaderPart(FragSection_Main,     0, F_SHADER);

-    registerFragmentShaderPart(FragSection_GetColor, FragGetColor_Blend, F_SHADER_COLOR);

-}

​

@@ -1,22 +0,0 @@

-/**

- * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>

- *

- * Distributed under the Boost Software License, Version 1.0.

- * See accompanying file license-boost.txt or copy at

- * http://www.boost.org/LICENSE_1_0.txt

- */

-

-#ifndef __StGLImageFlatProgram_h_

-#define __StGLImageFlatProgram_h_

-

-#include "StGLImageProgram.h"

-

-class StGLImageFlatProgram : public StGLImageProgram {

-

-        public:

-

-    ST_CPPEXPORT StGLImageFlatProgram();

-

-};

-

-#endif //__StGLImageFlatProgram_h_

​

@@ -1,22 +0,0 @@

-/**

- * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>

- *

- * Distributed under the Boost Software License, Version 1.0.

- * See accompanying file license-boost.txt or copy at

- * http://www.boost.org/LICENSE_1_0.txt

- */

-

-#ifndef __StGLImageSphereProgram_h_

-#define __StGLImageSphereProgram_h_

-

-#include "StGLImageProgram.h"

-

-class StGLImageSphereProgram : public StGLImageProgram {

-

-        public:

-

-    ST_CPPEXPORT StGLImageSphereProgram();

-

-};

-

-#endif //__StGLImageSphereProgram_h_

​

@@ -50,7 +50,6 @@

 #if defined(__SYMBIAN32__)

 #define NO_SSL // SSL is not supported

-#define NO_CGI // CGI is not supported

 #define PATH_MAX FILENAME_MAX

 #endif // __SYMBIAN32__

@@ -86,7 +85,6 @@

 #include <direct.h>

 #include <io.h>

 #else // _WIN32_WCE

-#define NO_CGI // WinCE has no pipes

 typedef long off_t;

@@ -190,7 +188,7 @@

 #ifndef HAS_POLL

 struct pollfd {

-  int fd;

+  intptr_t fd;

   short events;

   short revents;

 };

@@ -252,15 +250,8 @@

 #include "mongoose.h"

-#ifdef USE_LUA

-#include <lua.h>

-#include <lauxlib.h>

-#endif

-

 #define MONGOOSE_VERSION "3.7"

 #define PASSWORDS_FILE_NAME ".htpasswd"

-#define CGI_ENVIRONMENT_SIZE 4096

-#define MAX_CGI_ENVIR_VARS 64

 #define MG_BUF_LEN 8192

 #define MAX_REQUEST_SIZE 16384

 #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))

@@ -858,9 +849,10 @@

   return list;

 }

-static int match_prefix(const char *pattern, int pattern_len, const char *str) {

+static int match_prefix(const char *pattern, size_t pattern_len, const char *str) {

   const char *or_str;

-  int i, j, len, res;

+  int j, len, res;

+  size_t i;

   if ((or_str = (const char *) memchr(pattern, '|', pattern_len)) != NULL) {

     res = match_prefix(pattern, or_str - pattern, str);

@@ -868,7 +860,8 @@

         match_prefix(or_str + 1, (pattern + pattern_len) - (or_str + 1), str);

   }

-  i = j = 0;

+  j = 0;

+  i = 0;

   res = -1;

   for (; i < pattern_len; i++, j++) {

     if (pattern[i] == '?' && str[j] != '\0') {

@@ -1261,94 +1254,6 @@

   return LoadLibraryW(wbuf);

 }

-#if !defined(NO_CGI)

-#define SIGKILL 0

-static int kill(pid_t pid, int sig_num) {

-  (void) TerminateProcess(pid, sig_num);

-  (void) CloseHandle(pid);

-  return 0;

-}

-

-static void trim_trailing_whitespaces(char *s) {

-  char *e = s + strlen(s) - 1;

-  while (e > s && isspace(* (unsigned char *) e)) {

-    *e-- = '\0';

-  }

-}

-

-static pid_t spawn_process(struct mg_connection *conn, const char *prog,

-                           char *envblk, char *envp[], int fd_stdin,

-                           int fd_stdout, const char *dir) {

-  HANDLE me;

-  char *p, *interp, full_interp[PATH_MAX], full_dir[PATH_MAX],

-       cmdline[PATH_MAX], buf[PATH_MAX];

-  struct file file = STRUCT_FILE_INITIALIZER;

-  STARTUPINFOA si = { sizeof(si) };

-  PROCESS_INFORMATION pi = { 0 };

-

-  envp = NULL; // Unused

-

-  // TODO(lsm): redirect CGI errors to the error log file

-  si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;

-  si.wShowWindow = SW_HIDE;

-

-  me = GetCurrentProcess();

-  DuplicateHandle(me, (HANDLE) _get_osfhandle(fd_stdin), me,

-                  &si.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);

-  DuplicateHandle(me, (HANDLE) _get_osfhandle(fd_stdout), me,

-                  &si.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);

-

-  // If CGI file is a script, try to read the interpreter line

-  interp = conn->ctx->config[CGI_INTERPRETER];

-  if (interp == NULL) {

-    buf[0] = buf[1] = '\0';

-

-    // Read the first line of the script into the buffer

-    snprintf(cmdline, sizeof(cmdline), "%s%c%s", dir, '/', prog);

-    if (mg_fopen(conn, cmdline, "r", &file)) {

-      p = (char *) file.membuf;

-      mg_fgets(buf, sizeof(buf), &file, &p);

-      mg_fclose(&file);

-      buf[sizeof(buf) - 1] = '\0';

-    }

-

-    if (buf[0] == '#' && buf[1] == '!') {

-      trim_trailing_whitespaces(buf + 2);

-    } else {

-      buf[2] = '\0';

-    }

-    interp = buf + 2;

-  }

-

-  if (interp[0] != '\0') {

-    GetFullPathNameA(interp, sizeof(full_interp), full_interp, NULL);

-    interp = full_interp;

-  }

-  GetFullPathNameA(dir, sizeof(full_dir), full_dir, NULL);

-

-  mg_snprintf(conn, cmdline, sizeof(cmdline), "%s%s%s\\%s",

-              interp, interp[0] == '\0' ? "" : " ", full_dir, prog);

-

-  DEBUG_TRACE(("Running [%s]", cmdline));

-  if (CreateProcessA(NULL, cmdline, NULL, NULL, TRUE,

-        CREATE_NEW_PROCESS_GROUP, envblk, NULL, &si, &pi) == 0) {

-    cry(conn, "%s: CreateProcess(%s): %d",

-        __func__, cmdline, ERRNO);

-    pi.hProcess = (pid_t) -1;

-  }

-

-  // Always close these to prevent handle leakage.

-  (void) close(fd_stdin);

-  (void) close(fd_stdout);

-

-  (void) CloseHandle(si.hStdOutput);

-  (void) CloseHandle(si.hStdInput);

-  (void) CloseHandle(pi.hThread);

-

-  return (pid_t) pi.hProcess;

-}

-#endif // !NO_CGI

-

 static int set_non_blocking_mode(SOCKET sock) {

   unsigned long on = 1;

   return ioctlsocket(sock, FIONBIO, &on);

@@ -1386,58 +1291,6 @@

   return pthread_create(&thread_id, &attr, func, param);

 }

-#ifndef NO_CGI

-static pid_t spawn_process(struct mg_connection *conn, const char *prog,

-                           char *envblk, char *envp[], int fd_stdin,

-                           int fd_stdout, const char *dir) {

-  pid_t pid;

-  const char *interp;

-

-  (void) envblk;

-

-  if ((pid = fork()) == -1) {

-    // Parent

-    send_http_error(conn, 500, http_500_error, "fork(): %s", strerror(ERRNO));

-  } else if (pid == 0) {

-    // Child

-    if (chdir(dir) != 0) {

-      cry(conn, "%s: chdir(%s): %s", __func__, dir, strerror(ERRNO));

-    } else if (dup2(fd_stdin, 0) == -1) {

-      cry(conn, "%s: dup2(%d, 0): %s", __func__, fd_stdin, strerror(ERRNO));

-    } else if (dup2(fd_stdout, 1) == -1) {

-      cry(conn, "%s: dup2(%d, 1): %s", __func__, fd_stdout, strerror(ERRNO));

-    } else {

-      (void) dup2(fd_stdout, 2);

-      (void) close(fd_stdin);

-      (void) close(fd_stdout);

-

-      // After exec, all signal handlers are restored to their default values,

-      // with one exception of SIGCHLD. According to POSIX.1-2001 and Linux's

-      // implementation, SIGCHLD's handler will leave unchanged after exec

-      // if it was set to be ignored. Restore it to default action.

-      signal(SIGCHLD, SIG_DFL);

-

-      interp = conn->ctx->config[CGI_INTERPRETER];

-      if (interp == NULL) {

-        (void) execle(prog, prog, NULL, envp);

-        cry(conn, "%s: execle(%s): %s", __func__, prog, strerror(ERRNO));

-      } else {

-        (void) execle(interp, interp, prog, NULL, envp);

-        cry(conn, "%s: execle(%s %s): %s", __func__, interp, prog,

-            strerror(ERRNO));

-      }

-    }

-    exit(EXIT_FAILURE);

-  }

-

-  // Parent. Close stdio descriptors

-  (void) close(fd_stdin);

-  (void) close(fd_stdout);

-

-  return pid;

-}

-#endif // !NO_CGI

-

 static int set_non_blocking_mode(SOCKET sock) {

   int flags;

@@ -1504,51 +1357,6 @@

   return conn->ctx->stop_flag ? -1 : nread;

 }

-int mg_read(struct mg_connection *conn, void *buf, size_t len) {

-  int n, buffered_len, nread;

-  const char *body;

-

-  nread = 0;

-  if (conn->consumed_content < conn->content_len) {

-    // Adjust number of bytes to read.

-    int64_t to_read = conn->content_len - conn->consumed_content;

-    if (to_read < (int64_t) len) {

-      len = (size_t) to_read;

-    }

-

-    // Return buffered data

-    body = conn->buf + conn->request_len + conn->consumed_content;

-    buffered_len = &conn->buf[conn->data_len] - body;

-    if (buffered_len > 0) {

-      if (len < (size_t) buffered_len) {

-        buffered_len = (int) len;

-      }

-      memcpy(buf, body, (size_t) buffered_len);

-      len -= buffered_len;

-      conn->consumed_content += buffered_len;

-      nread += buffered_len;

-      buf = (char *) buf + buffered_len;

-    }

-

-    // We have returned all buffered data. Read new data from the remote socket.

-    while (len > 0) {

-      n = pull(NULL, conn, (char *) buf, (int) len);

-      if (n < 0) {

-        nread = n;  // Propagate the error

-        break;

-      } else if (n == 0) {

-        break;  // No more data to read

-      } else {

-        buf = (char *) buf + n;

-        conn->consumed_content += n;

-        nread += n;

-        len -= n;

-      }

-    }

-  }

-  return nread;

-}

-

 int mg_write(struct mg_connection *conn, const void *buf, size_t len) {

   time_t now;

   int64_t n, total, allowed;

@@ -1697,7 +1505,7 @@

         assert(s >= p);

         // Decode variable into destination buffer

-        len = url_decode(p, (size_t)(s - p), dst, dst_len, 1);

+        len = url_decode(p, (int )(s - p), dst, (int )dst_len, 1);

         // Redirect error code from -1 to -2 (destination buffer too small).

         if (len == -1) {

@@ -1738,7 +1546,7 @@

           p--;

         }

         if ((size_t) (p - s) < dst_size) {

-          len = p - s;

+          len = (int )(p - s);

           mg_strlcpy(dst, s, (size_t) len + 1);

         } else {

           len = -2;

@@ -2343,7 +2151,7 @@

     *p = eof;

     return eof;

   } else if (filep->fp != NULL) {

-    return fgets(buf, size, filep->fp);

+    return fgets(buf, (int )size, filep->fp);

   } else {

     return NULL;

   }

@@ -2721,7 +2529,7 @@

       }

       // Read from file, exit the loop on error

-      if ((num_read = fread(buf, 1, (size_t) to_read, filep->fp)) <= 0) {

+      if ((num_read = (int )fread(buf, 1, (size_t) to_read, filep->fp)) <= 0) {

         break;

       }

@@ -2980,7 +2788,7 @@

     }

     body = conn->buf + conn->request_len + conn->consumed_content;

-    buffered_len = &conn->buf[conn->data_len] - body;

+    buffered_len = (int )(&conn->buf[conn->data_len] - body);

     assert(buffered_len >= 0);

     assert(conn->consumed_content == 0);

@@ -3018,325 +2826,19 @@

   return success;

 }

-#if !defined(NO_CGI)

-// This structure helps to create an environment for the spawned CGI program.

-// Environment is an array of "VARIABLE=VALUE\0" ASCIIZ strings,

-// last element must be NULL.

-// However, on Windows there is a requirement that all these VARIABLE=VALUE\0

-// strings must reside in a contiguous buffer. The end of the buffer is

-// marked by two '\0' characters.

-// We satisfy both worlds: we create an envp array (which is vars), all

-// entries are actually pointers inside buf.

-struct cgi_env_block {

-  struct mg_connection *conn;

-  char buf[CGI_ENVIRONMENT_SIZE]; // Environment buffer

-  int len; // Space taken

-  char *vars[MAX_CGI_ENVIR_VARS]; // char **envp

-  int nvars; // Number of variables

-};

-

-static char *addenv(struct cgi_env_block *block,

-                    PRINTF_FORMAT_STRING(const char *fmt), ...)

-  PRINTF_ARGS(2, 3);

-

-// Append VARIABLE=VALUE\0 string to the buffer, and add a respective

-// pointer into the vars array.

-static char *addenv(struct cgi_env_block *block, const char *fmt, ...) {

-  int n, space;

-  char *added;

-  va_list ap;

-

-  // Calculate how much space is left in the buffer

-  space = sizeof(block->buf) - block->len - 2;

-  assert(space >= 0);

-

-  // Make a pointer to the free space int the buffer

-  added = block->buf + block->len;

-

-  // Copy VARIABLE=VALUE\0 string into the free space

-  va_start(ap, fmt);

-  n = mg_vsnprintf(block->conn, added, (size_t) space, fmt, ap);

-  va_end(ap);

-

-  // Make sure we do not overflow buffer and the envp array

-  if (n > 0 && n + 1 < space &&

-      block->nvars < (int) ARRAY_SIZE(block->vars) - 2) {

-    // Append a pointer to the added string into the envp array

-    block->vars[block->nvars++] = added;

-    // Bump up used length counter. Include \0 terminator

-    block->len += n + 1;

-  } else {

-    cry(block->conn, "%s: CGI env buffer truncated for [%s]", __func__, fmt);

-  }

-

-  return added;

-}

-

-static void prepare_cgi_environment(struct mg_connection *conn,

-                                    const char *prog,

-                                    struct cgi_env_block *blk) {

-  const char *s, *slash;

-  struct vec var_vec;

-  char *p, src_addr[20];

-  int  i;

-

-  blk->len = blk->nvars = 0;

-  blk->conn = conn;

-  sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa);

-

-  addenv(blk, "SERVER_NAME=%s", conn->ctx->config[AUTHENTICATION_DOMAIN]);

-  addenv(blk, "SERVER_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);

-  addenv(blk, "DOCUMENT_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);

-

-  // Prepare the environment block

-  addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1");

-  addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1");

-  addenv(blk, "%s", "REDIRECT_STATUS=200"); // For PHP

-

-  // TODO(lsm): fix this for IPv6 case

-  addenv(blk, "SERVER_PORT=%d", ntohs(conn->client.lsa.sin.sin_port));

-

-  addenv(blk, "REQUEST_METHOD=%s", conn->request_info.request_method);

-  addenv(blk, "REMOTE_ADDR=%s", src_addr);

-  addenv(blk, "REMOTE_PORT=%d", conn->request_info.remote_port);

-  addenv(blk, "REQUEST_URI=%s", conn->request_info.uri);

-

-  // SCRIPT_NAME

-  assert(conn->request_info.uri[0] == '/');

-  slash = strrchr(conn->request_info.uri, '/');

-  if ((s = strrchr(prog, '/')) == NULL)

-    s = prog;

-  addenv(blk, "SCRIPT_NAME=%.*s%s", (int) (slash - conn->request_info.uri),

-         conn->request_info.uri, s);

-

-  addenv(blk, "SCRIPT_FILENAME=%s", prog);

-  addenv(blk, "PATH_TRANSLATED=%s", prog);

-  addenv(blk, "HTTPS=%s", conn->ssl == NULL ? "off" : "on");

-

-  if ((s = mg_get_header(conn, "Content-Type")) != NULL)

-    addenv(blk, "CONTENT_TYPE=%s", s);

-

-  if (conn->request_info.query_string != NULL)

-    addenv(blk, "QUERY_STRING=%s", conn->request_info.query_string);

-

-  if ((s = mg_get_header(conn, "Content-Length")) != NULL)

-    addenv(blk, "CONTENT_LENGTH=%s", s);

-

-  if ((s = getenv("PATH")) != NULL)

-    addenv(blk, "PATH=%s", s);

-

-  if (conn->path_info != NULL) {

-    addenv(blk, "PATH_INFO=%s", conn->path_info);

-  }

-

-#if defined(_WIN32)

-  if ((s = getenv("COMSPEC")) != NULL) {

-    addenv(blk, "COMSPEC=%s", s);

-  }

-  if ((s = getenv("SYSTEMROOT")) != NULL) {

-    addenv(blk, "SYSTEMROOT=%s", s);

-  }

-  if ((s = getenv("SystemDrive")) != NULL) {

-    addenv(blk, "SystemDrive=%s", s);

-  }

-#else

-  if ((s = getenv("LD_LIBRARY_PATH")) != NULL)

-    addenv(blk, "LD_LIBRARY_PATH=%s", s);

-#endif // _WIN32

-

-  if ((s = getenv("PERLLIB")) != NULL)

-    addenv(blk, "PERLLIB=%s", s);

-

-  if (conn->request_info.remote_user != NULL) {

-    addenv(blk, "REMOTE_USER=%s", conn->request_info.remote_user);

-    addenv(blk, "%s", "AUTH_TYPE=Digest");

-  }

-

-  // Add all headers as HTTP_* variables

-  for (i = 0; i < conn->request_info.num_headers; i++) {

-    p = addenv(blk, "HTTP_%s=%s",

-        conn->request_info.http_headers[i].name,

-        conn->request_info.http_headers[i].value);

-

-    // Convert variable name into uppercase, and change - to _

-    for (; *p != '=' && *p != '\0'; p++) {

-      if (*p == '-')

-        *p = '_';

-      *p = (char) toupper(* (unsigned char *) p);

-    }

-  }

-

-  // Add user-specified variables

-  s = conn->ctx->config[CGI_ENVIRONMENT];

-  while ((s = next_option(s, &var_vec, NULL)) != NULL) {

-    addenv(blk, "%.*s", (int) var_vec.len, var_vec.ptr);

-  }

-

-  blk->vars[blk->nvars++] = NULL;

-  blk->buf[blk->len++] = '\0';

-

-  assert(blk->nvars < (int) ARRAY_SIZE(blk->vars));

-  assert(blk->len > 0);

-  assert(blk->len < (int) sizeof(blk->buf));

-}

-

-static void handle_cgi_request(struct mg_connection *conn, const char *prog) {

-  int headers_len, data_len, i, fd_stdin[2], fd_stdout[2];

-  const char *status, *status_text;

-  char buf[16384], *pbuf, dir[PATH_MAX], *p;

-  struct mg_request_info ri;

-  struct cgi_env_block blk;

-  FILE *in, *out;

-  struct file fout = STRUCT_FILE_INITIALIZER;

-  pid_t pid;

-

-  prepare_cgi_environment(conn, prog, &blk);

-

-  // CGI must be executed in its own directory. 'dir' must point to the

-  // directory containing executable program, 'p' must point to the

-  // executable program name relative to 'dir'.

-  (void) mg_snprintf(conn, dir, sizeof(dir), "%s", prog);

-  if ((p = strrchr(dir, '/')) != NULL) {

-    *p++ = '\0';

-  } else {

-    dir[0] = '.', dir[1] = '\0';

-    p = (char *) prog;

-  }

-

-  pid = (pid_t) -1;

-  fd_stdin[0] = fd_stdin[1] = fd_stdout[0] = fd_stdout[1] = -1;

-  in = out = NULL;

-

-  if (pipe(fd_stdin) != 0 || pipe(fd_stdout) != 0) {

-    send_http_error(conn, 500, http_500_error,

-        "Cannot create CGI pipe: %s", strerror(ERRNO));

-    goto done;

-  }

-

-  pid = spawn_process(conn, p, blk.buf, blk.vars, fd_stdin[0], fd_stdout[1],

-                      dir);

-  // spawn_process() must close those!

-  // If we don't mark them as closed, close() attempt before

-  // return from this function throws an exception on Windows.

-  // Windows does not like when closed descriptor is closed again.

-  fd_stdin[0] = fd_stdout[1] = -1;

-

-  if (pid == (pid_t) -1) {

-    send_http_error(conn, 500, http_500_error,

-        "Cannot spawn CGI process [%s]: %s", prog, strerror(ERRNO));

-    goto done;

-  }

-

-  if ((in = fdopen(fd_stdin[1], "wb")) == NULL ||

-      (out = fdopen(fd_stdout[0], "rb")) == NULL) {

-    send_http_error(conn, 500, http_500_error,

-        "fopen: %s", strerror(ERRNO));

-    goto done;

-  }

-

-  setbuf(in, NULL);

-  setbuf(out, NULL);

-  fout.fp = out;

-

-  // Send POST data to the CGI process if needed

-  if (!strcmp(conn->request_info.request_method, "POST") &&

-      !forward_body_data(conn, in, INVALID_SOCKET, NULL)) {

-    goto done;

-  }

-

-  // Close so child gets an EOF.

-  fclose(in);

-  in = NULL;

-  fd_stdin[1] = -1;

-

-  // Now read CGI reply into a buffer. We need to set correct

-  // status code, thus we need to see all HTTP headers first.

-  // Do not send anything back to client, until we buffer in all

-  // HTTP headers.

-  data_len = 0;

-  headers_len = read_request(out, conn, buf, sizeof(buf), &data_len);

-  if (headers_len <= 0) {

-    send_http_error(conn, 500, http_500_error,

-                    "CGI program sent malformed or too big (>%u bytes) "

-                    "HTTP headers: [%.*s]",

-                    (unsigned) sizeof(buf), data_len, buf);

-    goto done;

-  }

-  pbuf = buf;

-  buf[headers_len - 1] = '\0';

-  parse_http_headers(&pbuf, &ri);

-

-  // Make up and send the status line

-  status_text = "OK";

-  if ((status = get_header(&ri, "Status")) != NULL) {

-    conn->status_code = atoi(status);

-    status_text = status;

-    while (isdigit(* (unsigned char *) status_text) || *status_text == ' ') {

-      status_text++;

-    }

-  } else if (get_header(&ri, "Location") != NULL) {

-    conn->status_code = 302;

-  } else {

-    conn->status_code = 200;

-  }

-  if (get_header(&ri, "Connection") != NULL &&

-      !mg_strcasecmp(get_header(&ri, "Connection"), "keep-alive")) {

-    conn->must_close = 1;

-  }

-  (void) mg_printf(conn, "HTTP/1.1 %d %s\r\n", conn->status_code,

-                   status_text);

-

-  // Send headers

-  for (i = 0; i < ri.num_headers; i++) {

-    mg_printf(conn, "%s: %s\r\n",

-              ri.http_headers[i].name, ri.http_headers[i].value);

-  }

-  mg_write(conn, "\r\n", 2);

-

-  // Send chunk of data that may have been read after the headers

-  conn->num_bytes_sent += mg_write(conn, buf + headers_len,

-                                   (size_t)(data_len - headers_len));

-

-  // Read the rest of CGI output and send to the client

-  send_file_data(conn, &fout, 0, INT64_MAX);

-

-done:

-  if (pid != (pid_t) -1) {

-    kill(pid, SIGKILL);

-  }

-  if (fd_stdin[0] != -1) {

-    close(fd_stdin[0]);

-  }

-  if (fd_stdout[1] != -1) {

-    close(fd_stdout[1]);

-  }

-

-  if (in != NULL) {

-    fclose(in);

-  } else if (fd_stdin[1] != -1) {

-    close(fd_stdin[1]);

-  }

-

-  if (out != NULL) {

-    fclose(out);

-  } else if (fd_stdout[0] != -1) {

-    close(fd_stdout[0]);

-  }

-}

-#endif // !NO_CGI

-

 // For a given PUT path, create all intermediate subdirectories

 // for given path. Return 0 if the path itself is a directory,

 // or -1 on error, 1 if OK.

 static int put_dir(struct mg_connection *conn, const char *path) {

   char buf[PATH_MAX];

   const char *s, *p;

+  size_t len;

   struct file file = STRUCT_FILE_INITIALIZER;

-  int len, res = 1;

+  int res = 1;

   for (s = p = path + 2; (p = strchr(s, '/')) != NULL; s = ++p) {

     len = p - path;

-    if (len >= (int) sizeof(buf)) {

+    if (len >= sizeof(buf)) {

       res = -1;

       break;

     }

@@ -3904,158 +3406,6 @@

   return ntohl(* (uint32_t *) &conn->client.rsa.sin.sin_addr);

 }

-#ifdef USE_LUA

-

-#ifdef _WIN32

-static void *mmap(void *addr, int64_t len, int prot, int flags, int fd,

-                  int offset) {

-  HANDLE fh = (HANDLE) _get_osfhandle(fd);

-  HANDLE mh = CreateFileMapping(fh, 0, PAGE_READONLY, 0, 0, 0);

-  void *p = MapViewOfFile(mh, FILE_MAP_READ, 0, 0, (size_t) len);

-  CloseHandle(fh);

-  CloseHandle(mh);

-  return p;

-}

-#define munmap(x, y)  UnmapViewOfFile(x)

-#define MAP_FAILED NULL

-#define MAP_PRIVATE 0

-#define PROT_READ 0

-#else

-#include <sys/mman.h>

-#endif

-

-static void lsp(struct mg_connection *conn, const char *p, int64_t len,

-                lua_State *L) {

-  int i, j, pos = 0;

-

-  for (i = 0; i < len; i++) {

-    if (p[i] == '<' && p[i + 1] == '?') {

-      for (j = i + 1; j < len ; j++) {

-        if (p[j] == '?' && p[j + 1] == '>') {

-          mg_write(conn, p + pos, i - pos);

-          if (luaL_loadbuffer(L, p + (i + 2), j - (i + 2), "") == LUA_OK) {

-            lua_pcall(L, 0, LUA_MULTRET, 0);

-          }

-          pos = j + 2;

-          i = pos - 1;

-          break;

-        }

-      }

-    }

-  }

-

-  if (i > pos) {

-    mg_write(conn, p + pos, i - pos);

-  }

-}

-

-static int lsp_mg_print(lua_State *L) {

-  int i, num_args;

-  const char *str;

-  size_t size;

-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));

-

-  num_args = lua_gettop(L);

-  for (i = 1; i <= num_args; i++) {

-    if (lua_isstring(L, i)) {

-      str = lua_tolstring(L, i, &size);

-      mg_write(conn, str, size);

-    }

-  }

-

-  return 0;

-}

-

-static int lsp_mg_read(lua_State *L) {

-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));

-  char buf[1024];

-  int len = mg_read(conn, buf, sizeof(buf));

-

-  lua_settop(L, 0);

-  lua_pushlstring(L, buf, len);

-

-  return 1;

-}

-

-static void reg_string(struct lua_State *L, const char *name, const char *val) {

-  lua_pushstring(L, name);

-  lua_pushstring(L, val);

-  lua_rawset(L, -3);

-}

-

-static void reg_int(struct lua_State *L, const char *name, int val) {

-  lua_pushstring(L, name);

-  lua_pushinteger(L, val);

-  lua_rawset(L, -3);

-}

-

-static void prepare_lua_environment(struct mg_connection *conn, lua_State *L) {

-  const struct mg_request_info *ri = mg_get_request_info(conn);

-  extern void luaL_openlibs(lua_State *);

-  int i;

-

-  luaL_openlibs(L);

-#ifdef USE_LUA_SQLITE3

-  { extern int luaopen_lsqlite3(lua_State *); luaopen_lsqlite3(L); }

-#endif

-

-  // Register "print" function which calls mg_write()

-  lua_pushlightuserdata(L, conn);

-  lua_pushcclosure(L, lsp_mg_print, 1);

-  lua_setglobal(L, "print");

-

-  // Register mg_read()

-  lua_pushlightuserdata(L, conn);

-  lua_pushcclosure(L, lsp_mg_read, 1);

-  lua_setglobal(L, "read");

-

-  // Export request_info

-  lua_newtable(L);

-  reg_string(L, "request_method", ri->request_method);

-  reg_string(L, "uri", ri->uri);

-  reg_string(L, "http_version", ri->http_version);

-  reg_string(L, "query_string", ri->query_string);

-  reg_int(L, "remote_ip", ri->remote_ip);

-  reg_int(L, "remote_port", ri->remote_port);

-  reg_int(L, "num_headers", ri->num_headers);

-  lua_pushstring(L, "http_headers");

-  lua_newtable(L);

-  for (i = 0; i < ri->num_headers; i++) {

-    reg_string(L, ri->http_headers[i].name, ri->http_headers[i].value);

-  }

-  lua_rawset(L, -3);

-  lua_setglobal(L, "request_info");

-}

-

-static void handle_lsp_request(struct mg_connection *conn, const char *path,

-                               struct file *filep) {

-  void *p = NULL;

-  lua_State *L = NULL;

-

-  if (!mg_stat(conn, path, filep) || !mg_fopen(conn, path, "r", filep)) {

-    send_http_error(conn, 404, "Not Found", "%s", "File not found");

-  } else if (filep->membuf == NULL &&

-             (p = mmap(NULL, (size_t) filep->size, PROT_READ, MAP_PRIVATE,

-                       fileno(filep->fp), 0)) == MAP_FAILED) {

-    send_http_error(conn, 500, http_500_error, "mmap(%s, %zu, %d): %s", path,

-                    (size_t) filep->size, fileno(filep->fp), strerror(errno));

-  } else if ((L = luaL_newstate()) == NULL) {

-    send_http_error(conn, 500, http_500_error, "%s", "luaL_newstate failed");

-  } else {

-    // We're not sending HTTP headers here, Lua page must do it.

-    prepare_lua_environment(conn, L);

-    if (conn->ctx->callbacks.init_lua != NULL) {

-      conn->ctx->callbacks.init_lua(conn, L);

-    }

-    lsp(conn, filep->membuf == NULL ? p : filep->membuf, filep->size, L);

-  }

-

-  if (L) lua_close(L);

-  if (p) munmap(p, filep->size);

-  mg_fclose(filep);

-}

-#endif // USE_LUA

-

 static int is_put_or_delete_request(const struct mg_connection *conn) {

   const char *s = conn->request_info.request_method;

   return s != NULL && (!strcmp(s, "PUT") || !strcmp(s, "DELETE"));

@@ -4151,23 +3501,6 @@

       send_http_error(conn, 403, "Directory Listing Denied",

           "Directory listing denied");

     }

-#ifdef USE_LUA

-  } else if (match_prefix("**.lp$", 6, path) > 0) {

-    handle_lsp_request(conn, path, &file);

-#endif

-#if !defined(NO_CGI)

-  } else if (match_prefix(conn->ctx->config[CGI_EXTENSIONS],

-                          strlen(conn->ctx->config[CGI_EXTENSIONS]),

-                          path) > 0) {

-    if (strcmp(ri->request_method, "POST") &&

-        strcmp(ri->request_method, "HEAD") &&

-        strcmp(ri->request_method, "GET")) {

-      send_http_error(conn, 501, "Not Implemented",

-                      "Method %s is not implemented", ri->request_method);

-    } else {

-      handle_cgi_request(conn, path);

-    }

-#endif // !NO_CGI

   } else if (match_prefix(conn->ctx->config[SSI_EXTENSIONS],

                           strlen(conn->ctx->config[SSI_EXTENSIONS]),

                           path) > 0) {

​

@@ -65,8 +65,6 @@

   int  (*websocket_data)(struct mg_connection *);

   const char * (*open_file)(const struct mg_connection *,

                              const char *path, size_t *data_len);

-  void (*init_lua)(struct mg_connection *, void *lua_context);

-  void (*upload)(struct mg_connection *, const char *file_name);

 };

 // Start web server.

@@ -182,11 +180,6 @@

 // Send contents of the entire file together with HTTP headers.

 void mg_send_file(struct mg_connection *conn, const char *path);

-

-// Read data from the remote end, return number of bytes read.

-int mg_read(struct mg_connection *, void *buf, size_t len);

-

-

 // Get the value of particular HTTP header.

 //

 // This is a helper function. It traverses request_info->http_headers array,

​

@@ -86,6 +86,12 @@

 clean:     clean_StShared clean_StGLWidgets clean_StCore clean_sView clean_StOutAnaglyph clean_StOutDual clean_StOutInterlace clean_StOutPageFlip clean_StOutIZ3D clean_StOutDistorted clean_StImageViewer clean_StMoviePlayer clean_StDiagnostics clean_StCADViewer clean_sViewAndroid

 distclean: clean

+ifdef ANDROID_NDK

+outputs_all: $(aStOutAnaglyph) $(aStOutInterlace) $(aStOutDistorted)

+else

+outputs_all: $(aStOutAnaglyph) $(aStOutDual) $(aStOutInterlace) $(aStOutPageFlip) $(aStOutIZ3D) $(aStOutDistorted)

+endif

+

 install:

    mkdir -p $(DESTDIR)/usr/bin

    mkdir -p $(DESTDIR)/usr/$(USR_LIB)/sView

@@ -115,6 +121,7 @@

    mkdir -p sview/assets/lang/French

    mkdir -p sview/assets/lang/English

    mkdir -p sview/assets/lang/Russian

+   mkdir -p sview/assets/lang/Czech

    mkdir -p sview/assets/shaders

    mkdir -p sview/assets/textures

    ln --force --symbolic ../../../$(BUILD_ROOT)/$(aStShared)       sview/libs/armeabi-v7a/$(aStShared)

@@ -130,6 +137,7 @@

    cp -f -r $(BUILD_ROOT)/lang/français/* sview/assets/lang/French/

    cp -f -r $(BUILD_ROOT)/lang/English/*  sview/assets/lang/English/

    cp -f -r $(BUILD_ROOT)/lang/русский/*  sview/assets/lang/Russian/

+   cp -f -r $(BUILD_ROOT)/lang/Czech/*    sview/assets/lang/Czech/

    cp -f -r $(BUILD_ROOT)/shaders/*       sview/assets/shaders/

    cp -f -r $(BUILD_ROOT)/textures/*      sview/assets/textures/

    cp -f    license-gpl-3.0.txt           sview/assets/info/license.txt

@@ -139,6 +147,7 @@

    mkdir -p $(BUILD_ROOT)/lang/русский

    mkdir -p $(BUILD_ROOT)/lang/français

    mkdir -p $(BUILD_ROOT)/lang/Deutsch

+   mkdir -p $(BUILD_ROOT)/lang/Czech

    mkdir -p $(BUILD_ROOT)/textures

    mkdir -p $(BUILD_ROOT)/web

    mkdir -p sview/libs/armeabi-v7a

@@ -158,10 +167,10 @@

 aStGLWidgets_SRCS := $(wildcard StGLWidgets/*.cpp)

 aStGLWidgets_OBJS := ${aStGLWidgets_SRCS:.cpp=.o}

 aStGLWidgets_LIB  := $(LIB) -lStShared $(LIB_GLX)

-$(aStGLWidgets) : pre_StGLWidgets $(aStGLWidgets_OBJS)

+$(aStGLWidgets) : pre_StGLWidgets $(aStShared) $(aStGLWidgets_OBJS)

    $(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStGLWidgets_OBJS) $(aStGLWidgets_LIB) -o $(BUILD_ROOT)/$(aStGLWidgets)

 pre_StGLWidgets:

-   

+

 clean_StGLWidgets:

    rm -f $(BUILD_ROOT)/$(aStGLWidgets)

    rm -rf StGLWidgets/*.o

@@ -170,7 +179,7 @@

 aStCore_SRCS := $(wildcard StCore/*.cpp)

 aStCore_OBJS := ${aStCore_SRCS:.cpp=.o}

 aStCore_LIB  := $(LIB) -lStShared $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD) $(LIB_XLIB) $(LIB_ANDROID)

-$(aStCore) : $(aStCore_OBJS)

+$(aStCore) : $(aStShared) $(aStCore_OBJS)

    $(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStCore_OBJS) $(aStCore_LIB) -o $(BUILD_ROOT)/$(aStCore)

 clean_StCore:

    rm -f $(BUILD_ROOT)/$(aStCore)

@@ -180,7 +189,7 @@

 aStOutAnaglyph_SRCS := $(wildcard StOutAnaglyph/*.cpp)

 aStOutAnaglyph_OBJS := ${aStOutAnaglyph_SRCS:.cpp=.o}

 aStOutAnaglyph_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)

-$(aStOutAnaglyph) : pre_StOutAnaglyph $(aStOutAnaglyph_OBJS)

+$(aStOutAnaglyph) : pre_StOutAnaglyph $(aStCore) $(aStOutAnaglyph_OBJS)

    $(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutAnaglyph_OBJS) $(aStOutAnaglyph_LIB) -o $(BUILD_ROOT)/$(aStOutAnaglyph)

 pre_StOutAnaglyph:

    mkdir -p $(BUILD_ROOT)/shaders/StOutAnaglyph/

@@ -189,6 +198,7 @@

    cp -f -r StOutAnaglyph/lang/russian/* $(BUILD_ROOT)/lang/русский/

    cp -f -r StOutAnaglyph/lang/french/*  $(BUILD_ROOT)/lang/français/

    cp -f -r StOutAnaglyph/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/

+   cp -f -r StOutAnaglyph/lang/czech/*   $(BUILD_ROOT)/lang/Czech/

 clean_StOutAnaglyph:

    rm -f $(BUILD_ROOT)/$(aStOutAnaglyph)

    rm -rf StOutAnaglyph/*.o

@@ -199,13 +209,14 @@

 aStOutDual_SRCS := $(wildcard StOutDual/*.cpp)

 aStOutDual_OBJS := ${aStOutDual_SRCS:.cpp=.o}

 aStOutDual_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)

-$(aStOutDual) : pre_StOutDual $(aStOutDual_OBJS)

+$(aStOutDual) : pre_StOutDual $(aStCore) $(aStOutDual_OBJS)

    $(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutDual_OBJS) $(aStOutDual_LIB) -o $(BUILD_ROOT)/$(aStOutDual)

 pre_StOutDual:

    cp -f -r StOutDual/lang/english/* $(BUILD_ROOT)/lang/English/

    cp -f -r StOutDual/lang/russian/* $(BUILD_ROOT)/lang/русский/

    cp -f -r StOutDual/lang/french/*  $(BUILD_ROOT)/lang/français/

    cp -f -r StOutDual/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/

+   cp -f -r StOutDual/lang/czech/*   $(BUILD_ROOT)/lang/Czech/

 clean_StOutDual:

    rm -f $(BUILD_ROOT)/$(aStOutDual)

    rm -rf StOutDual/*.o

@@ -215,7 +226,7 @@

 aStOutIZ3D_SRCS := $(wildcard StOutIZ3D/*.cpp)

 aStOutIZ3D_OBJS := ${aStOutIZ3D_SRCS:.cpp=.o}

 aStOutIZ3D_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)

-$(aStOutIZ3D) : pre_StOutIZ3D $(aStOutIZ3D_OBJS)

+$(aStOutIZ3D) : pre_StOutIZ3D $(aStCore) $(aStOutIZ3D_OBJS)

    $(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutIZ3D_OBJS) $(aStOutIZ3D_LIB) -o $(BUILD_ROOT)/$(aStOutIZ3D)

 pre_StOutIZ3D:

    mkdir -p $(BUILD_ROOT)/shaders/StOutIZ3D/

@@ -224,6 +235,7 @@

    cp -f -r StOutIZ3D/lang/russian/* $(BUILD_ROOT)/lang/русский/

    cp -f -r StOutIZ3D/lang/french/*  $(BUILD_ROOT)/lang/français/

    cp -f -r StOutIZ3D/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/

+   cp -f -r StOutIZ3D/lang/czech/*   $(BUILD_ROOT)/lang/Czech/

 clean_StOutIZ3D:

    rm -f $(BUILD_ROOT)/$(aStOutIZ3D)

    rm -rf StOutIZ3D/*.o

@@ -234,7 +246,7 @@

 aStOutInterlace_SRCS := $(wildcard StOutInterlace/*.cpp)

 aStOutInterlace_OBJS := ${aStOutInterlace_SRCS:.cpp=.o}

 aStOutInterlace_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)

-$(aStOutInterlace) : pre_StOutInterlace $(aStOutInterlace_OBJS)

+$(aStOutInterlace) : pre_StOutInterlace $(aStCore) $(aStOutInterlace_OBJS)

    $(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutInterlace_OBJS) $(aStOutInterlace_LIB) -o $(BUILD_ROOT)/$(aStOutInterlace)

 pre_StOutInterlace:

    mkdir -p $(BUILD_ROOT)/shaders/StOutInterlace/

@@ -243,6 +255,7 @@

    cp -f -r StOutInterlace/lang/russian/* $(BUILD_ROOT)/lang/русский/

    cp -f -r StOutInterlace/lang/french/*  $(BUILD_ROOT)/lang/français/

    cp -f -r StOutInterlace/lang/german/*  $(BUILD_ROOT)/lang/Deutsch/

+   cp -f -r StOutInterlace/lang/czech/*   $(BUILD_ROOT)/lang/Czech/

 clean_StOutInterlace:

    rm -f $(BUILD_ROOT)/$(aStOutInterlace)

    rm -rf StOutInterlace/*.o

@@ -253,13 +266,14 @@

 aStOutPageFlip_SRCS := $(wildcard StOutPageFlip/*.cpp)

 aStOutPageFlip_OBJS := ${aStOutPageFlip_SRCS:.cpp=.o}

 aStOutPageFlip_LIB  := $(LIB) -lStShared -lStCore $(LIB_GLX) $(LIB_GTK) $(LIB_PTHREAD)

-$(aStOutPageFlip) : pre_StOutPageFlip $(aStOutPageFlip_OBJS)

+$(aStOutPageFlip) : pre_StOutPageFlip $(aStCore) $(aStOutPageFlip_OBJS)

    $(LD) -shared $(LDFLAGS) $(LIBDIR) $(aStOutPageFlip_OBJS) $(aStOutPageFlip_LIB) -o $(BUILD_ROOT)/$(aStOutPageFlip)

 pre_StOutPageFlip: