xash3d-fwgs-bin f4a7730

4 files changed, 58 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fde4e24cecca..e04ca495b61d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 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/linuxbombay/half-life1
+	pkgver = f4a7730
+	pkgrel = 1
+	url = https://gitlab.com/linuxbombay/xash3d-fwgs
 	arch = x86_64
 	arch = i686
 	arch = aarch64
@@ -10,11 +10,11 @@ pkgbase = xash3d-fwgs-bin
 	makedepends = unzip
 	depends = sdl2
 	depends = sdl2_net
-	source_x86_64 = https://gitlab.com/linuxbombay/binaries/1677835/-/raw/main/xash3d-fwgs-linux-x64.tar.xz
-	sha256sums_x86_64 = bcff2df44f242555b426ba6623ff5a28eeaca9003c6bd2bd55da550d90de2913
-	source_i686 = https://gitlab.com/linuxbombay/binaries/1677835/-/raw/main/xash3d-fwgs-linux-i686.tar.xz
-	sha256sums_i686 = 29c7cd4c4ffd7752494b27db2592458e6c768e57f2ad2f748f2efada5991437e
-	source_aarch64 = https://gitlab.com/linuxbombay/binaries/1677835/-/raw/main/xash3d-fwgs-linux-arm64.tar.xz
-	sha256sums_aarch64 = f298b84b34543efd4fca0a98469c05f33af136ae6adf8e7aa77de5c9394ad352
+	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
 
 pkgname = xash3d-fwgs-bin
diff --git a/.sync-conflict-20240427-181053-XPZ3XY2.SRCINFO b/.sync-conflict-20240427-181053-XPZ3XY2.SRCINFO
new file mode 100644
index 000000000000..223bb9beb822
--- /dev/null
+++ b/.sync-conflict-20240427-181053-XPZ3XY2.SRCINFO
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000000..223bb9beb822
--- /dev/null
+++ b/.sync-conflict-20240505-171459-IBL5KQU.SRCINFO
@@ -0,0 +1,20 @@
+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 46dcdfd5c128..0d38ea8b5413 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
 pkgname=xash3d-fwgs-bin
-pkgver=1677835
-pkgrel=2
+pkgver=f4a7730
+pkgrel=1
 _pkgrel_x86_64=1
 _pkgrel_i686=1
 _pkgrel_aarch64=1
 pkgdesc="Xash3D FWGS is a heavily modified fork of an original Xash3D Engine for Half Life 1"
 arch=('x86_64' 'i686' 'aarch64')
-url="https://gitlab.com/linuxbombay/half-life1"
+url="https://gitlab.com/linuxbombay/xash3d-fwgs"
 license=('GPL')
 depends=('sdl2' 'sdl2_net')
 makedepends=('unzip')
-sha256sums_x86_64=('bcff2df44f242555b426ba6623ff5a28eeaca9003c6bd2bd55da550d90de2913')
-sha256sums_i686=('29c7cd4c4ffd7752494b27db2592458e6c768e57f2ad2f748f2efada5991437e')
-sha256sums_aarch64=('f298b84b34543efd4fca0a98469c05f33af136ae6adf8e7aa77de5c9394ad352')
-source_x86_64=("https://gitlab.com/linuxbombay/binaries/$pkgver/-/raw/main/xash3d-fwgs-linux-x64.tar.xz")
-source_i686=("https://gitlab.com/linuxbombay/binaries/$pkgver/-/raw/main/xash3d-fwgs-linux-i686.tar.xz")
-source_aarch64=("https://gitlab.com/linuxbombay/binaries/$pkgver/-/raw/main/xash3d-fwgs-linux-arm64.tar.xz")
+sha256sums_x86_64=('12adb3b5c1fd1c9adae7ab9eef2fb9e4dcc0802b154f56c776c7284f13243d05')
+sha256sums_i686=('720c7d380cecd473707bfccee8ef23cd96843dc12631800cfd30a83453467971')
+sha256sums_aarch64=('3b8b8510e12274accf9d654e9cdba33a76f0f43ae2083afa9a6eb1804561b0a2')
+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")
 
 package() {
     install -dm755 "$pkgdir/usr/bin"