7:25 a.m.
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24747
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
- Updated to 0.147u2
- Conditionalised the low memory workaround
- Use system libjpeg-turbo on Fedora 19 and above
- Do not delete the entire obj/, leave the bits needed by the -debuginfo package
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore 8 Oct 2012 17:44:00 -0000 1.65
+++ .cvsignore 4 Nov 2012 07:25:48 -0000 1.66
@@ -1,2 +1,3 @@
mame0147s.exe
0147u1_diff.zip
+0147u2_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/mame.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mame.spec 8 Oct 2012 17:44:00 -0000 1.74
+++ mame.spec 4 Nov 2012 07:25:48 -0000 1.75
@@ -5,7 +5,13 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 1
+%global sourceupdate 2
+
+# work around low memory on the RPM Fusion builder
+%bcond_without lowmem
+%if %{with lowmem}
+%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+%endif
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +29,7 @@
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-#Source2: http://mamedev.org/updates/0%{baseversion}u2_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
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
@@ -39,13 +45,17 @@
BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
-# BuildRequires: libjpeg-devel
+%if 0%{?fedora} >= 19
+BuildRequires: libjpeg-devel
+%endif
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
+%if 0%{?fedora} < 19
Provides: bundled(libjpeg) = 8c
+%endif
Provides: bundled(lzma-sdk) = 9.22
%description
@@ -85,7 +95,9 @@
Summary: Multi Emulator Super System
Requires: mess-data = %{version}-%{release}
+%if 0%{?fedora} < 19
Provides: bundled(libjpeg) = 8c
+%endif
Provides: bundled(lzma-sdk) = 9.22
%description -n mess
@@ -175,8 +187,7 @@
EOF
#make a copy for MESS
-cp %{name}.ini mess.ini
-sed -i 's/%{name}/mess/' mess.ini
+sed 's/%{name}/mess/g' %{name}.ini > mess.ini
%build
@@ -185,7 +196,13 @@
#save some space
MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="
+ BUILD_FLAC=0 SUFFIX64="
+
+%if 0%{?fedora} >= 19
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=0"
+%else
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=1"
+%endif
%if %{with ldplayer}
make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer \
@@ -194,13 +211,13 @@
%if %{with debug}
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 \
OPT_FLAGS="$RPM_OPT_FLAGS
-DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TARGET=mess \
OPT_FLAGS="$RPM_OPT_FLAGS
-DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%else
make %{?_smp_mflags} $MAME_FLAGS \
OPT_FLAGS="$RPM_OPT_FLAGS
-DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
make %{?_smp_mflags} $MAME_FLAGS TARGET=mess\
OPT_FLAGS="$RPM_OPT_FLAGS
-DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%endif
@@ -344,9 +361,20 @@
%changelog
+* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
+- Updated to 0.147u2
+- Conditionalised the low memory workaround
+- Use system libjpeg-turbo on Fedora 19 and above
+- Do not delete the entire obj/, leave the bits needed by the -debuginfo package
+
+* Sat Oct 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-2
+- Work around low memory on the RPM Fusion builder
+
* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
- Updated to 0.147u1
- Dropped missing whatsnew.txt workaround
+- Fixed incorrect paths in mess.ini
+- Remove the object tree between mame and mess builds to prevent mess using /etc/mame
* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
- Updated to 0.147
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources 8 Oct 2012 17:44:00 -0000 1.65
+++ sources 4 Nov 2012 07:25:48 -0000 1.66
@@ -1,2 +1,3 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
+c0306cbf583309d23549529f441e97f2 0147u2_diff.zip