rpms/dgen-sdl/F-16 dgen-sdl-1.28-execstack.patch, NONE, 1.1 dgen-sdl-1.28-man_warning.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dgen-sdl.spec, 1.3, 1.4 sources, 1.2, 1.3 dgen-sdl-1.23-command_line.patch, 1.1, NONE dgen-sdl-1.23-execstack.patch, 1.1, NONE dgen-sdl-1.23-gcc34.patch, 1.1, NONE dgen-sdl-1.23-gcc4.patch, 1.1, NONE dgen-sdl-1.23-gzip_security_hole.patch, 1.1, NONE dgen-sdl-1.23-man_warning.patch, 1.1, NONE

Sun Dec 11 19:37:31 CET 2011

Author: musuruan

Update of /cvs/nonfree/rpms/dgen-sdl/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17341

Modified Files:
	.cvsignore dgen-sdl.spec sources 
Added Files:
	dgen-sdl-1.28-execstack.patch dgen-sdl-1.28-man_warning.patch 
Removed Files:
	dgen-sdl-1.23-command_line.patch dgen-sdl-1.23-execstack.patch 
	dgen-sdl-1.23-gcc34.patch dgen-sdl-1.23-gcc4.patch 
	dgen-sdl-1.23-gzip_security_hole.patch 
	dgen-sdl-1.23-man_warning.patch 
Log Message:
* Sun Dec 11 2011 Andrea Musuruane <musuruan at gmail.com> 1.28-1
- updated to new upstream version
- updated URL and Source tags
- updated summary and description
- dropped no longer needed patches
- submitted patches upstream


dgen-sdl-1.28-execstack.patch:
 mz80/makez80.c     |    2 ++
 star/star.c        |    2 ++
 x86_ctv.asm        |    3 +++
 x86_memcpy.asm     |    3 +++
 x86_mmx_memcpy.asm |    3 +++
 x86_tiles.asm      |    3 +++
 6 files changed, 16 insertions(+)

