From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] pcsx2: put data files in /usr/lib so it works on multilib setups.
Date: Mon, 28 Dec 2020 06:08:12 +0100 [thread overview]
Message-ID: <20201228050812.oy0DIb86Oo1gvaLfgRzNKOzrV0ya1gext0mp7C6FXh0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27484@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2020-12-28 5:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-27 20:16 [PR PATCH] " ericonr
2020-12-27 20:17 ` [PR PATCH] [Updated] " ericonr
2020-12-28 5:08 ` ericonr [this message]
2020-12-28 5:46 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201228050812.oy0DIb86Oo1gvaLfgRzNKOzrV0ya1gext0mp7C6FXh0@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).