Author: thias Update of /cvs/nonfree/rpms/snes9x/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv30627 Modified Files: .cvsignore snes9x.spec sources Added Files: snes9x-1.52-core.fix4.diff Removed Files: snes9x-1.43-wmclass.patch snes9x-1.51-src-fixes.patch Log Message: Update to 1.52. snes9x-1.52-core.fix4.diff: getset.h | 33 ++++++++++++++++++++++----------- port.h | 2 ++ 2 files changed, 24 insertions(+), 11 deletions(-) --- NEW FILE snes9x-1.52-core.fix4.diff --- Index: getset.h =================================================================== --- getset.h (revision 1169) +++ getset.h (working copy) @@ -266,6 +266,7 @@ inline uint16 S9xGetWord (uint32 Address, enum s9xwrap_t w = WRAP_NONE) { + uint16 ret; uint32 mask = MEMMAP_MASK & (w == WRAP_PAGE ? 0xff : (w == WRAP_BANK ? 0xffff : 0xffffff)); if ((Address & mask) == mask) { @@ -309,7 +310,8 @@ switch ((pint) GetAddress) { case CMemory::MAP_CPU: - return (S9xGetCPU(Address & 0xffff) | (S9xGetCPU((Address + 1) & 0xffff) << 8)); + ret = S9xGetCPU(Address & 0xffff); + return (ret | (S9xGetCPU((Address + 1) & 0xffff) << 8)); case CMemory::MAP_PPU: if (CPU.InDMAorHDMA) @@ -317,9 +319,10 @@ OpenBus = S9xGetByte(Address); return (OpenBus | (S9xGetByte(Address + 1) << 8)); } + + ret = S9xGetPPU(Address & 0xffff); + return (ret | (S9xGetPPU((Address + 1) & 0xffff) << 8)); - return (S9xGetPPU(Address & 0xffff) | (S9xGetPPU((Address + 1) & 0xffff) << 8)); - case CMemory::MAP_LOROM_SRAM: case CMemory::MAP_SA1RAM: if (Memory.SRAMMask >= MEMMAP_MASK) @@ -347,28 +350,36 @@ return (READ_WORD(Memory.BWRAM + ((Address & 0x7fff) - 0x6000))); case CMemory::MAP_DSP: - return (S9xGetDSP(Address & 0xffff) | (S9xGetDSP((Address + 1) & 0xffff) << 8)); + ret = S9xGetDSP(Address & 0xffff); + return (ret | (S9xGetDSP((Address + 1) & 0xffff) << 8)); case CMemory::MAP_SPC7110_ROM: - return (S9xGetSPC7110Byte(Address) | (S9xGetSPC7110Byte(Address + 1) << 8)); + ret = S9xGetSPC7110Byte(Address); + return (ret | (S9xGetSPC7110Byte(Address + 1) << 8)); case CMemory::MAP_SPC7110_DRAM: - return (S9xGetSPC7110(0x4800) | (S9xGetSPC7110(0x4800) << 8)); + ret = S9xGetSPC7110(0x4800); + return (ret | (S9xGetSPC7110(0x4800) << 8)); case CMemory::MAP_C4: - return (S9xGetC4(Address & 0xffff) | (S9xGetC4((Address + 1) & 0xffff) << 8)); + ret = S9xGetC4(Address & 0xffff); + return (ret | (S9xGetC4((Address + 1) & 0xffff) << 8)); case CMemory::MAP_OBC_RAM: - return (S9xGetOBC1(Address & 0xffff) | (S9xGetOBC1((Address + 1) & 0xffff) << 8)); + ret = S9xGetOBC1(Address & 0xffff); + return (ret | (S9xGetOBC1((Address + 1) & 0xffff) << 8)); case CMemory::MAP_SETA_DSP: - return (S9xGetSetaDSP(Address) | (S9xGetSetaDSP(Address + 1) << 8)); + ret = S9xGetSetaDSP(Address); + return (ret | (S9xGetSetaDSP(Address + 1) << 8)); case CMemory::MAP_SETA_RISC: - return (S9xGetST018(Address) | (S9xGetST018(Address + 1) << 8)); + ret = S9xGetST018(Address); + return (ret | (S9xGetST018(Address + 1) << 8)); case CMemory::MAP_BSX: - return (S9xGetBSX(Address) | (S9xGetBSX(Address + 1) << 8)); + ret = S9xGetBSX(Address); + return (ret | (S9xGetBSX(Address + 1) << 8)); case CMemory::MAP_NONE: default: Index: port.h =================================================================== --- port.h (revision 1169) +++ port.h (working copy) @@ -300,6 +300,8 @@ #define strncasecmp strnicmp void WinDisplayStringFromBottom(const char *string, int linesFromBottom, int pixelsFromLeft, bool allowWrap); #define S9xDisplayString WinDisplayStringFromBottom +void SetInfoDlgColor(unsigned char, unsigned char, unsigned char); +#define SET_UI_COLOR(r,g,b) SetInfoDlgColor(r,g,b) #endif #ifdef __DJGPP Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/snes9x/F-13/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Oct 2008 13:56:58 -0000 1.2 +++ .cvsignore 13 Oct 2010 09:25:11 -0000 1.3 @@ -1 +1 @@ -snes9x-1.51-src.tar.bz2 +snes9x-1.52-src.tar.bz2 Index: snes9x.spec =================================================================== RCS file: /cvs/nonfree/rpms/snes9x/F-13/snes9x.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- snes9x.spec 6 May 2009 08:54:12 -0000 1.4 +++ snes9x.spec 13 Oct 2010 09:25:11 -0000 1.5 @@ -1,21 +1,24 @@ -#define prever -WIP1 -%define real_version 1.51 - -Summary: Portable, freeware Super Nintendo Entertainment System (TM) emulator +Summary: Super Nintendo Entertainment System emulator Name: snes9x -Version: 1.51 -Release: 4%{?dist} +Version: 1.52 +Release: 1%{?dist} License: Other Group: Applications/Emulators -URL: http://www.snes9x.com/ -Source: http://files.ipherswipsite.com/snes9x/snes9x-%{real_version}%{?prever}-sr... -Patch0: snes9x-1.43-wmclass.patch -Patch1: snes9x-1.51-src-fixes.patch +URL: http://code.google.com/p/snes9x-gtk/ +Source: http://snes9x-gtk.googlecode.com/files/snes9x-%{version}-src.tar.bz2 +# http://download.sessionclan.de/overfiend/snes9x/snes9x-1.52-src.fix4.diff... +Patch0: snes9x-1.52-core.fix4.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, zlib-devel, libpng-devel -BuildRequires: libGL-devel, libGLU-devel -BuildRequires: libXt-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel +BuildRequires: gcc-c++ +BuildRequires: zlib-devel, libpng-devel +BuildRequires: libXv-devel, libXrandr-devel BuildRequires: nasm +BuildRequires: intltool +BuildRequires: gtk2-devel, libglade2-devel +BuildRequires: SDL-devel +BuildRequires: portaudio-devel +BuildRequires: alsa-lib-devel +BuildRequires: pulseaudio-libs-devel %description Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) @@ -24,45 +27,56 @@ %prep -%setup -q -n %{name}-%{real_version}%{?prever:-dev}-src -%patch0 -p2 -b .wmclass -%patch1 -p1 -b .fixes +%setup -q -n %{name}-%{version}-src +%patch0 -p0 -b .fixes %build -# First, build the OpenGL version -%configure --with-netplay --with-opengl -# Replace OPTIMISE here, it's the best I've found... -%{__perl} -pi.orig -e 's|^OPTIMISE.*|OPTIMISE = %{optflags}|g' Makefile +# Workaround for all of the missing links (as of 1.52) +export CFLAGS="%{optflags} -lX11 -ldl -lXext" +export CXXFLAGS="%{optflags} -lX11 -ldl -lXext" +# First, build the GTK version +cd gtk +%configure \ + --without-oss \ + --with-netplay %{__make} %{?_smp_mflags} - -%{__make} clean - -# Second, build the normal X11 version -%configure --with-netplay -# Replace OPTIMISE here, it's the best I've found... -%{__perl} -pi.orig -e 's|^OPTIMISE.*|OPTIMISE = %{optflags}|g' Makefile +cd .. +# Second, build the CLI version +cd unix +%configure \ + --enable-netplay %{__make} %{?_smp_mflags} +cd .. %install %{__rm} -rf %{buildroot} -%{__install} -D -m 0755 osnes9x %{buildroot}%{_bindir}/osnes9x -%{__install} -D -m 0755 snes9x %{buildroot}%{_bindir}/snes9x +cd gtk +%{__make} install DESTDIR=%{buildroot} +cd .. +%find_lang snes9x-gtk +%{__install} -p -m 0755 unix/snes9x %{buildroot}%{_bindir}/snes9x %clean %{__rm} -rf %{buildroot} -%files +%files -f snes9x-gtk.lang %defattr(-,root,root,-) -%doc doc/* unix/docs/readme_unix.txt -%{_bindir}/osnes9x +%doc gtk/doc/* unix/docs/readme_unix.html %{_bindir}/snes9x +%{_bindir}/snes9x-gtk +%{_datadir}/applications/snes9x.desktop +%{_datadir}/icons/hicolor/*/apps/snes9x.* %changelog +* Wed Aug 11 2010 Matthias Saou <http://freshrpms.net/> 1.52-1 +- Update to 1.52, which is now hosted at google (sort of a unique fork). +- Now include the new gtk version, it also supports OpenGL. + * Wed May 6 2009 Matthias Saou <http://freshrpms.net/> 1.51-4 - Include patch to fix the current compilation errors. - Quiet setup. Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/snes9x/F-13/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Oct 2008 13:56:58 -0000 1.2 +++ sources 13 Oct 2010 09:25:11 -0000 1.3 @@ -1 +1 @@ -a1038cc761f400318cdced960972f8a7 snes9x-1.51-src.tar.bz2 +813bd3a0f99732ee0238a2c8ab417725 snes9x-1.52-src.tar.bz2 --- snes9x-1.43-wmclass.patch DELETED --- --- snes9x-1.51-src-fixes.patch DELETED ---