rpms/mame/F-17 mame-disable-ldtools.patch, NONE, 1.1 .cvsignore, 1.49, 1.50 mame-systemlibs.patch, 1.2, 1.3 mame.spec, 1.57, 1.58 sources, 1.49, 1.50
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3293
Modified Files:
.cvsignore mame-systemlibs.patch mame.spec sources
Added Files:
mame-disable-ldtools.patch
Log Message:
* Sun Feb 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u1-1
- Updated to 0.145u1
- Added artwork/* and hlsl/* to the installed files
- Fixed the line ending fix to spare all the *.png files
- Added bundled(libjpeg) and bundled(lzma-sdk) Provides
- Temporarily disabled ldresample and ldverify
mame-disable-ldtools.patch:
tools.mak | 28 ----------------------------
1 file changed, 28 deletions(-)
--- NEW FILE mame-disable-ldtools.patch ---
diff -up mame-0.145u1/src/tools/tools.mak.disable-ldtools mame-0.145u1/src/tools/tools.mak
--- mame-0.145u1/src/tools/tools.mak.disable-ldtools 2012-02-19 19:36:31.466241947 +0100
+++ mame-0.145u1/src/tools/tools.mak 2012-02-19 20:25:29.340015401 +0100
@@ -55,8 +55,6 @@ TOOLS += \
chdman$(EXE) \
jedutil$(EXE) \
unidasm$(EXE) \
- ldresample$(EXE) \
- ldverify$(EXE) \
regrep$(EXE) \
srcclean$(EXE) \
src2html$(EXE) \
@@ -117,32 +115,6 @@ unidasm$(EXE): $(UNIDASMOBJS) $(LIBDASM)
-#-------------------------------------------------
-# ldresample
-#-------------------------------------------------
-
-LDRESAMPLEOBJS = \
- $(TOOLSOBJ)/ldresample.o \
-
-ldresample$(EXE): $(LDRESAMPLEOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(EXPAT)
- @echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@
-
-
-
-#-------------------------------------------------
-# ldverify
-#-------------------------------------------------
-
-LDVERIFYOBJS = \
- $(TOOLSOBJ)/ldverify.o \
-
-ldverify$(EXE): $(LDVERIFYOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(EXPAT)
- @echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@
-
-
-
#-------------------------------------------------
# regrep
#-------------------------------------------------
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore 6 Feb 2012 17:27:41 -0000 1.49
+++ .cvsignore 19 Feb 2012 19:44:47 -0000 1.50
@@ -1 +1,2 @@
mame0145s.exe
+0145u1_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-17/mame-systemlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mame-systemlibs.patch 6 Feb 2012 17:27:41 -0000 1.2
+++ mame-systemlibs.patch 19 Feb 2012 19:44:47 -0000 1.3
@@ -1,6 +1,6 @@
-diff -up mame-0.145/makefile.systemlibs mame-0.145/makefile
---- mame-0.145/makefile.systemlibs 2012-02-06 02:05:28.087005745 +0100
-+++ mame-0.145/makefile 2012-02-06 07:35:08.478866051 +0100
+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
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
@@ -65,31 +65,15 @@
-# $(OBJ)/libflac++.a
-
- #-------------------------------------------------
- # defines needed by multiple make files
-diff -up mame-0.145/src/emu/sound/samples.c.systemlibs mame-0.145/src/emu/sound/samples.c
---- mame-0.145/src/emu/sound/samples.c.systemlibs 2012-02-06 02:05:39.105092912 +0100
-+++ mame-0.145/src/emu/sound/samples.c 2012-02-06 02:06:02.576278597 +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 */
+ 7Z_LIB = $(OBJ)/lib7z.a
- typedef struct _sample_channel sample_channel;
- struct _sample_channel
-diff -up mame-0.145/src/lib/util/chd.c.systemlibs mame-0.145/src/lib/util/chd.c
---- mame-0.145/src/lib/util/chd.c.systemlibs 2012-02-06 02:05:28.422008396 +0100
-+++ mame-0.145/src/lib/util/chd.c 2012-02-06 02:06:02.578278613 +0100
-@@ -48,7 +48,11 @@
- #include <stdlib.h>
- #include <new>
+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
+@@ -44,7 +44,11 @@
+ #include "osdcore.h"
+ #include "corefile.h"
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
@@ -98,10 +82,10 @@
+#endif /* FLAC__NO_DLL */
- /***************************************************************************
-diff -up mame-0.145/src/mame/drivers/sliver.c.systemlibs mame-0.145/src/mame/drivers/sliver.c
---- mame-0.145/src/mame/drivers/sliver.c.systemlibs 2012-02-06 02:05:53.837209459 +0100
-+++ mame-0.145/src/mame/drivers/sliver.c 2012-02-06 02:06:02.580278628 +0100
+ //**************************************************************************
+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
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/mame.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mame.spec 6 Feb 2012 17:27:41 -0000 1.57
+++ mame.spec 19 Feb 2012 19:44:47 -0000 1.58
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 145
-#global sourceupdate 7
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -22,7 +22,7 @@
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+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
@@ -35,6 +35,7 @@
Patch0: %{name}-fortify.patch
Patch1: %{name}-systemlibs.patch
Patch2: %{name}-verbosebuild.patch
+Patch3: %{name}-disable-ldtools.patch
BuildRequires: expat-devel
BuildRequires: flac-devel
@@ -46,6 +47,8 @@
BuildRequires: zlib-devel
Provides: sdlmame = 0%{baseversion}-%{release}
+Provides: bundled(libjpeg) = 8c
+Provides: bundled(lzma-sdk) = 9.22
Obsoletes: sdlmame < 0136-2
%description
@@ -95,7 +98,7 @@
for sourcefile in %{sources}; do
7za x $sourcefile
done
-find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \;
+find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
%if 0%{?sourceupdate}
i=1
while [ $i -le %{sourceupdate} ]; do
@@ -106,6 +109,7 @@
%patch0 -p1 -b .fortify
%patch1 -p1 -b .systemlibs
%patch2 -p1 -b .verbosebuild
+%patch3 -p1 -b .disable-ldtools
# Create ini file
cat > %{name}.ini << EOF
@@ -143,13 +147,13 @@
%if %{with ldplayer}
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
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" TARGET=ldplayer \
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'"
%endif
%if %{with debug}
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
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" DEBUG=1 \
+ 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 \
BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
@@ -179,6 +183,7 @@
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples
@@ -194,14 +199,17 @@
%else
install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
%endif
-install -pm 755 chdman jedutil ldresample ldverify \
+#install -pm 755 chdman jedutil ldresample ldverify \
+install -pm 755 chdman jedutil \
romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir}
#for tool in regrep runtest split src2html srcclean
for tool in regrep split src2html srcclean
do
install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool
done
+install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -pm 644 hlsl/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl
install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
pushd src/osd/sdl/man
%if %{with ldplayer}
@@ -228,8 +236,8 @@
%files tools
%{_bindir}/chdman
%{_bindir}/jedutil
-%{_bindir}/ldresample
-%{_bindir}/ldverify
+#%{_bindir}/ldresample
+#%{_bindir}/ldverify
%{_bindir}/%{name}-regrep
%{_bindir}/romcmp
#%{_bindir}/%{name}-runtest
@@ -252,6 +260,13 @@
%changelog
+* Sun Feb 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u1-1
+- Updated to 0.145u1
+- Added artwork/* and hlsl/* to the installed files
+- Fixed the line ending fix to spare all the *.png files
+- Added bundled(libjpeg) and bundled(lzma-sdk) Provides
+- Temporarily disabled ldresample and ldverify
+
* Mon Feb 06 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145-1
- Updated to 0.145
- Updated the systemlibs patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources 6 Feb 2012 17:27:41 -0000 1.49
+++ sources 19 Feb 2012 19:44:47 -0000 1.50
@@ -1 +1,2 @@
4514ecf6dc5331cd0e803704f95e206f mame0145s.exe
+2b555a2fda60eac45743bbef3ef0481d 0145u1_diff.zip
12 years, 2 months
rpms/mame/devel mame-disable-ldtools.patch, NONE, 1.1 .cvsignore, 1.49, 1.50 mame-systemlibs.patch, 1.2, 1.3 mame.spec, 1.57, 1.58 sources, 1.49, 1.50
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3175
Modified Files:
.cvsignore mame-systemlibs.patch mame.spec sources
Added Files:
mame-disable-ldtools.patch
Log Message:
* Sun Feb 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u1-1
- Updated to 0.145u1
- Added artwork/* and hlsl/* to the installed files
- Fixed the line ending fix to spare all the *.png files
- Added bundled(libjpeg) and bundled(lzma-sdk) Provides
- Temporarily disabled ldresample and ldverify
mame-disable-ldtools.patch:
tools.mak | 28 ----------------------------
1 file changed, 28 deletions(-)
--- NEW FILE mame-disable-ldtools.patch ---
diff -up mame-0.145u1/src/tools/tools.mak.disable-ldtools mame-0.145u1/src/tools/tools.mak
--- mame-0.145u1/src/tools/tools.mak.disable-ldtools 2012-02-19 19:36:31.466241947 +0100
+++ mame-0.145u1/src/tools/tools.mak 2012-02-19 20:25:29.340015401 +0100
@@ -55,8 +55,6 @@ TOOLS += \
chdman$(EXE) \
jedutil$(EXE) \
unidasm$(EXE) \
- ldresample$(EXE) \
- ldverify$(EXE) \
regrep$(EXE) \
srcclean$(EXE) \
src2html$(EXE) \
@@ -117,32 +115,6 @@ unidasm$(EXE): $(UNIDASMOBJS) $(LIBDASM)
-#-------------------------------------------------
-# ldresample
-#-------------------------------------------------
-
-LDRESAMPLEOBJS = \
- $(TOOLSOBJ)/ldresample.o \
-
-ldresample$(EXE): $(LDRESAMPLEOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(EXPAT)
- @echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@
-
-
-
-#-------------------------------------------------
-# ldverify
-#-------------------------------------------------
-
-LDVERIFYOBJS = \
- $(TOOLSOBJ)/ldverify.o \
-
-ldverify$(EXE): $(LDVERIFYOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(EXPAT)
- @echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@
-
-
-
#-------------------------------------------------
# regrep
#-------------------------------------------------
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore 6 Feb 2012 17:27:41 -0000 1.49
+++ .cvsignore 19 Feb 2012 19:44:37 -0000 1.50
@@ -1 +1,2 @@
mame0145s.exe
+0145u1_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/devel/mame-systemlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mame-systemlibs.patch 6 Feb 2012 17:27:41 -0000 1.2
+++ mame-systemlibs.patch 19 Feb 2012 19:44:37 -0000 1.3
@@ -1,6 +1,6 @@
-diff -up mame-0.145/makefile.systemlibs mame-0.145/makefile
---- mame-0.145/makefile.systemlibs 2012-02-06 02:05:28.087005745 +0100
-+++ mame-0.145/makefile 2012-02-06 07:35:08.478866051 +0100
+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
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
@@ -65,31 +65,15 @@
-# $(OBJ)/libflac++.a
-
- #-------------------------------------------------
- # defines needed by multiple make files
-diff -up mame-0.145/src/emu/sound/samples.c.systemlibs mame-0.145/src/emu/sound/samples.c
---- mame-0.145/src/emu/sound/samples.c.systemlibs 2012-02-06 02:05:39.105092912 +0100
-+++ mame-0.145/src/emu/sound/samples.c 2012-02-06 02:06:02.576278597 +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 */
+ 7Z_LIB = $(OBJ)/lib7z.a
- typedef struct _sample_channel sample_channel;
- struct _sample_channel
-diff -up mame-0.145/src/lib/util/chd.c.systemlibs mame-0.145/src/lib/util/chd.c
---- mame-0.145/src/lib/util/chd.c.systemlibs 2012-02-06 02:05:28.422008396 +0100
-+++ mame-0.145/src/lib/util/chd.c 2012-02-06 02:06:02.578278613 +0100
-@@ -48,7 +48,11 @@
- #include <stdlib.h>
- #include <new>
+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
+@@ -44,7 +44,11 @@
+ #include "osdcore.h"
+ #include "corefile.h"
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
@@ -98,10 +82,10 @@
+#endif /* FLAC__NO_DLL */
- /***************************************************************************
-diff -up mame-0.145/src/mame/drivers/sliver.c.systemlibs mame-0.145/src/mame/drivers/sliver.c
---- mame-0.145/src/mame/drivers/sliver.c.systemlibs 2012-02-06 02:05:53.837209459 +0100
-+++ mame-0.145/src/mame/drivers/sliver.c 2012-02-06 02:06:02.580278628 +0100
+ //**************************************************************************
+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
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mame.spec 6 Feb 2012 17:27:41 -0000 1.57
+++ mame.spec 19 Feb 2012 19:44:37 -0000 1.58
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 145
-#global sourceupdate 7
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -22,7 +22,7 @@
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+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
@@ -35,6 +35,7 @@
Patch0: %{name}-fortify.patch
Patch1: %{name}-systemlibs.patch
Patch2: %{name}-verbosebuild.patch
+Patch3: %{name}-disable-ldtools.patch
BuildRequires: expat-devel
BuildRequires: flac-devel
@@ -46,6 +47,8 @@
BuildRequires: zlib-devel
Provides: sdlmame = 0%{baseversion}-%{release}
+Provides: bundled(libjpeg) = 8c
+Provides: bundled(lzma-sdk) = 9.22
Obsoletes: sdlmame < 0136-2
%description
@@ -95,7 +98,7 @@
for sourcefile in %{sources}; do
7za x $sourcefile
done
-find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \;
+find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
%if 0%{?sourceupdate}
i=1
while [ $i -le %{sourceupdate} ]; do
@@ -106,6 +109,7 @@
%patch0 -p1 -b .fortify
%patch1 -p1 -b .systemlibs
%patch2 -p1 -b .verbosebuild
+%patch3 -p1 -b .disable-ldtools
# Create ini file
cat > %{name}.ini << EOF
@@ -143,13 +147,13 @@
%if %{with ldplayer}
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
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" TARGET=ldplayer \
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'"
%endif
%if %{with debug}
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
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" DEBUG=1 \
+ 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 \
BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
@@ -179,6 +183,7 @@
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples
@@ -194,14 +199,17 @@
%else
install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
%endif
-install -pm 755 chdman jedutil ldresample ldverify \
+#install -pm 755 chdman jedutil ldresample ldverify \
+install -pm 755 chdman jedutil \
romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir}
#for tool in regrep runtest split src2html srcclean
for tool in regrep split src2html srcclean
do
install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool
done
+install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -pm 644 hlsl/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl
install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
pushd src/osd/sdl/man
%if %{with ldplayer}
@@ -228,8 +236,8 @@
%files tools
%{_bindir}/chdman
%{_bindir}/jedutil
-%{_bindir}/ldresample
-%{_bindir}/ldverify
+#%{_bindir}/ldresample
+#%{_bindir}/ldverify
%{_bindir}/%{name}-regrep
%{_bindir}/romcmp
#%{_bindir}/%{name}-runtest
@@ -252,6 +260,13 @@
%changelog
+* Sun Feb 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145u1-1
+- Updated to 0.145u1
+- Added artwork/* and hlsl/* to the installed files
+- Fixed the line ending fix to spare all the *.png files
+- Added bundled(libjpeg) and bundled(lzma-sdk) Provides
+- Temporarily disabled ldresample and ldverify
+
* Mon Feb 06 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145-1
- Updated to 0.145
- Updated the systemlibs patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources 6 Feb 2012 17:27:41 -0000 1.49
+++ sources 19 Feb 2012 19:44:37 -0000 1.50
@@ -1 +1,2 @@
4514ecf6dc5331cd0e803704f95e206f mame0145s.exe
+2b555a2fda60eac45743bbef3ef0481d 0145u1_diff.zip
12 years, 2 months
rpms/vbam/devel vbam.spec,1.1,1.2
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31858/devel
Modified Files:
vbam.spec
Log Message:
Added Zip as a dependancy
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/devel/vbam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vbam.spec 11 Feb 2012 23:32:38 -0000 1.1
+++ vbam.spec 19 Feb 2012 19:23:44 -0000 1.2
@@ -1,7 +1,7 @@
Name: vbam
#Pre-release version 1.8.0.1054 is a snapshot of svn 1054
Version: 1.8.0.1054
-Release: 3%{?dist}
+Release: 5%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
@@ -10,6 +10,7 @@
Source: https://downloads.sourceforge.net/project/%{name}/VBA-M%20svn%20r1054/%{n...
BuildRequires: SDL-devel
+BuildRequires: zip
BuildRequires: ImageMagick
BuildRequires: cmake
BuildRequires: zlib-devel
@@ -109,7 +110,8 @@
#Required for ffmpeg header to build
export CPATH='/usr/include/ffmpeg'
%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DVERSION=%{version} -DCMAKE_SKIP_RPATH=ON -DENABLE_LINK=ON
-make %{?_smp_mflags}
+free -m
+make V=1
%install
make install DESTDIR=%{buildroot}
@@ -177,6 +179,12 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-5
+- Added Zip as a dependancy
+
+* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-4
+- Changed building commands to avoid failed builds
+
* Thu Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
- Added missing Build Requirement: openal-soft-devel
- Removed redundant license files
12 years, 2 months
rpms/vbam/F-17 vbam.spec,1.1,1.2
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31695/F-17
Modified Files:
vbam.spec
Log Message:
Added Zip as a dependancy
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/F-17/vbam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vbam.spec 11 Feb 2012 23:32:38 -0000 1.1
+++ vbam.spec 19 Feb 2012 19:23:07 -0000 1.2
@@ -1,7 +1,7 @@
Name: vbam
#Pre-release version 1.8.0.1054 is a snapshot of svn 1054
Version: 1.8.0.1054
-Release: 3%{?dist}
+Release: 5%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
@@ -10,6 +10,7 @@
Source: https://downloads.sourceforge.net/project/%{name}/VBA-M%20svn%20r1054/%{n...
BuildRequires: SDL-devel
+BuildRequires: zip
BuildRequires: ImageMagick
BuildRequires: cmake
BuildRequires: zlib-devel
@@ -109,7 +110,8 @@
#Required for ffmpeg header to build
export CPATH='/usr/include/ffmpeg'
%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DVERSION=%{version} -DCMAKE_SKIP_RPATH=ON -DENABLE_LINK=ON
-make %{?_smp_mflags}
+free -m
+make V=1
%install
make install DESTDIR=%{buildroot}
@@ -177,6 +179,12 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-5
+- Added Zip as a dependancy
+
+* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-4
+- Changed building commands to avoid failed builds
+
* Thu Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
- Added missing Build Requirement: openal-soft-devel
- Removed redundant license files
12 years, 2 months
rpms/vbam/F-15 vbam.spec,1.2,1.3
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31493/F-15
Modified Files:
vbam.spec
Log Message:
Added Zip as a dependancy
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/F-15/vbam.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vbam.spec 18 Feb 2012 15:54:49 -0000 1.2
+++ vbam.spec 19 Feb 2012 19:22:28 -0000 1.3
@@ -1,7 +1,7 @@
Name: vbam
#Pre-release version 1.8.0.1054 is a snapshot of svn 1054
Version: 1.8.0.1054
-Release: 4%{?dist}
+Release: 5%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
@@ -10,6 +10,7 @@
Source: https://downloads.sourceforge.net/project/%{name}/VBA-M%20svn%20r1054/%{n...
BuildRequires: SDL-devel
+BuildRequires: zip
BuildRequires: ImageMagick
BuildRequires: cmake
BuildRequires: zlib-devel
@@ -178,6 +179,9 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-5
+- Added Zip as a dependancy
+
* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-4
- Changed building commands to avoid failed builds
12 years, 2 months
rpms/vbam/F-16 vbam.spec,1.3,1.4
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27793/F-16
Modified Files:
vbam.spec
Log Message:
Added Zip as a dependancy
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/F-16/vbam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vbam.spec 19 Feb 2012 18:55:57 -0000 1.3
+++ vbam.spec 19 Feb 2012 18:58:25 -0000 1.4
@@ -1,7 +1,7 @@
Name: vbam
#Pre-release version 1.8.0.1054 is a snapshot of svn 1054
Version: 1.8.0.1054
-Release: 4%{?dist}
+Release: 5%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
@@ -179,9 +179,11 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-5
+- Added Zip as a dependancy
+
* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-4
- Changed building commands to avoid failed builds
-- Added Zip as a dependancy
* Thu Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
- Added missing Build Requirement: openal-soft-devel
12 years, 2 months
rpms/vbam/F-16 vbam.spec,1.2,1.3
by Jeremy Newton
Author: jem256
Update of /cvs/free/rpms/vbam/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27088/F-16
Modified Files:
vbam.spec
Log Message:
Added Zip as a requirement for building
Index: vbam.spec
===================================================================
RCS file: /cvs/free/rpms/vbam/F-16/vbam.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vbam.spec 18 Feb 2012 17:11:05 -0000 1.2
+++ vbam.spec 19 Feb 2012 18:55:57 -0000 1.3
@@ -10,6 +10,7 @@
Source: https://downloads.sourceforge.net/project/%{name}/VBA-M%20svn%20r1054/%{n...
BuildRequires: SDL-devel
+BuildRequires: zip
BuildRequires: ImageMagick
BuildRequires: cmake
BuildRequires: zlib-devel
@@ -180,6 +181,7 @@
%changelog
* Tue Feb 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-4
- Changed building commands to avoid failed builds
+- Added Zip as a dependancy
* Thu Jan 29 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1054-3
- Added missing Build Requirement: openal-soft-devel
12 years, 2 months
rpms/minidlna/F-16 .cvsignore, 1.3, 1.4 minidlna.spec, 1.2, 1.3 sources, 1.3, 1.4
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21821
Modified Files:
.cvsignore minidlna.spec sources
Log Message:
* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
- Updated to upstream 1.0.24
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Jan 2012 19:59:31 -0000 1.3
+++ .cvsignore 19 Feb 2012 12:08:00 -0000 1.4
@@ -1,2 +1,2 @@
-minidlna_1.0.23_src.tar.gz
+minidlna_1.0.24_src.tar.gz
minidlna-1.0.21-debian-manpages.tar.gz
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/minidlna.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- minidlna.spec 28 Jan 2012 19:59:31 -0000 1.2
+++ minidlna.spec 19 Feb 2012 12:08:00 -0000 1.3
@@ -1,5 +1,5 @@
Name: minidlna
-Version: 1.0.23
+Version: 1.0.24
Release: 1%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
@@ -128,6 +128,9 @@
%changelog
+* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
+- Updated to upstream 1.0.24
+
* Sat Jan 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.23-1
- Updated to upstream 1.0.23
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Jan 2012 19:59:31 -0000 1.3
+++ sources 19 Feb 2012 12:08:00 -0000 1.4
@@ -1,2 +1,2 @@
-409a36830a9ac2aaddfaff4c8b90a40f minidlna_1.0.23_src.tar.gz
+be9b4c91e3fcde592dc3f9828098ca0f minidlna_1.0.24_src.tar.gz
34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
12 years, 2 months
rpms/minidlna/F-17 .cvsignore, 1.3, 1.4 minidlna.spec, 1.2, 1.3 sources, 1.3, 1.4
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21660
Modified Files:
.cvsignore minidlna.spec sources
Log Message:
* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
- Updated to upstream 1.0.24
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-17/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Jan 2012 19:59:08 -0000 1.3
+++ .cvsignore 19 Feb 2012 12:07:30 -0000 1.4
@@ -1,2 +1,2 @@
-minidlna_1.0.23_src.tar.gz
+minidlna_1.0.24_src.tar.gz
minidlna-1.0.21-debian-manpages.tar.gz
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-17/minidlna.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- minidlna.spec 28 Jan 2012 19:59:08 -0000 1.2
+++ minidlna.spec 19 Feb 2012 12:07:30 -0000 1.3
@@ -1,5 +1,5 @@
Name: minidlna
-Version: 1.0.23
+Version: 1.0.24
Release: 1%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
@@ -128,6 +128,9 @@
%changelog
+* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
+- Updated to upstream 1.0.24
+
* Sat Jan 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.23-1
- Updated to upstream 1.0.23
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-17/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Jan 2012 19:59:08 -0000 1.3
+++ sources 19 Feb 2012 12:07:30 -0000 1.4
@@ -1,2 +1,2 @@
-409a36830a9ac2aaddfaff4c8b90a40f minidlna_1.0.23_src.tar.gz
+be9b4c91e3fcde592dc3f9828098ca0f minidlna_1.0.24_src.tar.gz
34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
12 years, 2 months
rpms/minidlna/devel .cvsignore, 1.3, 1.4 minidlna.spec, 1.2, 1.3 sources, 1.3, 1.4
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21417
Modified Files:
.cvsignore minidlna.spec sources
Log Message:
* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
- Updated to upstream 1.0.24
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Jan 2012 19:59:08 -0000 1.3
+++ .cvsignore 19 Feb 2012 12:06:48 -0000 1.4
@@ -1,2 +1,2 @@
-minidlna_1.0.23_src.tar.gz
+minidlna_1.0.24_src.tar.gz
minidlna-1.0.21-debian-manpages.tar.gz
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/minidlna.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- minidlna.spec 28 Jan 2012 19:59:08 -0000 1.2
+++ minidlna.spec 19 Feb 2012 12:06:48 -0000 1.3
@@ -1,5 +1,5 @@
Name: minidlna
-Version: 1.0.23
+Version: 1.0.24
Release: 1%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
@@ -128,6 +128,9 @@
%changelog
+* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
+- Updated to upstream 1.0.24
+
* Sat Jan 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.23-1
- Updated to upstream 1.0.23
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Jan 2012 19:59:08 -0000 1.3
+++ sources 19 Feb 2012 12:06:48 -0000 1.4
@@ -1,2 +1,2 @@
-409a36830a9ac2aaddfaff4c8b90a40f minidlna_1.0.23_src.tar.gz
+be9b4c91e3fcde592dc3f9828098ca0f minidlna_1.0.24_src.tar.gz
34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
12 years, 2 months