Attachment #189597 for bug #225058

View | Details | Raw Unified | Return to bug 225058
Collapse All | Expand All




# $FreeBSD: head/graphics/jogamp-jogl/Makefile 449591 2017-09-10 20:55:38Z gerald $

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

EXTRACT_DEPENDS=	${7Z_CMD}:archivers/p7zip
BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
RUN_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel


USE_JAVA=	yes
USE_XORG=	x11 xcursor xrandr xrender xxf86vm

EXTRACT_CMD=	${TAR}
EXTRACT_BEFORE_ARGS=	xf
EXTRACT_BEFORE_ARGS=	x -so
EXTRACT_AFTER_ARGS=	| ${TAR} -xf -

PATCH_WRKSRC=	${WRKDIR}
BUILD_WRKSRC=	${WRKDIR}/jogl/make


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
	${MKDIR} ${BUILD_BINPATH}
	${LN} -sf ${LOCALBASE}/bin/${CC} ${BUILD_BINPATH}/gcc

Lines 1-4 Link Here

(-)jogamp-jogl/distinfo (-4 / +6 lines)
1	SHA256 (jogl-v2.2.4.tar.7z) = 39d53fc4c4c3f8e3a5287646bc10457cfaa6fcc88f07c0b0c7817a95cb1f282b	1	SHA256 (jogl-v2.3.2.tar.xz) = 88cd468a1401ac6e32f6fb850b59328aff6808ddfa0a579fae53e2fe3b446c06
2	SIZE (jogl-v2.2.4.tar.7z) = 33454202	2	SIZE (jogl-v2.3.2.tar.xz) = 35467924
3	SHA256 (gluegen-v2.2.4.tar.7z) = 6ad7b35f7c8fc81ec57d986f54b93c5c93127cd6c2b0efc2fb3950022feb15da	3	SHA256 (gluegen-v2.3.2.tar.xz) = d235d5d4c9b8e17d9029be2d9b9e3f2839a67f4f23dd3871fe10c4b5f04091d3
4	SIZE (gluegen-v2.2.4.tar.7z) = 39334025	4	SIZE (gluegen-v2.3.2.tar.xz) = 64053832
		5	SHA256 (jcpp-v2.3.2.tar.xz) = 67f889200e438789b2987d4e6c876a1ad6b8cfe3d5cb07a5f9de0d250ab73c46
		6	SIZE (jcpp-v2.3.2.tar.xz) = 39024




       <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 @@
         <srcfiles dir= "${src.jcpp}"  includes="**"/>
         <srcfiles dir= "${c.grammar}" includes="*.g"/>
         <srcfiles dir= "${j.grammar}" includes="*.g"/>
-        <mapper type="merge" to="${build}/gluegen.jar"/>

       </uptodate>
       <uptodate property="gluegen.build.skip.java2">
         <srcfiles dir= "."            includes="*.xml"/>
@@ -613,7 +613,7 @@
         <srcfiles dir= "${src.jcpp}"  includes="**"/>
         <srcfiles dir= "${c.grammar}" includes="*.g"/>
         <srcfiles dir= "${j.grammar}" includes="*.g"/>
-        <mapper type="merge" to="${build}/gluegen-rt.jar"/>

     // 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
@@ -196,8 +196,8 @@ public class TestTempJarCache extends SingletonJunitCase {
     @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);

Return to bug 225058

Lines 2-19 Link Here

(-)jogamp-jogl/Makefile (-9 / +8 lines)
2	# $FreeBSD: head/graphics/jogamp-jogl/Makefile 449591 2017-09-10 20:55:38Z gerald $	2	# $FreeBSD: head/graphics/jogamp-jogl/Makefile 449591 2017-09-10 20:55:38Z gerald $
3		3
4	PORTNAME= jogamp-jogl	4	PORTNAME= jogamp-jogl
5	PORTVERSION= 2.2.4	5	PORTVERSION= 2.3.2
6	PORTREVISION= 3	6	PORTREVISION= 1
7	CATEGORIES= graphics devel java	7	CATEGORIES= graphics devel java
8	MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ \	8	MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ \
9	http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/	9	http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/
10	DISTFILES= jogl-v${PORTVERSION}.tar.7z \	10	DISTFILES= jogl-v${PORTVERSION}.tar.xz \
11	gluegen-v${PORTVERSION}.tar.7z	11	gluegen-v${PORTVERSION}.tar.xz \
		12	jcpp-v${PORTVERSION}.tar.xz
