rpms/sdljava
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- And the dejavu-fonts fontfile names changed back again (what fun)

Browse source 
- The gcj bug causing us to not compile has been fixed, use gcj again and
    drop ExclusiveArch
- There is no reason for us to run ldconfig!
- Sigh we must now define __arch__ ourself as the newer swig doesn't
This commit is contained in:
Hans de Goede 2007-12-10 10:33:31 +00:00
commit 481c965745
2 changed files with 34 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sdljava-0.9.1-regen.patch
View file

@ -6,7 +6,7 @@ diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/li
CFLAGS=-O3
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit @ARCH_DEFINES@
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit
SDLJAVA_I=SDLAudio.i\
SDLCdrom.i\
@ -44,34 +44,34 @@ diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/li
-#SDLVideo_wrap.c: SDLVideo.i common.i
-# $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
+SDLAudio_wrap.c: SDLAudio.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
+
+SDLCdrom_wrap.c: SDLCdrom.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
+
+SDLEvent_wrap.c: SDLEvent.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
+
+SDLGFX_wrap.c: SDLGFX.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
+
+SDLImage_wrap.c: SDLImage.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
+
+SDLJoystick_wrap.c: SDLJoystick.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
+
+SDLMain_wrap.c: SDLMain.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
+
+SDLMixer_wrap.c: SDLMixer.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
+
+SDLTTF_wrap.c: SDLTTF.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
+
+SDLVideo_wrap.c: SDLVideo.i common.i
+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
@ -83,7 +83,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/b
CFLAGS=-O3
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ @ARCH_DEFINES@
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@
GLJAVA_I=glew.i
@ -100,7 +100,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/b
-#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-# $(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
+glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
+ $(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
+ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
@ -112,7 +112,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/
CFLAGS=-O3
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL @ARCH_DEFINES@
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL
FTGLJAVA_OBJ=FTGL_wrap.o
FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl
@ -124,7 +124,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/
-# $(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
-# ./post-process.rb
+FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
+ $(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
+ $(SWIG) -Wall -c++ $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
+ ./post-process.rb
%.o: %.cxx

42
sdljava.spec
View file

@ -67,29 +67,6 @@ sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \
etc/build/gljava/linux/Makefile \
etc/build/gljava/linux/ftgl/Makefile
# add arch defines for swig <-> SDL_config.h wrapper happiness
# special case ppc as the define is powerpc not ppc and both ppc and ppc64
# must be set for ppc64
%ifarch ppc
ARCHDEFS="-D__powerpc__"
%endif
%ifarch ppc64
ARCHDEFS="-D__powerpc__ -D__powerpc64__"
%endif
# special case ix86 as all of ix86 should define __i386__
%ifarch %{ix86}
ARCHDEFS="-D__i386__"
%endif
# All other archs
if [ -z "$ARCHDEFS" ]; then
ARCHDEFS="-D__%{_arch}__"
fi
# And actually patch the defines into the makefiles
sed -i "s/@ARCH_DEFINES@/$ARCHDEFS/g" \
etc/build/linux/Makefile \
etc/build/gljava/linux/Makefile \
etc/build/gljava/linux/ftgl/Makefile
# adjust testdata path in demos
find ./testsrc -name '*.java' | xargs sed -i \
-e 's|testdata|%{_datadir}/%{name}/testdata|g'
@ -112,6 +89,25 @@ rm src/org/gljava/opengl/native/glew_wrap.c
%build
# We must add -D__%{_arch}__ to swigs arguments as swig doesn't do that itself.
# Special case ppc as the define is powerpc not ppc and both ppc and ppc64
# must be set for ppc64, also add -D__LONG_DOUBLE_128__ which works around
# swig barfing on bits/stdlib-ldbl.h
%ifarch ppc
export ARCH_DEFINE="-D__powerpc__ -D__LONG_DOUBLE_128__"
%endif
%ifarch ppc64
export ARCH_DEFINE="-D__powerpc__ -D__powerpc64__ -D__LONG_DOUBLE_128__"
%endif
# special case ix86 as all of ix86 should define __i386__
%ifarch %{ix86}
export ARCH_DEFINE="-D__i386__"
%endif
# All other archs
if [ -z "$ARCH_DEFINE" ]; then
export ARCH_DEFINE="-D__%{_arch}__"
fi
pushd src/sdljava/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"