[jogl] Import.
Jon Ciesla
limb at fedoraproject.org
Mon May 23 18:17:48 UTC 2011
commit f5129a066e2d092d271b0c00203daa420eb999fc
Author: Jon Ciesla <limb at jcomserv.net>
Date: Mon May 23 13:09:48 2011 -0500
Import.
.gitignore | 1 +
jogl-X11R6.patch | 32 +++++++++
jogl-defaultFedoraPath.patch | 14 ++++
jogl-encoding.patch | 26 +++++++
jogl.properties | 22 ++++++
jogl.spec | 153 ++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
7 files changed, 249 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6810c06..4b7ad41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
jogl-src-1_0_0-beta05.zip
+/jogl-1.1.1a-src.zip
diff --git a/jogl-X11R6.patch b/jogl-X11R6.patch
new file mode 100644
index 0000000..13f67ae
--- /dev/null
+++ b/jogl-X11R6.patch
@@ -0,0 +1,32 @@
+--- jogl/make/build.xml~ 2008-04-29 19:18:50.000000000 -0500
++++ jogl/make/build.xml 2011-04-08 09:07:52.000000000 -0500
+@@ -727,7 +727,7 @@
+ <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
+ <!-- Need to force X11R6 headers on to include path after stub_includes -->
+ <includepath path="stub_includes/opengl"/>
+- <includepath path="/usr/X11R6/include" />
++ <includepath path="/usr/include" />
+ </compiler>
+
+ <!-- linker configuration -->
+--- jogl/make/build.xml~ 2011-04-20 11:38:37.000000000 -0500
++++ jogl/make/build.xml 2011-04-20 12:02:43.000000000 -0500
+@@ -735,14 +735,14 @@
+ <!-- linker configuration -->
+
+ <linker id="linker.cfg.linux.jogl" extends="linker.cfg.linux">
+- <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/>
+- <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" />
++ <syslibset dir="/usr/lib" libs="GL, X11"/>
++ <syslibset dir="/usr/lib" libs="Xxf86vm" />
+ <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
+ </linker>
+
+ <linker id="linker.cfg.linux.amd64.jogl" name="gcc">
+- <syslibset dir="/usr/X11R6/lib64" libs="GL, X11"/>
+- <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" />
++ <syslibset dir="/usr/lib64" libs="GL, X11"/>
++ <syslibset dir="/usr/lib64" libs="Xxf86vm" />
+ <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
+ </linker>
+
diff --git a/jogl-defaultFedoraPath.patch b/jogl-defaultFedoraPath.patch
new file mode 100644
index 0000000..e1a6316
--- /dev/null
+++ b/jogl-defaultFedoraPath.patch
@@ -0,0 +1,14 @@
+--- jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java 2007-07-21 01:06:04.000000000 +0100
++++ jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java 2010-08-05 22:53:33.121873871 +0100
+@@ -47,6 +47,11 @@ import java.security.PrivilegedAction;
+ import java.util.HashSet;
+
+ public class NativeLibLoader {
++ // Fedora requires java.library.path set up as early as possible
++ static {
++ System.setProperty("java.library.path", System.getProperty("java.library.path") + java.io.File.pathSeparator + "/usr/lib/gluegen" + java.io.File.pathSeparator + "/usr/lib64/gluegen" + java.io.File.pathSeparator + "/usr/lib/jogl" + java.io.File.pathSeparator + "/usr/lib64/jogl");
++ }
++
+ public interface LoaderAction {
+ /**
+ * Loads the library specified by libname. Optionally preloads the libraries specified by
diff --git a/jogl-encoding.patch b/jogl-encoding.patch
new file mode 100644
index 0000000..bd8254a
--- /dev/null
+++ b/jogl-encoding.patch
@@ -0,0 +1,26 @@
+--- jogl/make/build.xml.orig 2011-04-16 10:32:42.677447257 -0600
++++ jogl/make/build.xml 2011-04-16 10:32:54.478115346 -0600
+@@ -694,6 +694,7 @@
+ includes="javax/media/opengl/GL.java"
+ fork="yes"
+ memoryMaximumSize="128m"
++ encoding="UTF-8"
+ source="1.4" debug="true" debuglevel="source,lines">
+ </javac>
+ </target>
+@@ -706,6 +707,7 @@
+ classpath="${gluegen-rt.jar}"
+ fork="yes"
+ memoryMaximumSize="128m"
++ encoding="UTF-8"
+ debug="true" debuglevel="source,lines">
+ <src path="${src.java}" />
+ <src path="${src.generated.java}" />
+@@ -1018,6 +1020,7 @@
+ destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
+ overview="${javadoc.overview}"
+ source="1.4"
++ encoding="UTF-8"
+ linkoffline="${javadoc.link} 142-packages"
+ bottom="${javadoc.bottom}" >
+ <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
diff --git a/jogl.properties b/jogl.properties
new file mode 100644
index 0000000..64b6ce8
--- /dev/null
+++ b/jogl.properties
@@ -0,0 +1,22 @@
+###############################################################################
+# The host specific properties. The build will inform you of required
+# properties. This file must be copied into your home directory (pointed
+# to by the Java system property user.home) and the copy modified appropriately.
+###############################################################################
+#
+# java.home.dir is usually inferred from the java.home variable.
+# If it appears the build is failing because of an inability to
+# find e.g. JAWT or JNI headers, override this to point to the
+# root directory of your JDK.
+#
+# java.home.dir=C:/jdk1.4.2
+
+#
+# If you are building the Cg binding (by specifying -Djogl.cg=1 to the
+# Ant build) and have installed the Cg SDK in somewhere other than the
+# default location, modify the appropriate variable to point to the
+# absolute path of the lib directory
+#
+windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib
+x11.cg.lib=/usr/lib
+
diff --git a/jogl.spec b/jogl.spec
new file mode 100644
index 0000000..7c20cda
--- /dev/null
+++ b/jogl.spec
@@ -0,0 +1,153 @@
+Name: jogl
+Version: 1.1.1a
+Release: 5%{?dist}
+Summary: Java bindings for the OpenGL API
+
+Group: Development/Libraries
+License: MIT and BSD
+URL: http://jogl.dev.java.net
+Source0: http://download.java.net/media/jogl/builds/archive/jsr-231-1.1.1a/jogl-1.1.1a-src.zip
+Source1: %{name}.properties
+# Change include and library paths for X11R6 to match actual locations on
+# Fedora systems.
+Patch0: jogl-X11R6.patch
+# Fix the expected input encoding for javadoc generation.
+Patch1: jogl-encoding.patch
+# Fix loading of the compiled C code at runtime.
+Patch2: jogl-defaultFedoraPath.patch
+
+BuildRequires: ant-antlr
+BuildRequires: java-1.6.0-openjdk-devel >= 1:1.6
+BuildRequires: jpackage-utils
+BuildRequires: mesa-libGLU-devel
+BuildRequires: libX11-devel
+BuildRequires: gtkglext-devel
+BuildRequires: libXt-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: gluegen-source
+BuildRequires: cpptasks
+
+Requires: jpackage-utils
+Requires: java >= 1:1.6
+Requires: gluegen
+
+%description
+The JOGL project hosts the development version of the Java Binding for
+the OpenGL API (JSR-231), and is designed to provide hardware-supported 3D
+graphics to applications written in Java. JOGL provides full access to the
+APIs in the OpenGL 2.0 specification as well as nearly all vendor extensions,
+and integrates with the AWT and Swing widget sets. It is part of a suite of
+open-source technologies initiated by the Game Technology Group at
+Sun Microsystems.
+
+%package javadoc
+Summary: Javadoc for jogl
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+Javadoc for jogl.
+
+%package manual
+Summary: User manual for jogl
+Group: Documentation
+
+%description manual
+User manual for jogl
+
+%prep
+%setup -q -c
+
+find . -name '*.jar' | xargs rm -f
+find . -name '*.class' | xargs rm -f
+
+%patch0 -b .X11R6
+%patch1 -b .encoding
+%patch2 -b .defaultFedoraPath
+cd jogl
+iconv -f iso8859-1 -t utf-8 -o README.txt.conv README.txt
+touch -r README.txt README.txt.conv
+mv -f README.txt.conv README.txt
+cp -rdf %{_datadir}/gluegen-source/gluegen ..
+
+%build
+cd jogl/make
+ant \
+ -Duser.home=%{_topdir}/SOURCES \
+ -Dantlr.jar=$(build-classpath antlr) \
+ -Dc.compiler.debug=true \
+ -Dc.compiler.optimise=speed \
+ all \
+ javadoc.dev.x11
+
+%install
+cd jogl
+
+# jars
+mkdir -p %{buildroot}%{_libdir}/%{name}
+install -pm 0644 build/%{name}.jar %{buildroot}%{_libdir}/%{name}/%{name}.jar
+
+# native lib
+install -dm 755 %{buildroot}%{_libdir}/%{name}
+install -m 744 build/obj/lib*.so \
+ %{buildroot}%{_libdir}/%{name}
+
+# javadoc
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr javadoc_jogl_dev/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%defattr(-,root,root,-)
+%doc jogl/LICENSE.txt jogl/CHANGELOG.txt jogl/COPYRIGHT.txt jogl/README.txt
+%{_libdir}/%{name}/*.jar
+%attr(755,root,root) %{_libdir}/%{name}/libjogl.so
+%attr(755,root,root) %{_libdir}/%{name}/libjogl_awt.so
+
+%files javadoc
+%defattr(-,root,root)
+%doc %{_javadocdir}/%{name}
+%doc jogl/LICENSE.txt jogl/COPYRIGHT.txt
+
+%files manual
+%defattr(-,root,root)
+%doc jogl/doc/*
+%doc jogl/LICENSE.txt jogl/COPYRIGHT.txt
+
+
+%changelog
+* Fri May 20 2011 Jon Ciesla <limb at jcomserv.net> - 1.1.1a-5
+- Corrected license tag.
+- Removing prebuilt jar and class files in setup.
+- Added license files to subpackages.
+
+* Mon Apr 04 2011 Jon Ciesla <limb at jcomserv.net> - 1.1.1a-4
+- Added Aiden's defaultFedoraPath.
+
+* Mon Feb 21 2011 Aidan Delaney <a.j.delaney at brighton.ac.uk> - 1.1.1a-3
+- Licence change as per discussion on https://bugzilla.redhat.com/show_bug.cgi?id=572515
+
+* Thu Aug 05 2010 Aidan Delaney <a.j.delaney at brighton.ac.uk> - 1.1.1a-2
+- Added a modified version of the Debian patch from http://svn.debian.org/viewsvn/pkg-java/trunk/libjogl-java/debian/patches/defaultDebianPath.diff
+- Allows jogl.jar and .so to be installed into /usr/lib{64}/jogl as per Fedora JNI packaging guidelines
+
+* Wed Jul 28 2010 Aidan Delaney <a.j.delaney at brighton.ac.uk> - 1.1.1a-1
+- Addressed issued raised by Chen Lei in BZ #572515
+
+* Sun Apr 04 2010 Henrique Junior and Sylvestre Ledru <lspooky at fedoraproject.org> - 1.1.1-6
+- Added post and postum section
+
+* Fri Apr 02 2010 Henrique Junior and Sylvestre Ledru <lspooky at fedoraproject.org> - 1.1.1-5
+- New approach on using the gluegen source, now, JOGL is "cp"ing it
+
+* Tue Mar 09 2010 Henrique Junior and Sylvestre Ledru <lspooky at fedoraproject.org> - 1.1.1-4
+- Some cleaning on .spec
+
+* Tue Mar 09 2010 Henrique Junior and Sylvestre Ledru <lspooky at fedoraproject.org> - 1.1.1-3
+- Changes to use the new gluegen-source package
+
+* Fri Feb 26 2010 Henrique Junior and Sylvestre Ledru <lspooky at fedoraproject.org> - 1.1.1-2
+- Refinements in .spec
+
+* Sat Feb 20 2010 Henrique Junior and Sylvestre Ledru <lspooky at fedoraproject.org> - 1.1.1-1
+- Initial package.
diff --git a/sources b/sources
new file mode 100644
index 0000000..fd1d8f1
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+ccd14b7a8c667a2b6c23da2ad4afd752 jogl-1.1.1a-src.zip
More information about the scm-commits
mailing list