Author: laxathom
Update of /cvs/nonfree/rpms/raine/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4620
Modified Files:
raine.spec
Added Files:
raine-0.50.11-makefile.patch
Removed Files:
raine-0.50.3-makefile.patch
Log Message:
Update patch against new release
raine-0.50.11-makefile.patch:
--- NEW FILE raine-0.50.11-makefile.patch ---
--- raine-0.50.11/makefile.false 2008-03-14 23:24:04.000000000 +0100
+++ raine-0.50.11/makefile 2008-10-08 00:34:36.000000000 +0200
@@ -20,7 +20,7 @@
# RAINE_DEBUG = 1
# Be verbose ?
-# VERBOSE = 1
+VERBOSE = 1
# Use asm video core ? (comment to use C core)
ASM_VIDEO_CORE = 1
@@ -204,9 +204,9 @@
SDL = 1
prefix = $(DESTDIR)/usr
- bindir = $(prefix)/games
- sharedir = $(prefix)/share/games
- mandir = $(prefix)/man/man6
+ bindir = $(prefix)/bin
+ sharedir = $(prefix)/share
+ mandir = $(sharedir)/man/man6
rainedata = $(sharedir)/raine
ifndef SDL
langdir = $(rainedata)/languages
@@ -258,7 +258,6 @@
ifndef SDL
ifeq ("$(shell if [ -e /usr/include/vga.h ] || [ -e /usr/local/include/vga.h ]; then
echo yes; fi)","yes")
-GFX_SVGALIB=1
endif
endif
@@ -305,7 +304,7 @@
OBJDIR = $(OSTYPE)-sdl
endif
-include cpuinfo
+#include cpuinfo
ifdef X86_64
OBJDIR := $(OBJDIR)64
@@ -388,25 +387,18 @@
ifdef RAINE32
# when starting a game -> black screen if -O > 1 (bug in uint64 calculation)
-CFLAGS = -O1
+#CFLAGS = -O1
else
# Seems to work now, at least with the sdl version ? (to be tested with windows !)
-CFLAGS = -O3
+CFLAGS = $(RPMFLAGS)
endif
CFLAGS += $(INCDIR) \
$(DEFINE) \
- $(_MARCH) \
- -Wno-trigraphs \
- -fschedule-insns2 \
- -funroll-all-loops \
- -fexpensive-optimizations \
- -ffast-math \
- -w \
- -fomit-frame-pointer
+ $(_MARCH)
# This is required for gcc-2.9x (bug in -fomit-frame-pointer)
-CFLAGS_MCU = $(_MARCH) -O3 -fexpensive-optimizations # switches for the 68705 mcus
+CFLAGS_MCU = $(CFLAGS)s # switches for the 68705 mcus
ifdef RAINE_UNIX
CFLAGS += -pipe
@@ -1156,7 +1148,7 @@
./makedep $(OBJDIR) $(OBJS) > make.dep
cpuinfo:
- @sh ./detect-cpu
+# @sh ./detect-cpu
include make.dep
@@ -1207,8 +1199,6 @@
sh -c "if [ -f hiscore.dat ]; then $(INSTALL_DATA) hiscore.dat $(rainedata);
fi"
sh -c "if [ -f history.dat ]; then $(INSTALL_DATA) history.dat $(rainedata);
fi"
$(INSTALL_DATA) config/cheats.cfg $(rainedata)
- $(INSTALL_DATA) raine.desktop $(prefix)/share/applications
- $(INSTALL_DATA) raine.png $(prefix)/share/pixmaps
install_dirs:
$(MD) -pv $(bindir) $(rainedata) $(langdir) $(romdir) $(artdir) $(emudxdir)
$(prefix)/share/pixmaps $(prefix)/share/applications $(bitmaps_dir) $(fonts_dir)
Index: raine.spec
===================================================================
RCS file: /cvs/nonfree/rpms/raine/devel/raine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- raine.spec 14 Sep 2008 21:51:07 -0000 1.2
+++ raine.spec 7 Oct 2008 22:51:50 -0000 1.3
@@ -1,13 +1,13 @@
Name: raine
Version: 0.50.11
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Arcade emulator focused on Taito and Jaleco games hardware
Group: Applications/Emulators
License: GPL+ and Distributable
URL:
http://www.rainemu.com
Source0:
http://www.rainemu.com/html/archive/raines-%{version}.tar.bz2
Source1: %{name}.desktop
-Patch0: %{name}-0.50.3-makefile.patch
+Patch0: %{name}-0.50.11-makefile.patch
Patch1: %{name}-0.50.3-fixdatadirloc.patch
Patch2: %{name}-0.50.3-fixcustomcursor.patch
Patch3: %{name}-0.50.11-incdirfix.patch
@@ -101,6 +101,9 @@
%changelog
+* Tue Oct 07 2008 Xavier Lamien <lxtnow[at]gmail.com> - 0.50.11-3
+- Update patch against new release.
+
* Sun Sep 14 2008 Xavier Lamien <lxtnow[at]gmail.com> - 0.50.11-2
- Update files and rebuild for RPM fusion.
--- raine-0.50.3-makefile.patch DELETED ---