7:59 a.m.
Author: musuruan
Update of /cvs/nonfree/rpms/gens/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22478/devel
Modified Files:
.cvsignore sources
Added Files:
gens-2.15.2-execstack.patch gens-2.15.2-romsdir.patch
gens.desktop gens.spec
Log Message:
First import
gens-2.15.2-execstack.patch:
--- NEW FILE gens-2.15.2-execstack.patch ---
diff -dur gens-2.15.2/src/gens/gens_core/cpu/sh2/sh2a.asm
gens-2.15.2-execstack/src/gens/gens_core/cpu/sh2/sh2a.asm
--- gens-2.15.2/src/gens/gens_core/cpu/sh2/sh2a.asm 2005-03-08 22:02:54.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/cpu/sh2/sh2a.asm 2008-08-04
19:50:28.000000000 +0200
@@ -6129,3 +6129,8 @@
%include "sh2_io.inc"
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/cpu/z80/z80.asm
gens-2.15.2-execstack/src/gens/gens_core/cpu/z80/z80.asm
--- gens-2.15.2/src/gens/gens_core/cpu/z80/z80.asm 2005-03-08 22:02:39.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/cpu/z80/z80.asm 2008-08-04 19:35:31.000000000
+0200
@@ -6234,4 +6234,7 @@
dw 08392h, 08793h, 08394h, 08795h, 08796h, 08397h, 08B98h, 08F99h
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -dur gens-2.15.2/src/gens/gens_core/gfx/blit.asm
gens-2.15.2-execstack/src/gens/gens_core/gfx/blit.asm
--- gens-2.15.2/src/gens/gens_core/gfx/blit.asm 2005-03-08 22:02:52.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/gfx/blit.asm 2008-08-04 19:44:32.000000000
+0200
@@ -2051,3 +2051,8 @@
pop ebp
emms
ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/gfx/gfx_cd.asm
gens-2.15.2-execstack/src/gens/gens_core/gfx/gfx_cd.asm
--- gens-2.15.2/src/gens/gens_core/gfx/gfx_cd.asm 2005-03-08 22:02:51.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/gfx/gfx_cd.asm 2008-08-04 19:50:51.000000000
+0200
@@ -973,4 +973,7 @@
pop ebx
ret
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -dur gens-2.15.2/src/gens/gens_core/gfx/hq2x16.asm
gens-2.15.2-execstack/src/gens/gens_core/gfx/hq2x16.asm
--- gens-2.15.2/src/gens/gens_core/gfx/hq2x16.asm 2005-03-08 22:02:52.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/gfx/hq2x16.asm 2008-08-04 19:45:02.000000000
+0200
@@ -1955,3 +1955,7 @@
dd ..@cross8, ..@flag0, ..@flag0, ..@flag0,
dd ..@flag0, ..@flag0, ..@flag0, ..@flag0
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/io/io.asm
gens-2.15.2-execstack/src/gens/gens_core/io/io.asm
--- gens-2.15.2/src/gens/gens_core/io/io.asm 2005-03-08 22:03:20.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/io/io.asm 2008-08-04 19:43:46.000000000
+0200
@@ -1435,3 +1435,8 @@
pop ebx
pop eax
ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/mem/mem_m68k.asm
gens-2.15.2-execstack/src/gens/gens_core/mem/mem_m68k.asm
--- gens-2.15.2/src/gens/gens_core/mem/mem_m68k.asm 2005-03-08 22:02:39.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/mem/mem_m68k.asm 2008-08-04
19:45:39.000000000 +0200
@@ -1942,3 +1942,7 @@
%include "mem_m68k_32x.inc"
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/mem/mem_s68k.asm
gens-2.15.2-execstack/src/gens/gens_core/mem/mem_s68k.asm
--- gens-2.15.2/src/gens/gens_core/mem/mem_s68k.asm 2005-03-08 22:02:39.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/mem/mem_s68k.asm 2008-08-04
19:45:59.000000000 +0200
@@ -3626,3 +3626,8 @@
pop edi
pop ecx
ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/mem/mem_sh2.asm
gens-2.15.2-execstack/src/gens/gens_core/mem/mem_sh2.asm
--- gens-2.15.2/src/gens/gens_core/mem/mem_sh2.asm 2005-03-08 22:02:39.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/mem/mem_sh2.asm 2008-08-04 19:46:41.000000000
+0200
@@ -2194,3 +2194,8 @@
pop edi
mov [_32X_VDP + vx.AF_St], edx
ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/mem/mem_z80.asm
gens-2.15.2-execstack/src/gens/gens_core/mem/mem_z80.asm
--- gens-2.15.2/src/gens/gens_core/mem/mem_z80.asm 2005-03-08 22:02:39.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/mem/mem_z80.asm 2008-08-04 19:46:19.000000000
+0200
@@ -499,4 +499,9 @@
push ecx
call M68K_WB
add esp, 16
- ret
\ No newline at end of file
+ ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/misc/misc.asm
gens-2.15.2-execstack/src/gens/gens_core/misc/misc.asm
--- gens-2.15.2/src/gens/gens_core/misc/misc.asm 2005-03-08 22:03:18.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/misc/misc.asm 2008-08-04 19:36:04.000000000
+0200
@@ -1258,3 +1258,8 @@
pop ecx
pop ebx
ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/sound/pwm.asm
gens-2.15.2-execstack/src/gens/gens_core/sound/pwm.asm
--- gens-2.15.2/src/gens/gens_core/sound/pwm.asm 2005-03-08 22:02:37.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/sound/pwm.asm 2008-08-04 19:47:06.000000000
+0200
@@ -491,4 +491,9 @@
.End
pop esi
pop ebx
- ret
\ No newline at end of file
+ ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/vdp/vdp_32x.asm
gens-2.15.2-execstack/src/gens/gens_core/vdp/vdp_32x.asm
--- gens-2.15.2/src/gens/gens_core/vdp/vdp_32x.asm 2005-03-08 22:02:40.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/vdp/vdp_32x.asm 2008-08-04 19:47:29.000000000
+0200
@@ -174,4 +174,9 @@
jnz short .Palette_Loop
popad
- ret
\ No newline at end of file
+ ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/vdp/vdp_io.asm
gens-2.15.2-execstack/src/gens/gens_core/vdp/vdp_io.asm
--- gens-2.15.2/src/gens/gens_core/vdp/vdp_io.asm 2005-03-08 22:02:40.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/vdp/vdp_io.asm 2008-08-04 19:47:53.000000000
+0200
@@ -1689,4 +1689,9 @@
.No_H_Int
and byte [_main68k_context + 35 * 4], 0xF0
- ret
\ No newline at end of file
+ ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/gens/gens_core/vdp/vdp_rend.asm
gens-2.15.2-execstack/src/gens/gens_core/vdp/vdp_rend.asm
--- gens-2.15.2/src/gens/gens_core/vdp/vdp_rend.asm 2005-03-08 22:02:40.000000000 +0100
+++ gens-2.15.2-execstack/src/gens/gens_core/vdp/vdp_rend.asm 2008-08-04
19:48:12.000000000 +0200
@@ -2253,3 +2253,8 @@
popad
ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur gens-2.15.2/src/starscream/main68k/star.c
gens-2.15.2-execstack/src/starscream/main68k/star.c
--- gens-2.15.2/src/starscream/main68k/star.c 2005-03-08 22:03:12.000000000 +0100
+++ gens-2.15.2-execstack/src/starscream/main68k/star.c 2008-08-04 19:29:23.000000000
+0200
@@ -2355,6 +2355,10 @@
*/
static void suffixes(void) {
emit("end\n");
+ emit("\n");
+ emit("%%ifidn __OUTPUT_FORMAT__,elf\n");
+ emit("section .note.GNU-stack noalloc noexec nowrite progbits\n");
+ emit("%%endif\n");
}
/****************************************************************************
diff -dur gens-2.15.2/src/starscream/sub68k/star.c
gens-2.15.2-execstack/src/starscream/sub68k/star.c
--- gens-2.15.2/src/starscream/sub68k/star.c 2005-03-08 22:03:08.000000000 +0100
+++ gens-2.15.2-execstack/src/starscream/sub68k/star.c 2008-08-04 19:42:40.000000000
+0200
@@ -2264,6 +2264,10 @@
*/
static void suffixes(void) {
emit("end\n");
+ emit("\n");
+ emit("%%ifidn __OUTPUT_FORMAT__,elf\n");
+ emit("section .note.GNU-stack noalloc noexec nowrite progbits\n");
+ emit("%%endif\n");
}
/****************************************************************************
gens-2.15.2-romsdir.patch:
--- NEW FILE gens-2.15.2-romsdir.patch ---
diff -dur gens-2.15.2/src/gens/util/file/rom.c
gens-2.15.2-romsdir/src/gens/util/file/rom.c
--- gens-2.15.2/src/gens/util/file/rom.c 2008-06-20 00:33:13.000000000 +0200
+++ gens-2.15.2-romsdir/src/gens/util/file/rom.c 2008-07-27 15:00:04.000000000 +0200
@@ -411,6 +411,9 @@
widget = create_file_chooser_dialog ("Open Rom",
GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), Rom_Dir);
addRomsFilter (widget);
+
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), Rom_Dir);
+
res = gtk_dialog_run (GTK_DIALOG (widget));
if (res == GTK_RESPONSE_OK)
{
Only in gens-2.15.2-romsdir/src/gens/util/file: rom.c.orig
--- NEW FILE gens.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Gens
Comment=Gens is a win32/unix Sega Genesis / Sega CD / Sega 32X emulator
Exec=gens
Icon=gens
Terminal=false
Type=Application
Categories=Game;Emulator;
--- NEW FILE gens.spec ---
Summary: Gens is a win32/unix Sega Genesis / Sega CD / Sega 32X emulator
Name: gens
Version: 2.15.2
Release: 1%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.gens.ws/
Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
Source1: gens.desktop
Patch0: gens-2.15.2-romsdir.patch
Patch1: gens-2.15.2-execstack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for i386 on plague
#ExclusiveArch: %{ix86}
ExclusiveArch: i386
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: SDL-devel >= 1.1.3
BuildRequires: libglade2-devel
BuildRequires: nasm >= 0.98.37
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
Gens is a GPL emulator for the genesis, ported from win32
to BeOS and linux. It was the fastest on win32, and is pretty fast on linux.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# Fix line encoding
sed -i 's/\r//' gens.txt
sed -i 's/\r//' history.txt
# Fix char encoding
iconv --from=ISO-8859-1 --to=UTF-8 BUGS > BUGS.utf8
mv BUGS.utf8 BUGS
iconv --from=ISO-8859-1 --to=UTF-8 gens.txt > gens.txt.utf8
mv gens.txt.utf8 gens.txt
%build
%configure
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# install desktop file and icons
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32}/apps
convert -delete 1 pixmaps/Gens2.ico \
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
convert -delete 0 pixmaps/Gens2.ico \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-,root,root)
%{_bindir}/gens
%{_datadir}/gens
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%doc AUTHORS BUGS COPYING gens.txt history.txt README
%changelog
* Sat Aug 09 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.15.2-1
- updated to upstream 2.15.2
- added a patch not to require an executable stack
- removed no longer needed patches
- added openGL support in BR
- used a workaround to build only for i386 on plague
* Fri Mar 21 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.12-0.4.rc3
- changed license due to new guidelines
- updated URL tag
- added a patch from Daniel Schneidereit to fix "Open Rom" always starting in
~/.gens (Gentoo #153593)
- removed %%{?dist} tag from changelog
- updated icon cache scriptlets to be compliant to new guidelines
- fixed char encodings in docs
- desktop file is no longer built in the spec file
- removed icon extension from desktop file to match Icon Theme Specification
* Sat Mar 17 2007 Andrea Musuruane <musuruan(a)gmail.com> 2.12-0.3.rc3
- dropped --add-category X-Fedora from desktop-file-install
- changed .desktop category to Game;Emulator;
* Sat Jan 06 2007 Andrea Musuruane <musuruan(a)gmail.com> 2.12-0.2.rc3
- fixed upstream source link and package
- changed .desktop category to "Application;Emulator;"
* Sun Nov 26 2006 Andrea Musuruane <musuruan(a)gmail.com> 2.12-0.1.rc3%
- first release
- used a patch from Avuton Olrich to fix gcc4 compile patch (Gentoo #119024)
- used a patch from Dieter Baron to fix analog joysticks (SF #981963)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gens/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 15:38:57 -0000 1.1
+++ .cvsignore 9 Aug 2008 07:59:43 -0000 1.2
@@ -0,0 +1 @@
+gens-2.15.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gens/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 15:38:57 -0000 1.1
+++ sources 9 Aug 2008 07:59:43 -0000 1.2
@@ -0,0 +1 @@
+d0b675efa4833c8ea19e0611220cecf4 gens-2.15.2.tar.gz