summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-jogl.xml35
-rwxr-xr-xmake/scripts/tests-x64.sh17
-rw-r--r--make/scripts/tests.sh17
3 files changed, 26 insertions, 43 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 79e16933c..720607077 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1111,10 +1111,9 @@
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<classpath refid="nativewindow_gluegen.classpath"/>
<include name="jogamp/opengl/util/av/impl/FFMPEGStaticNatives.java" />
- <include name="jogamp/opengl/util/av/impl/FFMPEGv08Natives.java" />
- <include name="jogamp/opengl/util/av/impl/FFMPEGv09Natives.java" />
- <include name="jogamp/opengl/util/av/impl/FFMPEGv10Natives.java" />
- <include name="jogamp/opengl/util/av/impl/FFMPEGv11Natives.java" />
+ <include name="jogamp/opengl/util/av/impl/FFMPEGv0400Natives.java" />
+ <include name="jogamp/opengl/util/av/impl/FFMPEGv0500Natives.java" />
+ <include name="jogamp/opengl/util/av/impl/FFMPEGv0600Natives.java" />
<compilerarg value="-implicit:none" />
</javac>
@@ -1579,7 +1578,7 @@
<sysincludepath path="${stub.includes.gluegen.cc}"/>
<includepath path="stub_includes/khr"/>
<includepath path="stub_includes/opengl"/>
- <includepath path="stub_includes/libav/@{version.lav}"/>
+ <includepath path="stub_includes/ffmpeg/@{version.lav}"/>
<!-- This is for the generated headers for handwritten C code -->
<includepath path="${src.c}"/>
@@ -1615,10 +1614,9 @@
<patternset id="c.obj.files.none">
</patternset>
<patternset id="c.obj.files.ffmpeg.inject">
- <include name="${rootrel.obj.joglsub}/ffmpeg_lavc53_lavf53_lavu51.*"/>
- <include name="${rootrel.obj.joglsub}/ffmpeg_lavc54_lavf54_lavu52_lavr01.*"/>
- <include name="${rootrel.obj.joglsub}/ffmpeg_lavc55_lavf55_lavu53_lavr01.*"/>
- <include name="${rootrel.obj.joglsub}/ffmpeg_lavc56_lavf56_lavu54_lavr02.*"/>
+ <include name="${rootrel.obj.joglsub}/ffmpeg_v0400.*"/> <!-- ffmpeg 4.x.y -->
+ <include name="${rootrel.obj.joglsub}/ffmpeg_v0500.*"/> <!-- ffmpeg 5.x.y -->
+ <include name="${rootrel.obj.joglsub}/ffmpeg_v0600.*"/> <!-- ffmpeg 6.x.y -->
</patternset>
<patternset id="c.src.files.jogl.desktop">
@@ -1685,7 +1683,7 @@
<outofdate>
<sourcefiles>
<fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
- <fileset dir="${obj.joglsub}" includes="*jogl_ffmpegv08*, *jogl_ffmpegv09*, *jogl_ffmpegv10*"/> <!-- requires linkage -->
+ <fileset dir="${obj.joglsub}" includes="*jogl_ffmpegv0400*, *jogl_ffmpegv0500*, *jogl_ffmpegv0600*"/> <!-- requires linkage -->
</sourcefiles>
<targetfiles>
<fileset dir="${obj.jogl}" includes="${native.library.prefix}@{output.lib.name}.${native.library.suffix}"/>
@@ -1755,23 +1753,18 @@
</macrodef>
<target name="c.build.jogl.ffmpeg" if="setup.addNativeFFmpeg">
- <c.build.ffmpeg version.lav="lavc53_lavf53_lavu51"
- output.lib.name="jogl_ffmpegv08"
+ <c.build.ffmpeg version.lav="v0400"
+ output.lib.name="jogl_ffmpegv0400"
compiler.cfg.id="${compiler.cfg.id}"
linker.cfg.id="${linker.cfg.id.os}"/>
- <c.build.ffmpeg version.lav="lavc54_lavf54_lavu52_lavr01"
- output.lib.name="jogl_ffmpegv09"
+ <c.build.ffmpeg version.lav="v0500"
+ output.lib.name="jogl_ffmpegv0500"
compiler.cfg.id="${compiler.cfg.id}"
linker.cfg.id="${linker.cfg.id.os}"/>
- <c.build.ffmpeg version.lav="lavc55_lavf55_lavu53_lavr01"
- output.lib.name="jogl_ffmpegv10"
- compiler.cfg.id="${compiler.cfg.id}"
- linker.cfg.id="${linker.cfg.id.os}"/>
-
- <c.build.ffmpeg version.lav="lavc56_lavf56_lavu54_lavr02"
- output.lib.name="jogl_ffmpegv11"
+ <c.build.ffmpeg version.lav="v0600"
+ output.lib.name="jogl_ffmpegv0600"
compiler.cfg.id="${compiler.cfg.id}"
linker.cfg.id="${linker.cfg.id.os}"/>
</target>
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index ec2fd69b2..5da1c4c20 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -4,20 +4,9 @@
SDIR=`dirname $0`
-#export LD_LIBRARY_PATH=$HOME/libav-0.8/lib:$LD_LIBRARY_PATH
-#export LD_LIBRARY_PATH=$HOME/ffmpeg-0.10/lib:$LD_LIBRARY_PATH
-
-#export LD_LIBRARY_PATH=$HOME/libav-9.x/lib:$LD_LIBRARY_PATH
-#export LD_LIBRARY_PATH=$HOME/ffmpeg-1.2/lib:$LD_LIBRARY_PATH
-
-#export LD_LIBRARY_PATH=$HOME/libav-10.1/lib:$LD_LIBRARY_PATH
-#export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.2/lib:$LD_LIBRARY_PATH
-#export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$LD_LIBRARY_PATH
-
-#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
+#export LD_LIBRARY_PATH=/opt-linux-x86_64/ffmpeg-4.3/lib:$LD_LIBRARY_PATH
+#export LD_LIBRARY_PATH=/opt-linux-x86_64/ffmpeg-5.1/lib:$LD_LIBRARY_PATH
+#export LD_LIBRARY_PATH=/opt-linux-x86_64/ffmpeg-6.0/lib:$LD_LIBRARY_PATH
#J2RE_HOME=/opt-linux-x86_64/jre1.7.0_45
#JAVA_HOME=/opt-linux-x86_64/jdk1.7.0_45
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 88b0df627..6bc229c64 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -323,18 +323,19 @@ function jrun() {
#D_ARGS="-Dnativewindow.debug.NativeWindow"
#D_ARGS="-Dnativewindow.osx.calayer.bugfree"
#D_ARGS="-Dnativewindow.debug.ToolkitLock"
+ #D_ARGS="-Djogl.debug.graph.curve.Instance"
+ #D_ARGS="-Djogl.debug.graph.curve.Instance -Djogl.debug.graph.curve.Triangulation"
+ #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.graph.curve.Instance -Djogl.debug.graph.curve.Triangulation"
#D_ARGS="-Djogl.debug.graph.curve"
#D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode -Djogl.debug.DebugGL -Djogl.debug.TraceGL"
- #D_ARGS="-Djogl.debug.graph.curve"
#D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode"
#D_ARGS="-Djogl.debug.DebugGL"
#D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.graph.curve.Instance -Djogl.debug.GLSLCode"
#D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.graph.curve.triangulation.LINE_AA -Djogl.debug.graph.curve.Triangulation -Djogl.debug.graph.font.Renderer"
- #D_ARGS="-Djogl.debug.graph.font.Renderer"
- #D_ARGS="-Djogl.debug.graph.font.Renderer.Code"
+ #D_ARGS="-Djogl.debug.graph.font.Renderer -Djogl.debug.graph.font.Renderer.Code"
#D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.graph.curve.vbaa.resizeLowerBoundary=100"
#D_ARGS="-Djogl.debug.GLSLCode"
- #D_ARGS="-Djogl.debug.graph.curve.instance"
+ #D_ARGS="-Djogl.debug.graph.curve.instance -Djogl.debug.graph.curve"
#D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode -Djogl.debug.TraceGL"
#D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState"
#D_ARGS="-Djogamp.debug.IOUtil"
@@ -524,7 +525,7 @@ function testawtswt() {
#
#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 $*
#
@@ -938,11 +939,11 @@ function testawtswt() {
#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT00 $*
#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $*
#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $*
-testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.ui.UIShapeDemo01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.ui.UITypeDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.UIShapeDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.UITypeDemo01 $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
#testawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo $*
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 09:15:57 +0000