Hello community, here is the log from the commit of package jogl2 for openSUSE:Factory checked in at 2016-03-16 10:35:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jogl2 (Old) and /work/SRC/openSUSE:Factory/.jogl2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jogl2" Changes: -------- --- /work/SRC/openSUSE:Factory/jogl2/jogl2.changes 2015-10-20 00:04:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jogl2.new/jogl2.changes 2016-03-16 10:35:17.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 9 12:58:55 UTC 2016 - dval...@suse.com + +- Fix building on POWER 64bit platforms (jogl2-ppc64.patch) + +------------------------------------------------------------------- New: ---- jogl2-ppc64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jogl2.spec ++++++ --- /var/tmp/diff_new_pack.fOli56/_old 2016-03-16 10:35:19.000000000 +0100 +++ /var/tmp/diff_new_pack.fOli56/_new 2016-03-16 10:35:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package jogl2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Patch0: %{name}-0000-update-antlr-ant-contrib-jars.patch Patch1: %{name}-0001-update-ant-contrib-tasks.patch Patch2: jogl2-disable-tests.patch +Patch3: jogl2-ppc64.patch BuildRequires: ant >= 1.8.0 BuildRequires: ant-contrib BuildRequires: eclipse-swt @@ -68,6 +69,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Fix wrong-script-end-of-line-encoding rm make/scripts/*.bat ++++++ jogl2-ppc64.patch ++++++ diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 045a59d..82d4c8a 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1358,6 +1358,18 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> + <target name="c.configure.linux.ppc64" if="isLinuxPpc64"> + <echo message="Linux.PPC64" /> + <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.ppc64le" if="isLinuxPpc64le"> + <echo message="Linux.PPC64le" /> + <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.s390" if="isLinuxs390"> <echo message="Linux.S390" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -1370,7 +1382,7 @@ <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.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.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index a194999..3db8f47 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -539,6 +539,19 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> + + <target name="c.configure.linux.ppc64" if="isLinuxPpc64"> + <echo message="Linux.PPC64" /> + <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.ppc64le" if="isLinuxPpc64le"> + <echo message="Linux.PPC64le" /> + <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.s390" if="isLinuxs390"> <echo message="Linux.S390" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -551,7 +564,7 @@ <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.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.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> diff --git a/make/build-newt.xml b/make/build-newt.xml index 7163bb0..2916a6b 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -503,6 +503,26 @@ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> + <target name="c.configure.linux.ppc64" if="isLinuxPpc64"> + <echo message="Linux.ppc64" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + + <target name="c.configure.linux.ppc64le" if="isLinuxPpc64le"> + <echo message="Linux.ppc64le" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + <target name="c.configure.linux.s390" if="isLinuxs390"> <echo message="Linux.S390" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -529,7 +549,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.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.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index b89b66f..7734d00 100644 --- a/make/build-oculusvr.xml +++ b/make/build-oculusvr.xml @@ -334,6 +334,12 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux" /> </target> + <target name="c.configure.linux.ppc64" if="isLinuxPpc64"> + <echo message="Linux.PPC64" /> + <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.s390" if="isLinuxs390"> <echo message="Linux.S390" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -346,7 +352,7 @@ <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.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.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" />