rpms/sdlmame/F-10 sdlmame-0134-nounidasm.patch, NONE, 1.1 .cvsignore, 1.54, 1.55 sdlmame.spec, 1.64, 1.65 sources, 1.55, 1.56

[Julian Sikorski]

Author: belegdol

Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11232

Modified Files:
	.cvsignore sdlmame.spec sources 
Added Files:
	sdlmame-0134-nounidasm.patch 
Log Message:
* Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Turned the ldplayer back on, disabled unidasm instead


sdlmame-0134-nounidasm.patch:

--- NEW FILE sdlmame-0134-nounidasm.patch ---
diff -up sdlmame-0134/src/tools/tools.mak.nounidasm sdlmame-0134/src/tools/tools.mak
--- sdlmame-0134/src/tools/tools.mak.nounidasm	2009-09-10 15:45:02.000000000 +0200
+++ sdlmame-0134/src/tools/tools.mak	2009-09-11 10:31:56.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: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	31 Aug 2009 11:59:43 -0000	1.54
+++ .cvsignore	11 Sep 2009 08:34:39 -0000	1.55
@@ -1,2 +1,2 @@
 ui.bdc
-sdlmame0133u4.zip
+sdlmame0134.zip


Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sdlmame.spec	31 Aug 2009 12:45:38 -0000	1.64
+++ sdlmame.spec	11 Sep 2009 08:34:39 -0000	1.65
@@ -1,4 +1,4 @@
-%define beta 0133u4
+#define beta 0133u5
 
 %if "0%{?beta}" != "0"
 %define _version %{?beta}
@@ -18,7 +18,7 @@
 
 Name:           sdlmame
 Version:        0134
-Release:        0.3.%{?beta}%{?dist}
+Release:        1%{?beta}%{?dist}
 Summary:        SDL Multiple Arcade Machine Emulator
 
 Group:          Applications/Emulators
@@ -30,6 +30,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
@@ -84,6 +85,7 @@
 %patch0 -p0 -b .warnings~
 %patch1 -p0 -b .expat~
 %patch3 -p0 -b .fortify
+%patch4 -p1 -b .nounidasm
 
 # Create mame.ini file
 cat > mame.ini << EOF
@@ -116,8 +118,8 @@
 
 
 %build
-#make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
-#    OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
+    OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
 make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
     OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
 make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
@@ -153,8 +155,8 @@
 install -pm 644 mame.ini %{buildroot}%{_sysconfdir}/mame
 install -pm 644 keymaps/* %{buildroot}%{_datadir}/mame/keymaps
 install -pm 644 ui.bdf %{SOURCE1} %{buildroot}%{_datadir}/mame/fonts
-install -pm 755 chdman jedutil ldresample ldverify mame mamed romcmp \
-    testkeys unidasm %{buildroot}%{_bindir}
+install -pm 755 chdman jedutil ldplayer ldresample ldverify mame mamed romcmp \
+    testkeys %{buildroot}%{_bindir}
 for tool in regrep runtest src2html srcclean
 do
 install -pm 755 $tool %{buildroot}%{_bindir}/mame-$tool
@@ -193,13 +195,20 @@
 %doc docs/license.txt
 %{_bindir}/mamed
 
-#%files ldplayer
-#%defattr(-,root,root,-)
-#%doc docs/license.txt
-#%{_bindir}/ldplayer
+%files ldplayer
+%defattr(-,root,root,-)
+%doc docs/license.txt
+%{_bindir}/ldplayer
 
 
 %changelog
+* Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated to 0.134
+- Turned the ldplayer back on, disabled unidasm instead
+
+* Mon Sep 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-0.4.0133u5
+- Updated to 0.133u5
+
 * Mon Aug 31 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-0.3.0133u4
 - Updated to 0.133u4
 - Added unidasm to the -tools subpackage


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	31 Aug 2009 11:59:43 -0000	1.55
+++ sources	11 Sep 2009 08:34:39 -0000	1.56
@@ -1,2 +1,2 @@
 b64914c2a5589f6d5b00361464152acd  ui.bdc
-407345a8bc5148e508cc5ba9dfa06d21  sdlmame0133u4.zip
+706429e5ecf2ed48c1a732d0dc9c0f94  sdlmame0134.zip