summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO14
-rw-r--r--.sync-conflict-20240427-181053-XPZ3XY2.SRCINFO20
-rw-r--r--.sync-conflict-20240505-171459-IBL5KQU.SRCINFO20
-rw-r--r--PKGBUILD8
4 files changed, 11 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e04ca495b61d..2ef98ca26b03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xash3d-fwgs-bin
pkgdesc = Xash3D FWGS is a heavily modified fork of an original Xash3D Engine for Half Life 1
- pkgver = f4a7730
+ pkgver = bf31e9f
pkgrel = 1
url = https://gitlab.com/linuxbombay/xash3d-fwgs
arch = x86_64
@@ -10,11 +10,11 @@ pkgbase = xash3d-fwgs-bin
makedepends = unzip
depends = sdl2
depends = sdl2_net
- source_x86_64 = https://gitlab.com/linuxbombay/xash3d-fwgs/f4a7730/-/raw/main/xash3d-linux-x64.tar.xz
- sha256sums_x86_64 = 12adb3b5c1fd1c9adae7ab9eef2fb9e4dcc0802b154f56c776c7284f13243d05
- source_i686 = https://gitlab.com/linuxbombay/xash3d-fwgs/f4a7730/-/raw/main/xash3d-linux-i686.tar.xz
- sha256sums_i686 = 720c7d380cecd473707bfccee8ef23cd96843dc12631800cfd30a83453467971
- source_aarch64 = https://gitlab.com/linuxbombay/xash3d-fwgs/f4a7730/-/raw/main/xash3d-linux-arm64.tar.xz
- sha256sums_aarch64 = 3b8b8510e12274accf9d654e9cdba33a76f0f43ae2083afa9a6eb1804561b0a2
+ source_x86_64 = https://gitlab.com/linuxbombay/xash3d-fwgs/bf31e9f/-/raw/main/xash3d-linux-x64.tar.xz
+ sha256sums_x86_64 = fc259f59f475a5e57aae48a89cd98814294f61978fe5a31d9cdf667fbfb61afb
+ source_i686 = https://gitlab.com/linuxbombay/xash3d-fwgs/bf31e9f/-/raw/main/xash3d-linux-i686.tar.xz
+ sha256sums_i686 = 9913ff261fe116d779e7d5083af0d1936285f390d9687cb7311646f7efbd7543
+ source_aarch64 = https://gitlab.com/linuxbombay/xash3d-fwgs/bf31e9f/-/raw/main/xash3d-linux-arm64.tar.xz
+ sha256sums_aarch64 = 9455aca3cc8e9422d142f5d7c3295055a12be1254db2706f959d8de0defc284c
pkgname = xash3d-fwgs-bin
diff --git a/.sync-conflict-20240427-181053-XPZ3XY2.SRCINFO b/.sync-conflict-20240427-181053-XPZ3XY2.SRCINFO
deleted file mode 100644
index 223bb9beb822..000000000000
--- a/.sync-conflict-20240427-181053-XPZ3XY2.SRCINFO
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgbase = xash3d-fwgs-bin
- pkgdesc = Xash3D FWGS is a heavily modified fork of an original Xash3D Engine for Half Life 1
- pkgver = 1677835
- pkgrel = 2
- url = https://gitlab.com/half-life1
- arch = x86_64
- arch = i686
- arch = aarch64
- license = GPL
- makedepends = unzip
- depends = sdl2
- depends = sdl2_net
- source_x86_64 = https://gitlab.com/half-life1/binaries/1677835/-/raw/main/xash3d-fwgs-linux-x64.tar.xz
- sha256sums_x86_64 = SKIP
- source_i686 = https://gitlab.com/half-life1/binaries/1677835/-/raw/main/xash3d-fwgs-linux-i686.tar.xz
- sha256sums_i686 = SKIP
- source_aarch64 = https://gitlab.com/half-life1/binaries/1677835/-/raw/main/xash3d-fwgs-linux-arm64.tar.xz
- sha256sums_aarch64 = SKIP
-
-pkgname = xash3d-fwgs-bin
diff --git a/.sync-conflict-20240505-171459-IBL5KQU.SRCINFO b/.sync-conflict-20240505-171459-IBL5KQU.SRCINFO
deleted file mode 100644
index 223bb9beb822..000000000000
--- a/.sync-conflict-20240505-171459-IBL5KQU.SRCINFO
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgbase = xash3d-fwgs-bin
- pkgdesc = Xash3D FWGS is a heavily modified fork of an original Xash3D Engine for Half Life 1
- pkgver = 1677835
- pkgrel = 2
- url = https://gitlab.com/half-life1
- arch = x86_64
- arch = i686
- arch = aarch64
- license = GPL
- makedepends = unzip
- depends = sdl2
- depends = sdl2_net
- source_x86_64 = https://gitlab.com/half-life1/binaries/1677835/-/raw/main/xash3d-fwgs-linux-x64.tar.xz
- sha256sums_x86_64 = SKIP
- source_i686 = https://gitlab.com/half-life1/binaries/1677835/-/raw/main/xash3d-fwgs-linux-i686.tar.xz
- sha256sums_i686 = SKIP
- source_aarch64 = https://gitlab.com/half-life1/binaries/1677835/-/raw/main/xash3d-fwgs-linux-arm64.tar.xz
- sha256sums_aarch64 = SKIP
-
-pkgname = xash3d-fwgs-bin
diff --git a/PKGBUILD b/PKGBUILD
index 0d38ea8b5413..61db7d195a2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=xash3d-fwgs-bin
-pkgver=f4a7730
+pkgver=bf31e9f
pkgrel=1
_pkgrel_x86_64=1
_pkgrel_i686=1
@@ -10,9 +10,9 @@ url="https://gitlab.com/linuxbombay/xash3d-fwgs"
license=('GPL')
depends=('sdl2' 'sdl2_net')
makedepends=('unzip')
-sha256sums_x86_64=('12adb3b5c1fd1c9adae7ab9eef2fb9e4dcc0802b154f56c776c7284f13243d05')
-sha256sums_i686=('720c7d380cecd473707bfccee8ef23cd96843dc12631800cfd30a83453467971')
-sha256sums_aarch64=('3b8b8510e12274accf9d654e9cdba33a76f0f43ae2083afa9a6eb1804561b0a2')
+sha256sums_x86_64=('fc259f59f475a5e57aae48a89cd98814294f61978fe5a31d9cdf667fbfb61afb')
+sha256sums_i686=('9913ff261fe116d779e7d5083af0d1936285f390d9687cb7311646f7efbd7543')
+sha256sums_aarch64=('9455aca3cc8e9422d142f5d7c3295055a12be1254db2706f959d8de0defc284c')
source_x86_64=("$url/$pkgver/-/raw/main/xash3d-linux-x64.tar.xz")
source_i686=("$url/$pkgver/-/raw/main/xash3d-linux-i686.tar.xz")
source_aarch64=("$url/$pkgver/-/raw/main/xash3d-linux-arm64.tar.xz")