rpms/jogl/devel jogl-ppc.patch, 1.1, 1.2 jogl-ppctools.patch, 1.1, 1.2 jogl.spec, 1.17, 1.18
Anthony Green (green)
fedora-extras-commits at redhat.com
Sun Jul 30 20:33:48 UTC 2006
Author: green
Update of /cvs/extras/rpms/jogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4858
Modified Files:
jogl-ppc.patch jogl-ppctools.patch jogl.spec
Log Message:
Add ppc patches.
jogl-ppc.patch:
Index: jogl-ppc.patch
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl-ppc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jogl-ppc.patch 3 Sep 2005 18:55:27 -0000 1.1
+++ jogl-ppc.patch 30 Jul 2006 20:33:48 -0000 1.2
@@ -1,10 +1,10 @@
---- src/net/java/games/gluegen/StructLayout.java~ 2005-05-27 14:24:16.000000000 -0700
-+++ src/net/java/games/gluegen/StructLayout.java 2005-09-03 11:50:26.000000000 -0700
-@@ -124,6 +124,7 @@ public class StructLayout {
- if ((os.startsWith("windows") && cpu.equals("x86")) ||
- (os.startsWith("linux") && cpu.equals("i386")) ||
+--- gluegen/src/java/com/sun/gluegen/StructLayout.java~ 2006-04-24 18:32:04.000000000 -0700
++++ gluegen/src/java/com/sun/gluegen/StructLayout.java 2006-07-30 13:21:05.000000000 -0700
+@@ -129,6 +129,7 @@
(os.startsWith("linux") && cpu.equals("amd64")) ||
-+ (os.startsWith("linux") && cpu.equals("ppc")) ||
+ (os.startsWith("linux") && cpu.equals("x86_64")) ||
(os.startsWith("linux") && cpu.equals("ia64")) ||
++ (os.startsWith("linux") && cpu.equals("ppc")) ||
(os.startsWith("sunos") && cpu.equals("sparc")) ||
+ (os.startsWith("sunos") && cpu.equals("sparcv9")) ||
(os.startsWith("sunos") && cpu.equals("x86")) ||
jogl-ppctools.patch:
Index: jogl-ppctools.patch
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl-ppctools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jogl-ppctools.patch 3 Sep 2005 20:40:16 -0000 1.1
+++ jogl-ppctools.patch 30 Jul 2006 20:33:48 -0000 1.2
@@ -1,74 +1,125 @@
-*** make/build.xml.old 2005-09-03 13:17:38.000000000 -0700
---- make/build.xml 2005-09-03 13:17:46.000000000 -0700
-***************
-*** 202,207 ****
---- 202,208 ----
- <property name="java.includes.dir.freebsd" value="${java.includes.dir}/freebsd" />
- <property name="java.lib.dir.win32" value="${java.home.dir}/lib" />
- <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />
-+ <property name="java.lib.dir.linux.ppc" value="${java.home.dir}/jre/lib/ppc" />
- <property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" />
- <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" />
- <condition property="cpu" value="sparc">
-***************
-*** 315,320 ****
---- 316,329 ----
- <property name="linker.cfg.id" value="linker.cfg.linux" />
- </target>
-
-+ <target name="declare.linux.ppc" depends="declare.x11">
-+ <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" />
-+ <property name="java.lib.dir.platform" value="${java.lib.dir.linux.ppc}" />
-+
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux.ppc" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
-+ </target>
-+
- <target name="declare.linux.amd64" depends="declare.x11">
- <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" />
- <property name="java.lib.dir.platform" value="${java.lib.dir.linux.amd64}" />
-***************
-*** 684,689 ****
---- 693,702 ----
- <compilerarg value="-fPIC"/>
- </compiler>
-
-+ <compiler id="compiler.cfg.linux.ppc" name="gcc">
-+ <compilerarg value="-fPIC"/>
-+ </compiler>
-+
- <compiler id="compiler.cfg.solaris" name="suncc">
- </compiler>
-
-***************
-*** 885,890 ****
---- 898,906 ----
- <target name="c.compile.jogl.linux" depends="declare.linux, c.build.jogl, c.build.cg" >
- </target>
-
-+ <target name="c.compile.jogl.linux.ppc" depends="declare.linux.ppc, c.build.jogl, c.build.cg" >
-+ </target>
-+
- <target name="c.compile.jogl.linux.amd64" depends="declare.linux.amd64, c.build.jogl, c.build.cg" >
- </target>
-
-*************** Use a platform specific target: linux,
-*** 1093,1098 ****
---- 1109,1125 ----
- </target>
-
+--- jogl/make/build.xml~ 2006-05-30 17:27:02.000000000 -0700
++++ jogl/make/build.xml 2006-07-30 13:30:58.000000000 -0700
+@@ -33,6 +33,7 @@
+ - freebsd
+ - linux
+ - linux.amd64
++ - linux.ppc
+ - linux.ia64
+ - macosx
+ - macosxfat (ppc & i386 - requires Intel Transition Development Kit or fat Mac OS X)
+@@ -214,6 +215,7 @@
+ <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />
+ <property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" />
+ <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" />
++ <property name="java.lib.dir.linux.ppc" value="${java.home.dir}/jre/lib/ppc" />
+ <property name="java.lib.dir.hpux" value="${java.home.dir}/jre/lib/PA_RISC2.0" />
+ <condition property="cpu" value="sparc">
+ <os name="SunOS" arch="sparc" />
+@@ -367,6 +369,16 @@
+ <property name="linker.cfg.id.drihack" value="linker.cfg.linux.drihack" />
+ </target>
+
++ <target name="declare.linux.ppc" if="isLinuxPPC">
++ <echo message="Linux.PPC" />
++ <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" />
++ <property name="java.lib.dir.platform" value="${java.lib.dir.linux.ppc}" />
++
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.ppc" />
++ <property name="linker.cfg.id.core" value="linker.cfg.linux.ppc" />
++ <property name="linker.cfg.id.drihack" value="linker.cfg.linux.drihack" />
++ </target>
++
+ <target name="declare.linux.ia64" if="isLinuxIA64">
+ <echo message="Linux.IA64" />
+ <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" />
+@@ -377,7 +389,7 @@
+ <property name="linker.cfg.id.drihack" value="linker.cfg.linux.drihack" />
+ </target>
+
+- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.x11" if="isLinux" />
++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ppc,declare.linux.ia64,declare.x11" if="isLinux" />
+
+ <target name="declare.solaris" depends="declare.x11" if="isSolaris">
+ <echo message="Solaris" />
+@@ -725,6 +737,10 @@
+ <compilerarg value="-fPIC"/>
+ </compiler>
+
++ <compiler id="compiler.cfg.linux.ppc" name="gcc">
++ <compilerarg value="-fPIC"/>
++ </compiler>
++
+ <compiler id="compiler.cfg.solaris" name="suncc">
+ </compiler>
+
+@@ -823,6 +839,12 @@
+ <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
+ </linker>
+
++ <linker id="linker.cfg.linux.ppc" name="gcc">
++ <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/>
++ <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" />
++ <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
++ </linker>
++
+ <linker id="linker.cfg.solaris" name="suncc">
+ <syslibset libs="GL, X11"/>
+ </linker>
+@@ -1255,6 +1277,23 @@
+ </fail>
+ </target>
+
++ <target name="dist.check.linux-ppc" if="jogl.dist.dir">
++ <condition property="linux.complete">
++ <and>
++ <available file="${jogl.dist.dir}/jogl-linux/32/libjogl.so" />
++ <available file="${jogl.dist.dir}/jogl-linux/32/libjogl_awt.so" />
++ <available file="${jogl.dist.dir}/jogl-linux/32/libjogl_cg.so" />
++ </and>
++ </condition>
++ <fail unless="linux.complete">
++ ******************************************************************
++ ** Files are missing from the Linux build. This will cause **
++ ** the distribution to be incomplete. Please check the status **
++ ** of the Linux build and try again. **
++ ******************************************************************
++ </fail>
++ </target>
++
+ <target name="dist.check.macosx" if="jogl.dist.dir">
+ <condition property="macosx.complete">
+ <and>
+@@ -1345,7 +1384,7 @@
+ </fail>
+ </target>
+
+- <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86">
++ <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.linux,dist.check.linux-amd64,dist.check.linux-ppc,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86">
+ <delete file="${jogl.dist.dir}/jogl.jar" />
+ <delete>
+ <fileset dir="${jogl.dist.dir}" includes="jogl-natives-*.jar" />
+@@ -1371,6 +1410,9 @@
+ <jar destfile="${jogl.dist.dir}/jogl-natives-linux-amd64.jar"
+ basedir="${jogl.dist.dir}/jogl-linux/64"
+ includes="libjogl.so,libjogl_awt.so,libjogl_cg.so,libjogl_drihack.so" />
++ <jar destfile="${jogl.dist.dir}/jogl-natives-linux-ppc.jar"
++ basedir="${jogl.dist.dir}/jogl-linux/32"
++ includes="libjogl.so,libjogl_awt.so,libjogl_cg.so,libjogl_drihack.so" />
+ <jar destfile="${jogl.dist.dir}/jogl-natives-macosx-ppc.jar"
+ basedir="${jogl.dist.dir}/jogl-macosx/ppc"
+ includes="libjogl.jnilib,libjogl_awt.jnilib,libjogl_cg.jnilib" />
+@@ -1518,6 +1560,13 @@
+ <antcall target="all" />
+ </target>
+
++ <!--
++ - Linux on PPC (assuming GCC)
++ -->
++ <target name="linux.ppc">
++ <antcall target="all" />
++ </target>
++
<!--
-+ - Linux on PPC (assuming GCC)
-+ -->
-+ <target name="linux.ppc" depends="declare.linux.ppc">
-+ <!-- Generate, compile, and build the jar for the Java sources. -->
-+ <antcall target="jar" inheritRefs="true" />
-+
-+ <!-- Compile the native C sources and build the jogl lib. -->
-+ <antcall target="c.compile.jogl.linux.ppc" />
-+ </target>
-+
-+ <!--
- - Linux on AMD64 (assuming GCC)
- -->
- <target name="linux.amd64" depends="setup.java.home.dir.nonmacosx, declare.linux.amd64">
+ - Linux on IA64 (assuming GCC)
+ -->
Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jogl.spec 30 Jul 2006 19:55:28 -0000 1.17
+++ jogl.spec 30 Jul 2006 20:33:48 -0000 1.18
@@ -2,11 +2,8 @@
Name: jogl
Version: 1.0.0
-Release: 1.0.beta5%{?dist}
+Release: 2.0.beta5%{?dist}
Summary: Java bindings for the OpenGL API
-
-# Increment the epoch because Sun decided to reset their version
-# numbers back.
Epoch: 1
Group: System Environment/Libraries
@@ -15,6 +12,8 @@
Source0: jogl-src-1_0_0-beta05.zip
Source1: jogl.properties
Source2: SGIFreeSWLicB.1.1.ps
+Patch0: jogl-ppc.patch
+Patch1: jogl-ppctools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant, antlr, ant-antlr, jpackage-utils >= 1.5
@@ -45,6 +44,8 @@
%prep
%setup -q -c jogl-%{version}
+%patch0 -p0
+%patch1 -p0
cp %{SOURCE1} .
cp %{SOURCE2} .
@@ -105,6 +106,9 @@
%doc %{_javadocdir}/%{name}
%changelog
+* Sun Jul 30 2006 Anthony Green <green at redhat.com> - 1:1.0.0-2.0.beta5
+- Add ppc patches.
+
* Sat Jul 29 2006 Anthony Green <green at redhat.com> - 1:1.0.0-1.0.beta5
- Rebuild again with another new compiler.
- Update antlr reference in jogl.properties.
More information about the scm-commits
mailing list