upgpkg: jogl 2.3.2-1

upstream release
Upstream packaging of native libraries changed

4 files changed, 87 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32f2cca976c7..9c2275032b36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 4.2.0
-# Sun May 24 10:51:52 UTC 2015
+# Generated by mksrcinfo v8
+# Mon Feb  1 23:11:11 UTC 2016
 pkgbase = jogl
 	pkgdesc = OpenGL bindings for Java
-	pkgver = 2.3.1
-	pkgrel = 2
+	pkgver = 2.3.2
+	pkgrel = 1
 	url = http://jogamp.org/
 	arch = x86_64
 	arch = i686
@@ -12,22 +12,22 @@ pkgbase = jogl
 	depends = libgl
 	noextract = jogl-all.jar
 	noextract = gluegen-rt.jar
-	source = jogl.license.txt
-	source = gluegen.license.txt
-	source = http://jogamp.org/deployment/v2.3.1/jar/orig/jogl-all.jar
-	source = http://jogamp.org/deployment/v2.3.1/jar/orig/gluegen-rt.jar
+	source = jogl.LICENSE.txt
+	source = gluegen.LICENSE.txt
+	source = http://jogamp.org/deployment/v2.3.2/jar/orig/jogl-all.jar
+	source = http://jogamp.org/deployment/v2.3.2/jar/orig/gluegen-rt.jar
 	md5sums = e77015f08f0c8c3b39b9b7d379d57183
-	md5sums = 88456d8059e998bff8868c2b4d0347ce
-	md5sums = 888f852769e4a2deb908d0c3785d7a78
-	md5sums = 3a87d58820bafc2f164c33d8f4d609ad
-	source_x86_64 = http://jogamp.org/deployment/v2.3.1/jar/orig/jogl-all-natives-linux-amd64.jar
-	source_x86_64 = http://jogamp.org/deployment/v2.3.1/jar/orig/gluegen-rt-natives-linux-amd64.jar
-	md5sums_x86_64 = aba089cd88733cd45a1c16ea672835f7
-	md5sums_x86_64 = fcdc21b6d65c08ef79351cbc8aaefdb9
-	source_i686 = http://jogamp.org/deployment/v2.3.1/jar/orig/jogl-all-natives-linux-i586.jar
-	source_i686 = http://jogamp.org/deployment/v2.3.1/jar/orig/gluegen-rt-natives-linux-i586.jar
-	md5sums_i686 = 1a43558d33b08d7195a19813f42c8610
-	md5sums_i686 = 78dbf2cc29f7c03d58309d73eb4b6851
+	md5sums = 3809542dae46666cb50b9cb7c6d5ac5f
+	md5sums = ce831cf96129a663433861a7eda55595
+	md5sums = 14e746f9328bc33a9b01cf9e16427f4d
+	source_x86_64 = http://jogamp.org/deployment/v2.3.2/jar/orig/jogl-all-natives-linux-amd64.jar
+	source_x86_64 = http://jogamp.org/deployment/v2.3.2/jar/orig/gluegen-rt-natives-linux-amd64.jar
+	md5sums_x86_64 = 0ff2870c4f8da227b05e79b352133c3e
+	md5sums_x86_64 = 5ea60ff86650e3fc3ed77a417ef2fb95
+	source_i686 = http://jogamp.org/deployment/v2.3.2/jar/orig/jogl-all-natives-linux-i586.jar
+	source_i686 = http://jogamp.org/deployment/v2.3.2/jar/orig/gluegen-rt-natives-linux-i586.jar
+	md5sums_i686 = 79b946d0e6fff33a82a2e0d90133796a
+	md5sums_i686 = d67501bb4c973ca06140c34e8fb97461
 
 pkgname = jogl
 
diff --git a/PKGBUILD b/PKGBUILD
index 81419682b77b..c28c06c91fc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,50 +4,49 @@
 # Contributor: Simon Lipp <sloonz+aur@gmail.com>
 
 pkgname=jogl
-pkgver=2.3.1
-pkgrel=2
+pkgver=2.3.2
+pkgrel=1
 pkgdesc='OpenGL bindings for Java'
 arch=('x86_64' 'i686')
 url="http://jogamp.org/"
 license=('BSD')
 depends=('java-runtime' 'libgl')
-source=("jogl.license.txt"
-  "gluegen.license.txt"
+source=("jogl.LICENSE.txt"
+  "gluegen.LICENSE.txt"
 	"http://jogamp.org/deployment/v${pkgver}/jar/orig/jogl-all.jar"
 	"http://jogamp.org/deployment/v${pkgver}/jar/orig/gluegen-rt.jar")
 md5sums=('e77015f08f0c8c3b39b9b7d379d57183'
-  '88456d8059e998bff8868c2b4d0347ce'
-  '888f852769e4a2deb908d0c3785d7a78'
-  '3a87d58820bafc2f164c33d8f4d609ad')
+         '3809542dae46666cb50b9cb7c6d5ac5f'
+         'ce831cf96129a663433861a7eda55595'
+         '14e746f9328bc33a9b01cf9e16427f4d')
+md5sums_x86_64=('0ff2870c4f8da227b05e79b352133c3e'
+                '5ea60ff86650e3fc3ed77a417ef2fb95')
+md5sums_i686=('79b946d0e6fff33a82a2e0d90133796a'
+              'd67501bb4c973ca06140c34e8fb97461')
 
 source_i686=("http://jogamp.org/deployment/v${pkgver}/jar/orig/jogl-all-natives-linux-i586.jar"
 	"http://jogamp.org/deployment/v${pkgver}/jar/orig/gluegen-rt-natives-linux-i586.jar")
