Date: Tue, 15 Dec 2020 17:37:00 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558165 - in head/graphics/jogamp-jogl: . files Message-ID: <202012151737.0BFHb0T9088019@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Tue Dec 15 17:36:59 2020 New Revision: 558165 URL: https://svnweb.freebsd.org/changeset/ports/558165 Log: graphics/jogamp-jogl: add support for powerpc64 PR: 251870 Approved by: makc (maintainer) Added: head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml (contents, props changed) Modified: head/graphics/jogamp-jogl/Makefile head/graphics/jogamp-jogl/files/patch-freebsd head/graphics/jogamp-jogl/files/patch-gluegen2 head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml Modified: head/graphics/jogamp-jogl/Makefile ============================================================================== --- head/graphics/jogamp-jogl/Makefile Tue Dec 15 15:38:57 2020 (r558164) +++ head/graphics/jogamp-jogl/Makefile Tue Dec 15 17:36:59 2020 (r558165) @@ -17,7 +17,7 @@ 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 +ONLY_FOR_ARCHS= i386 amd64 powerpc64 USES= compiler tar:xz xorg Modified: head/graphics/jogamp-jogl/files/patch-freebsd ============================================================================== --- head/graphics/jogamp-jogl/files/patch-freebsd Tue Dec 15 15:38:57 2020 (r558164) +++ head/graphics/jogamp-jogl/files/patch-freebsd Tue Dec 15 17:36:59 2020 (r558165) @@ -22,7 +22,18 @@ <syslibset dir="/usr/local/lib" libs="X11"/> </linker> -@@ -1401,7 +1401,7 @@ +@@ -1211,6 +1211,10 @@ + <syslibset dir="/usr/local/lib" libs="X11"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc.jogl.x11" extends="linker.cfg.freebsd.ppc"> ++ <syslibset dir="/usr/local/lib" libs="X11"/> ++ </linker> ++ + <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux"> + <syslibset libs="X11"/> + </linker> +@@ -1401,7 +1405,7 @@ <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86"> <echo message="FreeBSD" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> @@ -31,6 +42,21 @@ </target> <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64"> +@@ -1410,7 +1414,13 @@ + <property name="linker.cfg.id.os" value="linker.cfg.freebsd.amd64.jogl.x11" /> + </target> + +- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> ++ <target name="c.configure.freebsd.ppc" depends="c.configure.x11" if="isFreeBSDPpc"> ++ <echo message="FreeBSD" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> ++ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc.jogl.x11" /> ++ </target> ++ ++ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD" /> + + <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> + <echo message="HP-UX" /> --- jogl/make/build-nativewindow.xml.orig 2015-10-10 01:08:14 UTC +++ jogl/make/build-nativewindow.xml @@ -373,7 +373,7 @@ @@ -42,7 +68,20 @@ <syslibset dir="/usr/local/lib" libs="X11"/> <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> <syslibset dir="/usr/local/lib" libs="Xrender"/> -@@ -582,7 +582,7 @@ +@@ -385,6 +385,12 @@ + <syslibset dir="/usr/local/lib" libs="Xrender"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc.nativewindow.x11" extends="linker.cfg.freebsd.ppc"> ++ <syslibset dir="/usr/local/lib" libs="X11" /> ++ <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> ++ <syslibset dir="/usr/local/lib" libs="Xrender"/> ++ </linker> ++ + <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux"> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> +@@ -582,7 +588,7 @@ <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> <echo message="FreeBSD.x86" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> @@ -51,6 +90,22 @@ </target> <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64"> +@@ -590,8 +596,14 @@ + <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" /> + </target> ++ ++ <target name="c.configure.freebsd.ppc" if="isFreeBSDPpc"> ++ <echo message="FreeBSD.Ppc" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> ++ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc.nativewindow.x11" /> ++ </target> + +- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> ++ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD" /> + + <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> + <echo message="HP-UX" /> --- jogl/make/build-newt.xml.orig 2015-10-10 01:08:14 UTC +++ jogl/make/build-newt.xml @@ -289,7 +289,7 @@ @@ -62,7 +117,21 @@ <linkerarg value="-L/usr/local/lib"/> <syslibset libs="X11"/> <syslibset libs="Xrandr"/> -@@ -560,8 +560,8 @@ +@@ -303,6 +303,13 @@ + <syslibset libs="Xcursor"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc.newt.x11" extends="linker.cfg.freebsd.ppc"> ++ <linkerarg value="-L/usr/local/lib"/> ++ <syslibset libs="X11"/> ++ <syslibset libs="Xrandr"/> ++ <syslibset libs="Xcursor"/> ++ </linker> ++ + <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux"> + <syslibset libs="EGL"/> + <syslibset libs="GLES_CM"/> +@@ -560,8 +567,8 @@ <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> <echo message="FreeBSD.x86" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> @@ -73,3 +142,22 @@ <isset property="isX11" /> </condition> <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> +@@ -577,7 +584,17 @@ + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + +- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/> ++ <target name="c.configure.freebsd.ppc" if="isFreeBSDPpc"> ++ <echo message="FreeBSD.Ppc" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> ++ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc.newt.x11" ++ else="linker.cfg.freebsd.ppc"> ++ <isset property="isX11" /> ++ </condition> ++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> ++ </target> ++ ++ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD"/> + + <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> + <echo message="HP-UX" /> Modified: head/graphics/jogamp-jogl/files/patch-gluegen2 ============================================================================== --- head/graphics/jogamp-jogl/files/patch-gluegen2 Tue Dec 15 15:38:57 2020 (r558164) +++ head/graphics/jogamp-jogl/files/patch-gluegen2 Tue Dec 15 17:36:59 2020 (r558165) @@ -1,6 +1,25 @@ ---- gluegen/make/build.xml.orig 2014-10-10 13:20:51 UTC +--- gluegen/make/build.xml.orig 2015-10-09 04:18:28 UTC +++ gluegen/make/build.xml -@@ -408,7 +408,7 @@ +@@ -375,10 +375,17 @@ + <property name="c.src.dir.os" value="unix" /> + </target> + +- <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64" if="isFreeBSD" > ++ <target name="declare.freebsd.ppc" if="isFreeBSDPpc"> ++ <echo message="FreeBSDPpc" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd" /> ++ <property name="linker.cfg.id" value="linker.cfg.freebsd.ppc" /> + <property name="c.src.dir.os" value="unix" /> + </target> + ++ <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64,declare.freebsd.ppc" if="isFreeBSD" > ++ <property name="c.src.dir.os" value="unix" /> ++ </target> ++ + <target name="declare.hpux" if="isHPUX"> + <echo message="HP-UX" /> + <property name="compiler.cfg.id" value="compiler.cfg.hpux" /> +@@ -408,7 +415,7 @@ <property name="c.compiler.src.files.common" value="src/native/common/*.c" /> <property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" /> @@ -9,7 +28,7 @@ <condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition> <condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition> <condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition> -@@ -605,7 +605,7 @@ +@@ -605,7 +612,7 @@ <srcfiles dir= "${src.jcpp}" includes="**"/> <srcfiles dir= "${c.grammar}" includes="*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/> @@ -18,7 +37,7 @@ </uptodate> <uptodate property="gluegen.build.skip.java2"> <srcfiles dir= "." includes="*.xml"/> -@@ -613,7 +613,7 @@ +@@ -613,7 +620,7 @@ <srcfiles dir= "${src.jcpp}" includes="**"/> <srcfiles dir= "${c.grammar}" includes="*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/> @@ -27,7 +46,7 @@ </uptodate> <condition property="gluegen.build.skip.java" value="true"> <or> -@@ -753,7 +753,7 @@ +@@ -763,7 +770,7 @@ </copy> <!-- Build gluegen.jar. --> @@ -36,7 +55,7 @@ <service type="javax.annotation.processing.Processor"> <provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/> </service> -@@ -806,7 +806,7 @@ +@@ -842,7 +849,7 @@ </copy> <!-- Build gluegen-rt.jar. --> @@ -45,9 +64,9 @@ <fileset dir="${classes}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/common/**" /> ---- gluegen/src/java/com/jogamp/common/os/Platform.java.orig 2014-10-10 13:20:51 UTC +--- 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 -@@ -146,7 +146,7 @@ public class Platform extends PlatformPr +@@ -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 */ @@ -56,9 +75,9 @@ // // static initialization order: ---- gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java.orig 2014-10-10 13:20:51 UTC +--- 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 SingletonJunitCase { +@@ -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; } Added: head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml Tue Dec 15 17:36:59 2020 (r558165) @@ -0,0 +1,64 @@ +--- gluegen/make/gluegen-cpptasks-base.xml.orig 2020-12-15 14:25:42 UTC ++++ gluegen/make/gluegen-cpptasks-base.xml +@@ -317,6 +317,12 @@ + <istrue value="${isAMD64}" /> + </and> + </condition> ++ <condition property="isFreeBSDPpc"> ++ <and> ++ <istrue value="${isFreeBSD}" /> ++ <os arch="ppc64" /> ++ </and> ++ </condition> + <condition property="isHPUX"> + <os name="HP-UX" /> + </condition> +@@ -581,6 +587,7 @@ + <echo message="FreeBSD=${isFreeBSD}" /> + <echo message="FreeBSDX86=${isFreeBSDX86}" /> + <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" /> ++ <echo message="FreeBSDPpc=${isFreeBSDPpc}" /> + <echo message="HPUX=${isHPUX}" /> + <echo message="IA64=${isIA64}" /> + <echo message="Android=${isAndroid}" /> +@@ -633,8 +640,12 @@ + <property name="os.and.arch" value="freebsd-amd64" /> + </target> + +- <target name="gluegen.cpptasks.detect.os.freebsd" depends="gluegen.cpptasks.detect.os.freebsd.amd64,gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" /> ++ <target name="gluegen.cpptasks.detect.os.freebsd.ppc" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDPpc"> ++ <property name="os.and.arch" value="freebsd-ppc" /> ++ </target> + ++ <target name="gluegen.cpptasks.detect.os.freebsd" depends="gluegen.cpptasks.detect.os.freebsd.amd64,gluegen.cpptasks.detect.os.freebsd.x86,gluegen.cpptasks.detect.os.freebsd.ppc" unless="gluegen.cpptasks.detected.os.2" /> ++ + <target name="gluegen.cpptasks.detect.os.hpux" unless="gluegen.cpptasks.detected.os.2" if="isHPUX"> + <property name="os.and.arch" value="hpux-hppa" /> + </target> +@@ -1292,6 +1303,10 @@ + <linkerarg value="-m64"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc" name="${gcc.compat.compiler}"> ++ <linkerarg value="-m64"/> ++ </linker> ++ + <!-- SOLARIS linker configuration --> + + <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> +@@ -1580,7 +1595,14 @@ + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/amd64" /> + </target> + +- <target name="gluegen.cpptasks.declare.compiler.freebsd" depends="gluegen.cpptasks.declare.compiler.freebsd.x86,gluegen.cpptasks.declare.compiler.freebsd.amd64" if="isFreeBSD"> ++ <target name="gluegen.cpptasks.declare.compiler.freebsd.ppc" if="isFreeBSDPpc"> ++ <echo message="FreeBSD" /> ++ <property name="compiler.cfg.id.base" value="compiler.cfg.freebsd" /> ++ <property name="linker.cfg.id.base" value="linker.cfg.freebsd.ppc" /> ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64" /> ++ </target> ++ ++ <target name="gluegen.cpptasks.declare.compiler.freebsd" depends="gluegen.cpptasks.declare.compiler.freebsd.x86,gluegen.cpptasks.declare.compiler.freebsd.amd64,gluegen.cpptasks.declare.compiler.freebsd.ppc" if="isFreeBSD"> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> + </target> + Modified: head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml ============================================================================== --- head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml Tue Dec 15 15:38:57 2020 (r558164) +++ head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml Tue Dec 15 17:36:59 2020 (r558165) @@ -1,4 +1,4 @@ ---- jogl/make/build-common.xml.orig 2015-03-27 14:58:50 UTC +--- jogl/make/build-common.xml.orig 2015-10-10 01:08:14 UTC +++ jogl/make/build-common.xml @@ -130,8 +130,8 @@ <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar"> @@ -11,7 +11,7 @@ </condition> <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar"> <istrue value="${isLinuxAMD64}" /> -@@ -210,7 +210,7 @@ +@@ -213,7 +213,7 @@ <property name="gluegen.build.xml" value="${gluegen.make}/build.xml" /> <property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" /> <property name="obj.gluegen" value="${build.gluegen}/obj"/> @@ -20,7 +20,7 @@ <property name="build.joal" value="${joal.root}/${rootrel.build}" /> <!-- optional --> -@@ -434,7 +434,7 @@ +@@ -438,7 +438,7 @@ </path> <!-- JavaSE combinations -->
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012151737.0BFHb0T9088019>