4:51 p.m.
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmess/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10325
Modified Files:
sdlmess.spec
Added Files:
sdlmess-0134-nounidasm.patch
Log Message:
Conditionalised -debug, disabled unidasm
sdlmess-0134-nounidasm.patch:
--- NEW FILE sdlmess-0134-nounidasm.patch ---
diff -up sdlmess-0134/src/tools/tools.mak.nounidasm sdlmess-0134/src/tools/tools.mak
--- sdlmess-0134/src/tools/tools.mak.nounidasm 2009-09-10 15:45:02.000000000 +0200
+++ sdlmess-0134/src/tools/tools.mak 2009-09-17 18:05:12.000000000 +0200
@@ -26,7 +26,6 @@ TOOLS += \
romcmp$(EXE) \
chdman$(EXE) \
jedutil$(EXE) \
- unidasm$(EXE) \
ldresample$(EXE) \
ldverify$(EXE) \
regrep$(EXE) \
@@ -77,19 +76,6 @@ jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL)
#-------------------------------------------------
-# unidasm
-#-------------------------------------------------
-
-UNIDASMOBJS = \
- $(TOOLSOBJ)/unidasm.o \
-
-unidasm$(EXE): $(UNIDASMOBJS) $(LIBUTIL) $(LIBOCORE) $(LIBDASM) $(ZLIB) $(EXPAT)
- @echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-
-
-
-#-------------------------------------------------
# ldresample
#-------------------------------------------------
Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-11/sdlmess.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sdlmess.spec 17 Sep 2009 12:23:15 -0000 1.13
+++ sdlmess.spec 17 Sep 2009 16:51:44 -0000 1.14
@@ -1,3 +1,6 @@
+# the debug build is disabled by default, please use --with debug to override
+%bcond_with debug
+
%ifarch x86_64
%define arch_flags PTR64=1
%endif
@@ -23,6 +26,7 @@
Patch0: %{name}-warnings.patch
Patch1: %{name}-expat.patch
Patch3: %{name}-fortify.patch
+Patch4: %{name}-0134-nounidasm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel unrar
@@ -57,19 +61,13 @@
%description data
%{summary}.
-%package debug
-Summary: Debug enabled version of sdlmess
-Group: Applications/Emulators
-
-%description debug
-%{summary}.
-
%prep
%setup -qn %{name}%{version}
%patch0 -p0 -b .warnings~
%patch1 -p0 -b .expat~
%patch3 -p0 -b .fortify
+%patch4 -p1 -b .nounidasm
# Create mess.ini file
cat > mess.ini << EOF
@@ -117,10 +115,13 @@
%build
+%if %{with debug}
make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags}
-DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%else
make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags}
-DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%endif
%install
@@ -148,8 +149,11 @@
install -d %{buildroot}%{_sysconfdir}/skel/.mess/snap
# Install binaries and config files
-install -pm 755 mess %{buildroot}%{_bindir}/mess
+%if %{with debug}
install -pm 755 messd %{buildroot}%{_bindir}/messd
+%else
+install -pm 755 mess %{buildroot}%{_bindir}/mess
+%endif
install -pm 755 castool imgtool messtest %{buildroot}%{_bindir}
install -pm 644 sysinfo.dat %{buildroot}%{_datadir}/mess
install -pm 644 artwork/* %{buildroot}%{_datadir}/mess/artwork
@@ -171,7 +175,11 @@
%doc *.txt docs/*
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
+%if %{with debug}
+%{_bindir}/messd
+%else
%{_bindir}/mess
+%endif
%dir %{_datadir}/mess
%dir %{_datadir}/mess/artwork
%dir %{_datadir}/mess/roms
@@ -197,16 +205,13 @@
%{_datadir}/mess/ctrlr/*
%{_datadir}/mess/hash/*
-%files debug
-%defattr(-,root,root,-)
-%doc docs/license.txt
-%{_bindir}/messd
-
%changelog
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Updated the warnings patch
+- Made the -debug build optional
+- Disabled unidasm until MAME bug #3442 is fixed
* Fri Jul 24 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated to 0.133