From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B6749158095 for ; Wed, 6 Jul 2022 00:10:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A1DDE0F6C; Wed, 6 Jul 2022 00:10:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C27B4E0F6C for ; Wed, 6 Jul 2022 00:10:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DB873416DC for ; Wed, 6 Jul 2022 00:10:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E162526 for ; Wed, 6 Jul 2022 00:10:31 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1657066229.1741005ef0607ee33620b6e3496eaf3c68e564a9.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-java/gluegen/files/, dev-java/gluegen/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff dev-java/gluegen/files/gluegen-2.3.2-armhf.diff dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff dev-java/gluegen/files/gluegen-2.3.2-disable-test-zip-archive.diff dev-java/gluegen/files/gluegen-2.3.2-disableArchive7z.diff dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch dev-java/gluegen/files/gluegen-2.3.2-hideException.diff dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch dev-java/gluegen/files/gluegen-2.3.2-linker.diff dev-java/gluegen/files/g luegen-2.3.2-missing-arch-symbol.diff dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff dev-java/gluegen/files/gluegen-2.3.2-tests.diff dev-java/gluegen/gluegen-2.3.2.ebuild X-VCS-Directories: dev-java/gluegen/files/ dev-java/gluegen/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: 1741005ef0607ee33620b6e3496eaf3c68e564a9 X-VCS-Branch: dev Date: Wed, 6 Jul 2022 00:10:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d90795a9-58f0-4f80-ad35-82e3a072bb4b X-Archives-Hash: f3fd84c4e654f90dac14e4829d169ba0 commit: 1741005ef0607ee33620b6e3496eaf3c68e564a9 Author: Alessandro Barbieri gmail com> AuthorDate: Tue Jul 5 09:06:28 2022 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Wed Jul 6 00:10:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1741005e dev-java/gluegen: Debian patches Closes: https://bugs.gentoo.org/855470 Signed-off-by: Alessandro Barbieri gmail.com> .../files/gluegen-2.2.4-dont-test-archive.patch | 14 -- ...gluegen-2.3.2-add-mips64el-mipsn32-support.diff | 229 ++++++++++++++++++ dev-java/gluegen/files/gluegen-2.3.2-armhf.diff | 62 +++++ .../gluegen-2.3.2-disable-java-version-check.diff | 28 +++ .../gluegen-2.3.2-disable-static-linking.diff | 42 ++++ .../gluegen-2.3.2-disable-test-zip-archive.diff | 11 + .../files/gluegen-2.3.2-disableArchive7z.diff | 26 ++ .../files/gluegen-2.3.2-disable_git_call.diff | 17 ++ ...-strip.patch => gluegen-2.3.2-dont-strip.patch} | 3 +- .../gluegen-2.3.2-fix-alpha-build-config.patch | 11 + .../gluegen-2.3.2-fix-arm64-build-config.diff | 75 ++++++ .../gluegen/files/gluegen-2.3.2-fix_gcc-10.patch | 18 ++ .../gluegen/files/gluegen-2.3.2-hideException.diff | 18 ++ .../files/gluegen-2.3.2-java10-compatibility.patch | 263 +++++++++++++++++++++ dev-java/gluegen/files/gluegen-2.3.2-linker.diff | 11 + .../files/gluegen-2.3.2-missing-arch-symbol.diff | 39 +++ .../files/gluegen-2.3.2-non-linux-support.diff | 16 ++ .../files/gluegen-2.3.2-ppc64el-support.diff | 207 ++++++++++++++++ .../files/gluegen-2.3.2-remove-static-lib.patch | 106 --------- dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff | 67 ++++++ .../gluegen/files/gluegen-2.3.2-s390x-support.diff | 138 +++++++++++ dev-java/gluegen/files/gluegen-2.3.2-tests.diff | 171 ++++++++++++++ dev-java/gluegen/gluegen-2.3.2.ebuild | 36 ++- 23 files changed, 1473 insertions(+), 135 deletions(-) diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch b/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch deleted file mode 100644 index a4f4507cf..000000000 --- a/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/make/build-test.xml -+++ b/make/build-test.xml -@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator} - - - -+ - - - diff --git a/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff new file mode 100644 index 000000000..9de0e28be --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff @@ -0,0 +1,229 @@ +Description: Add mips64(el) and mipsn32(el) support +Author: YunQiang Su , Dejan Latinovic +Forwarded: no +--- a/make/build.xml ++++ b/make/build.xml +@@ -298,6 +298,30 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -340,7 +364,7 @@ + + + +- ++ + + + +--- a/make/gluegen-cpptasks-base.xml ++++ b/make/gluegen-cpptasks-base.xml +@@ -47,6 +47,10 @@ + - isLinuxHppa + - isLinuxMips + - isLinuxMipsel ++ - isLinuxMipsn32 ++ - isLinuxMipsn32el ++ - isLinuxMips64 ++ - isLinuxMipsn64el + - isLinuxPpc + - isLinuxPpc64 + - isLinuxPpc64le +@@ -135,6 +139,10 @@ + - compiler.cfg.linux.hppa + - compiler.cfg.linux.mips + - compiler.cfg.linux.mipsel ++ - compiler.cfg.linux.mipsn32 ++ - compiler.cfg.linux.mipsn32el ++ - compiler.cfg.linux.mips64 ++ - compiler.cfg.linux.mips64el + - compiler.cfg.linux.ppc + - compiler.cfg.linux.ppc64 + - compiler.cfg.linux.ppc64le +@@ -160,6 +168,10 @@ + - linker.cfg.linux.hppa + - linker.cfg.linux.mips + - linker.cfg.linux.mipsel ++ - linker.cfg.linux.mipsn32 ++ - linker.cfg.linux.mipsn32el ++ - linker.cfg.linux.mips64 ++ - linker.cfg.linux.mips64el + - linker.cfg.linux.ppc + - linker.cfg.linux.ppc64le + - linker.cfg.linux.s390 +@@ -420,6 +432,42 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -639,6 +687,10 @@ + + + ++ ++ ++ ++ + + + +@@ -721,6 +773,22 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -757,7 +825,7 @@ + + + +- ++ + + + +@@ -1308,6 +1376,18 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1549,6 +1629,34 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1591,7 +1699,7 @@ + + + +- ++ + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff b/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff new file mode 100644 index 000000000..a474552cd --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff @@ -0,0 +1,62 @@ +--- a/make/build.xml ++++ b/make/build.xml +@@ -262,10 +262,16 @@ + + + +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -328,7 +334,7 @@ + + + +- ++ + + + +--- a/make/gluegen-cpptasks-base.xml ++++ b/make/gluegen-cpptasks-base.xml +@@ -1032,7 +1032,7 @@ + - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or + - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) + for official JogAmp builds! --> +- ++ + + + +@@ -1270,7 +1270,7 @@ + - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or + - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) + for official JogAmp builds! --> +- ++ + + + +@@ -1286,6 +1286,9 @@ + + + ++ ++ ++ + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff new file mode 100644 index 000000000..e3fb75f9a --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff @@ -0,0 +1,28 @@ +Description: Disables the Java version check since the JRE in Debian always + meets the minimum requirement and the check routinely breaks with the latest JREs. +Author: Emmanuel Bourg +Forwarded: not-needed +--- a/make/jogamp-env.xml ++++ b/make/jogamp-env.xml +@@ -45,21 +45,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff new file mode 100644 index 000000000..ffeb5d5be --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff @@ -0,0 +1,42 @@ +Description: disable static linking for native libraries. +Author: Gilles Filippini +--- a/make/gluegen-cpptasks-base.xml ++++ b/make/gluegen-cpptasks-base.xml +@@ -1262,20 +1262,14 @@ + + + +- +- + + + + +- +- + + + + +- +- + + + + + + + + + +@@ -1138,9 +1138,9 @@ + + + +- ++ includes="${archive.name}/**" />--> + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff new file mode 100644 index 000000000..7ba4b0e23 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff @@ -0,0 +1,17 @@ +--- a/make/build.xml ++++ b/make/build.xml +@@ -70,14 +70,6 @@ + + + +- +- +- +- +- +- + + diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch similarity index 91% rename from dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch rename to dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch index 2e4ed462f..0a06e96c5 100644 --- a/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch +++ b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch @@ -1,6 +1,6 @@ --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml -@@ -1511,17 +1511,6 @@ +@@ -1872,16 +1872,6 @@ - Helper strip.libraries for stripping off debug information --> @@ -12,7 +12,6 @@ - - - -- - - diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch b/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch new file mode 100644 index 000000000..b02629a60 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch @@ -0,0 +1,11 @@ +--- a/make/build.xml ++++ b/make/build.xml +@@ -334,7 +334,7 @@ + + + +- ++ + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff b/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff new file mode 100644 index 000000000..19de9401b --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff @@ -0,0 +1,75 @@ +--- a/make/build.xml ++++ b/make/build.xml +@@ -316,6 +316,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -334,7 +340,7 @@ + + + +- ++ + + + +--- a/make/gluegen-cpptasks-base.xml ++++ b/make/gluegen-cpptasks-base.xml +@@ -50,6 +50,7 @@ + - isLinuxPpc + - isLinuxPpc64 + - isLinuxPpc64le ++ - isLinuxAarch64 + - isLinuxs390 + - isLinuxs390x + - isLinuxSparc +@@ -137,6 +138,7 @@ + - compiler.cfg.linux.ppc + - compiler.cfg.linux.ppc64 + - compiler.cfg.linux.ppc64le ++ - compiler.cfg.linux.aarch64 + - compiler.cfg.linux.s390 + - compiler.cfg.linux.s390x + - compiler.cfg.linux.sparc +@@ -440,6 +442,15 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -626,6 +637,7 @@ + + + ++ + + + +@@ -1511,7 +1523,7 @@ + + + +- ++ + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch b/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch new file mode 100644 index 000000000..03c371a37 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch @@ -0,0 +1,18 @@ +Description: Fix ftbfs with GCC-10 + +Author: Sudip Mukherjee +Bug-Debian: https://bugs.debian.org/957276 +Forwarded: no + +--- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h ++++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h +@@ -299,9 +299,6 @@ MYAPI MYAPIConfig * MYAPIENTRY typeTest + #define HUGE_VALF_3 ((int) 1e53) + #define DOUBLE_DEFINE_BRACKETS_3 HUGE_VALF_3 + +-size_t unsigned_size_t_1; +-ptrdiff_t a_signed_pointer_t_1; +- + MYAPI int32_t MYAPIENTRY typeTestInt32T(const int32_t i1, int32_t i2); + MYAPI uint32_t MYAPIENTRY typeTestUInt32T(const uint32_t ui1, uint32_t ui2); + MYAPI int64_t MYAPIENTRY typeTestInt64T(const int64_t i1, int64_t i2); diff --git a/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff b/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff new file mode 100644 index 000000000..422021624 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff @@ -0,0 +1,18 @@ +--- a/src/java/com/jogamp/common/os/Platform.java ++++ b/src/java/com/jogamp/common/os/Platform.java +@@ -305,15 +305,6 @@ public class Platform extends PlatformPr + _USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) && + PropertyAccess.getBooleanProperty(useTempJarCachePropName, true, true); + +- // load GluegenRT native library +- if(_USE_TEMP_JAR_CACHE[0] && TempJarCache.initSingleton()) { +- try { +- JNILibLoaderBase.addNativeJarLibs(new Class[] { jogamp.common.Debug.class }, null); +- } catch (final Exception e0) { +- // IllegalArgumentException, IOException +- System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)"); +- } +- } + DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl); + + // JVM bug workaround diff --git a/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch b/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch new file mode 100644 index 000000000..f51157d18 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch @@ -0,0 +1,263 @@ +Description: Fixes the build failure with Java 10 +Author: Emmanuel Bourg +Forwarded: no +--- a/src/java/net/highteq/nativetaglet/NativeTaglet.java ++++ /dev/null +@@ -1,237 +0,0 @@ +-package net.highteq.nativetaglet; +- +-import com.sun.tools.doclets.Taglet; +-import com.sun.javadoc.*; +- +-import java.util.Map; +-import java.util.Properties; +-import java.util.Iterator; +-import java.io.InputStream; +-import java.net.URL; +-import java.net.MalformedURLException; +- +-public class NativeTaglet implements Taglet +-{ +- private Properties mapping= null; +- private static final String NAME = "native"; +- +- /** +- * Return the name of this custom tag. +- */ +- @Override +- public String getName() +- { +- return NAME; +- } +- +- /** +- * @return true since this tag can be used in a field +- * doc comment +- */ +- @Override +- public boolean inField() +- { +- return true; +- } +- +- /** +- * @return true since this tag can be used in a constructor +- * doc comment +- */ +- @Override +- public boolean inConstructor() +- { +- return true; +- } +- +- /** +- * @return true since this tag can be used in a method +- * doc comment +- */ +- @Override +- public boolean inMethod() +- { +- return true; +- } +- +- /** +- * @return true since this tag can be used in an overview +- * doc comment +- */ +- @Override +- public boolean inOverview() +- { +- return true; +- } +- +- /** +- * @return true since this tag can be used in a package +- * doc comment +- */ +- @Override +- public boolean inPackage() +- { +- return true; +- } +- +- /** +- * @return true since this +- */ +- @Override +- public boolean inType() +- { +- return true; +- } +- +- /** +- * Will return true since this is an inline tag. +- * +- * @return true since this is an inline tag. +- */ +- +- @Override +- public boolean isInlineTag() +- { +- return true; +- } +- +- /** +- * Register this Taglet. +- * +- * @param tagletMap the map to register this tag to. +- */ +- public static void register(final Map tagletMap) +- { +- final NativeTaglet tag = new NativeTaglet(); +- final Taglet t = (Taglet) tagletMap.get(tag.getName()); +- if (t != null) +- { +- tagletMap.remove(tag.getName()); +- } +- tagletMap.put(tag.getName(), tag); +- } +- +- /** +- * Given the Tag representation of this custom +- * tag, return its string representation. +- * +- * @param tag the Tag representation of this custom tag. +- */ +- @Override +- public String toString(final Tag tag) +- { +- String text= tag.text().trim(); +- if(mapping== null) +- { +- mapping= new Properties(); +- InputStream in= null; +- try +- { +- URL url; +- try +- { +- url = new URL(System.getProperty("nativetaglet.mapping","file:native-taglet.properties")); +- } +- catch (final MalformedURLException e) +- { +- url = new URL("file:"+System.getProperty("nativetaglet.mapping","file:native-taglet.properties")); +- } +- in= url.openStream(); +- mapping.load(in); +- } +- catch (final Exception e) +- { +- System.err.println("[NATIVE TAGLET] Could not read mapping file"); +- System.err.println("-->"); +- e.printStackTrace(System.err); +- System.err.println("<--"); +- System.err.println("[NATIVE TAGLET] !!! NO LINKS WILL BE GENERATED !!!"); +- } +- finally +- { +- if(in!=null) try{ in.close(); }catch(final Exception ignore){} +- } +- } +- +- if(mapping!=null) +- { +- // First check to see whether this key exists in the mapping +- String url = mapping.getProperty(text); +- if (url == null) { +- // Try iterating the keySet seeing if we can find a partial match +- // In the OpenGL spec this handles the case of glVertex -> glVertex3f +- for(final Iterator i= mapping.keySet().iterator(); i.hasNext();) { +- final String name= (String) i.next(); +- if (hasOpenGLSuffix(text, name)) { +- url = mapping.getProperty(name); +- break; +- } +- } +- } +- if (url != null) { +- url = mapping.getProperty("nativetaglet.baseUrl", "") + url; +- text = "" + text + ""; +- } +- } +- return text; +- } +- +- private static final String[] openGLSuffixes = { +- "b", +- "s", +- "i", +- "f", +- "d", +- "ub", +- "us", +- "ui", +- "bv", +- "sv", +- "iv", +- "fv", +- "dv", +- "ubv", +- "usv", +- "uiv" +- }; +- private static boolean hasOpenGLSuffix(final String name, +- final String baseName) { +- if (!name.startsWith(baseName)) { +- return false; +- } +- for (int i = 0; i < openGLSuffixes.length; i++) { +- final String suffix = openGLSuffixes[i]; +- if (name.endsWith(suffix)) { +- // First see whether it's a simple concatenation +- if (name.equals(baseName + suffix)) { +- return true; +- } +- // Now chop prefix and suffix off and see whether the +- // resulting is a number +- try { +- final String tmp = name.substring(baseName.length(), +- name.length() - suffix.length()); +- if (tmp.length() == 1 && +- Character.isDigit(tmp.charAt(0))) { +- return true; +- } +- } catch (final IndexOutOfBoundsException e) { +- } +- } +- } +- return false; +- } +- +- /** +- * This method should not be called since arrays of inline tags do not +- * exist. Method {@link #tostring(Tag)} should be used to convert this +- * inline tag to a string. +- * +- * @param tags the array of Tags representing of this custom tag. +- */ +- @Override +- public String toString(final Tag[] tags) +- { +- return null; +- } +-} +--- a/make/build.xml ++++ b/make/build.xml +@@ -466,9 +466,6 @@ + + + +- +- +- + + + +@@ -746,6 +743,7 @@ + + + + + ++ ++ + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff b/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff new file mode 100644 index 000000000..a39a2b145 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff @@ -0,0 +1,39 @@ +--- a/make/stub_includes/platform/glibc-compat-symbols.h ++++ b/make/stub_includes/platform/glibc-compat-symbols.h +@@ -15,35 +15,7 @@ + * + * Check build-in macro definitions via 'gcc -dM -E - < /dev/null' + */ +-#if defined(__linux__) /* Actually we like to test whether we link against GLIBC .. */ +- #if defined(__GNUC__) +- #if defined(__aarch64__) +- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4"); +- #elif defined(__arm__) +- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4"); +- #elif defined(__amd64__) +- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5"); +- #else +- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.0"); +- #endif /*__amd64__*/ +- #elif defined(__clang__) +- #if defined(__aarch64__) +- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4"); +- #elif defined(__arm__) +- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4"); +- #elif defined(__amd64__) +- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5"); +- #else +- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.0"); +- #endif /*__amd64__*/ +- #else +- #warning GLIBC_COMPAT_SYMBOL not supported with current compiler on GNU/Linux +- #define GLIBC_COMPAT_SYMBOL(FFF) +- #endif +-#else +- #warning GLIBC_COMPAT_SYMBOL not supported with target OS +- #define GLIBC_COMPAT_SYMBOL(FFF) +-#endif ++#define GLIBC_COMPAT_SYMBOL(FFF) + + GLIBC_COMPAT_SYMBOL(memcpy) + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff new file mode 100644 index 000000000..6dfa9b83f --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff @@ -0,0 +1,16 @@ +--- a/make/gluegen-cpptasks-base.xml ++++ b/make/gluegen-cpptasks-base.xml +@@ -292,7 +292,12 @@ + + + +- ++ ++ ++ ++ ++ ++ + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff new file mode 100644 index 000000000..b1dd58a13 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff @@ -0,0 +1,207 @@ +Description: add support for ppc64el arch. +Author: Gilles Filippini +--- /dev/null ++++ b/make/scripts/make.gluegen.all.linux-ppc64le.sh +@@ -0,0 +1,24 @@ ++#! /bin/sh ++ ++# -Dc.compiler.debug=true \ ++# -Dgluegen.cpptasks.detected.os=true \ ++# -DisUnix=true \ ++# -DisLinux=true \ ++# -DisLinuxX86=true \ ++# -DisX11=true \ ++ ++MACHINE=ppc64le ++ARCH=ppc64el ++TRIPLET=powerpc64le-linux-gnu ++ ++export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET ++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE ++ ++export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml" ++ ++#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" ++export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ++ ++ant \ ++ -Drootrel.build=build-linux-$MACHINE \ ++ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log +--- a/make/gluegen-cpptasks-base.xml ++++ b/make/gluegen-cpptasks-base.xml +@@ -48,6 +48,8 @@ + - isLinuxMips + - isLinuxMipsel + - isLinuxPpc ++ - isLinuxPpc64 ++ - isLinuxPpc64le + - isLinuxs390 + - isLinuxs390x + - isLinuxSparc +@@ -133,6 +135,8 @@ + - compiler.cfg.linux.mips + - compiler.cfg.linux.mipsel + - compiler.cfg.linux.ppc ++ - compiler.cfg.linux.ppc64 ++ - compiler.cfg.linux.ppc64le + - compiler.cfg.linux.s390 + - compiler.cfg.linux.s390x + - compiler.cfg.linux.sparc +@@ -155,6 +159,7 @@ + - linker.cfg.linux.mips + - linker.cfg.linux.mipsel + - linker.cfg.linux.ppc ++ - linker.cfg.linux.ppc64le + - linker.cfg.linux.s390 + - linker.cfg.linux.s390x + - linker.cfg.linux.sparc +@@ -417,6 +422,24 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -601,6 +624,8 @@ + + + ++ ++ + + + +@@ -683,6 +708,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -707,7 +740,7 @@ + + + +- ++ + + + +@@ -1268,6 +1301,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -1505,6 +1544,20 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1526,7 +1579,7 @@ + + + +- ++ + + + +--- a/src/java/jogamp/common/os/PlatformPropsImpl.java ++++ b/src/java/jogamp/common/os/PlatformPropsImpl.java +@@ -522,6 +522,7 @@ public abstract class PlatformPropsImpl + *
  • linux-aarch64
    • + *
  • linux-amd64
    • + *
  • linux-ppc64
    • ++ *
  • linux-ppc64le
    • + *
  • linux-mips64
    • + *
  • linux-ia64
    • + *
  • linux-sparcv9
    • +@@ -578,7 +579,7 @@ public abstract class PlatformPropsImpl + _and_arch_tmp = "amd64"; + break; + case PPC64: +- _and_arch_tmp = "ppc64"; ++ _and_arch_tmp = littleEndian ? "ppc64le" : "ppc64"; + break; + case MIPS_64: + _and_arch_tmp = "mips64"; +--- a/make/build.xml ++++ b/make/build.xml +@@ -306,6 +306,18 @@ + +     + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -324,7 +336,7 @@ + + + +- ++ + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch b/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch deleted file mode 100644 index 1b43c6721..000000000 --- a/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- a/make/gluegen-cpptasks-base.xml -+++ b/make/gluegen-cpptasks-base.xml -@@ -1216,21 +1216,12 @@ - - - -- -- -- -- -- - - -- -- - - - - -- -- - - - - - -@@ -1324,8 +1305,6 @@ - - - -- -- - - - -@@ -1334,16 +1313,12 @@ - - - -- -- - - - - - - -- -- - - - -@@ -1351,8 +1326,6 @@ - - - -- -- - - - -@@ -1360,8 +1333,6 @@ - - - -- -- - - - diff --git a/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff b/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff new file mode 100644 index 000000000..5820c7765 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff @@ -0,0 +1,67 @@ +Description: No longer use rt.jar which is gone since Java 9 +Author: Emmanuel Bourg +Forwarded: no +--- a/make/build.xml ++++ b/make/build.xml +@@ -729,7 +729,6 @@ + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" +- bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + + +@@ -757,7 +756,6 @@ + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" +- bootclasspath="${host.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + + +@@ -914,7 +912,6 @@ + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" +- bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + + +@@ -974,7 +971,6 @@ + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" +- bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + + +--- a/make/jogamp-env.xml ++++ b/make/jogamp-env.xml +@@ -183,13 +183,6 @@ + + + +- +- +- +- +- +- +- + + + +@@ -206,13 +199,6 @@ + + + +- +- +- +- +- +- +- + + + diff --git a/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff new file mode 100644 index 000000000..e5576b336 --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff @@ -0,0 +1,138 @@ +Description: add support for s390x arch. +Author: Gilles Filippini +--- /dev/null ++++ b/make/scripts/make.gluegen.all.linux-s390x.sh +@@ -0,0 +1,24 @@ ++#! /bin/sh ++ ++# -Dc.compiler.debug=true \ ++# -Dgluegen.cpptasks.detected.os=true \ ++# -DisUnix=true \ ++# -DisLinux=true \ ++# -DisLinuxX86=true \ ++# -DisX11=true \ ++ ++MACHINE=s390x ++ARCH=s390x ++TRIPLET=s390x-linux-gnu ++ ++export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET ++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE ++ ++export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml" ++ ++#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" ++export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ++ ++ant \ ++ -Drootrel.build=build-linux-$MACHINE \ ++ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log +--- a/src/java/jogamp/common/os/PlatformPropsImpl.java ++++ b/src/java/jogamp/common/os/PlatformPropsImpl.java +@@ -527,6 +527,7 @@ public abstract class PlatformPropsImpl + *
  • linux-ia64
    • + *
  • linux-sparcv9
    • + *
  • linux-risc2.0
    • ++ *
  • linux-s390x
    • + *
  • freebsd-i586
    • + *
  • freebsd-amd64
    • + *
  • hpux-hppa
    • +@@ -593,6 +594,9 @@ public abstract class PlatformPropsImpl + case PA_RISC2_0: + _and_arch_tmp = "risc2.0"; + break; ++ case S390X: ++ _and_arch_tmp = "s390x"; ++ break; + default: + throw new InternalError("Unhandled CPUType: "+cpuType); + } +--- a/src/java/jogamp/common/os/elf/ElfHeaderPart1.java ++++ b/src/java/jogamp/common/os/elf/ElfHeaderPart1.java +@@ -412,6 +412,15 @@ public class ElfHeaderPart1 { + cpuName = "ppc64"; + abiType = ABIType.GENERIC_ABI; + break; ++ case EM_S390: ++ // Can be 32 or 64 bits ++ if( 64 == getArchClassBits() ) { ++ cpuName = "s390x"; ++ } else { ++ cpuName = "s390"; ++ } ++ abiType = ABIType.GENERIC_ABI; ++ break; + case EM_SH: + cpuName = "superh"; + abiType = ABIType.GENERIC_ABI; +--- a/src/java/com/jogamp/common/os/Platform.java ++++ b/src/java/com/jogamp/common/os/Platform.java +@@ -77,7 +77,9 @@ public class Platform extends PlatformPr + /** Itanium */ + IA64, + /** Hitachi SuperH */ +- SuperH; ++ SuperH, ++ /** IBM ESA/390 and zSystems */ ++ S390; + } + + public enum CPUType { +@@ -118,9 +120,13 @@ public class Platform extends PlatformPr + /** SPARC 64bit, big endian */ + SPARCV9_64(CPUFamily.SPARC, false), + /** PA_RISC2_0 64bit, ??? endian */ +- PA_RISC2_0(CPUFamily.PA_RISC, false); ++ PA_RISC2_0(CPUFamily.PA_RISC, false), + // 17 + ++ /** S390X 64bit big endian */ ++ S390X(CPUFamily.S390, true); ++ // 18 ++ + public final CPUFamily family; + public final boolean is32Bit; + +@@ -201,6 +207,8 @@ public class Platform extends PlatformPr + return MIPS_32; + } else if( cpuABILower.startsWith("superh") ) { + return SuperH; ++ } else if( cpuABILower.equals("s390x") ) { ++ return S390X; + } else { + throw new RuntimeException("Please port CPUType detection to your platform (CPU_ABI string '" + cpuABILower + "')"); + } +--- a/src/java/com/jogamp/common/os/MachineDataInfo.java ++++ b/src/java/com/jogamp/common/os/MachineDataInfo.java +@@ -73,6 +73,7 @@ public class MachineDataInfo { + private final static int[] align_sparc_32_sunos = { 1, 2, 4, 8, 4, 4, 4, 8, 8, 4 }; + private final static int[] align_x86_32_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 4, 4 }; + private final static int[] align_lp64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 16, 8 }; ++ private final static int[] align_s390_64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 8, 8 }; + private final static int[] align_x86_64_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 16, 8 }; + + /** +@@ -108,9 +109,11 @@ public class MachineDataInfo { + X86_32_WINDOWS( size_x86_32_windows, align_x86_32_windows), + /** LP64 Unix, e.g.: {@link Platform.CPUType#X86_64} Unix, {@link Platform.CPUType#ARM64} EABI, {@link Platform.CPUType#PPC64} Unix, .. */ + LP64_UNIX( size_lp64_unix, align_lp64_unix), ++ /** {@link Platform.CPUType#S390X} Unix */ ++ S390_64_UNIX( size_lp64_unix, align_s390_64_unix), + /** {@link Platform.CPUType#X86_64} Windows */ + X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows); +- // 8 ++ // 9 + + public final MachineDataInfo md; + +--- a/src/java/jogamp/common/os/MachineDataInfoRuntime.java ++++ b/src/java/jogamp/common/os/MachineDataInfoRuntime.java +@@ -112,6 +112,8 @@ public class MachineDataInfoRuntime { + } else { + if( osType == Platform.OSType.WINDOWS ) { + return StaticConfig.X86_64_WINDOWS; ++ } else if ( Platform.CPUType.S390X == cpuType ) { ++ return StaticConfig.S390_64_UNIX; + } else { + // for all 64bit unix types (x86_64, aarch64, sparcv9, ..) + return StaticConfig.LP64_UNIX; diff --git a/dev-java/gluegen/files/gluegen-2.3.2-tests.diff b/dev-java/gluegen/files/gluegen-2.3.2-tests.diff new file mode 100644 index 000000000..be298505a --- /dev/null +++ b/dev-java/gluegen/files/gluegen-2.3.2-tests.diff @@ -0,0 +1,171 @@ +Description: enable testcases build and run. + One testcase can't build because of missing up to date semver-java: + - TestVersionSemantics + Three testcases fail on every arch while the library seems functional: + - TestUri99LaunchOnReservedCharPathBug908 + - TestStructGen01 + - TestStructGen02. +Author: Gilles Filippini +--- gluegen2.orig/make/build-test.xml ++++ gluegen2/make/build-test.xml +@@ -84,6 +84,7 @@ + + + ++ + + + +--- gluegen2.orig/make/scripts/runtest.sh ++++ gluegen2/make/scripts/runtest.sh +@@ -42,7 +42,7 @@ rm -f $LOG + GLUEGEN_ROOT=`dirname $builddir` + ROOTREL_BUILD=`basename $builddir` + +-X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT" ++X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT -Djava.library.path=$builddir/obj:$builddir/test/build/natives" + #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup" + #D_ARGS="-Djogamp.debug.TraceLock" + #D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary" +@@ -64,12 +64,12 @@ X_ARGS="-Drootrel.build=$ROOTREL_BUILD - + #D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.IOUtil.Exe" + #D_ARGS="-Djogamp.debug.ByteBufferInputStream" + #D_ARGS="-Djogamp.debug.Bitstream" +-#D_ARGS="-Djogamp.debug=all" ++D_ARGS="-Djogamp.debug=all" + #D_ARGS="-Djogamp.debug.Logging" + + function onetest() { + #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar +- USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar ++ USE_CLASSPATH=/usr/share/java/junit4.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../test/TestJarsInJar/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar + #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt-alt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar + libspath="$builddir"/test/build/natives + #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/classes:"$builddir"/test/build/classes +@@ -88,66 +88,68 @@ function onetest() { + echo + } + # ++(cd $builddir/../test/TestJarsInJar && sh make.sh) ++# +-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG ++onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG + #onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG + onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestSyncRingBuffer01 $* +-#onetest com.jogamp.common.util.TestLFRingBuffer01 $* +-#onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG +-#onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestSyncRingBuffer01 $* ++onetest com.jogamp.common.util.TestLFRingBuffer01 $* ++onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG ++onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG ++onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG ++onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG ++onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG ++onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG ++onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG ++onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG ++onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG ++onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG ++onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG ++onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG ++onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG ++onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG ++onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG ++onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG ++onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG ++onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG + +-#onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG + +-#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG +-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG ++onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG + diff --git a/dev-java/gluegen/gluegen-2.3.2.ebuild b/dev-java/gluegen/gluegen-2.3.2.ebuild index a1946b576..d8cfd0826 100644 --- a/dev-java/gluegen/gluegen-2.3.2.ebuild +++ b/dev-java/gluegen/gluegen-2.3.2.ebuild @@ -4,6 +4,7 @@ EAPI=8 JAVA_PKG_IUSE="doc source test" +WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0" inherit java-pkg-2 java-ant-2 toolchain-funcs @@ -40,26 +41,42 @@ DEPEND=" dev-java/ant-junit4 ) " -BDEPEND="dev-vcs/git" PATCHES=( + "${FILESDIR}/${PN}-2.3.2-ppc64el-support.diff" + "${FILESDIR}/${PN}-2.3.2-disableArchive7z.diff" + "${FILESDIR}/${PN}-2.3.2-disable-test-zip-archive.diff" + "${FILESDIR}/${PN}-2.3.2-disable_git_call.diff" + "${FILESDIR}/${PN}-2.3.2-linker.diff" + "${FILESDIR}/${PN}-2.3.2-hideException.diff" + "${FILESDIR}/${PN}-2.3.2-armhf.diff" + "${FILESDIR}/${PN}-2.3.2-fix-alpha-build-config.patch" + "${FILESDIR}/${PN}-2.3.2-missing-arch-symbol.diff" + "${FILESDIR}/${PN}-2.3.2-fix-arm64-build-config.diff" + "${FILESDIR}/${PN}-2.3.2-tests.diff" + "${FILESDIR}/${PN}-2.3.2-disable-static-linking.diff" + "${FILESDIR}/${PN}-2.3.2-s390x-support.diff" + "${FILESDIR}/${PN}-2.3.2-non-linux-support.diff" + "${FILESDIR}/${PN}-2.3.2-disable-java-version-check.diff" + "${FILESDIR}/${PN}-2.3.2-rtjar.diff" + "${FILESDIR}/${PN}-2.3.2-add-mips64el-mipsn32-support.diff" + "${FILESDIR}/${PN}-2.3.2-java10-compatibility.patch" + "${FILESDIR}/${PN}-2.3.2-fix_gcc-10.patch" + "${FILESDIR}/${PN}-2.2.4-dont-copy-jars.patch" "${FILESDIR}/${PN}-2.2.4-dont-strip.patch" - "${FILESDIR}/${PN}-2.2.4-dont-test-archive.patch" - "${FILESDIR}/${P}-remove-static-lib.patch" - "${FILESDIR}/${P}-respect-flags.patch" + "${FILESDIR}/${PN}-2.3.2-respect-flags.patch" ) EANT_BUILD_TARGET="all.no_junit" EANT_BUILD_XML="make/build.xml" EANT_DOC_TARGET="" -EANT_EXTRA_ARGS="-Dc.strip.libraries=false" +EANT_EXTRA_ARGS="-Dc.strip.libraries=false -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar= " EANT_GENTOO_CLASSPATH="antlr,ant-core,jsr305" EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar" EANT_NEEDS_TOOLS="yes" EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" EANT_TEST_TARGET="junit.run" JAVA_ANT_REWRITE_CLASSPATH="yes" -WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0" src_prepare() { tc-export CC @@ -67,13 +84,6 @@ src_prepare() { rm -rf make/lib || die default java-ant_bsfix_files "${S}/make/build-test.xml" "${S}/make/jogamp-env.xml" - - #it want a git repo - git init || die - git config --global user.email "you@example.com" || die - git config --global user.name "Your Name" || die - git add . || die - git commit -m 'init' || die } src_test() {