11:33 a.m.
Author: musuruan
Update of /cvs/free/rpms/osmose/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27144
Modified Files:
.cvsignore osmose.spec sources
Added Files:
osmose-0.9.1-usesystemlibraries.patch
Removed Files:
osmose-0.8.2-fixppcaudio.patch osmose-0.8.2-gcc43fix.patch
osmose-0.8.2-newtimer.patch
osmose-0.8.2-usesystemlibraries.patch
Log Message:
* Sat Nov 07 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.1-1
- New upstream release.
- Removed no longer used patches.
osmose-0.9.1-usesystemlibraries.patch:
--- NEW FILE osmose-0.9.1-usesystemlibraries.patch ---
diff -durN Osmose-0-9-1.orig/Makefile Osmose-0-9-1/Makefile
--- Osmose-0-9-1.orig/Makefile 2009-11-01 11:06:49.000000000 +0100
+++ Osmose-0-9-1/Makefile 2009-11-07 11:47:39.000000000 +0100
@@ -42,7 +42,7 @@
# Compiler/Linker Flags
# add -O3 to CFLAGS for speedup -pg on LFLAGS and CFLAGS for gprof
CFLAGS = -Wall -D__USE_UNIX98 -O3
-LFLAGS = -lSDL -lGL -lz
+LFLAGS = -lSDL -lGL -lz -lminizip
AFLAGS = -f elf
CC = g++
@@ -50,10 +50,10 @@
.cpp.o:
$(CC) $(CFLAGS) -c $*.cpp -o $*.o
-all: libs disasm osmose stripexe
+all: disasm osmose
osmose: $(z80_lib) $(OSM_OBJS) $(OPT_OBJS)
- $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) $(UNZIP_LIB) $(Z_LIB) -o $(OSM_EXE)
$(LFLAGS)
+ $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) -o $(OSM_EXE) $(LFLAGS)
disasm: $(DISASM_OBJS)
diff -durN Osmose-0-9-1.orig/MemoryMapper.h Osmose-0-9-1/MemoryMapper.h
--- Osmose-0-9-1.orig/MemoryMapper.h 2009-10-25 15:54:31.000000000 +0100
+++ Osmose-0-9-1/MemoryMapper.h 2009-11-07 11:44:22.000000000 +0100
@@ -17,7 +17,7 @@
#include <iostream>
#include <fstream>
#include <iomanip>
-#include "unzip/unzip.h"
+#include <minizip/unzip.h>
#include "Options.h"
#include "Definitions.h"
#include "DebugEventThrower.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/osmose/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jul 2008 19:04:43 -0000 1.2
+++ .cvsignore 7 Nov 2009 11:33:21 -0000 1.3
@@ -1 +1 @@
-osmose-0-8-2-src.zip
+Osmose-0-9-1-src.zip
Index: osmose.spec
===================================================================
RCS file: /cvs/free/rpms/osmose/devel/osmose.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- osmose.spec 29 Mar 2009 13:56:24 -0000 1.3
+++ osmose.spec 7 Nov 2009 11:33:21 -0000 1.4
@@ -1,37 +1,38 @@
+%define pkgname Osmose
%define pkgversion %(echo %version|sed s/\\\\\./-/g)
Name: osmose
-Version: 0.8.2
-Release: 5%{?dist}
+Version: 0.9.1
+Release: 1%{?dist}
Summary: A Sega Master System / Game Gear emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://bcz.emu-france.com/%{name}.htm
-Source: http://bcz.emu-france.com/%{name}/%{name}-%{pkgversion}-src.zip
+Source: http://bcz.emu-france.com/%{name}/%{pkgname}-%{pkgversion}-src.zip
# Andrea Musuruane
-Patch0: %{name}-0.8.2-usesystemlibraries.patch
-# Ian Chapman
-Patch1: %{name}-0.8.2-newtimer.patch
-Patch2: %{name}-0.8.2-fixppcaudio.patch
-Patch3: %{name}-0.8.2-gcc43fix.patch
+Patch0: %{name}-0.9.1-usesystemlibraries.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: minizip-devel
+BuildRequires: mesa-libGL-devel
%description
Osmose is another Sega Master System / Gamegear emulator.
%prep
-%setup -q -n Osmose
+%setup -q -n %{pkgname}-%{pkgversion}
%patch0 -p1
-%patch1 -p1
+
+# Make sure we don't use local zlib
+rm -rf zlib
+
+# Fix osmose on ppc
%ifarch ppc ppc64
-%patch2 -p1
+sed -i 's/AUDIO_S16LSB/AUDIO_S16MSB/' OsmoseCore.cpp
%endif
-%patch3 -p1
# Fix end-of-line encoding
sed -i 's/\r//' *.txt *.{cpp,h} cpu/*.{cpp,h}
@@ -61,6 +62,10 @@
%changelog
+* Sat Nov 07 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.1-1
+- New upstream release.
+- Removed no longer used patches.
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.2-5
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/osmose/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jul 2008 19:04:43 -0000 1.2
+++ sources 7 Nov 2009 11:33:21 -0000 1.3
@@ -1 +1 @@
-f1b3ba02f1641eb88e15b16b0caabbe6 osmose-0-8-2-src.zip
+fafa52a39e6fe194b34fa2cfd0df7466 Osmose-0-9-1-src.zip
--- osmose-0.8.2-fixppcaudio.patch DELETED ---
--- osmose-0.8.2-gcc43fix.patch DELETED ---
--- osmose-0.8.2-newtimer.patch DELETED ---
--- osmose-0.8.2-usesystemlibraries.patch DELETED ---