6
0
forked from pool/jogl2

Compare commits

...

19 Commits

Author SHA256 Message Date
414417a6bc Accepting request 1148929 from Java:packages
rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148929
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=16
2024-02-22 19:58:18 +00:00
35c9438fe7 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jogl2?expand=0&rev=32 2024-02-21 22:30:27 +00:00
3341bf3cd9 Accepting request 964044 from Java:packages
Build with source and target levels 8

OBS-URL: https://build.opensuse.org/request/show/964044
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=15
2022-03-22 20:36:48 +00:00
172cea6c2c OBS-URL: https://build.opensuse.org/package/show/Java:packages/jogl2?expand=0&rev=30 2022-03-22 17:27:50 +00:00
74c2bee590 Accepting request 952328 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/952328
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=14
2022-02-09 19:39:07 +00:00
8a608e4f12 Accepting request 952150 from openSUSE:Factory:RISCV
- jogl2-riscv64.patch: Add support for riscv64

OBS-URL: https://build.opensuse.org/request/show/952150
OBS-URL: https://build.opensuse.org/package/show/Java:packages/jogl2?expand=0&rev=29
2022-02-08 07:14:48 +00:00
5b287a5ca2 Accepting request 950362 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/950362
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=13
2022-02-01 13:02:54 +00:00
a4cf15ed45 Accepting request 949600 from home:bmwiedemann:branches:Java:packages
Build non-parallel to generate .java files reproducibly (boo#1102408)

note: build might be slower by 90 seconds, but reproducible build results should be worth it.

OBS-URL: https://build.opensuse.org/request/show/949600
OBS-URL: https://build.opensuse.org/package/show/Java:packages/jogl2?expand=0&rev=28
2022-02-01 08:14:31 +00:00
2ea22456a3 Accepting request 751503 from Java:packages
fix build on s390

OBS-URL: https://build.opensuse.org/request/show/751503
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=12
2019-11-28 12:50:14 +00:00
8dd6ef7998 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jogl2?expand=0&rev=26 2019-11-28 08:30:06 +00:00
80df5cbe5a Accepting request 563220 from Java:packages
Fix build with jdk10

OBS-URL: https://build.opensuse.org/request/show/563220
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=11
2018-01-10 22:37:50 +00:00
637f663e24 Accepting request 561164 from Java:packages
Force build with jdk < 10

OBS-URL: https://build.opensuse.org/request/show/561164
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=10
2018-01-03 12:39:42 +00:00
79f4a167b9 Accepting request 545580 from Java:packages
- Set TARGET_PLATFORM_ROOT to the root directory, as OBS does not
  do cross compilation. Fixes build on ARMv7, Aarch64.

Depends on SR#545523 to fully fix ARM compilation.

OBS-URL: https://build.opensuse.org/request/show/545580
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=9
2017-11-27 21:17:23 +00:00
1a210c4023 Accepting request 532190 from Java:packages
Fix build with jdk9

OBS-URL: https://build.opensuse.org/request/show/532190
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=8
2017-10-07 15:51:14 +00:00
7fcc5aebc5 Accepting request 527511 from Java:packages
Force building with jdk < 1.9

OBS-URL: https://build.opensuse.org/request/show/527511
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=7
2017-09-20 15:14:04 +00:00
cb31f5d2a2 Accepting request 369726 from Java:packages
1

OBS-URL: https://build.opensuse.org/request/show/369726
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=6
2016-03-16 09:35:14 +00:00
18ad57c247 Accepting request 338010 from Java:packages
1

OBS-URL: https://build.opensuse.org/request/show/338010
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=5
2015-10-19 20:50:15 +00:00
1bc0178c11 Accepting request 294942 from Java:packages
1

OBS-URL: https://build.opensuse.org/request/show/294942
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=4
2015-04-11 22:10:00 +00:00
Stephan Kulow
970f4f9bf2 Accepting request 240351 from Java:packages
javapackages updates submission

OBS-URL: https://build.opensuse.org/request/show/240351
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jogl2?expand=0&rev=2
2014-07-11 18:05:52 +00:00
3 changed files with 151 additions and 12 deletions

108
jogl2-riscv64.patch Normal file
View File

@@ -0,0 +1,108 @@
Index: jogl-v2.3.2/make/build-jogl.xml
===================================================================
--- jogl-v2.3.2.orig/make/build-jogl.xml
+++ jogl-v2.3.2/make/build-jogl.xml
@@ -1370,6 +1370,12 @@
<property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
</target>
+ <target name="c.configure.linux.riscv64" if="isLinuxRiscV64">
+ <echo message="Linux.RISCV64" />
+ <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" />
@@ -1388,7 +1394,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.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.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.riscv64,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" />
Index: jogl-v2.3.2/make/build-nativewindow.xml
===================================================================
--- jogl-v2.3.2.orig/make/build-nativewindow.xml
+++ jogl-v2.3.2/make/build-nativewindow.xml
@@ -552,6 +552,12 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
</target>
+ <target name="c.configure.linux.riscv64" if="isLinuxRiscV64">
+ <echo message="Linux.RISCV64" />
+ <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" />
@@ -570,7 +576,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.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.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.riscv64,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" />
Index: jogl-v2.3.2/make/build-newt.xml
===================================================================
--- jogl-v2.3.2.orig/make/build-newt.xml
+++ jogl-v2.3.2/make/build-newt.xml
@@ -523,6 +523,16 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
+ <target name="c.configure.linux.riscv64" if="isLinuxRiscV64">
+ <echo message="Linux.riscv64" />
+ <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" />
@@ -559,7 +569,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.s390x,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.riscv64,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" />
Index: jogl-v2.3.2/make/build-oculusvr.xml
===================================================================
--- jogl-v2.3.2.orig/make/build-oculusvr.xml
+++ jogl-v2.3.2/make/build-oculusvr.xml
@@ -340,6 +340,12 @@
<property name="linker.cfg.id.os" value="linker.cfg.linux" />
</target>
+ <target name="c.configure.linux.riscv64" if="isLinuxRiscV64">
+ <echo message="Linux.RISCV64" />
+ <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" />
@@ -358,7 +364,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.ppc64,c.configure.linux.s390,c.configure.linux.s390x,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.riscv64,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" />

View File

@@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Feb 21 22:30:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Tue Mar 22 17:27:29 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
-------------------------------------------------------------------
Sun Feb 6 20:34:29 UTC 2022 - Andreas Schwab <schwab@suse.de>
- jogl2-riscv64.patch: Add support for riscv64
-------------------------------------------------------------------
Fri Jan 28 08:30:12 UTC 2022 - Bernhard Wiedemann <bwiedemann@suse.com>
- Build non-parallel to generate .java files reproducibly (boo#1102408)
-------------------------------------------------------------------
Thu Nov 28 08:29:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* jogl2-s390x.patch
+ Fix build on s390x architecture
-------------------------------------------------------------------
Wed Jan 10 08:50:43 UTC 2018 - fstrba@suse.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package jogl2
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@ Release: 0
Summary: Java bindings for the OpenGL API
License: BSD-2-Clause
Group: Development/Libraries/Java
URL: http://jogamp.org/jogl/www/
URL: https://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
@@ -32,6 +32,7 @@ Patch3: jogl2-ppc64.patch
Patch4: jogl2-getPeer.patch
Patch5: jogl2-nojavah.patch
Patch6: jogl2-s390x.patch
Patch7: jogl2-riscv64.patch
BuildRequires: ant >= 1.9.8
BuildRequires: ant-contrib
BuildRequires: eclipse-swt
@@ -44,7 +45,7 @@ BuildRequires: libXrender-devel
BuildRequires: libXt-devel
BuildRequires: libXxf86vm-devel
Requires: gluegen2 = %{version}
Requires: java
Requires: java >= 1.8
Requires: jpackage-utils
%description
@@ -68,13 +69,14 @@ rm -fr make/lib
rm -fr src/newt/classes/com/jogamp/newt/util/applet/JOGLNewtApplet3Run.java
rm -fr src/newt/classes/com/jogamp/newt/util/applet/VersionApplet3.java
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
%patch -P 6 -p1
%patch -P 7 -p1
# Fix wrong-script-end-of-line-encoding
rm make/scripts/*.bat
@@ -102,11 +104,12 @@ cd make
export CLASSPATH=""
# force cross compilation support to use native root (noop on anything but ARM)
export TARGET_PLATFORM_ROOT=/
taskset 1 \
ant -Dcommon.gluegen.build.done=true \
-Djavacdebug=true \
-Djavacdebuglevel=lines,vars,source \
-Dc.compiler.debug=true \
-Djava.version=1.6 -Dant.java.version=1.6 \
-Djava.version=1.8 -Dant.java.version=1.8 \
-Dantlr.jar=$(build-classpath antlr) \
-Djunit.jar=$(build-classpath junit) \
-Dant.jar$(build-classpath ant) \
@@ -127,7 +130,8 @@ ln -s ../../..%{_jnidir}/%{name}.jar %{buildroot}%{_libdir}/%{name}/
install -t %{buildroot}%{_libdir}/%{name}/ build/lib/*.so
%files
%doc README.txt LICENSE.txt CHANGELOG.txt
%license LICENSE.txt
%doc README.txt CHANGELOG.txt
%{_libdir}/%{name}
%{_jnidir}/%{name}.jar