9:50 p.m.
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21977
Modified Files:
.cvsignore mame.spec sources
Added Files:
mame-systemlibs.patch
Removed Files:
mame-gcc47.patch
Log Message:
* Mon Jan 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u7-1
- Updated to 0.144u7
- Dropped upstreamed gcc-4.7 patch
- Patched to use system libflac, libjpeg needs more work
mame-systemlibs.patch:
makefile | 30 ++++++++++++++++++++++++++----
src/emu/sound/samples.c | 6 +++++-
src/lib/util/chd.c | 6 +++++-
src/mame/drivers/sliver.c | 2 +-
4 files changed, 37 insertions(+), 7 deletions(-)
--- NEW FILE mame-systemlibs.patch ---
diff -up mame-0.144u7/makefile.systemlibs mame-0.144u7/makefile
--- mame-0.144u7/makefile.systemlibs 2012-02-01 19:33:24.321723366 +0100
+++ mame-0.144u7/makefile 2012-02-01 19:33:27.444741982 +0100
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
+# uncomment next line to build libjpeg as part of MAME build
+BUILD_JPEG = 1
+
+# uncomment next line to build libflac as part of MAME build
+BUILD_FLAC = 1
+
# uncomment next line to include the symbols
# SYMBOLS = 1
@@ -411,7 +417,9 @@ DEFS += -DUSE_NETWORK
endif
# need to ensure FLAC functions are statically linked
+ifeq ($(BUILD_FLAC),1)
DEFS += -DFLAC__NO_DLL
+endif
@@ -622,14 +630,30 @@ LIBS += -lz
ZLIB =
endif
+# add jpeg library
+ifeq ($(BUILD_JPEG),1)
+INCPATH += -I$(SRC)/lib/libjpeg
+JPEG_LIB = $(OBJ)/libjpeg.a
+else
+LIBS += -ljpeg
+JPEG_LIB =
+endif
+
+# add flac library
+ifeq ($(BUILD_FLAC),1)
+INCPATH += -I$(SRC)/lib/libflac/include
+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
+else
+LIBS += -lFLAC -lFLAC++
+FLAC_LIB =
+endif
+
# add SoftFloat floating point emulation library
SOFTFLOAT = $(OBJ)/libsoftfloat.a
# add formats emulation library
FORMATS_LIB = $(OBJ)/libformats.a
-JPEG_LIB = $(OBJ)/libjpeg.a
-
#-------------------------------------------------
# 'default' target needs to go here, before the
# include files which define additional targets
@@ -639,8 +663,6 @@ default: maketree buildtools emulator
all: default tools
-FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
-
#-------------------------------------------------
# defines needed by multiple make files
diff -up mame-0.144u7/src/emu/sound/samples.c.systemlibs
mame-0.144u7/src/emu/sound/samples.c
--- mame-0.144u7/src/emu/sound/samples.c.systemlibs 2012-02-01 19:33:24.436724052 +0100
+++ mame-0.144u7/src/emu/sound/samples.c 2012-02-01 19:33:25.185728517 +0100
@@ -1,7 +1,11 @@
#include "emu.h"
#include "emuopts.h"
#include "samples.h"
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
typedef struct _sample_channel sample_channel;
struct _sample_channel
diff -up mame-0.144u7/src/lib/util/chd.c.systemlibs mame-0.144u7/src/lib/util/chd.c
--- mame-0.144u7/src/lib/util/chd.c.systemlibs 2012-02-01 19:33:24.573724868 +0100
+++ mame-0.144u7/src/lib/util/chd.c 2012-02-01 19:33:25.187728529 +0100
@@ -48,7 +48,11 @@
#include <stdlib.h>
#include <new>
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
/***************************************************************************
diff -up mame-0.144u7/src/mame/drivers/sliver.c.systemlibs
mame-0.144u7/src/mame/drivers/sliver.c
--- mame-0.144u7/src/mame/drivers/sliver.c.systemlibs 2012-02-01 19:33:24.785726133 +0100
+++ mame-0.144u7/src/mame/drivers/sliver.c 2012-02-01 19:33:25.189728541 +0100
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
#include "video/ramdac.h"
-#include "../../lib/libjpeg/jpeglib.h"
+#include <jpeglib.h>
#define FIFO_SIZE 1024
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 16 Jan 2012 08:33:25 -0000 1.47
+++ .cvsignore 1 Feb 2012 21:50:44 -0000 1.48
@@ -5,3 +5,4 @@
0144u4_diff.zip
0144u5_diff.zip
0144u6_diff.zip
+0144u7_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mame.spec 16 Jan 2012 08:33:25 -0000 1.55
+++ mame.spec 1 Feb 2012 21:50:44 -0000 1.56
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 144
-%global sourceupdate 6
+%global sourceupdate 7
Name: mame
%if 0%{?sourceupdate}
@@ -28,17 +28,19 @@
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
+Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
#Source9: http://mamedev.org/updates/0%{baseversion}u9_diff.zip
%endif
Patch0: %{name}-fortify.patch
-Patch1: %{name}-gcc47.patch
+Patch1: %{name}-systemlibs.patch
Patch2: %{name}-verbosebuild.patch
BuildRequires: expat-devel
+BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
+# BuildRequires: libjpeg-devel
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
@@ -102,7 +104,7 @@
done
%endif
%patch0 -p1 -b .fortify
-%patch1 -p1 -b .gcc47
+%patch1 -p1 -b .systemlibs
%patch2 -p1 -b .verbosebuild
#fix encoding
@@ -143,14 +145,17 @@
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//)
%if %{with ldplayer}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0
SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS
-DINI_PATH='\"%{_sysconfdir}/%{name};\"'" TARGET=ldplayer
%endif
%if %{with debug}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0
SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS
-DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all
%else
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0
SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS
-DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%endif
@@ -250,6 +255,11 @@
%changelog
+* Mon Jan 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u7-1
+- Updated to 0.144u7
+- Dropped upstreamed gcc-4.7 patch
+- Patched to use system libflac, libjpeg needs more work
+
* Mon Jan 16 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u6-1
- Updated to 0.144u6
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 16 Jan 2012 08:33:25 -0000 1.47
+++ sources 1 Feb 2012 21:50:44 -0000 1.48
@@ -5,3 +5,4 @@
fd2b7811b53a61028daff87cdfd775eb 0144u4_diff.zip
2425f1d27514c16b1044177b4374d9ec 0144u5_diff.zip
006609c0896cb3c2d65d501123e277be 0144u6_diff.zip
+f80e425a280406ae6e767f4676dcade0 0144u7_diff.zip
--- mame-gcc47.patch DELETED ---