Author: belegdol Update of /cvs/nonfree/rpms/mess/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6009 Modified Files: .cvsignore mess.spec sources Added Files: mess-systemlibs.patch Log Message: * Tue Feb 07 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.145-1 - Updated to 0.145 - Patched to use system libflac, libjpeg needs more work - dat2html is no more - Added floptool to the -tools sub-package mess-systemlibs.patch: makefile | 31 ++++++++++++++++++++++++++----- src/emu/sound/samples.c | 6 +++++- src/lib/util/chd.c | 6 +++++- src/mame/drivers/sliver.c | 2 +- 4 files changed, 37 insertions(+), 8 deletions(-) --- NEW FILE mess-systemlibs.patch --- diff -up mess-0.145/makefile.systemlibs mess-0.145/makefile --- mess-0.145/makefile.systemlibs 2012-02-07 20:16:08.845116674 +0100 +++ mess-0.145/makefile 2012-02-07 20:16:08.849116700 +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,9 +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 mess-0.145/src/emu/sound/samples.c.systemlibs mess-0.145/src/emu/sound/samples.c --- mess-0.145/src/emu/sound/samples.c.systemlibs 2012-02-07 20:15:32.260892239 +0100 +++ mess-0.145/src/emu/sound/samples.c 2012-02-07 20:16:08.850116706 +0100 @@ -16,7 +16,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 mess-0.145/src/lib/util/chd.c.systemlibs mess-0.145/src/lib/util/chd.c --- mess-0.145/src/lib/util/chd.c.systemlibs 2012-02-07 20:15:23.800840438 +0100 +++ mess-0.145/src/lib/util/chd.c 2012-02-07 20:16:08.854116730 +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 mess-0.145/src/mame/drivers/sliver.c.systemlibs mess-0.145/src/mame/drivers/sliver.c --- mess-0.145/src/mame/drivers/sliver.c.systemlibs 2012-02-07 20:15:57.226045319 +0100 +++ mess-0.145/src/mame/drivers/sliver.c 2012-02-07 20:16:08.856116742 +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/mess/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 15 Nov 2011 11:58:21 -0000 1.8 +++ .cvsignore 7 Feb 2012 19:58:01 -0000 1.9 @@ -1,3 +1,2 @@ ctrlr.rar -mess0143s.zip -mess0144s.zip +mess0145s.zip Index: mess.spec =================================================================== RCS file: /cvs/nonfree/rpms/mess/devel/mess.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mess.spec 15 Nov 2011 11:58:22 -0000 1.8 +++ mess.spec 7 Feb 2012 19:58:01 -0000 1.9 @@ -1,7 +1,7 @@ # the debug build is disabled by default, please use --with debug to override %bcond_with debug -%global baseversion 144 +%global baseversion 145 %global snapshot 0 Name: mess @@ -22,10 +22,13 @@ Source1: ctrlr.rar Patch0: %{name}-fortify.patch Patch1: %{name}-verbosebuild.patch +Patch2: %{name}-systemlibs.patch BuildRequires: expat-devel +BuildRequires: flac-devel BuildRequires: GConf2-devel BuildRequires: gtk2-devel +# BuildRequires: libjpeg-devel BuildRequires: SDL_ttf-devel BuildRequires: unrar BuildRequires: zlib-devel @@ -76,6 +79,7 @@ %endif %patch0 -p1 -b .fortify %patch1 -p1 -b .verbosebuild +%patch2 -p1 -b .systemlibs # Remove windows-specific documentation rm -fr docs/win* @@ -121,11 +125,13 @@ RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//) %if %{with debug} -make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all TARGET=mess +make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \ + BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" DEBUG=1 TARGET=mess \ + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all %else -make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all TARGET=mess +make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \ + BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" TARGET=mess\ + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all %endif @@ -159,7 +165,7 @@ %else install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir} %endif -install -pm 755 castool dat2html imgtool $RPM_BUILD_ROOT%{_bindir} +install -pm 755 castool floptool imgtool $RPM_BUILD_ROOT%{_bindir} install -pm 644 sysinfo.dat $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash @@ -192,7 +198,7 @@ %files tools %doc imgtool.txt %{_bindir}/castool -%{_bindir}/dat2html +%{_bindir}/floptool %{_bindir}/imgtool %files data @@ -203,6 +209,12 @@ %changelog +* Tue Feb 07 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.145-1 +- Updated to 0.145 +- Patched to use system libflac, libjpeg needs more work +- dat2html is no more +- Added floptool to the -tools sub-package + * Tue Nov 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.144-1 - Updated to 0.144 - Updated the Source0 URL comment Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mess/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 Nov 2011 11:58:22 -0000 1.8 +++ sources 7 Feb 2012 19:58:01 -0000 1.9 @@ -1,2 +1,2 @@ d907085f2f69b74198796378e3ed0cb3 ctrlr.rar -af4821f2575c7d8a241bc8e1243c3b20 mess0144s.zip +3beb88328d0627b21e6e122572526110 mess0145s.zip