Hello community,
here is the log from the commit of package jogl2 for openSUSE:Factory checked in at 2019-11-28 13:50:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jogl2 (Old)
and /work/SRC/openSUSE:Factory/.jogl2.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jogl2"
Thu Nov 28 13:50:14 2019 rev:12 rq:751503 version:2.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/jogl2/jogl2.changes 2018-01-10 23:37:50.772483915 +0100
+++ /work/SRC/openSUSE:Factory/.jogl2.new.26869/jogl2.changes 2019-11-28 13:50:16.142708557 +0100
@@ -1,0 +2,7 @@
+Thu Nov 28 08:29:17 UTC 2019 - Fridrich Strba
+
+- Added patch:
+ * jogl2-s390x.patch
+ + Fix build on s390x architecture
+
+-------------------------------------------------------------------
New:
----
jogl2-s390x.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jogl2.spec ++++++
--- /var/tmp/diff_new_pack.38VHgO/_old 2019-11-28 13:50:17.166708167 +0100
+++ /var/tmp/diff_new_pack.38VHgO/_new 2019-11-28 13:50:17.166708167 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jogl2
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -23,7 +23,7 @@
Summary: Java bindings for the OpenGL API
License: BSD-2-Clause
Group: Development/Libraries/Java
-Url: http://jogamp.org/jogl/www/
+URL: http://jogamp.org/jogl/www/
Source0: http://jogamp.org/deployment/v%{version}/archive/Sources/%{src_name}.tar.xz
Patch0: %{name}-0000-update-antlr-ant-contrib-jars.patch
Patch1: %{name}-0001-update-ant-contrib-tasks.patch
@@ -31,6 +31,7 @@
Patch3: jogl2-ppc64.patch
Patch4: jogl2-getPeer.patch
Patch5: jogl2-nojavah.patch
+Patch6: jogl2-s390x.patch
BuildRequires: ant >= 1.9.8
BuildRequires: ant-contrib
BuildRequires: eclipse-swt
@@ -73,6 +74,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# Fix wrong-script-end-of-line-encoding
rm make/scripts/*.bat
++++++ jogl2-s390x.patch ++++++
--- jogl-v2.3.2/make/build-jogl.xml 2019-11-28 07:31:39.631611065 +0100
+++ jogl-v2.3.2/make/build-jogl.xml 2019-11-28 07:32:16.359814714 +0100
@@ -1376,13 +1376,19 @@
<property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
</target>
+ <target name="c.configure.linux.s390x" if="isLinuxs390x">
+ <echo message="Linux.S390x" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
+
<target name="c.configure.linux.sparc" if="isLinuxSparc">
<echo message="Linux.SPARC" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
<property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
</target>
- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.ppc64le,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.ppc64le,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
--- jogl-v2.3.2/make/build-nativewindow.xml 2019-11-28 07:31:39.631611065 +0100
+++ jogl-v2.3.2/make/build-nativewindow.xml 2019-11-28 07:32:16.359814714 +0100
@@ -558,13 +558,19 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
</target>
+ <target name="c.configure.linux.s390x" if="isLinuxs390x">
+ <echo message="Linux.S390x" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ </target>
+
<target name="c.configure.linux.sparc" if="isLinuxSparc">
<echo message="Linux.SPARC" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
</target>
- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.ppc64le,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.ppc64le,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
--- jogl-v2.3.2/make/build-newt.xml 2019-11-28 07:31:39.635611088 +0100
+++ jogl-v2.3.2/make/build-newt.xml 2019-11-28 07:32:16.363814736 +0100
@@ -533,6 +533,16 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
+ <target name="c.configure.linux.s390x" if="isLinuxs390x">
+ <echo message="Linux.S390x" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
<target name="c.configure.linux.sparc" if="isLinuxSparc">
<echo message="Linux.sparc" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -549,7 +559,7 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
</target>
- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.ppc64le,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.ppc64le,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
--- jogl-v2.3.2/make/build-oculusvr.xml 2019-11-28 07:31:14.135469694 +0100
+++ jogl-v2.3.2/make/build-oculusvr.xml 2019-11-28 07:32:16.363814736 +0100
@@ -346,13 +346,19 @@
<property name="linker.cfg.id.os" value="linker.cfg.linux" />
</target>
+ <target name="c.configure.linux.s390" if="isLinuxs390x">
+ <echo message="Linux.S390x" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.os" value="linker.cfg.linux" />
+ </target>
+
<target name="c.configure.linux.sparc" if="isLinuxSparc">
<echo message="Linux.SPARC" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
<property name="linker.cfg.id.os" value="linker.cfg.linux" />
</target>
- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />