Index: head/graphics/jogamp-jogl/Makefile =================================================================== --- head/graphics/jogamp-jogl/Makefile (revision 558372) +++ head/graphics/jogamp-jogl/Makefile (revision 558373) @@ -1,62 +1,62 @@ # Created by: Tassilo Philipp # $FreeBSD$ PORTNAME= jogamp-jogl PORTVERSION= 2.3.2 PORTREVISION= 1 CATEGORIES= graphics devel java MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ \ http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/ DISTFILES= jogl-v${PORTVERSION}.tar.xz \ gluegen-v${PORTVERSION}.tar.xz \ jcpp-v${PORTVERSION}.tar.xz MAINTAINER= makc@FreeBSD.org COMMENT= Java bindings for OpenGL BUILD_DEPENDS= ${JAVALIBDIR}/swt.jar:x11-toolkits/swt RUN_DEPENDS= ${JAVALIBDIR}/swt.jar:x11-toolkits/swt -ONLY_FOR_ARCHS= i386 amd64 powerpc64 +ONLY_FOR_ARCHS= i386 amd64 powerpc64 powerpc64le USES= compiler tar:xz xorg USE_ANT= yes USE_JAVA= yes USE_XORG= x11 xcursor xrandr xrender xxf86vm PATCH_WRKSRC= ${WRKDIR} BUILD_WRKSRC= ${WRKDIR}/jogl/make # compiler must be literally "gcc" or "clang" BINARY_ALIAS= ${CHOSEN_COMPILER_TYPE}=${CC} MAKE_ARGS= -Dgcc.compat.compiler=${CHOSEN_COMPILER_TYPE} post-extract: ${MV} ${WRKDIR}/gluegen-v${PORTVERSION} ${WRKDIR}/gluegen ${MV} ${WRKDIR}/jcpp-v${PORTVERSION}/src ${WRKDIR}/gluegen/jcpp/src ${MV} ${WRKDIR}/jogl-v${PORTVERSION} ${WRKDIR}/jogl post-patch: ${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \ ${BUILD_WRKSRC}/build-common.xml ${REINPLACE_CMD} -e '/name="all"/s|,test.compile||g' \ ${BUILD_WRKSRC}/build.xml pre-build: @(cd ${WRKDIR}/gluegen/make; \ ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} all.no_junit) do-install: ${INSTALL_LIB} \ ${WRKDIR}/gluegen/build/obj/libgluegen2-rt.so \ ${WRKDIR}/jogl/build/lib/*.so \ ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} \ ${WRKDIR}/gluegen/build/gluegen2-rt.jar \ ${WRKDIR}/gluegen/build/gluegen2.jar \ ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKDIR}/jogl/build/jar/jogl-all.jar \ ${STAGEDIR}${JAVAJARDIR}/jogl2.jar .include Index: head/graphics/jogamp-jogl/files/patch-freebsd =================================================================== --- head/graphics/jogamp-jogl/files/patch-freebsd (revision 558372) +++ head/graphics/jogamp-jogl/files/patch-freebsd (revision 558373) @@ -1,163 +1,202 @@ --- jogl/make/build-jogl.xml.orig 2015-10-10 01:08:14 UTC +++ jogl/make/build-jogl.xml @@ -1184,9 +1184,9 @@ - - - + + + @@ -1203,7 +1203,7 @@ - + -@@ -1211,6 +1211,10 @@ +@@ -1211,6 +1211,14 @@ -+ ++ + + + ++ ++ ++ ++ -@@ -1401,7 +1405,7 @@ +@@ -1401,7 +1409,7 @@ - + -@@ -1410,7 +1414,13 @@ +@@ -1410,7 +1418,19 @@ - -+ ++ + + -+ ++ + + -+ ++ ++ ++ ++ ++ ++ ++ --- jogl/make/build-nativewindow.xml.orig 2015-10-10 01:08:14 UTC +++ jogl/make/build-nativewindow.xml @@ -373,7 +373,7 @@ - + -@@ -385,6 +385,12 @@ +@@ -385,6 +385,18 @@ -+ ++ + + + + + ++ ++ ++ ++ ++ ++ -@@ -582,7 +588,7 @@ +@@ -582,7 +594,7 @@ - + -@@ -590,8 +596,14 @@ +@@ -590,8 +602,20 @@ + -+ -+ ++ ++ + -+ ++ + - -+ ++ ++ ++ ++ ++ ++ ++ --- jogl/make/build-newt.xml.orig 2015-10-10 01:08:14 UTC +++ jogl/make/build-newt.xml @@ -289,7 +289,7 @@ - + -@@ -303,6 +303,13 @@ +@@ -303,6 +303,20 @@ -+ ++ + + + + + + ++ ++ ++ ++ ++ ++ ++ -@@ -560,8 +567,8 @@ +@@ -560,8 +574,8 @@ - + -@@ -577,7 +584,17 @@ +@@ -577,7 +591,27 @@ - -+ -+ ++ ++ + -+ ++ + + + + + -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Index: head/graphics/jogamp-jogl/files/patch-gluegen2 =================================================================== --- head/graphics/jogamp-jogl/files/patch-gluegen2 (revision 558372) +++ head/graphics/jogamp-jogl/files/patch-gluegen2 (revision 558373) @@ -1,90 +1,97 @@ --- gluegen/make/build.xml.orig 2015-10-09 04:18:28 UTC +++ gluegen/make/build.xml -@@ -375,10 +375,17 @@ +@@ -375,10 +375,24 @@ - -+ -+ ++ ++ + -+ ++ -+ ++ ++ ++ ++ + + + ++ ++ ++ ++ -@@ -408,7 +415,7 @@ +@@ -408,7 +422,7 @@ - + -@@ -605,7 +612,7 @@ +@@ -605,7 +619,7 @@ - + -@@ -613,7 +620,7 @@ +@@ -613,7 +627,7 @@ - + -@@ -763,7 +770,7 @@ +@@ -763,7 +777,7 @@ - + -@@ -842,7 +849,7 @@ +@@ -842,7 +856,7 @@ - + --- gluegen/src/java/com/jogamp/common/os/Platform.java.orig 2015-10-09 04:18:28 UTC +++ gluegen/src/java/com/jogamp/common/os/Platform.java @@ -256,7 +256,7 @@ public class Platform extends PlatformPropsImpl { private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache"; /** fixed basename of JAR file and native library */ - private static final String libBaseName = "gluegen-rt"; + private static final String libBaseName = "gluegen2-rt"; // // static initialization order: --- gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java.orig 2015-10-09 04:18:28 UTC +++ gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java @@ -196,8 +196,8 @@ public class TestTempJarCache extends SingletonJunitCa @Test public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException { if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } - final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen-rt-natives-"+Platform.getOSAndArch()+".jar"); - final String libBaseName = "gluegen-rt"; + final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar"); + final String libBaseName = "gluegen2-rt"; final ClassLoader cl = getClass().getClassLoader(); final Uri jarUri = JarUtil.getJarUri(TempJarCache.class.getName(), cl); Index: head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml =================================================================== --- head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml (revision 558372) +++ head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml (revision 558373) @@ -1,64 +1,86 @@ ---- gluegen/make/gluegen-cpptasks-base.xml.orig 2020-12-15 14:25:42 UTC +--- gluegen/make/gluegen-cpptasks-base.xml.orig 2015-10-09 04:18:28 UTC +++ gluegen/make/gluegen-cpptasks-base.xml -@@ -317,6 +317,12 @@ +@@ -317,6 +317,18 @@ -+ ++ + + + + + ++ ++ ++ ++ ++ ++ -@@ -581,6 +587,7 @@ +@@ -581,6 +593,8 @@ -+ ++ ++ -@@ -633,8 +640,12 @@ +@@ -633,8 +647,16 @@ - -+ -+ ++ ++ + -+ ++ ++ ++ + ++ ++ -@@ -1292,6 +1303,10 @@ +@@ -1292,6 +1314,14 @@ -+ ++ + + + ++ ++ ++ ++ -@@ -1580,7 +1595,14 @@ +@@ -1580,7 +1610,21 @@ - -+ ++ + + -+ ++ + + + -+ ++ ++ ++ ++ ++ ++ ++ ++