debian/0000755000000000000000000000000011770260316007171 5ustar debian/compat0000644000000000000000000000000211770162474010375 0ustar 9 debian/control0000644000000000000000000000357711770162474010616 0ustar Source: pcsxr Section: games Priority: optional Maintainer: Debian Games Team Uploaders: Andrey Rahmatullin Build-Depends: debhelper (>= 9), dh-autoreconf, nasm [i386], libgtk2.0-dev, libglade2-dev, zlib1g-dev, libxv-dev, libxtst-dev, libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev Standards-Version: 3.9.3 Homepage: http://pcsxr.codeplex.com/ Vcs-Git: git://git.debian.org/pkg-games/pcsxr.git Vcs-Browser: http://git.debian.org/?p=pkg-games/pcsxr.git;a=summary Package: pcsxr Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: pcsx, pcsx-bin, pcsx-i18n, psemu-drive-cdrmooby, psemu-input-omnijoy, psemu-input-padjoy, psemu-sound-alsa, psemu-sound-oss, psemu-video-x11 Conflicts: pcsx, pcsx-bin, pcsx-i18n, psemu-drive-cdrmooby, psemu-input-omnijoy, psemu-input-padjoy, psemu-sound-alsa, psemu-sound-oss, psemu-video-x11, pcsx-df Description: Sony PlayStation emulator PCSX is an advanced PlayStation (PSX) emulator, which uses a plugin architecture to provide full support for all components of the PSX. It has full emulation support for gamepads, videos, sound, memory cards, and other important PSX components, and is able to play many games without problems. . This package contains PCSX-Reloaded, which is based on PCSX-df 1.9 which is in turn based on the original PCSX. Package: pcsxr-dbg Architecture: any Section: debug Priority: extra Depends: pcsxr (= ${binary:Version}), ${misc:Depends} Description: Sony PlayStation emulator (debug) PCSX is an advanced PlayStation (PSX) emulator, which uses a plugin architecture to provide full support for all components of the PSX. It has full emulation support for gamepads, videos, sound, memory cards, and other important PSX components, and is able to play many games without problems. . This package contains the debugging symbols. debian/docs0000644000000000000000000000007511602557261010050 0ustar doc/keys.txt doc/tweaks.txt README NEWS ChangeLog.df AUTHORS debian/pcsxr.install0000644000000000000000000000022511770162474011725 0ustar /usr/lib/*/psemu/ /usr/games/pcsx /usr/share/psemu/ /usr/share/locale/ /usr/share/man/ /usr/share/pcsx/ /usr/share/pixmaps/ /usr/share/applications/ debian/changelog0000644000000000000000000000235111770162474011052 0ustar pcsxr (1.9.92-4) unstable; urgency=low * Disable dynarec on powerpc (Closes: #661666) * Fix FTBFS caused by --as-needed (Closes: #669500) * Switch to the debhelper level 9 * Enable all hardening options * Fix several format security problems * Bump Standards-Version to 3.9.3 (no change needed) * Use $libdir/psemu/ instead of $libdir/games/psemu/ * Update symlinks in ~/.pcsx/plugins/ on the program start, to support plugin path changes * debian/copyright: + Update the format URL + Update copyright years + Fix the License: public-domain paragraph * Add debian/watch (with comments only) -- Andrey Rahmatullin Fri, 15 Jun 2012 23:07:59 +0600 pcsxr (1.9.92-3) unstable; urgency=low * Fix FTBFS on armel * Bump Standards-Version to 3.9.2 (no change needed) -- Andrey Rahmatullin Sat, 28 May 2011 13:41:41 +0600 pcsxr (1.9.92-2) unstable; urgency=low * Move the package to the pkg-games team * Add a debug package * Upload to unstable -- Andrey Rahmatullin Sat, 09 Apr 2011 23:37:34 +0600 pcsxr (1.9.92-1) experimental; urgency=low * Initial release (Closes: #608599) -- Andrey Rahmatullin Sat, 15 Jan 2011 16:30:07 +0500 debian/copyright0000644000000000000000000000632611770162474011141 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: PCSX-Reloaded Upstream-Contact: Wei Mingzhi Source: http://pcsxr.codeplex.com/ Files: * Copyright: 2008-2010, Wei Mingzhi 2005-2007, Ryan Schultz 2005-2007, Andrew Burton 2007, Stephen Chao 2007, Stefan Sikora 1999-2003, Pcsx Team 1998, Vision Thing License: GPL-2+ Files: debian/* Copyright: 2009, Wei Mingzhi 2011-2012, Andrey Rahmatullin License: GPL-2+ Files: libpcsxcore/psemu_plugin_defs.h libpcsxcore/sjisfont.h Copyright: Public domain License: public-domain The file 'PSEmu_Plugin_Defs.h' is released to the public domain, contrary to its headers. This is an excerpt from a forum, by Pete Bernert (who wrote many of the plugins and was a PCSX contributor): . "The "PSEmu Plugin Def.h" header file is very old (1998) and (as you have noticed) contains just a few basic defines. When PSemu Pro died in early 1999, and new psx emus showed up, the Vision Thing crew allowed free usage/enhancements of the interface. Sure, nobody ever updated the header file to state something new, but Duddie gave his agreement, as well as Kazz with his XA audio defines (used in the spu plugin interface). So, there is nothing to worry about using the headers." Files: win32/zlib/* Copyright: 1995-2002, Jean-loup Gailly and Mark Adler License: Zlib Files: win32/intl/* Copyright: 1995, 1996, 1997, 1998 Free Software Foundation, Inc License: GPL-2+ License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. License: Zlib This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. . Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: . 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. . 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. . 3. This notice may not be removed or altered from any source distribution. debian/patches/0000755000000000000000000000000011770162474010626 5ustar debian/patches/fix-i386-exec-stack.patch0000644000000000000000000000144511602557261015151 0ustar Description: Fix executable stack on i386 Fix is needed only for nasm >= 2.09, not tested on older versions. Author: Andrey Rahmatullin Bug: http://pcsxr.codeplex.com/workitem/7915 Last-Update: 2011-01-15 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -4,7 +4,7 @@ .asm.lo: $(LIBTOOL) --tag=CC --mode=compile \ - $(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $< + $(STRIP_FPIC) $(NASM) -f elf32 -d ELF -I${srcdir}/ $< INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -DLOCALE_DIR=\"${datadir}/locale/\" \ --- a/plugins/dfxvideo/i386.asm +++ b/plugins/dfxvideo/i386.asm @@ -61,7 +61,7 @@ mov esp, ebp pop ebp ret -%ifidn __OUTPUT_FORMAT__,elf +%ifidn __OUTPUT_FORMAT__,elf32 section .note.GNU-stack noalloc noexec nowrite progbits %endif debian/patches/format-security.patch0000644000000000000000000000367711770162474015021 0ustar Description: Fix multiple "format not a string literal" warnings Author: Andrey Rahmatullin Forwarded: no Last-Update: 2012-06-15 diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c index 89da504..2e556c7 100644 --- a/gui/Gtk2Gui.c +++ b/gui/Gtk2Gui.c @@ -917,7 +917,7 @@ void SysErrorMessage(gchar *primary, gchar *secondary) { primary, NULL); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog), - secondary); + "%s", secondary); gtk_dialog_run(GTK_DIALOG(message_dialog)); gtk_widget_destroy(message_dialog); @@ -936,7 +936,7 @@ void SysInfoMessage(gchar *primary, gchar *secondary) { primary, NULL); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog), - secondary); + "%s", secondary); gtk_dialog_run(GTK_DIALOG(message_dialog)); gtk_widget_destroy(message_dialog); diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index ebfe629..74954f0 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -100,7 +100,7 @@ void verboseLog( s32 level, const char *str, ... ) vsprintf( buf, str, va ); va_end( va ); - printf( buf ); + printf( "%s", buf ); fflush( stdout ); } } diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c index 33381e5..cca1463 100644 --- a/plugins/peopsxgl/draw.c +++ b/plugins/peopsxgl/draw.c @@ -545,9 +545,9 @@ int GLinitialize() glPixelTransferi(GL_ALPHA_SCALE, 1); glPixelTransferi(GL_ALPHA_BIAS, 0); - printf(glGetString(GL_VENDOR)); // linux: tell user what is getting used + printf("%s", glGetString(GL_VENDOR)); // linux: tell user what is getting used printf("\n"); - printf(glGetString(GL_RENDERER)); + printf("%s", glGetString(GL_RENDERER)); printf("\n"); glFlush(); // we are done... debian/patches/fix-plugin-dir.patch0000644000000000000000000000562711770162474014517 0ustar Description: Move the plugins directory from $libdir/games to $libdir. Author: Andrey Rahmatullin Forwarded: no Last-Update: 2012-06-15 diff --git a/gui/Makefile.am b/gui/Makefile.am index 50e9e8f..b2874e0 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \ $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \ -I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \ -DPSEMU_DATA_DIR=\"${datadir}/psemu\" \ - -DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\" + -DDEF_PLUGIN_DIR=\"${libdir}/psemu\" bin_PROGRAMS = pcsx diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am index 6edf16b..4692e5f 100644 --- a/plugins/dfcdrom/Makefile.am +++ b/plugins/dfcdrom/Makefile.am @@ -1,5 +1,5 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/psemu/ +libdir = @libdir@/psemu/ lib_LTLIBRARIES = libDFCdrom.la diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index 0f5138a..13cc599 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -1,5 +1,5 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/psemu/ +libdir = @libdir@/psemu/ lib_LTLIBRARIES = libDFInput.la diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am index 36f9768..0e806b0 100644 --- a/plugins/dfnet/Makefile.am +++ b/plugins/dfnet/Makefile.am @@ -1,5 +1,5 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/psemu/ +libdir = @libdir@/psemu/ lib_LTLIBRARIES = libDFNet.la diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am index 88a7dc8..568eee4 100644 --- a/plugins/dfsound/Makefile.am +++ b/plugins/dfsound/Makefile.am @@ -4,8 +4,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \ -I../../include -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/psemu/ +libdir = @libdir@/psemu/ lib_LTLIBRARIES = libDFSound.la diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index 89ba770..8460c2d 100644 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -13,8 +13,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -I../../libpcsxcore \ -I../../include -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/psemu/ +libdir = @libdir@/psemu/ lib_LTLIBRARIES = libDFXVideo.la diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am index d88dc94..41a7c1a 100644 --- a/plugins/peopsxgl/Makefile.am +++ b/plugins/peopsxgl/Makefile.am @@ -4,8 +4,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ $(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \ -I../../libpcsxcore -I../../include -fPIC -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/psemu/ +libdir = @libdir@/psemu/ lib_LTLIBRARIES = libpeopsxgl.la debian/patches/series0000644000000000000000000000025311770162474012043 0ustar fix-i386-exec-stack.patch fix-armel-ftbfs.diff disable-ppc-auto-dynarec.patch fix-pcsx-link.patch fix-plugin-dir.patch update-homedir-symlinks.patch format-security.patch debian/patches/fix-armel-ftbfs.diff0000644000000000000000000002043411602557261014445 0ustar Description: Fix FTBFS on armel by renaming symbols conflicting with system ones enum breakpoint_types has several name clashes with armel Origin: upstream, http://pcsxr.codeplex.com/SourceControl/changeset/changes/66613 Bug: http://pcsxr.codeplex.com/workitem/8584 Last-Update: 2011-05-27 Index: pcsxr/libpcsxcore/psxmem.c =================================================================== --- pcsxr/libpcsxcore/psxmem.c (revision 66612) +++ pcsxr/libpcsxcore/psxmem.c (revision 66613) @@ -157,7 +157,7 @@ p = (char *)(psxMemRLUT[t]); if (p != NULL) { if (Config.Debug) - DebugCheckBP((mem & 0xffffff) | 0x80000000, R1); + DebugCheckBP((mem & 0xffffff) | 0x80000000, BR1); return *(u8 *)(p + (mem & 0xffff)); } else { #ifdef PSXMEM_LOG @@ -186,7 +186,7 @@ p = (char *)(psxMemRLUT[t]); if (p != NULL) { if (Config.Debug) - DebugCheckBP((mem & 0xffffff) | 0x80000000, R2); + DebugCheckBP((mem & 0xffffff) | 0x80000000, BR2); return SWAPu16(*(u16 *)(p + (mem & 0xffff))); } else { #ifdef PSXMEM_LOG @@ -215,7 +215,7 @@ p = (char *)(psxMemRLUT[t]); if (p != NULL) { if (Config.Debug) - DebugCheckBP((mem & 0xffffff) | 0x80000000, R4); + DebugCheckBP((mem & 0xffffff) | 0x80000000, BR4); return SWAPu32(*(u32 *)(p + (mem & 0xffff))); } else { #ifdef PSXMEM_LOG @@ -244,7 +244,7 @@ p = (char *)(psxMemWLUT[t]); if (p != NULL) { if (Config.Debug) - DebugCheckBP((mem & 0xffffff) | 0x80000000, W1); + DebugCheckBP((mem & 0xffffff) | 0x80000000, BW1); *(u8 *)(p + (mem & 0xffff)) = value; #ifdef PSXREC psxCpu->Clear((mem & (~3)), 1); @@ -275,7 +275,7 @@ p = (char *)(psxMemWLUT[t]); if (p != NULL) { if (Config.Debug) - DebugCheckBP((mem & 0xffffff) | 0x80000000, W2); + DebugCheckBP((mem & 0xffffff) | 0x80000000, BW2); *(u16 *)(p + (mem & 0xffff)) = SWAPu16(value); #ifdef PSXREC psxCpu->Clear((mem & (~1)), 1); @@ -307,7 +307,7 @@ p = (char *)(psxMemWLUT[t]); if (p != NULL) { if (Config.Debug) - DebugCheckBP((mem & 0xffffff) | 0x80000000, W4); + DebugCheckBP((mem & 0xffffff) | 0x80000000, BW4); *(u32 *)(p + (mem & 0xffff)) = SWAPu32(value); #ifdef PSXREC psxCpu->Clear(mem, 1); Index: pcsxr/libpcsxcore/debug.h =================================================================== --- pcsxr/libpcsxcore/debug.h (revision 66612) +++ pcsxr/libpcsxcore/debug.h (revision 66613) @@ -25,7 +25,7 @@ #endif enum breakpoint_types { - E, R1, R2, R4, W1, W2, W4 + BE, BR1, BR2, BR4, BW1, BW2, BW4 }; void StartDebugger(); Index: pcsxr/libpcsxcore/debug.c =================================================================== --- pcsxr/libpcsxcore/debug.c (revision 66612) +++ pcsxr/libpcsxcore/debug.c (revision 66613) @@ -193,7 +193,7 @@ Execution flow control commands acknowledge (4xx): ------------------------------------------------- 400 @
- - Displays a breakpoint, where 'type' can be of E, R1, R2, R4, W1, W2 or W4. + Displays a breakpoint, where 'type' can be of BE, BR1, BR2, BR4, BW1, BW2 or BW4. 401 Breakpoint deleting acknowledge. 410, 420, 421, 422, 430, 431, 432 @@ -389,7 +389,7 @@ } } if (!paused) { - DebugCheckBP(psxRegs.pc, E); + DebugCheckBP(psxRegs.pc, BE); } if (mapping_e) { MarkMap(psxRegs.pc, MAP_EXEC); @@ -951,7 +951,7 @@ // sprintf(reply, "531 Invalid address %08X\r\n", address); // break; // } - code = add_breakpoint(E, address); + code = add_breakpoint(BE, address); sprintf(reply, "410 %X\r\n", code); break; case 0x320: @@ -963,7 +963,7 @@ sprintf(reply, "532 Invalid address %08X\r\n", address); break; } - code = add_breakpoint(R1, address); + code = add_breakpoint(BR1, address); sprintf(reply, "420 %X\r\n", code); break; case 0x321: @@ -975,7 +975,7 @@ sprintf(reply, "532 Invalid address %08X\r\n", address); break; } - code = add_breakpoint(R2, address); + code = add_breakpoint(BR2, address); sprintf(reply, "421 %X\r\n", code); break; case 0x322: @@ -987,7 +987,7 @@ sprintf(reply, "532 Invalid address %08X\r\n", address); break; } - code = add_breakpoint(R4, address); + code = add_breakpoint(BR4, address); sprintf(reply, "422 %X\r\n", code); break; case 0x330: @@ -999,7 +999,7 @@ sprintf(reply, "533 Invalid address %08X\r\n", address); break; } - code = add_breakpoint(W1, address); + code = add_breakpoint(BW1, address); sprintf(reply, "430 %X\r\n", code); break; case 0x331: @@ -1011,7 +1011,7 @@ sprintf(reply, "533 Invalid address %08X\r\n", address); break; } - code = add_breakpoint(W2, address); + code = add_breakpoint(BW2, address); sprintf(reply, "431 %X\r\n", code); break; case 0x332: @@ -1023,7 +1023,7 @@ sprintf(reply, "533 Invalid address %08X\r\n", address); break; } - code = add_breakpoint(W4, address); + code = add_breakpoint(BW4, address); sprintf(reply, "432 %X\r\n", code); break; case 0x390: @@ -1087,59 +1087,59 @@ return; } } - if (breakmp_e && type == E) { + if (breakmp_e && type == BE) { if (!IsMapMarked(address, MAP_EXEC)) { sprintf(reply, "010 %08X@%08X\r\n", address, psxRegs.pc); WriteSocket(reply, strlen(reply)); paused = 1; } } - if (breakmp_r8 && type == R1) { + if (breakmp_r8 && type == BR1) { if (!IsMapMarked(address, MAP_R8)) { sprintf(reply, "011 %08X@%08X\r\n", address, psxRegs.pc); WriteSocket(reply, strlen(reply)); paused = 1; } } - if (breakmp_r16 && type == R2) { + if (breakmp_r16 && type == BR2) { if (!IsMapMarked(address, MAP_R16)) { sprintf(reply, "012 %08X@%08X\r\n", address, psxRegs.pc); WriteSocket(reply, strlen(reply)); paused = 1; } } - if (breakmp_r32 && type == R4) { + if (breakmp_r32 && type == BR4) { if (!IsMapMarked(address, MAP_R32)) { sprintf(reply, "013 %08X@%08X\r\n", address, psxRegs.pc); WriteSocket(reply, strlen(reply)); paused = 1; } } - if (breakmp_w8 && type == W1) { + if (breakmp_w8 && type == BW1) { if (!IsMapMarked(address, MAP_W8)) { sprintf(reply, "014 %08X@%08X\r\n", address, psxRegs.pc); WriteSocket(reply, strlen(reply)); paused = 1; } } - if (breakmp_w16 && type == W2) { + if (breakmp_w16 && type == BW2) { if (!IsMapMarked(address, MAP_W16)) { sprintf(reply, "015 %08X@%08X\r\n", address, psxRegs.pc); WriteSocket(reply, strlen(reply)); paused = 1; } } - if (breakmp_w32 && type == W4) { + if (breakmp_w32 && type == BW4) { if (!IsMapMarked(address, MAP_W32)) { sprintf(reply, "016 %08X@%08X\r\n", address, psxRegs.pc); WriteSocket(reply, strlen(reply)); paused = 1; } } - if (mapping_r8 && type == R1) MarkMap(address, MAP_R8); - if (mapping_r16 && type == R2) MarkMap(address, MAP_R16); - if (mapping_r32 && type == R4) MarkMap(address, MAP_R32); - if (mapping_w8 && type == W1) MarkMap(address, MAP_W8); - if (mapping_w16 && type == W2) MarkMap(address, MAP_W16); - if (mapping_w32 && type == W4) MarkMap(address, MAP_W32); + if (mapping_r8 && type == BR1) MarkMap(address, MAP_R8); + if (mapping_r16 && type == BR2) MarkMap(address, MAP_R16); + if (mapping_r32 && type == BR4) MarkMap(address, MAP_R32); + if (mapping_w8 && type == BW1) MarkMap(address, MAP_W8); + if (mapping_w16 && type == BW2) MarkMap(address, MAP_W16); + if (mapping_w32 && type == BW4) MarkMap(address, MAP_W32); } debian/patches/update-homedir-symlinks.patch0000644000000000000000000000251511770162474016430 0ustar Description: Remove old symlinks from ~/.pcsx/plugins/ before creating new ones If a plugin location was changed and a symlink to the old location exist in the home user directory, it must be updated. Author: Andrey Rahmatullin Forwarded: no Last-Update: 2012-06-15 diff --git a/gui/LnxMain.c b/gui/LnxMain.c index 8297a91..e316248 100644 --- a/gui/LnxMain.c +++ b/gui/LnxMain.c @@ -111,12 +111,15 @@ static void ScanPlugins(gchar* scandir) { } else { /* Create a symlink from this file to the directory ~/.pcsx/plugin */ linkname = g_build_filename (getenv("HOME"), PLUGINS_DIR, ent->d_name, NULL); + unlink(linkname); symlink(filename, linkname); + /* If it's a config tool, make one in the cfg dir as well. This allows plugins with retarded cfg finding to work :- ) */ if (match(filename, "cfg.*") == 1) { linkname = g_build_filename (getenv("HOME"), PLUGINS_CFG_DIR, ent->d_name, NULL); + unlink(linkname); symlink(filename, linkname); } g_free (linkname); @@ -147,6 +150,7 @@ static void ScanBios(gchar* scandir) { } else { /* Create a symlink from this file to the directory ~/.pcsx/plugin */ linkname = g_build_filename(getenv("HOME"), BIOS_DIR, ent->d_name, NULL); + unlink(linkname); symlink(filename, linkname); g_free(linkname); debian/patches/fix-pcsx-link.patch0000644000000000000000000000106411770162474014344 0ustar Description: Order libraries on the link command properly Origin: backport, http://pcsxr.codeplex.com/SourceControl/changeset/changes/61512 Forwarded: not-needed Last-Update: 2012-04-20 diff --git a/gui/Makefile.am b/gui/Makefile.am index 50e9e8f..5c12795 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -20,5 +20,5 @@ pcsx_SOURCES = \ AboutDlg.c pcsx_LDADD = \ - $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst \ - ../libpcsxcore/libpcsxcore.a + ../libpcsxcore/libpcsxcore.a \ + $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst debian/patches/disable-ppc-auto-dynarec.patch0000644000000000000000000000113311770162474016421 0ustar Description: Do not enable dynarec on ppc when built with --enable-dynarec=auto PowerPC dynarec code seems unsupported and not working. Author: Andrey Rahmatullin Forwarded: not-needed Last-Update: 2012-03-03 diff --git a/configure.ac b/configure.ac index 42de1b3..0346d30 100644 --- a/configure.ac +++ b/configure.ac @@ -175,10 +175,6 @@ if test "x$DYNARECSEL" = xauto; then if expr x"$target_cpu" : 'xx86_64' > /dev/null; then DYNARECSEL="x86_64" fi - - if expr x"$target_cpu" : 'xpowerpc' > /dev/null; then - DYNARECSEL="ppc" - fi fi if test "x$DYNARECSEL" = xno; then debian/source/0000755000000000000000000000000011602557261010473 5ustar debian/source/format0000644000000000000000000000001411602557261011701 0ustar 3.0 (quilt) debian/rules0000755000000000000000000000121111770162474010252 0ustar #!/usr/bin/make -f .PHONY: override_dh_auto_configure override_dh_auto_install override_dh_install override_dh_strip DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export DEB_BUILD_MAINT_OPTIONS=hardening=+all export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed %: dh $@ --parallel --with autoreconf override_dh_auto_configure: dh_auto_configure --parallel -- --bindir=/usr/games --enable-opengl override_dh_auto_install: dh_auto_install --parallel rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/psemu/*.la override_dh_install: dh_install --fail-missing override_dh_strip: dh_strip --dbg-package=pcsxr-dbg debian/gbp.conf0000644000000000000000000000003611602557261010611 0ustar [DEFAULT] pristine-tar = True debian/watch0000644000000000000000000000022711770162474010231 0ustar # The software is hosted on CodePlex which doesn't support automated uscan(1) downloads # The latest release is at http://pcsxr.codeplex.com/releases/