From owner-svn-ports-all@FreeBSD.ORG Mon May 12 12:10:05 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C1FBCED; Mon, 12 May 2014 12:10:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 083BB2ECD; Mon, 12 May 2014 12:10:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CCA4R6000532; Mon, 12 May 2014 12:10:04 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CCA4UI000524; Mon, 12 May 2014 12:10:04 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201405121210.s4CCA4UI000524@svn.freebsd.org> From: Max Brazhnikov Date: Mon, 12 May 2014 12:10:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353810 - in head/graphics/jogamp-jogl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 12:10:05 -0000 Author: makc Date: Mon May 12 12:10:03 2014 New Revision: 353810 URL: http://svnweb.freebsd.org/changeset/ports/353810 QAT: https://qat.redports.org/buildarchive/r353810/ Log: graphics/jogamp-jogl: - Properly rename gluegen library and jar files - Add patch to fix build on i386 Added: head/graphics/jogamp-jogl/files/patch-freebsd.x86 (contents, props changed) head/graphics/jogamp-jogl/files/patch-gluegen2 (contents, props changed) Modified: head/graphics/jogamp-jogl/Makefile head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml Modified: head/graphics/jogamp-jogl/Makefile ============================================================================== --- head/graphics/jogamp-jogl/Makefile Mon May 12 12:04:54 2014 (r353809) +++ head/graphics/jogamp-jogl/Makefile Mon May 12 12:10:03 2014 (r353810) @@ -3,6 +3,7 @@ PORTNAME= jogamp-jogl PORTVERSION= 2.1.5 +PORTREVISION= 1 CATEGORIES= graphics devel java MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ DISTFILES= jogl-v${PORTVERSION}.tar.7z \ @@ -44,17 +45,17 @@ post-patch: pre-build: @(cd ${WRKDIR}/gluegen/make; \ - ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET}) + ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} all.no_junit) do-install: - ${INSTALL_LIB} ${WRKDIR}/gluegen/build/obj/libgluegen-rt.so \ - ${STAGEDIR}${PREFIX}/lib/libgluegen2-rt.so - ${INSTALL_DATA} ${WRKDIR}/gluegen/build/gluegen-rt.jar \ - ${STAGEDIR}${JAVAJARDIR}/gluegen2-rt.jar - ${INSTALL_DATA} ${WRKDIR}/gluegen/build/gluegen.jar \ - ${STAGEDIR}${JAVAJARDIR}/gluegen2.jar - ${INSTALL_LIB} ${WRKDIR}/jogl/build/lib/*.so \ + ${INSTALL_LIB} \ + ${WRKDIR}/gluegen/build/obj/libgluegen2-rt.so \ + ${WRKDIR}/jogl/build/lib/*.so \ ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} \ + ${WRKDIR}/gluegen/build/gluegen2-rt.jar \ + ${WRKDIR}/gluegen/build/gluegen2.jar \ + ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKDIR}/jogl/build/jar/jogl-all.jar \ ${STAGEDIR}${JAVAJARDIR}/jogl2.jar Added: head/graphics/jogamp-jogl/files/patch-freebsd.x86 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jogamp-jogl/files/patch-freebsd.x86 Mon May 12 12:10:03 2014 (r353810) @@ -0,0 +1,62 @@ +--- jogl/make/build-jogl.xml.orig 2014-03-11 00:59:24.000000000 +0000 ++++ jogl/make/build-jogl.xml 2014-05-12 07:33:35.849403725 +0000 +@@ -1195,7 +1195,7 @@ + + + +- ++ + + + +@@ -1383,7 +1383,7 @@ + + + +- ++ + + + +--- jogl/make/build-nativewindow.xml.orig 2014-03-11 00:59:24.000000000 +0000 ++++ jogl/make/build-nativewindow.xml 2014-05-12 07:32:13.047407428 +0000 +@@ -365,7 +365,7 @@ + + + +- ++ + + + +@@ -562,7 +562,7 @@ + + + +- ++ + + + +--- jogl/make/build-newt.xml.orig 2014-03-11 00:59:24.000000000 +0000 ++++ jogl/make/build-newt.xml 2014-05-12 07:32:57.565406321 +0000 +@@ -273,7 +273,7 @@ + + + +- ++ + + + +@@ -528,8 +528,8 @@ + + + +- ++ + + + Added: head/graphics/jogamp-jogl/files/patch-gluegen2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jogamp-jogl/files/patch-gluegen2 Mon May 12 12:10:03 2014 (r353810) @@ -0,0 +1,79 @@ +--- gluegen/make/build.xml.orig 2014-03-10 13:56:04.000000000 +0000 ++++ gluegen/make/build.xml 2014-05-08 18:55:36.726179257 +0000 +@@ -439,7 +439,7 @@ + + + +- ++ + + + +@@ -633,14 +633,14 @@ + + + +- ++ + + + + + + +- ++ + + + +@@ -752,7 +752,7 @@ + + + +- ++ + + + +@@ -792,7 +792,7 @@ + + + +- ++ + + + +--- 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 2014-05-08 18:47:51.760174681 +0000 +@@ -146,7 +146,7 @@ + private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache"; + + /** fixed basename of JAR file and native library */ +- private static final String libBaseName = "gluegen-rt"; ++ private static final String libBaseName = "gluegen2-rt"; + + // + // 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 2014-05-08 18:47:51.758178183 +0000 +@@ -197,8 +197,8 @@ + @Test + public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException { + if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } +- final String nativeJarName = "gluegen-rt-natives-"+Platform.getOSAndArch()+".jar"; +- final String libBaseName = "gluegen-rt"; ++ final String nativeJarName = "gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar"; ++ final String libBaseName = "gluegen2-rt"; + final ClassLoader cl = getClass().getClassLoader(); + + 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)); Modified: head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml ============================================================================== --- head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml Mon May 12 12:04:54 2014 (r353809) +++ head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml Mon May 12 12:10:03 2014 (r353810) @@ -1,5 +1,5 @@ ---- ./jogl/make/build-common.xml.orig 2014-04-29 16:52:29.835776699 +0000 -+++ ./jogl/make/build-common.xml 2014-04-29 16:56:14.552780952 +0000 +--- ./jogl/make/build-common.xml.orig 2014-03-11 00:59:24.000000000 +0000 ++++ ./jogl/make/build-common.xml 2014-05-08 19:04:20.951173869 +0000 @@ -128,8 +128,8 @@ @@ -11,3 +11,21 @@ +@@ -208,7 +208,7 @@ + + + +- ++ + + + +@@ -413,7 +413,7 @@ + + + +- ++ + + +