6:40 p.m.
Author: musuruan
Update of /cvs/free/rpms/osmose/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9475
Modified Files:
.cvsignore osmose.spec sources
Added Files:
osmose-0.9.2-usesystemlibraries.patch
Removed Files:
osmose-0.9.1-usesystemlibraries.patch
Log Message:
* Sat Dec 12 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.2-1
- New upstream release.
osmose-0.9.2-usesystemlibraries.patch:
Makefile | 6 +++---
MemoryMapper.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE osmose-0.9.2-usesystemlibraries.patch ---
diff -durN Osmose-0-9-2.orig/Makefile Osmose-0-9-2/Makefile
--- Osmose-0-9-2.orig/Makefile 2009-12-10 19:33:32.000000000 +0100
+++ Osmose-0-9-2/Makefile 2009-12-12 12:58:46.652385568 +0100
@@ -43,7 +43,7 @@
# add -O3 to CFLAGS for speedup -pg on LFLAGS and CFLAGS for gprof
# remove -DUSE_ISO_IEC_6429 to use a monochrom terminal.
CFLAGS = -Wall -D__USE_UNIX98 -DUSE_ISO_IEC_6429 -O3
-LFLAGS = -lSDL -lGL -lz
+LFLAGS = -lSDL -lGL -lz -lminizip
AFLAGS = -f elf
CC = g++
@@ -51,10 +51,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-2.orig/MemoryMapper.h Osmose-0-9-2/MemoryMapper.h
--- Osmose-0-9-2.orig/MemoryMapper.h 2009-12-10 19:35:31.000000000 +0100
+++ Osmose-0-9-2/MemoryMapper.h 2009-12-12 12:59:02.368385484 +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/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 7 Nov 2009 11:42:28 -0000 1.3
+++ .cvsignore 14 Dec 2009 18:40:46 -0000 1.4
@@ -1 +1 @@
-Osmose-0-9-1-src.zip
+Osmose-0-9-2-src.zip
Index: osmose.spec
===================================================================
RCS file: /cvs/free/rpms/osmose/F-11/osmose.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- osmose.spec 7 Nov 2009 11:42:28 -0000 1.4
+++ osmose.spec 14 Dec 2009 18:40:46 -0000 1.5
@@ -2,7 +2,7 @@
%define pkgversion %(echo %version|sed s/\\\\\./-/g)
Name: osmose
-Version: 0.9.1
+Version: 0.9.2
Release: 1%{?dist}
Summary: A Sega Master System / Game Gear emulator
@@ -11,7 +11,7 @@
URL: http://bcz.emu-france.com/%{name}.htm
Source: http://bcz.emu-france.com/%{name}/%{pkgname}-%{pkgversion}-src.zip
# Andrea Musuruane
-Patch0: %{name}-0.9.1-usesystemlibraries.patch
+Patch0: %{name}-0.9.2-usesystemlibraries.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -41,7 +41,7 @@
chmod 644 cpu/*.{cpp,h}
%build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D__USE_UNIX98"
%install
@@ -62,6 +62,9 @@
%changelog
+* Sat Dec 12 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.2-1
+- New upstream release.
+
* Sat Nov 07 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.1-1
- New upstream release.
- Removed no longer used patches.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/osmose/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 7 Nov 2009 11:42:28 -0000 1.3
+++ sources 14 Dec 2009 18:40:46 -0000 1.4
@@ -1 +1 @@
-fafa52a39e6fe194b34fa2cfd0df7466 Osmose-0-9-1-src.zip
+4b9714d87c02d862256f169cb112e293 Osmose-0-9-2-src.zip
--- osmose-0.9.1-usesystemlibraries.patch DELETED ---