diff options
| author | Sven Gothel <[email protected]> | 2015-10-05 13:51:51 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-10-05 13:51:51 +0200 |
| commit | c82ab4d75a50cd88c675e6c1e757dc9ed2db9655 (patch) | |
| tree | 19c8c4364496d513311da3565bea88883e812d91 /make | |
| parent | 9abd252b4d30e0611a360d37d228dbae427c9cd5 (diff) | |
Bug 1239: Support OSX input via 'avfoundation' ; Use remaining camera ID (index) as filename for OSX
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/tests-osx-x64.sh | 3 | ||||
| -rwxr-xr-x | make/scripts/tests-x64.sh | 2 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index c95c69bed..8fa8f4aea 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -1,7 +1,8 @@ #! /bin/bash #export DYLD_LIBRARY_PATH=$HOME/ffmpeg-0.8_0.9/lib:$DYLD_LIBRARY_PATH -export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH +#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/2.8/lib:$DYLD_LIBRARY_PATH JAVA_HOME=`/usr/libexec/java_home -version 1.8` #JAVA_HOME=`/usr/libexec/java_home -version 1.7` diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index 8102c011f..722e37f34 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -15,6 +15,8 @@ SDIR=`dirname $0` #export LD_LIBRARY_PATH=$HOME/libav-11.2/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=$HOME/ffmpeg-2.5/lib:$LD_LIBRARY_PATH +#export LD_LIBRARY_PATH=$HOME/ffmpeg-2.8/lib:$LD_LIBRARY_PATH + #J2RE_HOME=/opt-linux-x86_64/jre1.7.0_45 #JAVA_HOME=/opt-linux-x86_64/jdk1.7.0_45 #J2RE_HOME=/opt-linux-x86_64/jre7 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index e9af09ea3..2f628aa78 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -437,7 +437,7 @@ function testawtswt() { # # HiDPI # -testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2SimpleNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $* @@ -484,7 +484,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* # #testnoawt jogamp.opengl.openal.av.ALDummyUsage $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.CrossFadePlayer $* # |