@@ -1,4 +1,54 @@

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

+Tue Aug 24 12:45:46 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

+

+- Update to version 20.08

+  * Added support for Equiangular Cubemaps (EAC).

+  version 20.05:

+  * Added Spanish translation files.

+  * Image Viewer - added trilinear texture filtering option

+    generating mip-maps.

+  * Image Viewer - support 1x6 cubemap layout.

+  * Image Viewer - panorama is now automatically enabled for

+    JPEG files with GPano:ProjectionType tag.

+  * Image Viewer - panorama is now automatically enabled for

+    JPEG files with 360Stereo/360Mono tags (game screenshots).

+  * Image Viewer - support DDS-packed cubemaps.

+  * Movie Player - image-based subtitles size can be now

+    adjusted.

+  * Movie Player - workaround subtitles seeking issues for

+    attached SRT files.

+  * Movie Player - fixed ASS subtitles formatting issue on files

+    without closure tags.

+  * Movie Player - added handling of image-based subtitles

+    encoded as stereoscopic pair (side-by-side).

+  * Image Viewer - fixed poor quality on saving JPEG (yuv420p)

+    image into PNG (rgb).

+  * Image Viewer - fixed displaying WebP images with alpha

+    channel (yuva pixel formats).

+  * fontconfig library is now used to retrieve paths to system

+    fonts.

+  version 19.08:

+  * Introduced VR180 (hemisphere) and cylindrical panorama input

+    support.

+  * Image Viewer now redirects video file to Movie Player and

+    vice versa.

+  * Added single-finger swipe gesture for opening next/previous

+    file in playlist.

+  * FFmpeg 4.1 support.

+  * Fixed sporadic text formatting issues.

+  version 17.10:

+  * Image Viewer - added Slideshow delay parameter to Settings.

+  * Movie Player - added general information about the stream

+    (bitrate, codec, PAR, DAR) in File Info dialog.

+  * Movie Player - fixed seeking to the very beginning of the

+    file.

+  * Movie Player - fixed (workaround) displaying attached image

+    within some mp3 files.

+  * Fixed text rendering artifacts when using glyphs with

+    kerning defined.

+  * Fixed compilation on glibc 2.26+.

+

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

 Fri May  4 14:03:47 UTC 2018 - olaf@aepfle.de

 - Use ffmpeg3 versions of pkgconfig(libav*)

​

@@ -1,6 +1,7 @@

 #

 # spec file for package sview

 #

+# Copyright (c) 2021 Packman Team <packman@links2linux.de>

 # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.

 #

 # All modifications and additions to the file contributed by third parties

@@ -16,27 +17,27 @@

 #

-%define src_ver 17_04

+%define src_ver 20_08

 %define src_name sView

 %define ffmpeg_includedir %(pkg-config --variable=includedir libavcodec)

 Name:           sview

-Version:        17.04

+Version:        20.08

 Release:        0

 Summary:        Stereoscopic media player

-License:        GPL-3.0+ and LGPL-3.0+

+License:        GPL-3.0-or-later AND LGPL-3.0-or-later

 Group:          Productivity/Multimedia/Video/Players

-Url:            http://www.sview.ru/en/

+URL:            http://www.sview.ru/en/

 Source:         https://github.com/gkv311/sview/archive/%{src_ver}.tar.gz#/%{name}-%{src_ver}.tar.gz

 BuildRequires:  dos2unix

-BuildRequires:  gcc-c++

 BuildRequires:  fdupes

+BuildRequires:  gcc-c++

 BuildRequires:  hicolor-icon-theme

 BuildRequires:  make

 BuildRequires:  pkgconfig

 BuildRequires:  update-desktop-files

+BuildRequires:  pkgconfig(freetype2)

 BuildRequires:  pkgconfig(gl)

 BuildRequires:  pkgconfig(gtk+-2.0)

-BuildRequires:  pkgconfig(freetype2)

 BuildRequires:  pkgconfig(libavcodec) = 57.107.100

 BuildRequires:  pkgconfig(libavformat) = 57.83.100

 BuildRequires:  pkgconfig(libavutil) = 55.78.100

@@ -48,7 +49,6 @@

 Requires:       xdg-utils

 #Recommends:     mongoose

 ExclusiveArch:  %{ix86} x86_64

-BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description

 Stereoscopic Image Viewer and Movie Player.

@@ -66,7 +66,7 @@

     -e '/^CFLAGS/s/$/\ %{optflags}/' \

     -e '/^CXXFLAGS/s/$/\ %{optflags}/' \

     -i Makefile

-# Remove %%_smp_mflags to avoid compilation errors

+# Remove %%{?_smp_mflags} to avoid compilation errors

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

 %install

@@ -98,8 +98,7 @@

 %desktop_database_postun

 %files

-%defattr(-,root,root)

-%doc LICENSE*

+%license LICENSE*

 %{_bindir}/%{src_name}

 %{_libdir}/%{src_name}/

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

​

@@ -1,5 +1,6 @@

 *.o

 *.obj

+*.class

 *.a

 *.vcxproj.user

 sView.Cpp.Custom.props

@@ -32,6 +33,7 @@

 Doxygen/

 distribution/repository/

 distribution/temp/

+distribution/build-*

 3rdparty/atlmfc

 3rdparty/OCCT/inc/

 3rdparty/OCCT/lib/

​

@@ -25,6 +25,9 @@

 sudo: required

 dist: trusty

+# require Ubuntu 16.04 Xenial Xerus

+#dist: xenial

+

 addons:

   apt:

     packages:

@@ -41,10 +44,14 @@

       - libavformat-dev

       - libavutil-dev

       - libswscale-dev

+  homebrew:

+    packages:

+      - freetype

+      - ffmpeg

+    update: true

-before_install:

-  - if [[ "$MY_TARGET" == "osx" ]]; then brew update; fi

-  - if [[ "$MY_TARGET" == "osx" ]]; then brew install freetype ffmpeg; fi

+#before_install:

+#  - if [[ "$MY_TARGET" == "osx" ]]; then brew update; fi

 install: true

​

@@ -4,12 +4,13 @@

 echo "Usage: $0 [FFmpegPath] [GPL || LGPL] [DEBUG || RELEASE] [GCC_PREFIX]"

-rebuildTarget="FFmpeg"

-rebuildLicense="LGPL"

+rebuildTarget="ffmpeg.git"

+rebuildLicense="lgpl"

 rebuildDebug="false"

 rebuildAndroid="false"

 compilerPrefix=""

 androidTarget=""

+androidAbi="armeabi-v7a"

 androidNdkRoot="$HOME/develop/android-ndk-r12b"

 aSystem=`uname -s`

 aPwdBack=$PWD

@@ -17,9 +18,9 @@

 for i in $*

 do

   if [ "$i" == "gpl"       ] || [ "$i" == "GPL" ]; then

-    rebuildLicense="GPL"

+    rebuildLicense="gpl"

   elif [ "$i" == "lgpl"    ] || [ "$i" == "LGPL" ]; then

-    rebuildLicense="LGPL"

+    rebuildLicense="lgpl"

   elif [ "$i" == "android" ]; then

     rebuildAndroid="true"

   elif [ "$i" == "debug"   ] || [ "$i" == "DEBUG" ]; then

@@ -51,8 +52,10 @@

 if [ "$rebuildAndroid" == "true" ]; then

   if [ "$androidTarget" == "arm64" ]; then

     aPrefixShort="aarch64-linux-android"

+    androidAbi="arm64-v8a"

   else

     aPrefixShort="arm-linux-androideabi"

+    androidAbi="armeabi-v7a"

   fi

   compilerPrefix="${androidNdkRoot}/toolchains/${aPrefixShort}-4.8/prebuilt/linux-x86_64/bin/${aPrefixShort}-"

@@ -72,18 +75,19 @@

 echo "  Start building FFmpeg $rebuildLicense from $rebuildTarget"

 cd $rebuildTarget