12		13
13	MAINTAINER= makc@FreeBSD.org	14	MAINTAINER= makc@FreeBSD.org
14	COMMENT= Java bindings for OpenGL	15	COMMENT= Java bindings for OpenGL
15		16
16	EXTRACT_DEPENDS= ${7Z_CMD}:archivers/p7zip
17	BUILD_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel	17	BUILD_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
18	RUN_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel	18	RUN_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
19		19
Lines 24-33 USE_GCC= yes Link Here
24	USE_JAVA= yes	24	USE_JAVA= yes
25	USE_XORG= x11 xcursor xrandr xrender xxf86vm	25	USE_XORG= x11 xcursor xrandr xrender xxf86vm
26		26
27	7Z_CMD= ${LOCALBASE}/bin/7z	27	EXTRACT_CMD= ${TAR}
28	EXTRACT_CMD= ${7Z_CMD}	28	EXTRACT_BEFORE_ARGS= xf
29	EXTRACT_BEFORE_ARGS= x -so
30	EXTRACT_AFTER_ARGS= \| ${TAR} -xf -
31		29
32	PATCH_WRKSRC= ${WRKDIR}	30	PATCH_WRKSRC= ${WRKDIR}
33	BUILD_WRKSRC= ${WRKDIR}/jogl/make	31	BUILD_WRKSRC= ${WRKDIR}/jogl/make
Lines 36-41 MAKE_ENV+= PATH="${BUILD_BINPATH}:${PATH Link Here
36		34
37	post-extract:	35	post-extract:
38	${MV} ${WRKDIR}/gluegen-v${PORTVERSION} ${WRKDIR}/gluegen	36	${MV} ${WRKDIR}/gluegen-v${PORTVERSION} ${WRKDIR}/gluegen
		37	${MV} ${WRKDIR}/jcpp-v${PORTVERSION}/src ${WRKDIR}/gluegen/jcpp/src
39	${MV} ${WRKDIR}/jogl-v${PORTVERSION} ${WRKDIR}/jogl	38	${MV} ${WRKDIR}/jogl-v${PORTVERSION} ${WRKDIR}/jogl
40	${MKDIR} ${BUILD_BINPATH}	39	${MKDIR} ${BUILD_BINPATH}
41	${LN} -sf ${LOCALBASE}/bin/${CC} ${BUILD_BINPATH}/gcc	40	${LN} -sf ${LOCALBASE}/bin/${CC} ${BUILD_BINPATH}/gcc

Lines 9-16 Link Here

(-)jogamp-jogl/files/patch-gluegen2 (-7 / +8 lines)
9	<condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition>	9	<condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition>
10	<condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition>	10	<condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition>
11	<condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition>	11	<condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition>
12	@@ -604,14 +604,14 @@	12	@@ -605,7 +605,7 @@
13	<srcfiles dir= "${src.java}" includes="**"/>	13	<srcfiles dir= "${src.jcpp}" includes="**"/>
14	<srcfiles dir= "${c.grammar}" includes="*.g"/>	14	<srcfiles dir= "${c.grammar}" includes="*.g"/>
15	<srcfiles dir= "${j.grammar}" includes="*.g"/>	15	<srcfiles dir= "${j.grammar}" includes="*.g"/>
16	- <mapper type="merge" to="${build}/gluegen.jar"/>	16	- <mapper type="merge" to="${build}/gluegen.jar"/>
Lines 18-24 Link Here
18	</uptodate>	18	</uptodate>
19	<uptodate property="gluegen.build.skip.java2">	19	<uptodate property="gluegen.build.skip.java2">
20	<srcfiles dir= "." includes="*.xml"/>	20	<srcfiles dir= "." includes="*.xml"/>
21	<srcfiles dir= "${src.java}" includes="**"/>	21	@@ -613,7 +613,7 @@
		22	<srcfiles dir= "${src.jcpp}" includes="**"/>
22	<srcfiles dir= "${c.grammar}" includes="*.g"/>	23	<srcfiles dir= "${c.grammar}" includes="*.g"/>
23	<srcfiles dir= "${j.grammar}" includes="*.g"/>	24	<srcfiles dir= "${j.grammar}" includes="*.g"/>
24	- <mapper type="merge" to="${build}/gluegen-rt.jar"/>	25	- <mapper type="merge" to="${build}/gluegen-rt.jar"/>
Lines 57-70 Link Here
57	// static initialization order:	58	// static initialization order:
58	--- gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java.orig 2014-10-10 13:20:51 UTC	59	--- gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java.orig 2014-10-10 13:20:51 UTC
59	+++ gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java	60	+++ gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java
60	@@ -197,8 +197,8 @@ public class TestTempJarCache extends Ju	61	@@ -196,8 +196,8 @@ public class TestTempJarCache extends SingletonJunitCase {
61	@Test	62	@Test
62	public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {	63	public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {
63	if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }	64	if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
64	- final String nativeJarName = "gluegen-rt-natives-"+Platform.getOSAndArch()+".jar";	65	- final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen-rt-natives-"+Platform.getOSAndArch()+".jar");
65	- final String libBaseName = "gluegen-rt";	66	- final String libBaseName = "gluegen-rt";
66	+ final String nativeJarName = "gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar";	67	+ final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar");
67	+ final String libBaseName = "gluegen2-rt";	68	+ final String libBaseName = "gluegen2-rt";
68	final ClassLoader cl = getClass().getClassLoader();	69	final ClassLoader cl = getClass().getClassLoader();
69		70
70	URI jarUriRoot = JarUtil.getJarSubURI(TempJarCache.class.getName(), cl);	71	final Uri jarUri = JarUtil.getJarUri(TempJarCache.class.getName(), cl);