+ pcsxr-nia

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: + pcsxr-nia
From: nia <nia%netbsd.org@localhost>
Date: Thu, 17 Sep 2020 12:13:25 +0000
Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Thu Sep 17 14:13:25 2020 +0200
Changeset:	b64b7bf47c3d564d727c4b055fe9fb37b0c1d100

Modified Files:
	Makefile
Added Files:
	pcsxr-nia/DESCR
	pcsxr-nia/Makefile
	pcsxr-nia/PLIST
	pcsxr-nia/TODO
	pcsxr-nia/distinfo
	pcsxr-nia/patches/patch-CMakeLists.txt
	pcsxr-nia/patches/patch-doc_CMakeLists.txt
	pcsxr-nia/patches/patch-libpcsxcore_ix86__64_ix86__cpudetect.c
	pcsxr-nia/patches/patch-libpcsxcore_misc.c
	pcsxr-nia/patches/patch-plugins_bladesio1_gui.c
	pcsxr-nia/patches/patch-plugins_dfcdrom_cdr.c
	pcsxr-nia/patches/patch-plugins_dfinput_pad.c
	pcsxr-nia/patches/patch-plugins_dfsound_cfg.c
	pcsxr-nia/patches/patch-plugins_dfxvideo_cfg.c

Log Message:
+ pcsxr-nia

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b64b7bf47c3d564d727c4b055fe9fb37b0c1d100

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 +
 pcsxr-nia/DESCR                                    |  6 ++++
 pcsxr-nia/Makefile                                 | 36 ++++++++++++++++++++++
 pcsxr-nia/PLIST                                    | 34 ++++++++++++++++++++
 pcsxr-nia/TODO                                     |  3 ++
 pcsxr-nia/distinfo                                 | 15 +++++++++
 pcsxr-nia/patches/patch-CMakeLists.txt             | 15 +++++++++
 pcsxr-nia/patches/patch-doc_CMakeLists.txt         | 12 ++++++++
 .../patch-libpcsxcore_ix86__64_ix86__cpudetect.c   | 15 +++++++++
 pcsxr-nia/patches/patch-libpcsxcore_misc.c         | 24 +++++++++++++++
 pcsxr-nia/patches/patch-plugins_bladesio1_gui.c    | 16 ++++++++++
 pcsxr-nia/patches/patch-plugins_dfcdrom_cdr.c      | 15 +++++++++
 pcsxr-nia/patches/patch-plugins_dfinput_pad.c      | 19 ++++++++++++
 pcsxr-nia/patches/patch-plugins_dfsound_cfg.c      | 17 ++++++++++
 pcsxr-nia/patches/patch-plugins_dfxvideo_cfg.c     | 15 +++++++++
 15 files changed, 243 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 1a8c7e13a8..8d763f068c 100644
--- a/Makefile
+++ b/Makefile
@@ -2797,6 +2797,7 @@ SUBDIR+=	pcsx
 SUBDIR+=	pcsx-df
 SUBDIR+=	pcsx2
 SUBDIR+=	pcsxr
+SUBDIR+=	pcsxr-nia
 SUBDIR+=	pdb2ldif
 SUBDIR+=	pdfcrack
 SUBDIR+=	pdfminer