-# releases extract the version number from the VERSION file

-ffmpegVersion=$(cat VERSION 2> /dev/null)

+# releases extract the version number from the RELEASE file

+ffmpegVersion=$(cat RELEASE 2> /dev/null)

 ffmpegRevision=$(git log -1 --pretty=format:%h 2> /dev/null)

 ffmpegDate=$(git show -s --format="%ci" 2> /dev/null)

 ffmpegDate=${ffmpegDate:0:10}

-test $ffmpegRevision && ffmpegRevision=git-$ffmpegRevision

+test $ffmpegRevision && ffmpegRevision=git-$ffmpegDate-$ffmpegRevision

 test $ffmpegVersion || ffmpegVersion=$ffmpegRevision

 # remove slashes

 rebuildTarget="${rebuildTarget//\//}"

-SOURCES_NAME="FFmpeg-$ffmpegDate-$ffmpegVersion"

-OUTPUT_NAME="$SOURCES_NAME-$gccMachine-$gccVersion-$rebuildLicense"

+SOURCES_NAME="ffmpeg-$ffmpegVersion"

+#OUTPUT_NAME="$SOURCES_NAME-$gccMachine-$gccVersion-$rebuildLicense"

+OUTPUT_NAME="$SOURCES_NAME-$gccMachine-$rebuildLicense"

 SOURCES_NAME="$SOURCES_NAME-src"

 if [ "$rebuildDebug" == "true" ]; then

   OUTPUT_NAME="$OUTPUT_NAME-debug"

@@ -97,9 +101,9 @@

   OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/Frameworks"

 fi

 if [ "$androidTarget" == "arm64" ]; then

-  OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/libs/arm64-v8a"

+  OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/libs/$androidAbi"

 elif [ "$androidTarget" == "arm" ]; then

-  OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/libs/armeabi-v7a"

+  OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/libs/$androidAbi"

 fi

 rm -f -r $OUTPUT_FOLDER

@@ -115,6 +119,12 @@

 mkdir -p $OUTPUT_FOLDER_INC/libswscale

 mkdir -p $OUTPUT_FOLDER_INC/libswresample

+# include some information about FFmpeg into archive

+echo \<pre\>> $OUTPUT_FOLDER/VERSION.html

+git status >> $OUTPUT_FOLDER/VERSION.html

+git log -n 100 >> $OUTPUT_FOLDER/VERSION.html

+echo \</pre\>>> $OUTPUT_FOLDER/VERSION.html

+

 echo "  make distclean"

 make distclean &>/dev/null

@@ -125,10 +135,17 @@

   then

     echo "Sources archive '$SOURCES_NAME.7z' already exists"

   else

+

+    if [ ! -f ../exclude.lst ]; then

+      echo -e ".svn\n.git\n" > ../exclude.lst

+    fi

     7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on ../$SOURCES_NAME.7z ../$rebuildTarget '-xr@../exclude.lst'

   fi

 fi

+# --extra-cflags parameters

+anExtraCFlags=

+

 #--enable-memalign-hack

 configArguments="\

  --extra-version=sView.ru \

@@ -138,7 +155,6 @@

  --enable-avfilter \

  --enable-hardcoded-tables \

  --enable-pthreads \

- --disable-libopenjpeg \

  --disable-doc \

  --enable-runtime-cpudetect"

@@ -147,6 +163,8 @@

   configArguments="$configArguments --enable-vda --libdir=@executable_path/../Frameworks"

 fi

+export PKG_CONFIG_LIBDIR=

+

 #if [ "$gccMachine" != "$GCC_MACHINE_LINUX_64" ]; then

 if [ "$gccMachine" == "$GCC_MACHINE_MINGW_32" ] || [ "$gccMachine" == "$GCC_MACHINE_MINGW_32_1" ] \

 || [ "$gccMachine" == "$GCC_MACHINE_MINGW_64" ] || [ "$gccMachine" == "$GCC_MACHINE_MINGW_64_1" ]; then

@@ -154,14 +172,19 @@

   # you should use with --enable-pthreads instead to enable full multithreading support!

   #configArguments="$configArguments --enable-w32threads"

   configArguments="$configArguments --disable-w32threads"

-  if [ "$rebuildLicense" == "GPL" ]; then

+  if [ "$rebuildLicense" == "gpl" ]; then

     configArguments="$configArguments --enable-avisynth"

   fi

+  aMingwRoot=${compilerPrefix::-1}

+  export PKG_CONFIG_LIBDIR=/usr/$aMingwRoot/share/pkgconfig

+

   configArguments="$configArguments --enable-libopenjpeg"

   # avoid dynamic linkage with libgcc_s_sjlj-1.dll

   configArguments="$configArguments --extra-ldflags=-static-libgcc"

+else

+  configArguments="$configArguments --disable-libopenjpeg"

 fi

 # cross-compiling options

@@ -169,19 +192,31 @@

   targetFlags="--cross-prefix=$compilerPrefix --arch=x86_32"

   configArguments="$configArguments --enable-cross-compile --target-os=mingw32 $targetFlags"

 elif [ "$gccMachine" == "$GCC_MACHINE_MINGW_64" ] || [ "$gccMachine" == "$GCC_MACHINE_MINGW_64_1" ]; then

+  anExtraCFlags="$anExtraCFlags -Dstrtod=__strtod"

   targetFlags="--cross-prefix=$compilerPrefix --arch=x86_64 --extra-cflags=-Dstrtod=__strtod"

   configArguments="$configArguments --enable-cross-compile --target-os=mingw32 $targetFlags"

 elif [ "$rebuildAndroid" == "true" ]; then

+  anAndArch=arm

+  anAndSysRoot=${androidNdkRoot}/platforms/android-15/arch-arm

   if [ "$androidTarget" == "arm64" ]; then

-    targetFlags="--cross-prefix=$compilerPrefix --sysroot=${androidNdkRoot}/platforms/android-21/arch-arm64 --arch=aarch64"

-  else

-    targetFlags="--cross-prefix=$compilerPrefix --sysroot=${androidNdkRoot}/platforms/android-15/arch-arm --arch=arm"

+    anAndArch=aarch64

+    anAndSysRoot=${androidNdkRoot}/platforms/android-21/arch-arm64

   fi

+  configArguments="$configArguments --enable-cross-compile --target-os=android --cross-prefix=$compilerPrefix --sysroot=${anAndSysRoot} --arch=${anAndArch}"

+  #if [ -x "${androidNdkRoot}/sysroot" ]; then

+    #configArguments="$configArguments --sysinclude=${androidNdkRoot}/sysroot/usr/include"

+  #fi

-  configArguments="$configArguments --enable-cross-compile --target-os=android $targetFlags"

-  #configArguments="$configArguments --extra-cflags='-fno-builtin-sin -fno-builtin-sinf'"

+  if [ "$androidTarget" == "arm64" ]; then

+    anExtraCFlags="$anExtraCFlags -march=armv8-a"

+  else

+    anExtraCFlags="$anExtraCFlags -march=armv7-a -mfloat-abi=softfp -fno-builtin-sin -fno-builtin-sinf"

+  fi

   configArguments="$configArguments --enable-jni --enable-mediacodec"

+

+  configArguments="$configArguments --enable-mbedtls --extra-ldflags=-L$aPwdBack/mbedtls-2.16.2-android/libs/$androidAbi"

+  anExtraCFlags="$anExtraCFlags -I$aPwdBack/mbedtls-2.16.2-android/include"

 fi

 # More options

@@ -200,7 +235,7 @@

 # enable (L)GPL version 3

 configArguments="$configArguments --enable-version3"

-if [ "$rebuildLicense" == "GPL" ]; then

+if [ "$rebuildLicense" == "gpl" ]; then

   configArguments="$configArguments --enable-gpl"

   # enable libx264 encoder (should be compiled and installed!)

   #configArguments="$configArguments --enable-libx264"

