sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/jogamp-jogl:

Browse source 
- Update to 2.2.4
- Add backup MASTER_SITES
- Regenerate patches
This commit is contained in:
Max Brazhnikov 2015-07-31 10:29:18 +00:00
parent ee839219be
commit 38b15deea4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=393293
4 changed files with 37 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
graphics/jogamp-jogl/Makefile
View file

@ -2,10 +2,10 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= jogamp-jogl PORTNAME= jogamp-jogl
PORTVERSION= 2.1.5 PORTVERSION= 2.2.4
PORTREVISION= 2
CATEGORIES= graphics devel java CATEGORIES= graphics devel java
MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ \
http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/
DISTFILES= jogl-v${PORTVERSION}.tar.7z \ DISTFILES= jogl-v${PORTVERSION}.tar.7z \
gluegen-v${PORTVERSION}.tar.7z gluegen-v${PORTVERSION}.tar.7z
@ -42,6 +42,8 @@ post-extract:
post-patch: post-patch:
${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \ ${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \
${BUILD_WRKSRC}/build-common.xml ${BUILD_WRKSRC}/build-common.xml
${REINPLACE_CMD} -e '/name="all"/s|,test.compile||g' \
${BUILD_WRKSRC}/build.xml
pre-build: pre-build:
@(cd ${WRKDIR}/gluegen/make; \ @(cd ${WRKDIR}/gluegen/make; \

8
graphics/jogamp-jogl/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (jogl-v2.1.5.tar.7z) = e64474c28e4dd64f2a926ef2c8a645fe4de0ca9db482f939b1b84ba624d42bd5 SHA256 (jogl-v2.2.4.tar.7z) = 39d53fc4c4c3f8e3a5287646bc10457cfaa6fcc88f07c0b0c7817a95cb1f282b
SIZE (jogl-v2.1.5.tar.7z) = 21513866 SIZE (jogl-v2.2.4.tar.7z) = 33454202
SHA256 (gluegen-v2.1.5.tar.7z) = 9ca3c0961f790e778bf4453a6d676e6cfa72a0ca9cd461bd65710777bc3c9247 SHA256 (gluegen-v2.2.4.tar.7z) = 6ad7b35f7c8fc81ec57d986f54b93c5c93127cd6c2b0efc2fb3950022feb15da
SIZE (gluegen-v2.1.5.tar.7z) = 38641669 SIZE (gluegen-v2.2.4.tar.7z) = 39334025

49
graphics/jogamp-jogl/files/patch-gluegen2
View file

@ -1,6 +1,6 @@
--- gluegen/make/build.xml.orig 2014-03-10 13:56:04.000000000 +0000 --- gluegen/make/build.xml.orig 2014-10-10 13:20:51 UTC
+++ gluegen/make/build.xml 2014-05-08 18:55:36.726179257 +0000 +++ gluegen/make/build.xml
@@ -439,7 +439,7 @@ @@ -408,7 +408,7 @@
<property name="c.compiler.src.files.common" value="src/native/common/*.c" /> <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" /> <property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" />
@ -9,44 +9,44 @@
<condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition> <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="${output.lib.name}.dll"><isset property="isWindows"/></condition>
<condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition> <condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition>
@@ -633,14 +633,14 @@ @@ -604,14 +604,14 @@
<srcfiles dir= "${src.java}" includes="**"/> <srcfiles dir= "${src.java}" includes="**"/>
<srcfiles dir= "${c.grammar}" includes="**/*.g"/> <srcfiles dir= "${c.grammar}" includes="*.g"/>
<srcfiles dir= "${j.grammar}" includes="**/*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/>
- <mapper type="merge" to="${build}/gluegen.jar"/> - <mapper type="merge" to="${build}/gluegen.jar"/>
+ <mapper type="merge" to="${build}/gluegen2.jar"/> + <mapper type="merge" to="${build}/gluegen2.jar"/>
</uptodate> </uptodate>
<uptodate property="gluegen.build.skip.java2"> <uptodate property="gluegen.build.skip.java2">
<srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "." includes="*.xml"/>
<srcfiles dir= "${src.java}" includes="**"/> <srcfiles dir= "${src.java}" includes="**"/>
<srcfiles dir= "${c.grammar}" includes="**/*.g"/> <srcfiles dir= "${c.grammar}" includes="*.g"/>
<srcfiles dir= "${j.grammar}" includes="**/*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/>
- <mapper type="merge" to="${build}/gluegen-rt.jar"/> - <mapper type="merge" to="${build}/gluegen-rt.jar"/>
+ <mapper type="merge" to="${build}/gluegen2-rt.jar"/> + <mapper type="merge" to="${build}/gluegen2-rt.jar"/>
</uptodate> </uptodate>
<condition property="gluegen.build.skip.java" value="true"> <condition property="gluegen.build.skip.java" value="true">
<or> <or>
@@ -752,7 +752,7 @@ @@ -753,7 +753,7 @@
</copy> </copy>
<!-- Build gluegen.jar. --> <!-- Build gluegen.jar. -->
- <jar destfile="${build}/gluegen.jar" manifest="${build}/Manifest.temp"> - <jar destfile="${build}/gluegen.jar" manifest="${build}/Manifest.temp" filesonly="true">
+ <jar destfile="${build}/gluegen2.jar" manifest="${build}/Manifest.temp"> + <jar destfile="${build}/gluegen2.jar" manifest="${build}/Manifest.temp" filesonly="true">
<service type="javax.annotation.processing.Processor"> <service type="javax.annotation.processing.Processor">
<provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/> <provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/>
</service> </service>
@@ -792,7 +792,7 @@ @@ -806,7 +806,7 @@
</copy> </copy>
<!-- Build gluegen-rt.jar. --> <!-- Build gluegen-rt.jar. -->
- <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp"> - <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp" filesonly="true">
+ <jar destfile="${build}/gluegen2-rt.jar" manifest="${build}/Manifest-rt.temp"> + <jar destfile="${build}/gluegen2-rt.jar" manifest="${build}/Manifest-rt.temp" filesonly="true">
<fileset dir="${classes}"> <fileset dir="${classes}">
<include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/gluegen/runtime/*.class" />
<include name="com/jogamp/common/**" /> <include name="com/jogamp/common/**" />
--- gluegen/src/java/com/jogamp/common/os/Platform.java.orig 2014-03-10 13:56:04.000000000 +0000 --- 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 2014-05-08 18:47:51.760174681 +0000 +++ gluegen/src/java/com/jogamp/common/os/Platform.java
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@ public class Platform extends PlatformPr
private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache"; private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache";
/** fixed basename of JAR file and native library */ /** fixed basename of JAR file and native library */
@ -55,9 +55,9 @@
// //
// static initialization order: // static initialization order:
--- gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java.orig 2014-03-10 13:56:04.000000000 +0000 --- 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 2014-05-08 18:47:51.758178183 +0000 +++ gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java
@@ -197,8 +197,8 @@ @@ -197,8 +197,8 @@ public class TestTempJarCache extends Ju
@Test @Test
public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException { public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {
if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
@ -68,12 +68,3 @@
final ClassLoader cl = getClass().getClassLoader(); final ClassLoader cl = getClass().getClassLoader();
URI jarUriRoot = JarUtil.getJarSubURI(TempJarCache.class.getName(), cl); URI jarUriRoot = JarUtil.getJarSubURI(TempJarCache.class.getName(), cl);
@@ -217,7 +217,7 @@
@Test
public void testTempJarCache03AddNativeJarLibs() throws IOException {
if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
- final String libBaseName = "gluegen-rt";
+ final String libBaseName = "gluegen2-rt";
JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName);
Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName));

16
graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml
View file

@ -1,6 +1,6 @@
--- ./jogl/make/build-common.xml.orig 2014-03-11 00:59:24.000000000 +0000 --- jogl/make/build-common.xml.orig 2015-03-27 14:58:50 UTC
+++ ./jogl/make/build-common.xml 2014-05-08 19:04:20.951173869 +0000 +++ jogl/make/build-common.xml
@@ -128,8 +128,8 @@ @@ -130,8 +130,8 @@
<condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar"> <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
<istrue value="${isWindowsX86}" /> <istrue value="${isWindowsX86}" />
</condition> </condition>
@ -11,21 +11,21 @@
</condition> </condition>
<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar"> <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
<istrue value="${isLinuxAMD64}" /> <istrue value="${isLinuxAMD64}" />
@@ -208,7 +208,7 @@ @@ -210,7 +210,7 @@
<property name="gluegen.build.xml" value="${gluegen.make}/build.xml" /> <property name="gluegen.build.xml" value="${gluegen.make}/build.xml" />
<property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" /> <property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" />
<property name="obj.gluegen" value="${build.gluegen}/obj"/> <property name="obj.gluegen" value="${build.gluegen}/obj"/>
- <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" /> - <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" />
+ <property name="gluegen.jar" value="${build.gluegen}/gluegen2.jar" /> + <property name="gluegen.jar" value="${build.gluegen}/gluegen2.jar" />
<property name="ant.jar" value="${ant.home}/lib/ant.jar" />
<property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
@@ -413,7 +413,7 @@ <property name="build.joal" value="${joal.root}/${rootrel.build}" /> <!-- optional -->
@@ -434,7 +434,7 @@
</path> </path>
<!-- JavaSE combinations --> <!-- JavaSE combinations -->
- <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" /> - <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" />
+ <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen2-rt.jar" /> + <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen2-rt.jar" />
<property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" /> <property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" />
<property name="gluegen-test-util.jar" value="${build.gluegen}/gluegen-test-util.jar" />
<property name="jogl-test.jar" value="${jar}/jogl-test.jar"/> <property name="jogl-test.jar" value="${jar}/jogl-test.jar"/>
<property name="jogl-test-android.jar" value="${jar}/jogl-test-android.jar"/>