diff --git a/pcsxr-nia/DESCR b/pcsxr-nia/DESCR
new file mode 100644
index 0000000000..8b130a62da
--- /dev/null
+++ b/pcsxr-nia/DESCR
@@ -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.
diff --git a/pcsxr-nia/Makefile b/pcsxr-nia/Makefile
new file mode 100644
index 0000000000..05294b5c54
--- /dev/null
+++ b/pcsxr-nia/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD$
+
+DISTNAME=	pcsxr-1.9.95.20190306
+CATEGORIES=	emulators
+MASTER_SITES=	${MASTER_SITE_GITHUB:=iCatButler/}
+GITHUB_PROJECT=	pcsxr
+GITHUB_TAG=	62467b86871aee3d70c7445f3cb79f0858ec566e
+
+MAINTAINER=	nia%NetBSD.org@localhost
+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"
diff --git a/pcsxr-nia/PLIST b/pcsxr-nia/PLIST
new file mode 100644
index 0000000000..7b851b99ff
--- /dev/null
+++ b/pcsxr-nia/PLIST
@@ -0,0 +1,34 @@
+@comment $NetBSD$
+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
diff --git a/pcsxr-nia/TODO b/pcsxr-nia/TODO
new file mode 100644
index 0000000000..affd9bb3a8
--- /dev/null
+++ b/pcsxr-nia/TODO
@@ -0,0 +1,3 @@
+Does not play well with NetBSD X11:
+
+http://releng.netbsd.org/cgi-bin/req-9.cgi?show=1087
diff --git a/pcsxr-nia/distinfo b/pcsxr-nia/distinfo
new file mode 100644
index 0000000000..ef0a3962e2
--- /dev/null
+++ b/pcsxr-nia/distinfo
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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
diff --git a/pcsxr-nia/patches/patch-CMakeLists.txt b/pcsxr-nia/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..f67ae9561c
--- /dev/null
+++ b/pcsxr-nia/patches/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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)
diff --git a/pcsxr-nia/patches/patch-doc_CMakeLists.txt b/pcsxr-nia/patches/patch-doc_CMakeLists.txt
new file mode 100644
index 0000000000..32e991173d
--- /dev/null
+++ b/pcsxr-nia/patches/patch-doc_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+
+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)
+ 
diff --git a/pcsxr-nia/patches/patch-libpcsxcore_ix86__64_ix86__cpudetect.c b/pcsxr-nia/patches/patch-libpcsxcore_ix86__64_ix86__cpudetect.c
new file mode 100644
index 0000000000..28b03ef2dc
--- /dev/null
+++ b/pcsxr-nia/patches/patch-libpcsxcore_ix86__64_ix86__cpudetect.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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 <sys/time.h>
+ #include <errno.h>
diff --git a/pcsxr-nia/patches/patch-libpcsxcore_misc.c b/pcsxr-nia/patches/patch-libpcsxcore_misc.c
new file mode 100644
index 0000000000..1084aac76c
--- /dev/null
+++ b/pcsxr-nia/patches/patch-libpcsxcore_misc.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+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;
+ 			}
diff --git a/pcsxr-nia/patches/patch-plugins_bladesio1_gui.c b/pcsxr-nia/patches/patch-plugins_bladesio1_gui.c
new file mode 100644
index 0000000000..0533526502
--- /dev/null
+++ b/pcsxr-nia/patches/patch-plugins_bladesio1_gui.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Portability.
+
+--- plugins/bladesio1/gui.c.orig	2019-03-06 11:37:17.000000000 +0000
++++ plugins/bladesio1/gui.c
+@@ -27,8 +27,8 @@
+ 
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+-#include <linux/if.h>
+ #include <netinet/in.h>
++#include <net/if.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ 
diff --git a/pcsxr-nia/patches/patch-plugins_dfcdrom_cdr.c b/pcsxr-nia/patches/patch-plugins_dfcdrom_cdr.c
new file mode 100644
index 0000000000..e8e1c150df
--- /dev/null
+++ b/pcsxr-nia/patches/patch-plugins_dfcdrom_cdr.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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 <sys/types.h>
+ #include <sys/wait.h>
+ #endif 
diff --git a/pcsxr-nia/patches/patch-plugins_dfinput_pad.c b/pcsxr-nia/patches/patch-plugins_dfinput_pad.c
new file mode 100644
index 0000000000..c66bb37663
--- /dev/null
+++ b/pcsxr-nia/patches/patch-plugins_dfinput_pad.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+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 <sys/types.h>
+ #include <sys/wait.h>
+-#if !SDL_VERSION_ATLEAST(2,0,0)
++#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__)
+ #include <linux/input.h>
+ #include <sys/file.h>
+ #include <time.h>
diff --git a/pcsxr-nia/patches/patch-plugins_dfsound_cfg.c b/pcsxr-nia/patches/patch-plugins_dfsound_cfg.c
new file mode 100644
index 0000000000..c76424d3b9
--- /dev/null
+++ b/pcsxr-nia/patches/patch-plugins_dfsound_cfg.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+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 <unistd.h>
+-#if defined(__linux__)
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#endif
+ 
+ ////////////////////////////////////////////////////////////////////////
+ // START EXTERNAL CFG TOOL
diff --git a/pcsxr-nia/patches/patch-plugins_dfxvideo_cfg.c b/pcsxr-nia/patches/patch-plugins_dfxvideo_cfg.c
new file mode 100644
index 0000000000..2967a73675
--- /dev/null
+++ b/pcsxr-nia/patches/patch-plugins_dfxvideo_cfg.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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 <sys/stat.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+-#if defined(__linux__)
++#if defined(__unix__)
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #endif
Prev by Date: fff: new package
Next by Date: ad2vcf: Increase SAM_BUFF_MAX_ALIGNMENTS to 512k per AWS error
Previous by Thread: fff: new package
Next by Thread: ad2vcf: Increase SAM_BUFF_MAX_ALIGNMENTS to 512k per AWS error
Indexes:
Home | Main Index | Thread Index | Old Index