@@ -212,30 +247,28 @@

 set -o pipefail

 aNbJobs="$(getconf _NPROCESSORS_ONLN)"

+"$compilerPrefix"gcc --version > $OUTPUT_FOLDER/gccInfo-$gccMachine-$rebuildLicense.log

+

+# --extra-cflags should be passed as single dedicated argument

+anExtraCFlags="--extra-cflags=${anExtraCFlags}"

 echo

-echo "  ./configure $configArguments"

+echo "  ./configure $configArguments $anExtraCFlags"

 echo

 if [ "$rebuildAndroid" == "true" ]; then

-  if [ "$androidTarget" == "arm64" ]; then

-    ./configure $configArguments --disable-symver --extra-cflags='-march=armv8-a' 2>&1 | tee $OUTPUT_FOLDER/config.log

-  else

-    ./configure $configArguments --disable-symver --extra-cflags='-march=armv7-a -mfloat-abi=softfp -fno-builtin-sin -fno-builtin-sinf' 2>&1 | tee $OUTPUT_FOLDER/config.log

-  fi

+  ./configure $configArguments --disable-symver "$anExtraCFlags" 2>&1 | tee $OUTPUT_FOLDER/config-$gccMachine-$rebuildLicense.log

 else

-  ./configure $configArguments 2>&1 | tee -a $OUTPUT_FOLDER/config.log

+  ./configure $configArguments 2>&1 | tee -a $OUTPUT_FOLDER/config-$gccMachine-$rebuildLicense.log

 fi

 aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi

-make -j $aNbJobs 2>&1 | tee -a $OUTPUT_FOLDER/make.log

+make -j $aNbJobs 2>&1 | tee -a $OUTPUT_FOLDER/make-$gccMachine-$rebuildLicense.log

 aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi

 # Now copy result files

 echo

 echo "  Now copy result files into $OUTPUT_FOLDER"

-"$compilerPrefix"gcc --version > $OUTPUT_FOLDER/gccInfo.log

