Date: Fri, 18 Dec 2020 13:58:16 +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: r558373 - in head/graphics/jogamp-jogl: . files Message-ID: <202012181358.0BIDwGeP060685@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Fri Dec 18 13:58:16 2020 New Revision: 558373 URL: https://svnweb.freebsd.org/changeset/ports/558373 Log: graphics/jogamp-jogl: port to powerpc64le PR: 251929 Approved by: makc (maintainer) 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-gluegen_make_gluegen-cpptasks-base.xml Modified: head/graphics/jogamp-jogl/Makefile ============================================================================== --- head/graphics/jogamp-jogl/Makefile Fri Dec 18 13:39:54 2020 (r558372) +++ head/graphics/jogamp-jogl/Makefile Fri Dec 18 13:58:16 2020 (r558373) @@ -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 powerpc64 +ONLY_FOR_ARCHS= i386 amd64 powerpc64 powerpc64le USES= compiler tar:xz xorg Modified: head/graphics/jogamp-jogl/files/patch-freebsd ============================================================================== --- head/graphics/jogamp-jogl/files/patch-freebsd Fri Dec 18 13:39:54 2020 (r558372) +++ head/graphics/jogamp-jogl/files/patch-freebsd Fri Dec 18 13:58:16 2020 (r558373) @@ -22,18 +22,22 @@ <syslibset dir="/usr/local/lib" libs="X11"/> </linker> -@@ -1211,6 +1211,10 @@ +@@ -1211,6 +1211,14 @@ <syslibset dir="/usr/local/lib" libs="X11"/> </linker> -+ <linker id="linker.cfg.freebsd.ppc.jogl.x11" extends="linker.cfg.freebsd.ppc"> ++ <linker id="linker.cfg.freebsd.ppc64.jogl.x11" extends="linker.cfg.freebsd.ppc64"> + <syslibset dir="/usr/local/lib" libs="X11"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc64le.jogl.x11" extends="linker.cfg.freebsd.ppc64le"> ++ <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 @@ +@@ -1401,7 +1409,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" /> @@ -42,18 +46,24 @@ </target> <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64"> -@@ -1410,7 +1414,13 @@ +@@ -1410,7 +1418,19 @@ <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"> ++ <target name="c.configure.freebsd.ppc64" depends="c.configure.x11" if="isFreeBSDPpc64"> + <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" /> ++ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64.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.freebsd.ppc64le" depends="c.configure.x11" if="isFreeBSDPpc64le"> ++ <echo message="FreeBSD" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> ++ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64le.jogl.x11" /> ++ </target> ++ ++ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD" /> <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> <echo message="HP-UX" /> @@ -68,20 +78,26 @@ <syslibset dir="/usr/local/lib" libs="X11"/> <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> <syslibset dir="/usr/local/lib" libs="Xrender"/> -@@ -385,6 +385,12 @@ +@@ -385,6 +385,18 @@ <syslibset dir="/usr/local/lib" libs="Xrender"/> </linker> -+ <linker id="linker.cfg.freebsd.ppc.nativewindow.x11" extends="linker.cfg.freebsd.ppc"> ++ <linker id="linker.cfg.freebsd.ppc64.nativewindow.x11" extends="linker.cfg.freebsd.ppc64"> + <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.freebsd.ppc64le.nativewindow.x11" extends="linker.cfg.freebsd.ppc64le"> ++ <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 @@ +@@ -582,7 +594,7 @@ <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> <echo message="FreeBSD.x86" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> @@ -90,19 +106,25 @@ </target> <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64"> -@@ -590,8 +596,14 @@ +@@ -590,8 +602,20 @@ <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" /> ++ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64"> ++ <echo message="FreeBSD.Ppc64" /> + <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> -+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc.nativewindow.x11" /> ++ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.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.freebsd.ppc64le" if="isFreeBSDPpc64le"> ++ <echo message="FreeBSD.Ppc64le" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> ++ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.nativewindow.x11" /> ++ </target> ++ ++ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD" /> <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> <echo message="HP-UX" /> @@ -117,21 +139,28 @@ <linkerarg value="-L/usr/local/lib"/> <syslibset libs="X11"/> <syslibset libs="Xrandr"/> -@@ -303,6 +303,13 @@ +@@ -303,6 +303,20 @@ <syslibset libs="Xcursor"/> </linker> -+ <linker id="linker.cfg.freebsd.ppc.newt.x11" extends="linker.cfg.freebsd.ppc"> ++ <linker id="linker.cfg.freebsd.ppc64.newt.x11" extends="linker.cfg.freebsd.ppc64"> + <linkerarg value="-L/usr/local/lib"/> + <syslibset libs="X11"/> + <syslibset libs="Xrandr"/> + <syslibset libs="Xcursor"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc64le.newt.x11" extends="linker.cfg.freebsd.ppc64le"> ++ <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 @@ +@@ -560,8 +574,8 @@ <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> <echo message="FreeBSD.x86" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> @@ -142,22 +171,32 @@ <isset property="isX11" /> </condition> <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> -@@ -577,7 +584,17 @@ +@@ -577,7 +591,27 @@ <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" /> ++ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64"> ++ <echo message="FreeBSD.Ppc64" /> + <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"> ++ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.newt.x11" ++ else="linker.cfg.freebsd.ppc64"> + <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.freebsd.ppc64le" if="isFreeBSDPpc64le"> ++ <echo message="FreeBSD.Ppc64le" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> ++ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.newt.x11" ++ else="linker.cfg.freebsd.ppc64le"> ++ <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.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" 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 Fri Dec 18 13:39:54 2020 (r558372) +++ head/graphics/jogamp-jogl/files/patch-gluegen2 Fri Dec 18 13:58:16 2020 (r558373) @@ -1,25 +1,32 @@ --- gluegen/make/build.xml.orig 2015-10-09 04:18:28 UTC +++ gluegen/make/build.xml -@@ -375,10 +375,17 @@ +@@ -375,10 +375,24 @@ <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" /> ++ <target name="declare.freebsd.ppc64" if="isFreeBSDPpc64"> ++ <echo message="FreeBSDPpc64" /> + <property name="compiler.cfg.id" value="compiler.cfg.freebsd" /> -+ <property name="linker.cfg.id" value="linker.cfg.freebsd.ppc" /> ++ <property name="linker.cfg.id" value="linker.cfg.freebsd.ppc64" /> <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" > ++ <target name="declare.freebsd.ppc64le" if="isFreeBSDPpc64le"> ++ <echo message="FreeBSDPpc64le" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd" /> ++ <property name="linker.cfg.id" value="linker.cfg.freebsd.ppc64le" /> + <property name="c.src.dir.os" value="unix" /> + </target> + ++ <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64,declare.freebsd.ppc64,declare.freebsd.ppc64le" 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 @@ +@@ -408,7 +422,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" /> @@ -28,7 +35,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 +612,7 @@ +@@ -605,7 +619,7 @@ <srcfiles dir= "${src.jcpp}" includes="**"/> <srcfiles dir= "${c.grammar}" includes="*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/> @@ -37,7 +44,7 @@ </uptodate> <uptodate property="gluegen.build.skip.java2"> <srcfiles dir= "." includes="*.xml"/> -@@ -613,7 +620,7 @@ +@@ -613,7 +627,7 @@ <srcfiles dir= "${src.jcpp}" includes="**"/> <srcfiles dir= "${c.grammar}" includes="*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/> @@ -46,7 +53,7 @@ </uptodate> <condition property="gluegen.build.skip.java" value="true"> <or> -@@ -763,7 +770,7 @@ +@@ -763,7 +777,7 @@ </copy> <!-- Build gluegen.jar. --> @@ -55,7 +62,7 @@ <service type="javax.annotation.processing.Processor"> <provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/> </service> -@@ -842,7 +849,7 @@ +@@ -842,7 +856,7 @@ </copy> <!-- Build gluegen-rt.jar. --> Modified: head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml ============================================================================== --- head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml Fri Dec 18 13:39:54 2020 (r558372) +++ head/graphics/jogamp-jogl/files/patch-gluegen_make_gluegen-cpptasks-base.xml Fri Dec 18 13:58:16 2020 (r558373) @@ -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 @@ <istrue value="${isAMD64}" /> </and> </condition> -+ <condition property="isFreeBSDPpc"> ++ <condition property="isFreeBSDPpc64"> + <and> + <istrue value="${isFreeBSD}" /> + <os arch="ppc64" /> + </and> + </condition> ++ <condition property="isFreeBSDPpc64le"> ++ <and> ++ <istrue value="${isFreeBSD}" /> ++ <os arch="ppc64le" /> ++ </and> ++ </condition> <condition property="isHPUX"> <os name="HP-UX" /> </condition> -@@ -581,6 +587,7 @@ +@@ -581,6 +593,8 @@ <echo message="FreeBSD=${isFreeBSD}" /> <echo message="FreeBSDX86=${isFreeBSDX86}" /> <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" /> -+ <echo message="FreeBSDPpc=${isFreeBSDPpc}" /> ++ <echo message="FreeBSDPpc64=${isFreeBSDPpc64}" /> ++ <echo message="FreeBSDPpc64le=${isFreeBSDPpc64le}" /> <echo message="HPUX=${isHPUX}" /> <echo message="IA64=${isIA64}" /> <echo message="Android=${isAndroid}" /> -@@ -633,8 +640,12 @@ +@@ -633,8 +647,16 @@ <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 name="gluegen.cpptasks.detect.os.freebsd.ppc64" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDPpc64"> ++ <property name="os.and.arch" value="freebsd-ppc64" /> + </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.freebsd.ppc64le" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDPpc64le"> ++ <property name="os.and.arch" value="freebsd-ppc64le" /> ++ </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.ppc64,gluegen.cpptasks.detect.os.freebsd.ppc64le" 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 @@ +@@ -1292,6 +1314,14 @@ <linkerarg value="-m64"/> </linker> -+ <linker id="linker.cfg.freebsd.ppc" name="${gcc.compat.compiler}"> ++ <linker id="linker.cfg.freebsd.ppc64" name="${gcc.compat.compiler}"> + <linkerarg value="-m64"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc64le" name="${gcc.compat.compiler}"> ++ <linkerarg value="-m64"/> ++ </linker> ++ <!-- SOLARIS linker configuration --> <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> -@@ -1580,7 +1595,14 @@ +@@ -1580,7 +1610,21 @@ <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"> ++ <target name="gluegen.cpptasks.declare.compiler.freebsd.ppc64" if="isFreeBSDPpc64"> + <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="linker.cfg.id.base" value="linker.cfg.freebsd.ppc64" /> + <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"> ++ <target name="gluegen.cpptasks.declare.compiler.freebsd.ppc64le" if="isFreeBSDPpc64le"> ++ <echo message="FreeBSD" /> ++ <property name="compiler.cfg.id.base" value="compiler.cfg.freebsd" /> ++ <property name="linker.cfg.id.base" value="linker.cfg.freebsd.ppc64le" /> ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64le" /> ++ </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.ppc64,gluegen.cpptasks.declare.compiler.freebsd.ppc64le" if="isFreeBSD"> <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> </target>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012181358.0BIDwGeP060685>