Received: by mail.netbsd.org (Postfix, from userid 605) id 67A7384E28; Tue, 29 Sep 2020 12:23:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E254C84E21 for ; Tue, 29 Sep 2020 12:23:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id K_UY_U0xUezq for ; Tue, 29 Sep 2020 12:23:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CA64684D65 for ; Tue, 29 Sep 2020 12:23:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C52B5FB28; Tue, 29 Sep 2020 12:23:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1601382183265180" MIME-Version: 1.0 Date: Tue, 29 Sep 2020 12:23:03 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators/pcsxr To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200929122303.C52B5FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1601382183265180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Sep 29 12:23:03 UTC 2020 Added Files: pkgsrc/emulators/pcsxr: DESCR MESSAGE.NetBSD Makefile PLIST distinfo pkgsrc/emulators/pcsxr/patches: patch-CMakeLists.txt patch-doc_CMakeLists.txt patch-libpcsxcore_ix86__64_ix86__cpudetect.c patch-libpcsxcore_misc.c patch-plugins_bladesio1_gui.c patch-plugins_dfcdrom_cdr.c patch-plugins_dfinput_pad.c patch-plugins_dfsound_cfg.c patch-plugins_dfxvideo_cfg.c Log Message: emulators: Add pcsxr. PCSX-Reloaded is a forked version of the dead PCSX PlayStation emulator, with a nicer interface and several improvements to stability and functionality. PCSX-Reloaded uses the PSEMU plugin interface to provide most functionality; without them, you will not be able to use it to play games. PCSX-Reloaded provides a number of plugins to provide basic functionality out of the box. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/pcsxr/DESCR \ pkgsrc/emulators/pcsxr/MESSAGE.NetBSD pkgsrc/emulators/pcsxr/Makefile \ pkgsrc/emulators/pcsxr/PLIST pkgsrc/emulators/pcsxr/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/pcsxr/patches/patch-CMakeLists.txt \ pkgsrc/emulators/pcsxr/patches/patch-doc_CMakeLists.txt \ pkgsrc/emulators/pcsxr/patches/patch-libpcsxcore_ix86__64_ix86__cpudetect.c \ pkgsrc/emulators/pcsxr/patches/patch-libpcsxcore_misc.c \ pkgsrc/emulators/pcsxr/patches/patch-plugins_bladesio1_gui.c \ pkgsrc/emulators/pcsxr/patches/patch-plugins_dfcdrom_cdr.c \ pkgsrc/emulators/pcsxr/patches/patch-plugins_dfinput_pad.c \ pkgsrc/emulators/pcsxr/patches/patch-plugins_dfsound_cfg.c \ pkgsrc/emulators/pcsxr/patches/patch-plugins_dfxvideo_cfg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1601382183265180 Content-Disposition: inline Content-Length: 12594 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/emulators/pcsxr/DESCR diff -u /dev/null pkgsrc/emulators/pcsxr/DESCR:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/DESCR Tue Sep 29 12:23:03 2020 @@ -0,0 +1,6 @@ +PCSX-Reloaded is a forked version of the dead PCSX PlayStation emulator, with +a nicer interface and several improvements to stability and functionality. + +PCSX-Reloaded uses the PSEMU plugin interface to provide most functionality; +without them, you will not be able to use it to play games. PCSX-Reloaded +provides a number of plugins to provide basic functionality out of the box. Index: pkgsrc/emulators/pcsxr/MESSAGE.NetBSD diff -u /dev/null pkgsrc/emulators/pcsxr/MESSAGE.NetBSD:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/MESSAGE.NetBSD Tue Sep 29 12:23:03 2020 @@ -0,0 +1,9 @@ +=========================================================================== +$NetBSD: MESSAGE.NetBSD,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Note for NetBSD users with native X11: + +Please ensure your userspace is at least as new as 9.0_STABLE, otherwise, +a bug will prevent any games from being loaded by PCSX-R. + +=========================================================================== Index: pkgsrc/emulators/pcsxr/Makefile diff -u /dev/null pkgsrc/emulators/pcsxr/Makefile:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/Makefile Tue Sep 29 12:23:03 2020 @@ -0,0 +1,36 @@ +# $NetBSD: Makefile,v 1.1 2020/09/29 12:23:03 nia Exp $ + +DISTNAME= pcsxr-1.9.95.20190306 +CATEGORIES= emulators +MASTER_SITES= ${MASTER_SITE_GITHUB:=iCatButler/} +GITHUB_PROJECT= pcsxr +GITHUB_TAG= 62467b86871aee3d70c7445f3cb79f0858ec566e + +MAINTAINER= nia@NetBSD.org +HOMEPAGE= https://github.com/iCatButler/pcsxr +COMMENT= Sony PlayStation emulator +LICENSE= gnu-gpl-v3 + +USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++ + +USE_CMAKE= yes + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} != "Linux" +CMAKE_ARGS+= -DDL_LIB="" +.endif + +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +NOT_PAX_MPROTECT_SAFE= bin/pcsxr +.endif + +.include "../../devel/SDL2/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/emulators/pcsxr/PLIST diff -u /dev/null pkgsrc/emulators/pcsxr/PLIST:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/PLIST Tue Sep 29 12:23:03 2020 @@ -0,0 +1,34 @@ +@comment $NetBSD: PLIST,v 1.1 2020/09/29 12:23:03 nia Exp $ +bin/pcsxr +lib/games/psemu/cfgBladeSio1 +lib/games/psemu/cfgDFCdrom +lib/games/psemu/cfgDFInput +lib/games/psemu/cfgDFNet +lib/games/psemu/cfgDFSound +lib/games/psemu/cfgDFXVideo +lib/games/psemu/cfgpeopsxgl +lib/games/psemu/libBladeSio1.so +lib/games/psemu/libDFCdrom.so +lib/games/psemu/libDFInput.so +lib/games/psemu/libDFNet.so +lib/games/psemu/libDFSound.so +lib/games/psemu/libDFXVideo.so +lib/games/psemu/libNullSio1.so +lib/games/psemu/libpeopsxgl.so +man/man1/pcsxr.1 +share/applications/pcsxr.desktop +share/doc/pcsxr/AUTHORS +share/doc/pcsxr/COPYING +share/doc/pcsxr/README +share/doc/pcsxr/keys.txt +share/doc/pcsxr/tweaks.txt +share/icons/hicolor/48x48/apps/pcsxr-icon.png +share/locale/es/LC_MESSAGES/pcsxr.mo +share/locale/fr/LC_MESSAGES/pcsxr.mo +share/locale/hu/LC_MESSAGES/pcsxr.mo +share/locale/it/LC_MESSAGES/pcsxr.mo +share/locale/ko_KR/LC_MESSAGES/pcsxr.mo +share/locale/pt_BR/LC_MESSAGES/pcsxr.mo +share/locale/ru/LC_MESSAGES/pcsxr.mo +share/locale/zh_CN/LC_MESSAGES/pcsxr.mo +share/locale/zh_TW/LC_MESSAGES/pcsxr.mo Index: pkgsrc/emulators/pcsxr/distinfo diff -u /dev/null pkgsrc/emulators/pcsxr/distinfo:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/distinfo Tue Sep 29 12:23:03 2020 @@ -0,0 +1,15 @@ +$NetBSD: distinfo,v 1.1 2020/09/29 12:23:03 nia Exp $ + +SHA1 (pcsxr-1.9.95.20190306-62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz) = bd9140a4b87b60382259a502c4f9434ef5b6e4ad +RMD160 (pcsxr-1.9.95.20190306-62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz) = 63e07f88f9e190de78d9035404ae04906cd1f813 +SHA512 (pcsxr-1.9.95.20190306-62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz) = 894e795c3616bb6abf87d144e1a2409142d457f2f2c04c4287e2804bb06caf008f42501089d555b5e43e6b2d6d2e8ac9a7d78842bed975b1b4b94465f4ed3a3c +Size (pcsxr-1.9.95.20190306-62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz) = 2229537 bytes +SHA1 (patch-CMakeLists.txt) = 370eb85b69b8b3c97b0caf0a2d98b25a8fbd4a78 +SHA1 (patch-doc_CMakeLists.txt) = 14ede350ef8956a5a6939ae8f1b38e2aaa5b15df +SHA1 (patch-libpcsxcore_ix86__64_ix86__cpudetect.c) = 9e06a6b08a505457a9cc4d8f7b3771368fbf6716 +SHA1 (patch-libpcsxcore_misc.c) = fd3f91e2c4554b30cca89e30b9794fc5e0380f7f +SHA1 (patch-plugins_bladesio1_gui.c) = 8b9d5dc170f2b40d1fc5f4832137aeb7198ec274 +SHA1 (patch-plugins_dfcdrom_cdr.c) = 84d81e0a4d7be216c7fd0c3ecdc45d5427211b7c +SHA1 (patch-plugins_dfinput_pad.c) = 33337086faea20646856d252292cbd0ddcc6d95c +SHA1 (patch-plugins_dfsound_cfg.c) = 4886966684220f99812c0a6b4d41e6b36d8ade08 +SHA1 (patch-plugins_dfxvideo_cfg.c) = 6cb11eeea04e9feb6764c3ffee210ded090b1ba9 Index: pkgsrc/emulators/pcsxr/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-CMakeLists.txt:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-CMakeLists.txt Tue Sep 29 12:23:03 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Do not strip executables, let pkgsrc handle that. + +--- CMakeLists.txt.orig 2019-03-06 11:37:17.000000000 +0000 ++++ CMakeLists.txt +@@ -15,8 +15,6 @@ set(PCSXR_VERSION_PATCH "94") + add_definitions(-DPACKAGE_VERSION="${PCSXR_VERSION_MAJOR}.${PCSXR_VERSION_MINOR}.${PCSXR_VERSION_PATCH}") + add_definitions(-DPACKAGE_NAME="PCSXr") + add_definitions(-DPACKAGE_STRING="PCSXr ${PCSXR_VERSION_MAJOR}.${PCSXR_VERSION_MINOR}.${PCSXR_VERSION_PATCH}") +-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") +-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") + + include(CheckCCompilerFlag) + include(GNUInstallDirs) Index: pkgsrc/emulators/pcsxr/patches/patch-doc_CMakeLists.txt diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-doc_CMakeLists.txt:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-doc_CMakeLists.txt Tue Sep 29 12:23:03 2020 @@ -0,0 +1,12 @@ +$NetBSD: patch-doc_CMakeLists.txt,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Respect PKGMANDIR + +--- doc/CMakeLists.txt.orig 2019-03-06 11:37:17.000000000 +0000 ++++ doc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-install(FILES pcsxr.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) ++install(FILES pcsxr.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + install(FILES keys.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr) + install(FILES tweaks.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr) + Index: pkgsrc/emulators/pcsxr/patches/patch-libpcsxcore_ix86__64_ix86__cpudetect.c diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-libpcsxcore_ix86__64_ix86__cpudetect.c:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-libpcsxcore_ix86__64_ix86__cpudetect.c Tue Sep 29 12:23:03 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-libpcsxcore_ix86__64_ix86__cpudetect.c,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Make this more generic. + +--- libpcsxcore/ix86_64/ix86_cpudetect.c.orig 2019-03-06 11:37:17.000000000 +0000 ++++ libpcsxcore/ix86_64/ix86_cpudetect.c +@@ -145,7 +145,7 @@ u64 GetCPUTick( void ) + #endif + } + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__unix__) + + #include + #include Index: pkgsrc/emulators/pcsxr/patches/patch-libpcsxcore_misc.c diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-libpcsxcore_misc.c:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-libpcsxcore_misc.c Tue Sep 29 12:23:03 2020 @@ -0,0 +1,24 @@ +$NetBSD: patch-libpcsxcore_misc.c,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Portability. + +--- libpcsxcore/misc.c.orig 2019-03-06 11:37:17.000000000 +0000 ++++ libpcsxcore/misc.c +@@ -124,7 +124,7 @@ int GetCdromFile(u8 *mdir, u8 *time, s8 + i += dir->length[0]; + + if (dir->flags[0] & 0x2) { // it's a dir +- if (!strnicmp((char *)&dir->name[0], filename, dir->name_len[0])) { ++ if (!strncasecmp((char *)&dir->name[0], filename, dir->name_len[0])) { + if (filename[dir->name_len[0]] != '\\') continue; + + filename += dir->name_len[0] + 1; +@@ -135,7 +135,7 @@ int GetCdromFile(u8 *mdir, u8 *time, s8 + mdir = ddir; + } + } else { +- if (!strnicmp((char *)&dir->name[0], filename, strlen(filename))) { ++ if (!strncasecmp((char *)&dir->name[0], filename, strlen(filename))) { + mmssdd(dir->extent, (char *)time); + break; + } Index: pkgsrc/emulators/pcsxr/patches/patch-plugins_bladesio1_gui.c diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-plugins_bladesio1_gui.c:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-plugins_bladesio1_gui.c Tue Sep 29 12:23:03 2020 @@ -0,0 +1,16 @@ +$NetBSD: patch-plugins_bladesio1_gui.c,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Portability. + +--- plugins/bladesio1/gui.c.orig 2019-03-06 11:37:17.000000000 +0000 ++++ plugins/bladesio1/gui.c +@@ -27,8 +27,8 @@ + + #include + #include +-#include + #include ++#include + #include + #include + Index: pkgsrc/emulators/pcsxr/patches/patch-plugins_dfcdrom_cdr.c diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-plugins_dfcdrom_cdr.c:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-plugins_dfcdrom_cdr.c Tue Sep 29 12:23:03 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins_dfcdrom_cdr.c,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Make this more generic. + +--- plugins/dfcdrom/cdr.c.orig 2019-03-06 11:37:17.000000000 +0000 ++++ plugins/dfcdrom/cdr.c +@@ -20,7 +20,7 @@ + */ + + #include "cdr.h" +-#if defined(__linux__) ++#ifndef _MACOSX + #include + #include + #endif Index: pkgsrc/emulators/pcsxr/patches/patch-plugins_dfinput_pad.c diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-plugins_dfinput_pad.c:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-plugins_dfinput_pad.c Tue Sep 29 12:23:03 2020 @@ -0,0 +1,19 @@ +$NetBSD: patch-plugins_dfinput_pad.c,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Make the code more generic. + +--- plugins/dfinput/pad.c.orig 2019-03-06 11:37:17.000000000 +0000 ++++ plugins/dfinput/pad.c +@@ -17,10 +17,10 @@ + */ + + #include "pad.h" +-#if defined(__linux__) ++#if defined(__unix__) + #include + #include +-#if !SDL_VERSION_ATLEAST(2,0,0) ++#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__) + #include + #include + #include Index: pkgsrc/emulators/pcsxr/patches/patch-plugins_dfsound_cfg.c diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-plugins_dfsound_cfg.c:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-plugins_dfsound_cfg.c Tue Sep 29 12:23:03 2020 @@ -0,0 +1,17 @@ +$NetBSD: patch-plugins_dfsound_cfg.c,v 1.1 2020/09/29 12:23:03 nia Exp $ + +waitpid code is compiled unconditionally. + +--- plugins/dfsound/cfg.c.orig 2019-03-06 11:37:17.000000000 +0000 ++++ plugins/dfsound/cfg.c +@@ -26,10 +26,8 @@ + //////////////////////////////////////////////////////////////////////// + + #include +-#if defined(__linux__) + #include + #include +-#endif + + //////////////////////////////////////////////////////////////////////// + // START EXTERNAL CFG TOOL Index: pkgsrc/emulators/pcsxr/patches/patch-plugins_dfxvideo_cfg.c diff -u /dev/null pkgsrc/emulators/pcsxr/patches/patch-plugins_dfxvideo_cfg.c:1.1 --- /dev/null Tue Sep 29 12:23:03 2020 +++ pkgsrc/emulators/pcsxr/patches/patch-plugins_dfxvideo_cfg.c Tue Sep 29 12:23:03 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins_dfxvideo_cfg.c,v 1.1 2020/09/29 12:23:03 nia Exp $ + +Make the code more generic. + +--- plugins/dfxvideo/cfg.c.orig 2019-03-06 11:37:17.000000000 +0000 ++++ plugins/dfxvideo/cfg.c +@@ -20,7 +20,7 @@ + #include + #include + #include +-#if defined(__linux__) ++#if defined(__unix__) + #include + #include + #endif --_----------=_1601382183265180--