7:54 p.m.
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29062
Modified Files:
.cvsignore mame-systemlibs.patch mame.spec sources
Added Files:
mame-tms57002-unidasm.patch
Log Message:
* Sun Mar 11 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u4-1
- Updated to 0.145u4
- Updated the systemlibs patch (FLAC++ was removed)
mame-tms57002-unidasm.patch:
unidasm.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE mame-tms57002-unidasm.patch ---
From 74919107bea5ccb48e7a950af4e9bfe513fb7510 Mon Sep 17 00:00:00 2001
From: olivierg <olivierg@749742ba-7341-0410-aadc-df50b521781e>
Date: Sun, 11 Mar 2012 18:20:30 +0000
Subject: unidasm: Remove the tms57002 until modern cores are handled sanely [O. Galibert]
git-svn-id: svn://mamedev.org/mame/trunk@15687 749742ba-7341-0410-aadc-df50b521781e
---
(limited to 'src/tools/unidasm.c')
diff --git a/src/tools/unidasm.c b/src/tools/unidasm.c
index 6845309..41996c2 100644
--- a/src/tools/unidasm.c
+++ b/src/tools/unidasm.c
@@ -197,7 +197,7 @@ CPU_DISASSEMBLE( tms3203x );
CPU_DISASSEMBLE( tms32051 );
CPU_DISASSEMBLE( tms34010 );
CPU_DISASSEMBLE( tms34020 );
-CPU_DISASSEMBLE( tms57002 );
+//CPU_DISASSEMBLE( tms57002 );
CPU_DISASSEMBLE( tms7000 );
CPU_DISASSEMBLE( upd7810 );
CPU_DISASSEMBLE( upd7807 );
@@ -326,7 +326,7 @@ static const dasm_table_entry dasm_table[] =
{ "tms32051", _16le, -1, CPU_DISASSEMBLE_NAME(tms32051) },
{ "tms34010", _8bit, 3, CPU_DISASSEMBLE_NAME(tms34010) },
{ "tms34020", _8bit, 3, CPU_DISASSEMBLE_NAME(tms34020) },
- { "tms57002", _32le, -2, CPU_DISASSEMBLE_NAME(tms57002) },
+ // { "tms57002", _32le, -2, CPU_DISASSEMBLE_NAME(tms57002) },
{ "tms7000", _8bit, 0, CPU_DISASSEMBLE_NAME(tms7000) },
{ "upd7810", _8bit, 0, CPU_DISASSEMBLE_NAME(upd7810) },
{ "upd7807", _8bit, 0, CPU_DISASSEMBLE_NAME(upd7807) },
--
cgit v0.9.0.2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore 27 Feb 2012 11:29:07 -0000 1.52
+++ .cvsignore 11 Mar 2012 19:54:04 -0000 1.53
@@ -2,3 +2,4 @@
0145u1_diff.zip
0145u2_diff.zip
0145u3_diff.zip
+0145u4_diff.zip
mame-systemlibs.patch:
makefile | 31 ++++++++++++++++++++++++++-----
src/lib/util/flac.h | 6 +++++-
src/mame/drivers/sliver.c | 2 +-
3 files changed, 32 insertions(+), 7 deletions(-)
Index: mame-systemlibs.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/mame-systemlibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mame-systemlibs.patch 19 Feb 2012 19:44:57 -0000 1.3
+++ mame-systemlibs.patch 11 Mar 2012 19:54:04 -0000 1.4
@@ -1,6 +1,6 @@
-diff -up mame-0.145u1/makefile.systemlibs mame-0.145u1/makefile
---- mame-0.145u1/makefile.systemlibs 2012-02-19 18:50:05.671231564 +0100
-+++ mame-0.145u1/makefile 2012-02-19 18:50:06.439236391 +0100
+diff -up mame-0.145u4/makefile.systemlibs mame-0.145u4/makefile
+--- mame-0.145u4/makefile.systemlibs 2012-03-11 19:54:25.276698074 +0100
++++ mame-0.145u4/makefile 2012-03-11 19:54:25.905706616 +0100
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
@@ -24,7 +24,7 @@
-@@ -622,14 +630,30 @@ LIBS += -lz
+@@ -620,14 +628,30 @@ LIBS += -lz
ZLIB =
endif
@@ -40,9 +40,9 @@
+# add flac library
+ifeq ($(BUILD_FLAC),1)
+INCPATH += -I$(SRC)/lib/libflac/include
-+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
++FLAC_LIB = $(OBJ)/libflac.a
+else
-+LIBS += -lFLAC -lFLAC++
++LIBS += -lFLAC
+FLAC_LIB =
+endif
+
@@ -57,7 +57,7 @@
#-------------------------------------------------
# 'default' target needs to go here, before the
# include files which define additional targets
-@@ -639,9 +663,6 @@ default: maketree buildtools emulator
+@@ -637,9 +661,6 @@ default: maketree buildtools emulator
all: default tools
@@ -67,9 +67,9 @@
7Z_LIB = $(OBJ)/lib7z.a
-diff -up mame-0.145u1/src/lib/util/flac.h.systemlibs mame-0.145u1/src/lib/util/flac.h
---- mame-0.145u1/src/lib/util/flac.h.systemlibs 2012-02-19 18:50:06.082234146 +0100
-+++ mame-0.145u1/src/lib/util/flac.h 2012-02-19 18:50:06.440236397 +0100
+diff -up mame-0.145u4/src/lib/util/flac.h.systemlibs mame-0.145u4/src/lib/util/flac.h
+--- mame-0.145u4/src/lib/util/flac.h.systemlibs 2012-03-11 19:54:24.935693445 +0100
++++ mame-0.145u4/src/lib/util/flac.h 2012-03-11 19:54:25.905706616 +0100
@@ -44,7 +44,11 @@
#include "osdcore.h"
@@ -83,9 +83,9 @@
//**************************************************************************
-diff -up mame-0.145u1/src/mame/drivers/sliver.c.systemlibs
mame-0.145u1/src/mame/drivers/sliver.c
---- mame-0.145u1/src/mame/drivers/sliver.c.systemlibs 2012-02-19 18:49:57.477180052
+0100
-+++ mame-0.145u1/src/mame/drivers/sliver.c 2012-02-19 18:50:06.441236403 +0100
+diff -up mame-0.145u4/src/mame/drivers/sliver.c.systemlibs
mame-0.145u4/src/mame/drivers/sliver.c
+--- mame-0.145u4/src/mame/drivers/sliver.c.systemlibs 2012-03-11 19:54:16.440578020
+0100
++++ mame-0.145u4/src/mame/drivers/sliver.c 2012-03-11 19:54:25.906706630 +0100
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/mame.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mame.spec 27 Feb 2012 11:29:07 -0000 1.60
+++ mame.spec 11 Mar 2012 19:54:04 -0000 1.61
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 145
-%global sourceupdate 3
+%global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -25,7 +25,7 @@
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
-#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
+Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
#Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
@@ -35,6 +35,7 @@
Patch0: %{name}-fortify.patch
Patch1: %{name}-systemlibs.patch
Patch2: %{name}-verbosebuild.patch
+Patch3: %{name}-tms57002-unidasm.patch
BuildRequires: expat-devel
BuildRequires: flac-devel
@@ -108,6 +109,8 @@
%patch0 -p1 -b .fortify
%patch1 -p1 -b .systemlibs
%patch2 -p1 -b .verbosebuild
+%patch3 -p1 -b .tms57002-unidasm
+
# Create ini file
cat > %{name}.ini << EOF
@@ -257,6 +260,10 @@
%changelog
+* Sun Mar 11 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u4-1
+- Updated to 0.145u4
+- Updated the systemlibs patch (FLAC++ was removed)
+
* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u3-1
- Updated to 0.145u3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 27 Feb 2012 11:29:07 -0000 1.52
+++ sources 11 Mar 2012 19:54:04 -0000 1.53
@@ -2,3 +2,4 @@
2b555a2fda60eac45743bbef3ef0481d 0145u1_diff.zip
cf2b866a1ba7f537c011328b727a6f5b 0145u2_diff.zip
b8a7c306cc18c9c45e2893c8aed7c4d4 0145u3_diff.zip
+6e4fb1e07f1558ac764875d7e4f884af 0145u4_diff.zip