[GUIDE] Ubuntu repository - maintained by djcj

selur@ubuntu1604:~/workspace/scripts/Hybrid$ git diff deploy-vapoursynth.sh 

diff --git a/Hybrid/deploy-vapoursynth.sh b/Hybrid/deploy-vapoursynth.sh

index d3d1618..b785e40 100755

--- a/Hybrid/deploy-vapoursynth.sh

+++ b/Hybrid/deploy-vapoursynth.sh

@@ -8,7 +8,7 @@ test -e "$vsprefix"

 mkdir -p AppDir/usr/

 cp -r "$vsprefix/include" "$vsprefix/lib" "$vsprefix/src" install-vs.sh AppDir/usr/

 

-for l in AppDir/usr/lib/vapoursynth/*.so ; do

+for l in AppDir/usr/lib/vapoursynth/*.so* ; do

   cmdLine="$cmdLine -e$l"

 done

 

@@ -24,7 +24,7 @@ rm linuxdeploy-x86_64.AppImage

 mv AppDir/usr/ vapoursynth

 rmdir AppDir

 cd vapoursynth

-mv -f bin/*.so lib/vapoursynth/

+mv -f bin/*.so* lib/vapoursynth/

 rm -rf bin lib/python*/ lib/vapoursynth/*.la lib/*.la

 mv lib/vapoursynth/ vsplugins

 cd ..

selur@ubuntu1604:~/workspace/scripts/Hybrid$ git diff install-vs.sh

diff --git a/Hybrid/install-vs.sh b/Hybrid/install-vs.sh

index bc1eec5..3dcdcd1 100755

--- a/Hybrid/install-vs.sh

+++ b/Hybrid/install-vs.sh

@@ -33,20 +33,20 @@ cp -r include lib vsplugins "$vsprefix" &

 counter $! "Copy files"

 

 # cython

-gcc -shared -fPIC -O3 -Isrc  $(pkg-config --cflags python3) \

+g++ -std=c++11 -shared -fPIC -O3 -Isrc  $(pkg-config --cflags python3) \

   src/src/cython/vapoursynth.c  -o "$sitepackages/vapoursynth.so" \

   -Llib -lvapoursynth  -s -Wl,-rpath,"$vsprefix/lib" &

 counter $! "Build Python module"

 

 # vsscript

-g++ -shared -fPIC -O3 -Isrc/include  $(pkg-config --cflags python3) \

+g++ -std=c++11 -shared -fPIC -O3 -Isrc/include  $(pkg-config --cflags python3) \

   src/src/vsscript/vsscript.cpp  -o "$vsprefix/lib/libvapoursynth-script.so.0" \

   $(pkg-config --libs python3)  -s -Wl,-rpath,"$vsprefix/lib"  -Wl,-soname,libvapoursynth-script.so.0 &

 counter $! "Build VSScript library"

 ln -sf libvapoursynth-script.so.0 "$vsprefix/lib/libvapoursynth-script.so"

 

 # vspipe

-g++ -O3 -Isrc/include  src/src/vspipe/vspipe.cpp  -o "$vsprefix/vspipe" \

+g++ -std=c++11 -O3 -Isrc/include  src/src/vspipe/vspipe.cpp  -o "$vsprefix/vspipe" \

   -L"$vsprefix/lib" -lvapoursynth-script  -s -Wl,-rpath,"$vsprefix/lib" &

 counter $! "Build VSPipe"

selur@ubuntu1604:~/workspace/scripts/Hybrid$ git diff build-tools.sh

diff --git a/Hybrid/build-tools.sh b/Hybrid/build-tools.sh

index 728dd69..72785bf 100755

--- a/Hybrid/build-tools.sh

+++ b/Hybrid/build-tools.sh

@@ -243,7 +243,8 @@ fi

 ### vsViewer

 if echo "$args" | grep -q -i -w -E 'all|vsviewer'

 then

-  git clone https://github.com/Selur/vsViewer build

+  git clone --single-branch --branch debug2 https://github.com/Selur/vsViewer build

+#  git clone https://github.com/Selur/vsViewer build

   cd build

   git clone https://github.com/vapoursynth/vapoursynth vapoursynth-git

   cd vapoursynth-git

@@ -262,21 +263,14 @@ scriptDir="\$(dirname "\$(readlink -f "\$0")")"

 

 env="\$HOME/opt/vapoursynth/env.sh"

 if [ -f "\$env" ]; then

-  echo "sourcing \$env"

   . "\$env"

 else

-  echo "'\$env' does not exist!"

-fi

-

-env="/opt/vapoursynth/env.sh"

-if [ -f "\$env" ]; then

-  echo "sourcing \$env"

-  . "\$env"

-else

-  echo "'\$env' does not exist!"

+  env="/opt/vapoursynth/env.sh"

+  if [ -f "\$env" ]; then

+    . "\$env"

+  fi

 fi

-

-"\$scriptDir/vsViewer" \$*

+$*

 EOF

   chmod a+x vsfilters_env.sh

 fi