[PR PATCH] pcsx2: put data files in /usr/lib so it works on multilib setups.

[PR PATCH] pcsx2: put data files in /usr/lib so it works on multilib setups.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages pcsx2
https://github.com/void-linux/void-packages/pull/27484

pcsx2: put data files in /usr/lib so it works on multilib setups.
@selfsigned and @q66 

A patch file from https://github.com/void-linux/void-packages/pull/27484.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pcsx2-27484.patch --]
[-- Type: text/x-diff, Size: 1054 bytes --]

From 073713bb8022da95514c98a411c6290498ed0ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 26 Dec 2020 23:54:51 -0300
Subject: [PATCH] pcsx2: put data files in /usr/lib so it works on multilib
 setups.

---
 srcpkgs/pcsx2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template
index 50a4b0c1ccea..78404b75012e 100644
--- a/srcpkgs/pcsx2/template
+++ b/srcpkgs/pcsx2/template
@@ -5,10 +5,10 @@ nopie=yes
 
 pkgname=pcsx2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DGLSL_API=1 -DSDL2_API=0 -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 -DXDG_STD=1
- -DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DDISABLE_ADVANCE_SIMD=1
+ -DPLUGIN_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2 -DGAMEINDEX_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2 -DDISABLE_ADVANCE_SIMD=1
  -DSDL2_API=TRUE"
 hostmakedepends="pkg-config sparsehash perl"
 makedepends="alsa-lib-devel SDL2-devel glu-devel glew-devel libaio-devel

Re: [PR PATCH] [Updated] pcsx2: put data files in /usr/lib so it works on multilib setups.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages pcsx2
https://github.com/void-linux/void-packages/pull/27484

pcsx2: put data files in /usr/lib so it works on multilib setups.
@selfsigned and @q66 

A patch file from https://github.com/void-linux/void-packages/pull/27484.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pcsx2-27484.patch --]
[-- Type: text/x-diff, Size: 1063 bytes --]

From 708b548ecbf47fb3f749be29ff914be3abab2550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 26 Dec 2020 23:54:51 -0300
Subject: [PATCH] pcsx2: put data files in /usr/lib$wordsize so it works in
 multilib setups.

---
 srcpkgs/pcsx2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template
index 50a4b0c1ccea..78404b75012e 100644
--- a/srcpkgs/pcsx2/template
+++ b/srcpkgs/pcsx2/template
@@ -5,10 +5,10 @@ nopie=yes
 
 pkgname=pcsx2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DGLSL_API=1 -DSDL2_API=0 -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 -DXDG_STD=1
- -DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DDISABLE_ADVANCE_SIMD=1
+ -DPLUGIN_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2 -DGAMEINDEX_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2 -DDISABLE_ADVANCE_SIMD=1
  -DSDL2_API=TRUE"
 hostmakedepends="pkg-config sparsehash perl"
 makedepends="alsa-lib-devel SDL2-devel glu-devel glew-devel libaio-devel

Re: [PR PATCH] [Updated] pcsx2: put data files in /usr/lib so it works on multilib setups.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages pcsx2
https://github.com/void-linux/void-packages/pull/27484

pcsx2: put data files in /usr/lib so it works on multilib setups.
@selfsigned and @q66 

A patch file from https://github.com/void-linux/void-packages/pull/27484.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pcsx2-27484.patch --]
[-- Type: text/x-diff, Size: 1570 bytes --]

From 18c284b8b083d50078a4e6bd4d2322e0efa02ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 26 Dec 2020 23:54:51 -0300
Subject: [PATCH] pcsx2: put data files in /usr/lib$wordsize.

This allows it to access its data files in multilib setups.

Also clean up and organize the rest of the configure_args; SDL2_API was
being set twice.
---
 srcpkgs/pcsx2/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template
index 50a4b0c1cce..59f8dfcdce7 100644
--- a/srcpkgs/pcsx2/template
+++ b/srcpkgs/pcsx2/template
@@ -5,11 +5,15 @@ nopie=yes
 
 pkgname=pcsx2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DGLSL_API=1 -DSDL2_API=0 -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 -DXDG_STD=1
- -DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DDISABLE_ADVANCE_SIMD=1
- -DSDL2_API=TRUE"
+# store all data that pcsx2 has to access into /usr/lib, so it can be accessed
+# on multilib setups. when/if pcsx2 supports 64-bit builds, GAMEINDEX_DIR should
+# be moved to /usr/share/pcsx2
+configure_args="-DGLSL_API=1 -DSDL2_API=TRUE -DPACKAGE_MODE=1 -DREBUILD_SHADER=1
+ -DXDG_STD=1 -DDISABLE_ADVANCE_SIMD=1
+ -DPLUGIN_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2
+ -DGAMEINDEX_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2"
 hostmakedepends="pkg-config sparsehash perl"
 makedepends="alsa-lib-devel SDL2-devel glu-devel glew-devel libaio-devel
  libcanberra-devel libjpeg-turbo-devel wxWidgets-devel portaudio-devel soundtouch-devel

Re: [PR PATCH] [Merged]: pcsx2: put data files in /usr/lib so it works on multilib setups.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

There's a merged pull request on the void-packages repository

pcsx2: put data files in /usr/lib so it works on multilib setups.
https://github.com/void-linux/void-packages/pull/27484

Description:
@selfsigned and @q66