-md5sums_i686=('1a43558d33b08d7195a19813f42c8610'
-  '78dbf2cc29f7c03d58309d73eb4b6851')
 
 source_x86_64=("http://jogamp.org/deployment/v${pkgver}/jar/orig/jogl-all-natives-linux-amd64.jar"
 	"http://jogamp.org/deployment/v${pkgver}/jar/orig/gluegen-rt-natives-linux-amd64.jar")
-md5sums_x86_64=('aba089cd88733cd45a1c16ea672835f7'
-  'fcdc21b6d65c08ef79351cbc8aaefdb9')
 
 noextract=({jogl-all,gluegen-rt}.jar)
 
 package() {
+  # *.so files
+  install -Ddm755 "${pkgdir}/usr/lib/${pkgname}"
+  find "${srcdir}/natives" -type f -print0 | xargs -0 mv -t "${pkgdir}/usr/lib/${pkgname}"
+
   cd "${srcdir}"
   install -Dm644 "jogl-all.jar" "${pkgdir}/usr/share/java/${pkgname}/jogl-all.jar"
   install -Dm644 "gluegen-rt.jar" "${pkgdir}/usr/share/java/${pkgname}/gluegen-rt.jar"
-  install -Dm644 "libgluegen-rt.so" "${pkgdir}/usr/lib/${pkgname}/libgluegen-rt.so"
-  install -Dm644 "libjogl_desktop.so" "${pkgdir}/usr/lib/${pkgname}/libjogl_desktop.so"
-  install -Dm644 "libjogl_mobile.so" "${pkgdir}/usr/lib/${pkgname}/libjogl_mobile.so"
-  install -Dm644 "libnativewindow_awt.so" "${pkgdir}/usr/lib/${pkgname}/libnativewindow_awt.so"
-  install -Dm644 "libnativewindow_x11.so" "${pkgdir}/usr/lib/${pkgname}/libnativewindow_x11.so"
-  install -Dm644 "libnewt.so" "${pkgdir}/usr/lib/${pkgname}/libnewt.so"
-  install -Dm644 "jogl.license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/jogl.license.txt"
-  install -Dm644 "gluegen.license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/gluegen.license.txt"
+  install -Dm644 "jogl.LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/jogl.LICENSE.txt"
+  install -Dm644 "gluegen.LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/gluegen.LICENSE.txt"
 
   cd "${pkgdir}/usr/share/java/${pkgname}"
   ln -s "jogl-all.jar" "jogl2.jar"
   ln -s "gluegen-rt.jar" "gluegen2-rt.jar"
+
   cd "${pkgdir}/usr/lib"
   ln -s "jogl" "jogl2"
   ln -s "jogl" "gluegen2"
diff --git a/gluegen.license.txt b/gluegen.LICENSE.txt
index 8be18dfbf7d7..1b21c36ecd1f 100644
--- a/gluegen.license.txt
+++ b/gluegen.LICENSE.txt
@@ -1,7 +1,13 @@
-
 The GlueGen source code is mostly licensed under the New BSD 2-clause license,
 however it contains other licensed material as well.
 
+Other licensed material is compatible with the 'New BSD 2-Clause License',
+if not stated otherwise.
+
+'New BSD 2-Clause License' incompatible materials are optional, they are:
+
+    NONE
+
 Below you find a detailed list of licenses used in this project.
 
 +++
@@ -131,3 +137,46 @@ L.3) The GlueGen source tree contains CGRAM http://www.antlr.org/grammar/cgram/,
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 
+A.1) The GlueGen source tree contains code from The Apache Software Foundation
+     which is covered by the Apache License Version 2.0
+
+   Apache Harmony - Open Source Java SE
+   =====================================
+
+   <http://harmony.apache.org/>
+
+   Author: The Apache Software Foundation (http://www.apache.org/).
+
+   Copyright 2006, 2010 The Apache Software Foundation.
+
+   Apache License Version 2.0, January 2004
+   http://www.apache.org/licenses/LICENSE-2.0
+   Or within this repository: doc/licenses/Apache.LICENSE-2.0
+
+   Files:
+    - src/java/com/jogamp/common/net/Uri.java 
+      (derived from java.net.URI.Helper and heavily modified)
+
+A.2) The GlueGen source tree contains code from Ben Mankin, a.k.a 'Shevek',
+     which is covered by the Apache License Version 2.0
+
+   JCPP - A Java C Preprocessor
+   =============================
+
+   <http://www.anarres.org/projects/jcpp/>
+   <https://github.com/shevek/jcpp>
+
+   Author: Ben Mankin, a.k.a 'Shevek' (http://www.anarres.org/about/).
+
+   Copyright (c) 2007-2008, Shevek
+
+   Apache License Version 2.0, January 2004
+   http://www.apache.org/licenses/LICENSE-2.0
+   Or within this repository: doc/licenses/Apache.LICENSE-2.0
+
+   Files:
+    The complete git submodule 'jcpp',
+    which is a patched version of the original mentioned above.
+
+   Used for the compile-time module gluegen.jar only.
+
diff --git a/jogl.license.txt b/jogl.LICENSE.txt
index 02d605cd3a6d..02d605cd3a6d 100644
--- a/jogl.license.txt
+++ b/jogl.LICENSE.txt