-

 if [ -f libavcodec/avcodec.dll ]; then

   cp -f libavcodec/*.dll $OUTPUT_FOLDER_BIN

   cp -f libavcodec/*.lib $OUTPUT_FOLDER_LIB &>/dev/null

​

@@ -23,6 +23,10 @@

   #ifndef _CRT_SECURE_NO_WARNINGS

     #define _CRT_SECURE_NO_WARNINGS

   #endif

+  #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS

+    // Warning C4996 'inet_ntoa': Use inet_ntop() or InetNtop() instead

+    #define _WINSOCK_DEPRECATED_NO_WARNINGS

+  #endif

 #else

 #ifdef __linux__

 #define _XOPEN_SOURCE 600     // For flockfile() on Linux

​

+(directory)

​

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

+@echo OFF

+

+rem Auxiliary script for semi-automated building of mbedtls (https://tls.mbed.org/) for Android platform.

+rem Script should be placed into root of mbedtls repository, edited with paths

+rem to CMake, 3rd-parties, Android NDK and MinGW64 make tool.

+

+rem CMake toolchain definition should be cloned from the following git repository:

+rem https://github.com/taka-no-me/android-cmake

+

+rem CMake can be downloaded from official site:

+rem https://cmake.org/download/

+

+rem Android NDK can be downloaded from offical site:

+rem https://developer.android.com/ndk/downloads

+

+rem x86 build is broken on old gcc due to https://github.com/ARMmbed/mbedtls/issues/1910

+rem include/mbedtls/bn_mul.h

+rem -#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(__ANDROID__)

+rem +#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(__ANDROID__)

+rem

+rem #define MULADDC_INIT

+

+set "anMbedTlsSrc=%~dp0"

+set aNbJobs=%NUMBER_OF_PROCESSORS%

+

+call c:\develop\MinGW\TDM-GCC-64\mingwvars.bat

+set "PATH=c:\develop\CMake\bin;%PATH%"

+set "anNdkPath=c:/develop/android/android-ndk-r12"

+set "aToolchain=c:/develop/android-cmake/android.toolchain.cmake"

+

+set "anInstDir=%~dp0work/mbedtls-android"

+if exist "%anInstDir%" ( rmdir /S /Q "%anInstDir%" )

+

+call :cmakeGenerate "15" "armeabi-v7a"

+call :cmakeGenerate "21" "arm64-v8a"

+call :cmakeGenerate "15" "x86"

+

+pause

+

+goto :eof

+

+:cmakeGenerate

+set "anApi=%1"

+set "anAbi=%2"

+set "aPlatformAndCompiler=android-%anAbi%-gcc"

+set "aWorkDir=work\%aPlatformAndCompiler%-make"

+set "aLogFile=%~dp0build-%anAbi%.log"

+if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" )

+if     exist "%aLogFile%" ( del   "%aLogFile%" )

+

+pushd "%aWorkDir%"

+

+echo Configuring mbedtls for Android %anAbi% (API level %anApi%)...

+cmake -G "MinGW Makefiles" ^

+ -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^

+ -D ANDROID_NDK:FILEPATH="%anNdkPath%" ^

+ -D CMAKE_BUILD_TYPE:STRING="Release" ^

+ -D ANDROID_ABI:STRING="%anAbi%" ^

+ -D ANDROID_NATIVE_API_LEVEL:STRING="%anApi%" ^

+ -D ANDROID_STL:STRING="gnustl_shared" ^

+ -D CMAKE_INSTALL_PREFIX:PATH="%anInstDir%" ^

+ -D LIBRARY_OUTPUT_PATH:PATH="%anInstDir%/libs/%anAbi%" ^

+ -D USE_SHARED_MBEDTLS_LIBRARY:BOOL="OFF" ^

+ -D USE_STATIC_MBEDTLS_LIBRARY:BOOL="ON" ^

+ -D ENABLE_TESTING:BOOL="OFF" ^

+ -D ENABLE_PROGRAMS:BOOL="OFF" ^

+ "%anMbedTlsSrc%"

+

+if errorlevel 1 (

+  popd

+  pause

+  exit /B

+  goto :eof

+)

+

+mingw32-make clean

+

+echo Building mbedtls...

+mingw32-make -j %aNbJobs% 2>> %aLogFile%

+type %aLogFile%

+if errorlevel 1 (

+  popd

+  pause

+  exit /B

+  goto :eof

+)

+echo Installing mbedtls into %~dp0work/%aPlatformAndCompiler%...

+mingw32-make install 2>> %aLogFile%

+if exist "%anInstDir%/lib" ( rmdir /S /Q "%anInstDir%/lib" )

+

+popd

+goto :eof

​

@@ -2,6 +2,8 @@

 WORKDIR = $(shell pwd)

 SRCDIR = $(WORKDIR)

+JAVA_HOME = /usr

+APP_PREFIX = /usr

 $(info SRCDIR=$(SRCDIR))

@@ -13,7 +15,17 @@

 .mm.o:

    $(CXX) -c $(CXXFLAGS) $< -o $@

+# Compile java files.

+# javac takes output folder, not file, and actually sometimes generates multiple files from single .java input.

+# To fool make (avoid recompiling on each build) - copy result .class file to source folder;

+# this, however, might lead to incomplete build on .java change without make clean.

+.SUFFIXES: .class .java

+.java.class:

+   $(JAVA_HOME)/bin/javac -source 1.7 -target 1.7 -d $(BUILD_ROOT)/java/classes -classpath $(ANDROID_PLATFORM) -sourcepath $(SRCDIR)/sview/src:$(BUILD_ROOT)/java/gen $<

+   cp -f $(BUILD_ROOT)/java/classes/com/sview/$(@F) $@

+

 TARGET_OS = linux

+TARGET_ARCH2 =

 #ANDROID_NDK = $(HOME)/develop/android-ndk-r12b

 ifeq ($(OS),Windows_NT)

@@ -25,6 +37,7 @@

 endif

 ifeq ($(UNAME_S),Darwin)

 TARGET_OS = osx

+TARGET_OS_VERSION = 10.10

 endif

 endif

@@ -40,12 +53,19 @@

 BUILD_ROOT = $(BUILD_ROOT_BUNDLE)/Contents/MacOS

 endif

+ST_DEBUG = 0

 FFMPEG_ROOT =

 FREETYPE_ROOT =

 OPENAL_ROOT =

 LIBCONFIG_ROOT =

 LIBSUBFOLDER = lib

 LIBSUFFIX = so

+ANDROID_BUILD_TOOLS = $(ANDROID_HOME)/build-tools/26.0.3

+ANDROID_PLATFORM = $(ANDROID_HOME)/platforms/android-26/android.jar

+ANDROID_KEYSTORE = $(BUILD_ROOT)/sview_debug.key

+ANDROID_KEYSTORE_PASSWORD = sview_store_pswd

+ANDROID_KEY = "sview android key"

+ANDROID_KEY_PASSWORD = sview_pswd

 # function defining library install_name to @executable_path on OS X

 libinstname =

@@ -62,6 +82,7 @@

 LIB_CONFIG =

 LIB_ANDROID =

 LIB_IOKIT =

+LIB_COREVIDEO =

 LIB_OPENAL = -lopenal

 LIB_OUTPUTS = -lStOutAnaglyph -lStOutDual -lStOutInterlace -lStOutPageFlip -lStOutIZ3D -lStOutDistorted

 TOOLCHAIN =

@@ -81,7 +102,10 @@

 LIB_PTHREAD = -lobjc

 LIB_GLX = -framework OpenGL -framework Appkit

 LIB_IOKIT = -framework IOKit

-LIB_OPENAL = -framework OpenAL

+LIB_COREVIDEO = -framework CoreVideo

+ifeq ($(OPENAL_ROOT),)

+  LIB_OPENAL = -framework OpenAL

+endif

 endif

 # Android libraries

@@ -122,28 +146,45 @@

 LDSTRIP = -s

 LDZDEF = -z defs

 EXTRA_CFLAGS   =

-EXTRA_CXXFLAGS =

+EXTRA_CXXFLAGS = -DAPP_PREFIX="\"$(APP_PREFIX)\""

 EXTRA_LDFLAGS  =

 ifeq ($(TARGET_OS),osx)

 LDZDEF =

 endif

+CCVERSION := $(shell $(CC) -dumpversion)

+CCMACHINE := $(shell $(CC) -dumpmachine)

+

+ifneq (,$(findstring i586,$(CCMACHINE)))

+TARGET_ARCH2 = x86

+else ifneq (,$(findstring i686,$(CCMACHINE)))

+TARGET_ARCH2 = x86

+else ifneq (,$(findstring x86,$(CCMACHINE)))

+TARGET_ARCH2 = x86

+else ifneq (,$(findstring mingw,$(CCMACHINE)))

+TARGET_ARCH2 = x86

+endif

+

 # to activate debug build

+ifneq ($(ST_DEBUG),0)

+EXTRA_CXXFLAGS = -DST_DEBUG

+LDSTRIP =

+STRIPFLAGS = --info

+endif

 #EXTRA_CXXFLAGS = -DST_DEBUG_LOG_TO_FILE=\"/sdcard/Android/data/com.sview/files/sview.log\" -DST_DEBUG

 #EXTRA_CXXFLAGS += -DST_DEBUG_GL

 #EXTRA_CXXFLAGS += -DST_DEBUG_FFMPEG_VERBOSE

 #EXTRA_CXXFLAGS += -DST_DEBUG_SYSLOG

 #EXTRA_CXXFLAGS += -DST_DEBUG_THREADID

-#LDSTRIP =

-#STRIPFLAGS = --info

 ifdef ANDROID_NDK

 LIBSUBFOLDER = libs/$(ANDROID_EABI)

 EXTRA_CFLAGS   += $(ANDROID_SYSROOT) $(ANDROID_MARCH)

 EXTRA_CXXFLAGS += $(ANDROID_SYSROOT) $(ANDROID_MARCH)

-EXTRA_CXXFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/include -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(ANDROID_EABI)/include -DST_HAVE_EGL -DST_NO_UPDATES_CHECK

+EXTRA_CXXFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/include -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(ANDROID_EABI)/include -DST_HAVE_EGL

 EXTRA_LDFLAGS  += $(ANDROID_SYSROOT) -L$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(ANDROID_EABI) -lstdc++ -lgnustl_shared

-else

+else ifeq ($(TARGET_ARCH2),x86)

+# necessary for 32-bit x86 builds, where MMX and SSE are not enabled by default

 EXTRA_CFLAGS   += -mmmx -msse

 EXTRA_CXXFLAGS += -mmmx -msse

 endif

@@ -152,6 +193,13 @@

 # todo

 LDSTRIP =

+# minimal supported version of macOS:

+# - CMake: CMAKE_OSX_DEPLOYMENT

+# - qmake: QMAKE_MACOSX_DEPLOYMENT_TARGET = $(TARGET_OS_VERSION)

+# - environment variable: export MACOSX_DEPLOYMENT_TARGET=$(TARGET_OS_VERSION)

+EXTRA_CFLAGS   += -mmacosx-version-min=$(TARGET_OS_VERSION)

+EXTRA_CXXFLAGS += -mmacosx-version-min=$(TARGET_OS_VERSION)

+

 # workaround homebrew

 HAS_PKGCONF := $(shell command -v pkg-config 2> /dev/null)

 ifdef HAS_PKGCONF

@@ -182,11 +230,23 @@

 ifeq ($(TARGET_OS),linux)

 EXTRA_CXXFLAGS += `pkg-config gtk+-2.0 --cflags`

+# notification about updates available on sview.ru

+#EXTRA_CXXFLAGS += -DST_UPDATES_CHECK

+endif

+

+# optionally fail on any compiler warning except #warning and deprecations

+WERROR_LEVEL = 0

+ifeq ($(WERROR_LEVEL),1)

+EXTRA_CXXFLAGS += -Werror -Wno-error=cpp -Wno-error=deprecated-declarations

 endif

 INC =  -I$(SRCDIR)/3rdparty/include -I$(SRCDIR)/include

 CFLAGS   = -fPIC $(HAVE_MONGOOSE) $(INC) $(EXTRA_CFLAGS)

+ifneq ($(ST_DEBUG),0)

+CXXFLAGS = -g -std=c++0x -Wall -fPIC $(HAVE_MONGOOSE) $(INC) $(EXTRA_CXXFLAGS)

+else

 CXXFLAGS = -O3 -std=c++0x -Wall -fPIC $(HAVE_MONGOOSE) $(INC) $(EXTRA_CXXFLAGS)

+endif

 LIBDIR = -L$(BUILD_ROOT)

 LIB =

 LDFLAGS = $(LDSTRIP) $(LDZDEF) $(EXTRA_LDFLAGS)

@@ -207,13 +267,16 @@

 sViewAndroidCad := libsviewcad.$(LIBSUFFIX)

 sView           := sView

 sViewAndroid    := libsview.$(LIBSUFFIX)

-

-aDestAndroid    := sview

-

-all:         pre_all $(aStShared) $(aStGLWidgets) $(aStCore) $(aStOutAnaglyph) $(aStOutDual) $(aStOutInterlace) $(aStOutPageFlip) $(aStOutIZ3D) $(aStOutDistorted) $(aStImageViewer) $(aStMoviePlayer) $(aStDiagnostics) $(sView)

-android_cad: aDestAndroid = StCADViewer

-android_cad: pre_all $(aStShared) $(aStGLWidgets) $(aStCore) $(aStOutAnaglyph) $(aStOutInterlace) $(aStOutDistorted) $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroidCad) install_android install_android_cad_libs

-android:     pre_all $(aStShared) $(aStGLWidgets) $(aStCore) $(aStOutAnaglyph) $(aStOutInterlace) $(aStOutDistorted) $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroid)    install_android install_android_libs

+sViewApk        := $(SRCDIR)/build/sView.apk

+sViewApkSigned  := $(SRCDIR)/build/sView.signed.apk.tmp

+sViewApkUnsigned:= $(SRCDIR)/build/sView.unsigned.apk.tmp

+aDestAndroid    := build/apk-tmp

+sViewDex        := $(aDestAndroid)/classes.dex

+

+all:         shared $(aStDiagnostics) $(sView)

+android_cad: pre_all_android shared $(sViewAndroidCad) $(sViewApk) install_android install_android_cad_libs

+android:     pre_all_android shared $(sViewAndroid)    $(sViewApk) install_android install_android_libs

+shared:      pre_all $(aStShared) $(aStGLWidgets) $(aStCore) outputs_all $(aStImageViewer) $(aStMoviePlayer)

 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

@@ -224,33 +287,34 @@

 endif

 install:

-   mkdir -p $(DESTDIR)/usr/bin

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

-   mkdir -p $(DESTDIR)/usr/$(USR_LIB)/firefox/plugins

-   mkdir -p $(DESTDIR)/usr/$(USR_LIB)/mozilla/plugins

-   mkdir -p $(DESTDIR)/usr/share

-   mkdir -p $(DESTDIR)/usr/share/sView/info

-   mkdir -p $(DESTDIR)/usr/share/sView/lang

-   mkdir -p $(DESTDIR)/usr/share/sView/shaders

-   mkdir -p $(DESTDIR)/usr/share/sView/textures

-   mkdir -p $(DESTDIR)/usr/share/sView/web

-   cp -f -r share/*                     $(DESTDIR)/usr/share/

-   cp -f -r $(BUILD_ROOT)/lang/*        $(DESTDIR)/usr/share/sView/lang/

-   cp -f -r $(BUILD_ROOT)/shaders/*     $(DESTDIR)/usr/share/sView/shaders/

-   cp -f -r $(BUILD_ROOT)/textures/*    $(DESTDIR)/usr/share/sView/textures/

-   cp -f -r $(BUILD_ROOT)/web/*         $(DESTDIR)/usr/share/sView/web/

-   cp -f    license-gpl-3.0.txt         $(DESTDIR)/usr/share/sView/info/license.txt

-   cp -f -r $(BUILD_ROOT)/*.$(LIBSUFFIX) $(DESTDIR)/usr/$(USR_LIB)/

-   cp -f    $(BUILD_ROOT)/sView         $(DESTDIR)/usr/$(USR_LIB)/sView/sView

-   ln --force --symbolic ../$(USR_LIB)/sView/sView       $(DESTDIR)/usr/bin/sView

-   ln --force --symbolic ../../share/sView/demo/demo.jps $(DESTDIR)/usr/$(USR_LIB)/sView/demo.jps

-   rm -f    $(DESTDIR)/usr/$(USR_LIB)/sView/*.a

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/bin

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/$(USR_LIB)/sView

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/$(USR_LIB)/firefox/plugins

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/$(USR_LIB)/mozilla/plugins

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/share

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/share/sView/info

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/share/sView/lang

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/share/sView/shaders

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/share/sView/textures

+   mkdir -p $(DESTDIR)/$(APP_PREFIX)/share/sView/web

+   cp -f -r share/*                     $(DESTDIR)/$(APP_PREFIX)/share/

+   cp -f -r $(BUILD_ROOT)/lang/*        $(DESTDIR)/$(APP_PREFIX)/share/sView/lang/

+   cp -f -r $(BUILD_ROOT)/shaders/*     $(DESTDIR)/$(APP_PREFIX)/share/sView/shaders/

+   cp -f -r $(BUILD_ROOT)/textures/*    $(DESTDIR)/$(APP_PREFIX)/share/sView/textures/

+   cp -f -r $(BUILD_ROOT)/web/*         $(DESTDIR)/$(APP_PREFIX)/share/sView/web/

+   cp -f    license-gpl-3.0.txt         $(DESTDIR)/$(APP_PREFIX)/share/sView/info/license.txt

+   cp -f -r $(BUILD_ROOT)/*.$(LIBSUFFIX) $(DESTDIR)/$(APP_PREFIX)/$(USR_LIB)/

+   cp -f    $(BUILD_ROOT)/sView         $(DESTDIR)/$(APP_PREFIX)/$(USR_LIB)/sView/sView

+   ln --force --symbolic ../$(USR_LIB)/sView/sView       $(DESTDIR)/$(APP_PREFIX)/bin/sView

+   ln --force --symbolic ../../share/sView/demo/demo.jps $(DESTDIR)/$(APP_PREFIX)/$(USR_LIB)/sView/demo.jps

+   rm -f    $(DESTDIR)/$(APP_PREFIX)/$(USR_LIB)/sView/*.a

 install_android:

    mkdir -p $(aDestAndroid)/assets/info

    mkdir -p $(aDestAndroid)/assets/lang/German

    mkdir -p $(aDestAndroid)/assets/lang/French

    mkdir -p $(aDestAndroid)/assets/lang/English

+   mkdir -p $(aDestAndroid)/assets/lang/Spanish

    mkdir -p $(aDestAndroid)/assets/lang/Russian

    mkdir -p $(aDestAndroid)/assets/lang/Czech

    mkdir -p $(aDestAndroid)/assets/lang/ChineseS

@@ -260,6 +324,7 @@

    cp -f -r $(BUILD_ROOT)/lang/Deutsch/*  $(aDestAndroid)/assets/lang/German/

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

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

+   cp -f -r $(BUILD_ROOT)/lang/Español/*  $(aDestAndroid)/assets/lang/Spanish/

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

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

    cp -f -r $(BUILD_ROOT)/lang/ChineseS/* $(aDestAndroid)/assets/lang/ChineseS/

@@ -267,51 +332,53 @@

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

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

    cp -f    license-gpl-3.0.txt           $(aDestAndroid)/assets/info/license.txt

+   $(ANDROID_BUILD_TOOLS)/aapt package -v -f -m -S $(SRCDIR)/sview/res -J $(BUILD_ROOT)/java/gen -M $(SRCDIR)/sview/AndroidManifest.xml -I $(ANDROID_PLATFORM)

 install_android_libs: $(aStShared) $(aStGLWidgets) $(aStCore) $(aStOutAnaglyph) $(aStOutInterlace) $(aStOutDistorted) $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroid)

-   cp -f $(BUILD_ROOT)/$(aStShared)       $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStGLWidgets)    $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStCore)         $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStOutAnaglyph)  $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStOutInterlace) $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStOutDistorted) $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStImageViewer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStMoviePlayer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(sViewAndroid)    $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(ANDROID_EABI)/libgnustl_shared.so $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   $(STRIP) $(STRIPFLAGS) $(aDestAndroid)/libs/$(ANDROID_EABI)/libgnustl_shared.so

-   cp -f $(FREETYPE_ROOT)/libs/$(ANDROID_EABI)/libfreetype.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(OPENAL_ROOT)/libs/$(ANDROID_EABI)/libopenal.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavcodec.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavdevice.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavformat.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavutil.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswresample.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswscale.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStShared)       $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStGLWidgets)    $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStCore)         $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStOutAnaglyph)  $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStOutInterlace) $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStOutDistorted) $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStImageViewer)  $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStMoviePlayer)  $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(sViewAndroid)    $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(ANDROID_EABI)/libgnustl_shared.so $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   $(STRIP) $(STRIPFLAGS) $(aDestAndroid)/lib/$(ANDROID_EABI)/libgnustl_shared.so

+   cp -f $(FREETYPE_ROOT)/libs/$(ANDROID_EABI)/libfreetype.so    $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(OPENAL_ROOT)/libs/$(ANDROID_EABI)/libopenal.so        $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavcodec.so       $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavdevice.so      $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavformat.so      $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavutil.so        $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswresample.so    $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswscale.so       $(aDestAndroid)/lib/$(ANDROID_EABI)/

 install_android_cad_libs: $(aStShared) $(aStGLWidgets) $(aStCore) $(aStOutAnaglyph) $(aStOutInterlace) $(aStOutDistorted) $(aStImageViewer) $(aStMoviePlayer) $(sViewAndroidCad)

-   cp -f $(BUILD_ROOT)/$(aStShared)       $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStGLWidgets)    $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStCore)         $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStOutAnaglyph)  $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStOutInterlace) $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStOutDistorted) $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStImageViewer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(aStMoviePlayer)  $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(BUILD_ROOT)/$(sViewAndroidCad) $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FREETYPE_ROOT)/libs/$(ANDROID_EABI)/libfreetype.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(OPENAL_ROOT)/libs/$(ANDROID_EABI)/libopenal.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavcodec.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavdevice.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavformat.so      $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavutil.so        $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswresample.so    $(aDestAndroid)/libs/$(ANDROID_EABI)/

-   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswscale.so       $(aDestAndroid)/libs/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStShared)       $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStGLWidgets)    $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStCore)         $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStOutAnaglyph)  $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStOutInterlace) $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStOutDistorted) $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStImageViewer)  $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(aStMoviePlayer)  $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(BUILD_ROOT)/$(sViewAndroidCad) $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FREETYPE_ROOT)/libs/$(ANDROID_EABI)/libfreetype.so    $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(OPENAL_ROOT)/libs/$(ANDROID_EABI)/libopenal.so        $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavcodec.so       $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavdevice.so      $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavformat.so      $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libavutil.so        $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswresample.so    $(aDestAndroid)/lib/$(ANDROID_EABI)/

+   cp -f $(FFMPEG_ROOT)/libs/$(ANDROID_EABI)/libswscale.so       $(aDestAndroid)/lib/$(ANDROID_EABI)/

    mkdir -p $(aDestAndroid)/assets/shaders

    mkdir -p $(aDestAndroid)/assets/lang

 pre_all:

    mkdir -p $(BUILD_ROOT)/lang/English

+   mkdir -p $(BUILD_ROOT)/lang/Español

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

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

    mkdir -p $(BUILD_ROOT)/lang/Deutsch

@@ -320,10 +387,13 @@

    mkdir -p $(BUILD_ROOT)/lang/Korean

    mkdir -p $(BUILD_ROOT)/textures

    mkdir -p $(BUILD_ROOT)/web

-   mkdir -p sview/libs/$(ANDROID_EABI)

-   mkdir -p StCADViewer/libs/$(ANDROID_EABI)

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

+pre_all_android:

+   mkdir -p $(aDestAndroid)/lib/$(ANDROID_EABI)

+   mkdir -p $(BUILD_ROOT)/java/gen

+   mkdir -p $(BUILD_ROOT)/java/classes

+

 # StShared shared library

 aStShared_SRCS1 := $(sort $(wildcard $(SRCDIR)/StShared/*.cpp))

 aStShared_OBJS1 := ${aStShared_SRCS1:.cpp=.o}

@@ -378,6 +448,7 @@

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

    cp -f -r StOutAnaglyph/shaders/*      $(BUILD_ROOT)/shaders/StOutAnaglyph/

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

+   cp -f -r StOutAnaglyph/lang/spanish/* $(BUILD_ROOT)/lang/Español/

    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/

@@ -398,6 +469,7 @@

    $(LD) -shared $(call libinstname,$@) $(LDFLAGS) $(LIBDIR) $(aStOutDual_OBJS) $(aStOutDual_LIB) -o $(BUILD_ROOT)/$@

 pre_StOutDual:

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

+   cp -f -r StOutDual/lang/spanish/* $(BUILD_ROOT)/lang/Español/

    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/

@@ -419,6 +491,7 @@

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

    cp -f -r StOutIZ3D/shaders/*      $(BUILD_ROOT)/shaders/StOutIZ3D/

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

+   cp -f -r StOutIZ3D/lang/spanish/* $(BUILD_ROOT)/lang/Español/

    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/

@@ -441,6 +514,7 @@

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

    cp -f -r StOutInterlace/shaders/*      $(BUILD_ROOT)/shaders/StOutInterlace/

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

+   cp -f -r StOutInterlace/lang/spanish/* $(BUILD_ROOT)/lang/Español/

    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/

@@ -467,6 +541,7 @@

    $(LD) -shared $(call libinstname,$@) $(LDFLAGS) $(LIBDIR) $(aStOutPageFlip_OBJS1) $(aStOutPageFlip_OBJS2) $(aStOutPageFlip_LIB) -o $(BUILD_ROOT)/$@

 pre_StOutPageFlip:

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

+   cp -f -r StOutPageFlip/lang/spanish/* $(BUILD_ROOT)/lang/Español/

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

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

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

@@ -486,6 +561,7 @@

    $(LD) -shared $(call libinstname,$@) $(LDFLAGS) $(LIBDIR) $(aStOutDistorted_OBJS) $(aStOutDistorted_LIB) -o $(BUILD_ROOT)/$@

 pre_StOutDistorted:

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

+   cp -f -r StOutDistorted/lang/spanish/* $(BUILD_ROOT)/lang/Español/

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

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

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

@@ -505,6 +581,7 @@

    $(LD) -shared $(call libinstname,$@) $(LDFLAGS) $(LIBDIR) $(aStImageViewer_OBJS) $(aStImageViewer_LIB) -o $(BUILD_ROOT)/$@

 pre_StImageViewer:

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

+   cp -f -r StImageViewer/lang/spanish/* $(BUILD_ROOT)/lang/Español/

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

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

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

@@ -523,11 +600,12 @@

 aStMoviePlayer_OBJS2 := ${aStMoviePlayer_SRCS2:.cpp=.o}

 aStMoviePlayer_SRCS3 := $(sort $(wildcard $(SRCDIR)/StMoviePlayer/*.c))

 aStMoviePlayer_OBJS3 := ${aStMoviePlayer_SRCS3:.c=.o}

-aStMoviePlayer_LIB   := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) -lavutil -lavformat -lavcodec -lswscale $(LIB_OPENAL) $(LIB_PTHREAD)

+aStMoviePlayer_LIB   := $(LIB) -lStGLWidgets -lStShared -lStCore $(LIB_OUTPUTS) $(LIB_GLX) $(LIB_GTK) -lavutil -lavformat -lavcodec -lswscale $(LIB_OPENAL) $(LIB_COREVIDEO) $(LIB_PTHREAD)

 $(aStMoviePlayer) : pre_StMoviePlayer $(aStGLWidgets) outputs_all $(aStMoviePlayer_OBJS1) $(aStMoviePlayer_OBJS2) $(aStMoviePlayer_OBJS3)

    $(LD) -shared $(call libinstname,$@) $(LDFLAGS) $(LIBDIR) $(aStMoviePlayer_OBJS1) $(aStMoviePlayer_OBJS2) $(aStMoviePlayer_OBJS3) $(aStMoviePlayer_LIB) -o $(BUILD_ROOT)/$@

 pre_StMoviePlayer:

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

+   cp -f -r StMoviePlayer/lang/spanish/* $(BUILD_ROOT)/lang/Español/

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

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

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

@@ -550,6 +628,7 @@

    $(LD) -shared $(call libinstname,$@) $(LDFLAGS) $(LIBDIR) $(aStDiagnostics_OBJS) $(aStDiagnostics_LIB) -o $(BUILD_ROOT)/$@

 pre_StDiagnostics:

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

+   cp -f -r StDiagnostics/lang/spanish/* $(BUILD_ROOT)/lang/Español/

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

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

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

@@ -581,6 +660,7 @@

    $(LD) -shared $(call libinstname,$@) $(LDFLAGS) $(LIBDIR) $(aStCADViewer_OBJS) $(aStCADViewer_LIB) -o $(BUILD_ROOT)/$@

 pre_StCADViewer:

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

+   cp -f -r StCADViewer/lang/spanish/* $(BUILD_ROOT)/lang/Español/

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

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

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

@@ -601,6 +681,14 @@

 clean_sViewAndroid:

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

    rm -rf sview/jni/*.o

+   rm -rf $(BUILD_ROOT)/java/classes/com/sview/*.class

+   rm -rf $(SRCDIR)/sview/src/com/sview/*class

+   rm -rf $(aDestAndroid)

+   rm -f $(sViewDex)

+   rm -f $(sViewApkUnsigned)

+   rm -f $(sViewApkSigned)

+   rm -f $(sViewApk)

+   rm -rf $(BUILD_ROOT)/java/gen/com/sview/*.java

 # sView executable

 sView_SRCS1 := $(sort $(wildcard $(SRCDIR)/sview/*.cpp))

@@ -635,11 +723,57 @@

    cp -R -f $(FFMPEG_ROOT)/$(LIBSUBFOLDER)/libswscale*.dylib    $(BUILD_ROOT_BUNDLE)/Contents/Frameworks

 endif

 ifneq ($(OPENAL_ROOT),)

+   mkdir -p $(BUILD_ROOT_BUNDLE)/Contents/MacOS/openal/hrtf/

    cp -R -f $(OPENAL_ROOT)/$(LIBSUBFOLDER)/libopenal*.dylib     $(BUILD_ROOT_BUNDLE)/Contents/Frameworks

+   cp -f -r $(OPENAL_ROOT)/hrtf/*.mhr                           $(BUILD_ROOT_BUNDLE)/Contents/MacOS/openal/hrtf/

 endif

 endif

    @echo sView building is DONE

+$(sViewApk): $(sViewApkSigned)

+   $(ANDROID_BUILD_TOOLS)/zipalign -v -f 4 $< $(sViewApk)

+

+# There are three options:

+# 1) Passwords are specified within Makefile / passed as make arguments

+# 2) Passwords are asked by jarsigner itself (requires console input)

+# 3) Passwords are asked using zenity message window (requires GUI input)

+ifeq ($(MAKECMDGOALS), android)

+

+ifeq ($(ANDROID_KEY_GUI), 1)

+$(sViewApkSigned): $(sViewApkUnsigned) sView_keystore_debug

+   $(eval ANDROID_KEYSTORE_PASSWORD := $(shell zenity --password --title="Android keystore"))

+   $(eval ANDROID_KEY_PASSWORD      := $(shell zenity --password --title="Android key"))

+   $(JAVA_HOME)/bin/jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $(ANDROID_KEYSTORE) -storepass $(ANDROID_KEYSTORE_PASSWORD) -keypass $(ANDROID_KEY_PASSWORD) -signedjar $(sViewApkSigned) $< $(ANDROID_KEY)

+else ifeq ($(ANDROID_KEY_PASSWORD),)

+$(sViewApkSigned): $(sViewApkUnsigned) sView_keystore_debug

+   $(JAVA_HOME)/bin/jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $(ANDROID_KEYSTORE) -signedjar $(sViewApkSigned) $< $(ANDROID_KEY)

+else

+$(sViewApkSigned): $(sViewApkUnsigned) sView_keystore_debug

+   $(JAVA_HOME)/bin/jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $(ANDROID_KEYSTORE) -storepass $(ANDROID_KEYSTORE_PASSWORD) -keypass $(ANDROID_KEY_PASSWORD) -signedjar $(sViewApkSigned) $< $(ANDROID_KEY)

+endif

+endif

+

+$(sViewApkUnsigned): $(sViewDex) install_android_libs

+   rm -f $(sViewApkUnsigned)

+   $(ANDROID_BUILD_TOOLS)/aapt package -v -f -M $(SRCDIR)/sview/AndroidManifest.xml -S $(SRCDIR)/sview/res -I $(ANDROID_PLATFORM) -F $(sViewApkUnsigned) $(aDestAndroid)

+

+sView_SRCS_JAVA1 := $(sort $(wildcard $(SRCDIR)/sview/src/com/sview/*.java))

+sView_OBJS_JAVA1 := ${sView_SRCS_JAVA1:.java=.class}

+$(sViewDex): $(BUILD_ROOT)/java/gen/com/sview/R.class $(sView_OBJS_JAVA1)

+   $(ANDROID_BUILD_TOOLS)/dx --dex --verbose --output=$(sViewDex) $(BUILD_ROOT)/java/classes

+

+$(BUILD_ROOT)/java/gen/com/sview/R.java: install_android $(shell find $(SRCDIR)/sview/res -type f)

+   $(ANDROID_BUILD_TOOLS)/aapt package -v -f -m -S $(SRCDIR)/sview/res -J $(BUILD_ROOT)/java/gen -M $(SRCDIR)/sview/AndroidManifest.xml -I $(ANDROID_PLATFORM)

+

+# This target generates a dummy signing key for debugging purposes.

+# Executed only when ANDROID_KEYSTORE points to non-existing file.

+ifeq (,$(wildcard $(ANDROID_KEYSTORE)))

+sView_keystore_debug:

+   $(JAVA_HOME)/bin/keytool -genkeypair -validity 1000 -dname "CN=sview_dummy,O=Android,C=JPN" -keystore $(ANDROID_KEYSTORE) \

+   -storepass $(ANDROID_KEYSTORE_PASSWORD) -keypass $(ANDROID_KEY_PASSWORD) -alias $(ANDROID_KEY) -keyalg RSA -v

+else

+sView_keystore_debug:

+endif

 clean_sView:

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

​

@@ -21,7 +21,7 @@

       VALUE "FileOpenName",     ST_NPAPI_MIME_DESC

       VALUE "FileVersion",      SVIEW_SDK_VER_STRING "\000"

       VALUE "InternalName",     "StBrowserPlugin\000"

-      VALUE "LegalCopyright",   "\251 2009-2016 Kirill Gavrilov\000"

+      VALUE "LegalCopyright",   "\251 2009-2020 Kirill Gavrilov\000"

       VALUE "LegalTrademarks",  "\000"

       VALUE "MIMEType",         ST_NPAPI_MIME_LIST

       VALUE "OriginalFilename", "npStBrowserPlugin.dll\000"

​

@@ -15,7 +15,7 @@

     BEGIN

       VALUE "FileDescription", "Stereoscopic CAD Viewer\000"

       VALUE "FileVersion",     SVIEW_SDK_VER_STRING "\000"

-      VALUE "LegalCopyright",  "\251 2011-2017 Kirill Gavrilov\000"

+      VALUE "LegalCopyright",  "\251 2011-2020 Kirill Gavrilov\000"

       VALUE "ProductName",     "StCADViewer\000"

       VALUE "ProductVersion",  SVIEW_SDK_VER_STRING "\000"

       VALUE "OfficialSite",    "www.sview.ru\000"

​

@@ -426,7 +426,7 @@

     const StGLVec3 THE_WHITE(1.0f, 1.0f, 1.0f);

     const StString anAbout = tr(ABOUT_DPLUGIN_NAME) + '\n'

                            + tr(ABOUT_VERSION) + " " + StVersionInfo::getSDKVersionString()

-                           + "\n \n" + tr(ABOUT_DESCRIPTION).format("2011-2017", "kirill@sview.ru", "www.sview.ru");

+                           + "\n \n" + tr(ABOUT_DESCRIPTION).format("2011-2020", "kirill@sview.ru", "www.sview.ru");

     StArgumentsMap anInfo;

     anInfo.add(StDictEntry("CPU cores", StString(StThread::countLogicalProcessors()) + StString(" logical processor(s)")));

​

+(directory)

​

@@ -0,0 +1,27 @@

+# Spanish translation file for StCADViewer

+--------

+1200=Ver

+1202=Pantalla completa

+1204=Mostrar triedro

+1206=Proyección

+1208=Ajustar TODO

+1240=Ortogonal

+1241=Perspectiva

+1242=Estéreo

+1402=Mostrar FPS

+1500=Ayuda

+1501=Acerca de...

+1503=Texto de la licencia

+1504=Idioma (Language)

+1511=Ajustes

+3000=sView - Mini visor de CAD

+3001=versión

+3002=El visualizador CAD te permite ver archivos CAD en formatos IGES, STEP y BREP usando tecnología OpenCASCADE.\n © {0} Kirill Gavrilov <{1}>\nSitio oficial: {2}\n\nEste programa se distribuye bajo licencia GPL 3.0

+3004=Información del sistema

+4000=Cerrar

+4001=Cancelar

+4006=Guardar

+4007=Eliminar

+4008=Predeterminado

+4009=Predeterminados

+4010=Asignar

​

@@ -19,60 +19,13 @@

 #include <StStrings/StLogger.h>

 #include <StAV/stAV.h>

+#include <StJNI/StJNIEnv.h>

 #include <android/window.h>

-#define jexp extern "C" JNIEXPORT

-

-StJNIEnv::StJNIEnv(JavaVM* theJavaVM)

-: myJavaVM(theJavaVM),

-  myJniEnv(NULL),

-  myToDetach(false) {

-    if(myJavaVM == NULL) {

-        return;

-    }

-

-    void* aJniEnv = NULL;

-    switch(myJavaVM->GetEnv(&aJniEnv, JNI_VERSION_1_6)) {

-        case JNI_EDETACHED: {

-            if(myJavaVM->AttachCurrentThread(&myJniEnv, NULL) < 0) {

-                myJniEnv = NULL;

-                ST_ERROR_LOG("Failed to attach working thread to Java VM");

-                return;

-            }

-            myToDetach = true;

-            break;

-        }

-        case JNI_OK: {

-            myJniEnv   = (JNIEnv* )aJniEnv;

-            myToDetach = false;

-            break;

-        }

-        case JNI_EVERSION: {

-            ST_ERROR_LOG("Failed to attach working thread to Java VM - JNI version is not supported");

-            break;

-        }

-        default: {

-            ST_ERROR_LOG("Failed to attach working thread to Java VM");

-            break;

-        }

-    }

-}

-

-StJNIEnv::~StJNIEnv() {

-    detach();

-}

+#include "stvkeysandroid.h" // Android NDK keys to VKEYs lookup array

-void StJNIEnv::detach() {

-    if(myJavaVM != NULL

-    && myJniEnv != NULL

-    && myToDetach) {

-        myJavaVM->DetachCurrentThread();

-    }

-

-    myJniEnv   = NULL;

-    myToDetach = false;

-}

+#define jexp extern "C" JNIEXPORT

 StAndroidResourceManager::StAndroidResourceManager(StAndroidGlue*  theGlueApp,

                                                    const StString& theAppName)

@@ -171,6 +124,7 @@

   myWindow(NULL),

   myWindowPending(NULL),

   myIsChangingSurface(false),

+  myIsWakeLockSet(false),

   myWindowFlags(0),

   myActivityState(0),

   myMemoryClassMiB(0),

@@ -190,6 +144,7 @@

   myIsRunning(false),

   myIsStateSaved(false),

   myToDestroy(false) {

+    stMemZero(myRegKeys, sizeof(myRegKeys));

     theActivity->instance = this;

     theActivity->env->GetJavaVM(&myJavaVM);

@@ -210,6 +165,15 @@

         myMemoryClassMiB = aJniEnv->CallIntMethod(aJActivityMgr, aJMet_getMemoryClass);

     }

+    if(jclass aClassBuild = aJniEnv->FindClass("android/os/Build")) {

+        if(jfieldID aJFieldModel = aJniEnv->GetStaticFieldID(aClassBuild, "MODEL", "Ljava/lang/String;")) {

+            myBuildModel = stStringFromJava(aJniEnv, (jstring )aJniEnv->GetStaticObjectField(aClassBuild, aJFieldModel));

+        }

+        if(jfieldID aJFieldDevice = aJniEnv->GetStaticFieldID(aClassBuild, "DEVICE", "Ljava/lang/String;")) {

+            myBuildDevice = stStringFromJava(aJniEnv, (jstring )aJniEnv->GetStaticObjectField(aClassBuild, aJFieldDevice));

+        }

+    }

+

     jmethodID aJMet_getStAppClass = aJniEnv->GetMethodID(aJClass_Activity, "getStAppClass", "()Ljava/lang/String;");

     myStAppClass = stStringFromJava(aJniEnv, (jstring )aJniEnv->CallObjectMethod(myActivity->clazz, aJMet_getStAppClass));

@@ -220,7 +184,8 @@

     jmethodID aJMet_setCppInstance = aJniEnv->GetMethodID(aJClass_Activity, "setCppInstance", "(J)V");

     aJniEnv->CallVoidMethod(myActivity->clazz, aJMet_setCppInstance, (jlong )this);

-    readOpenPath();

+    // do not NULLify intent here since Activity.onCreate() crashes on some devices

+    readOpenPath(false);

     myCmdPollSource.id        = LooperId_MAIN;

     myCmdPollSource.app       = this;

@@ -261,11 +226,11 @@

     myMsgWrite = aMsgPipe[1];

 }

-void StAndroidGlue::readOpenPath() {

+void StAndroidGlue::readOpenPath(bool theToNullifyIntent) {

     JNIEnv*   aJniEnv = myActivity->env;

     jclass    aJClass_Activity   = aJniEnv->GetObjectClass(myActivity->clazz);

-    jmethodID aJMet_readOpenPath = aJniEnv->GetMethodID(aJClass_Activity, "readOpenPath", "()V");

-    aJniEnv->CallVoidMethod(myActivity->clazz, aJMet_readOpenPath);

+    jmethodID aJMet_readOpenPath = aJniEnv->GetMethodID(aJClass_Activity, "readOpenPath", "(Z)V");

+    aJniEnv->CallVoidMethod(myActivity->clazz, aJMet_readOpenPath, (jboolean )(theToNullifyIntent ? JNI_TRUE : JNI_FALSE));

 }

 void StAndroidGlue::setOpenPath(const jstring  theOpenPath,

@@ -295,8 +260,11 @@

 void StAndroidGlue::fetchState(StString&             theNewFile,

                                StQuaternion<double>& theQuaternion,

-                               bool&                 theToSwapEyes) {

+                               bool&                 theToSwapEyes,

+                               const StKeysState&    theKeys) {

     StMutexAuto aLock(myFetchLock);

+    stMemCpy(myRegKeys, theKeys.getRegisteredKeys(), sizeof(myRegKeys));

+

     theQuaternion = myQuaternion;

     theToSwapEyes = myToSwapEyesHW;

     if(!myDndPath.isEmpty()) {

@@ -376,8 +344,17 @@

     StMonitor aMon;

     aMon.setId(0);

+

+    const StString aBuildDevice = myBuildDevice.lowerCased();

+    const StString aBuildModel  = myBuildModel.lowerCased();

     if(myStereoApiId == "S3DV") {

         aMon.setPnPId("ST@S3DV");

+    } else if(aBuildDevice == "king7s" || aBuildModel == "pp6000") { // PPTV King 7S

+        aMon.setPnPId("ST@COL0");

+    } else if(aBuildModel == "y6 max 3d") { // DOOGEE Y6 Max 3D

+        aMon.setPnPId("ST@COL0");

+    } else if(aBuildModel == "p8 3d" || aBuildModel == "p8_3d") { // Elephone P8 3D

+        aMon.setPnPId("ST@COL0");

     }

     aMon.changeVRect().top()    = 0;

     aMon.changeVRect().left()   = 0;

@@ -523,14 +500,26 @@

         postMessage("jp.co.sharp.android.stereo3dlcd !!!");

     }*/

-    createApplication();

-    if(!myApp.isNull()) {

-        if(!myApp->open()) {