--- NEW FILE dgen-sdl-1.28-execstack.patch ---
diff -durN dgen-sdl-1.28.orig/mz80/makez80.c dgen-sdl-1.28/mz80/makez80.c
--- dgen-sdl-1.28.orig/mz80/makez80.c	2011-11-17 22:49:02.000000000 +0100
+++ dgen-sdl-1.28/mz80/makez80.c	2011-12-11 18:18:39.121410978 +0100
@@ -7121,6 +7121,8 @@
 {
 	if (MZ80_ASSEMBLY_X86 == bWhat)
 	{
+		fprintf(fp, "\n");
+		fprintf(fp, "section .note.GNU-stack noalloc noexec nowrite progbits\n");
 	}
 	else
 	if (MZ80_C == bWhat)
diff -durN dgen-sdl-1.28.orig/star/star.c dgen-sdl-1.28/star/star.c
--- dgen-sdl-1.28.orig/star/star.c	2011-11-17 22:49:02.000000000 +0100
+++ dgen-sdl-1.28/star/star.c	2011-12-11 18:13:49.853913096 +0100
@@ -2428,6 +2428,8 @@
 ** the jump table / loop info table
 */
 static void suffixes(void) {
+	emit("\n");
+	emit("section .note.GNU-stack noalloc noexec nowrite progbits\n");
 }
 
 /****************************************************************************
diff -durN dgen-sdl-1.28.orig/x86_ctv.asm dgen-sdl-1.28/x86_ctv.asm
--- dgen-sdl-1.28.orig/x86_ctv.asm	2011-11-17 22:49:02.000000000 +0100
+++ dgen-sdl-1.28/x86_ctv.asm	2011-12-11 18:09:15.354529188 +0100
@@ -162,3 +162,6 @@
 pop  edi
 xor eax,eax
 ret
+
+section .note.GNU-stack noalloc noexec nowrite progbits
+
diff -durN dgen-sdl-1.28.orig/x86_memcpy.asm dgen-sdl-1.28/x86_memcpy.asm
--- dgen-sdl-1.28.orig/x86_memcpy.asm	2011-11-17 22:49:02.000000000 +0100
+++ dgen-sdl-1.28/x86_memcpy.asm	2011-12-11 18:09:25.474623101 +0100
@@ -33,3 +33,6 @@
 ret
 
 ; --------------------------------------
+
+section .note.GNU-stack noalloc noexec nowrite progbits
+
diff -durN dgen-sdl-1.28.orig/x86_mmx_memcpy.asm dgen-sdl-1.28/x86_mmx_memcpy.asm
--- dgen-sdl-1.28.orig/x86_mmx_memcpy.asm	2011-11-17 22:49:02.000000000 +0100
+++ dgen-sdl-1.28/x86_mmx_memcpy.asm	2011-12-11 18:09:40.598763991 +0100
@@ -40,3 +40,6 @@
 ret
 
 ; --------------------------------------
+
+section .note.GNU-stack noalloc noexec nowrite progbits
+
diff -durN dgen-sdl-1.28.orig/x86_tiles.asm dgen-sdl-1.28/x86_tiles.asm
--- dgen-sdl-1.28.orig/x86_tiles.asm	2011-11-17 22:49:02.000000000 +0100
+++ dgen-sdl-1.28/x86_tiles.asm	2011-12-11 18:10:12.001055826 +0100
@@ -1088,3 +1088,6 @@
 	__highpal	dd 0
 
 ; ----------------------------------------
+
+section .note.GNU-stack noalloc noexec nowrite progbits
+

dgen-sdl-1.28-man_warning.patch:
 dgenrc.5 |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE dgen-sdl-1.28-man_warning.patch ---
diff -durN dgen-sdl-1.28.orig/dgenrc.5 dgen-sdl-1.28/dgenrc.5
--- dgen-sdl-1.28.orig/dgenrc.5	2011-11-17 22:49:02.000000000 +0100
+++ dgen-sdl-1.28/dgenrc.5	2011-12-09 15:09:46.141956178 +0100
@@ -259,13 +259,13 @@
 `	~
 -	_
 =	+
-\	|
+\\	|
 [	{
 ]	}
 :	;
-'	"
+\'	"
 ,	<
-\.	>
+\&.	>
 /	?
 .Ed
 .Sh SEE ALSO


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/dgen-sdl/F-16/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2008 13:06:01 -0000	1.2
+++ .cvsignore	11 Dec 2011 18:37:28 -0000	1.3
@@ -1 +1 @@
-dgen-sdl-1.23.tar.gz
+dgen-sdl-1.28.tar.gz


Index: dgen-sdl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dgen-sdl/F-16/dgen-sdl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dgen-sdl.spec	29 Mar 2009 14:49:15 -0000	1.3
+++ dgen-sdl.spec	11 Dec 2011 18:37:30 -0000	1.4
@@ -1,38 +1,41 @@
-Summary: DGen/SDL is a Sega Genesis (MegaDrive outside the US) emulator
+Summary: A Sega Genesis (MegaDrive outside the US) emulator
 Name: dgen-sdl 
-Version: 1.23
-Release: 5%{?dist}
+Version: 1.28
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Emulators
-URL: http://tamentis.net/projects/dgen/
-Source: http://tamentis.net/projects/dgen/files/%{name}-%{version}.tar.gz
-Patch0: dgen-sdl-1.23-gcc4.patch
-Patch1: dgen-sdl-1.23-gcc34.patch
-Patch2: dgen-sdl-1.23-man_warning.patch
-Patch3: dgen-sdl-1.23-gzip_security_hole.patch
-Patch4: dgen-sdl-1.23-command_line.patch
-Patch5: dgen-sdl-1.23-execstack.patch
+URL: http://dgen.sourceforge.net/
+Source: http://downloads.sourceforge.net/dgen/%{name}-%{version}.tar.gz
+# Fix man page warnings
+# http://sourceforge.net/tracker/?func=detail&aid=3455451&group_id=227519&atid=1070824
+Patch0: dgen-sdl-1.28-man_warning.patch
+# Fix not to require an executable stack
+# http://sourceforge.net/tracker/?func=detail&aid=3457405&group_id=227519&atid=1070824
+Patch1: dgen-sdl-1.28-execstack.patch 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel >= 1.0.0
+BuildRequires: libarchive-devel
 %ifarch %{ix86}
 BuildRequires: nasm
 %endif
 
 %description
-DGen/SDL is a semi-fantastic emulator for Unix-esque operating systems
-supported by SDL library. It produces a virtual environment in which 
-Sega Genesis (MegaDrive outside the US) games may run with fairly 
-accurate audio and video.
+DGen/SDL is an emulator for the Sega Genesis/MegaDrive game console. It 
+supports save states, full screen mode, interlace mode, Game Genie, joystick, 
+compressed ROM images, and more. 
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-sed -i 's/\r//' mz80/mz80.txt
+%patch0 -p1
+%patch1 -p1
+
+# Fix file encoding
+for txtfile in cz80/readme.txt
+do
+    iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp
+    touch -r $txtfile tmp
+    mv tmp $txtfile
+done
 
 %build
 %configure
@@ -43,6 +46,11 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mkdir docs
+mkdir docs/cz80
+cp -a cz80/readme.txt docs/cz80
+mkdir docs/musa
+cp -a musa/readme.txt docs/musa
+cp -a musa/history.txt docs/musa
 mkdir docs/mz80
 cp -a mz80/mz80.txt docs/mz80
 mkdir docs/star
@@ -54,14 +62,21 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/dgen
-%{_bindir}/tobin
+%{_bindir}/dgen_tobin
 %{_mandir}/man1/dgen.1*
-%{_mandir}/man1/tobin.1*
+%{_mandir}/man1/dgen_tobin.1*
 %{_mandir}/man5/dgenrc.5*
 %doc AUTHORS ChangeLog COPYING README sample.dgenrc
-%doc docs/mz80 docs/star
+%doc docs/cz80 docs/musa docs/mz80 docs/star
 
 %changelog
+* Sun Dec 11 2011 Andrea Musuruane <musuruan at gmail.com> 1.28-1
+- updated to new upstream version
+- updated URL and Source tags
+- updated summary and description
+- dropped no longer needed patches
+- submitted patches upstream
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.23-5
 - rebuild for new F11 features
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/dgen-sdl/F-16/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2008 13:06:01 -0000	1.2
+++ sources	11 Dec 2011 18:37:30 -0000	1.3
@@ -1 +1 @@
-b1896c1b21ddb152626aec2e8a157a3a  dgen-sdl-1.23.tar.gz
+4fa71cd04375e6de547dc9703c518cb3  dgen-sdl-1.28.tar.gz


--- dgen-sdl-1.23-command_line.patch DELETED ---


--- dgen-sdl-1.23-execstack.patch DELETED ---


--- dgen-sdl-1.23-gcc34.patch DELETED ---


--- dgen-sdl-1.23-gcc4.patch DELETED ---


--- dgen-sdl-1.23-gzip_security_hole.patch DELETED ---


--- dgen-sdl-1.23-man_warning.patch DELETED ---

