summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
-rw-r--r--fix-linking.patch11
3 files changed, 4 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 92dd83b83e2c..6293786bdeaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libretro-pcsx2-git
pkgdesc = Sony PlayStation 2 core
- pkgver = r11818.7de89581c
+ pkgver = r11822.70b76b999
pkgrel = 1
url = https://github.com/libretro/pcsx2
arch = x86_64
@@ -23,8 +23,6 @@ pkgbase = libretro-pcsx2-git
provides = libretro-pcsx2
conflicts = libretro-pcsx2
source = libretro-pcsx2::git+https://github.com/libretro/pcsx2.git
- source = fix-linking.patch
b2sums = SKIP
- b2sums = e014e39b50c031d28c271cfc36fef8c1f54f87771c5f1e4fbf7c680d432a76736b19043697d4789e2b72b7d9eea69f500dc405a38773fe13d667231a54ed519e
pkgname = libretro-pcsx2-git
diff --git a/PKGBUILD b/PKGBUILD
index 7ae8b8cf7b51..bcbd469a92b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Alexandre Bouvier <contact@amb.tf>
_pkgname=libretro-pcsx2
pkgname=$_pkgname-git
-pkgver=r11818.7de89581c
+pkgver=r11822.70b76b999
pkgrel=1
pkgdesc="Sony PlayStation 2 core"
arch=('x86_64')
@@ -12,25 +12,14 @@ depends=('glib2' 'libaio' 'libgl' 'libretro-core-info' 'systemd-libs')
makedepends=('ccache' 'cmake' 'git' 'libglvnd' 'systemd' 'vim')
provides=("$_pkgname")
conflicts=("$_pkgname")
-source=(
- "$_pkgname::git+$url.git"
- 'fix-linking.patch'
-)
-b2sums=(
- 'SKIP'
- 'e014e39b50c031d28c271cfc36fef8c1f54f87771c5f1e4fbf7c680d432a76736b19043697d4789e2b72b7d9eea69f500dc405a38773fe13d667231a54ed519e'
-)
+source=("$_pkgname::git+$url.git")
+b2sums=('SKIP')
pkgver() {
cd $_pkgname
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-prepare() {
- cd $_pkgname
- patch -Np1 < ../fix-linking.patch
-}
-
build() {
cmake -S $_pkgname -B build \
-DARCH_FLAG="" \
diff --git a/fix-linking.patch b/fix-linking.patch
deleted file mode 100644
index 06d84f1dbd82..000000000000
--- a/fix-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pcsx2/CMakeLists.txt
-+++ b/pcsx2/CMakeLists.txt
-@@ -637,7 +637,7 @@ set(pcsx2FinalLibs
- )
-
- if(BUILTIN_GS)
-- set(pcsx2FinalLibs ${pcsx2FinalLibs} GSdx)
-+ set(pcsx2FinalLibs GSdx ${pcsx2FinalLibs})
- if(MSVC)
- set(pcsx2FinalSources ${pcsx2FinalSources} ${CMAKE_SOURCE_DIR}/plugins/GSdx/GSdx.rc)
- endif()