Modifying the master branch

3 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 437fda6d51c5..6b5aaa06b8c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openxray-git
 	pkgdesc = Unofficial X-Ray Engine Linux port by OpenXRay team (Originally developed by GSC Game World)
-	pkgver = 1.6.02
+	pkgver = 1.6.02_11b46a96f
 	pkgrel = 1
 	url = https://github.com/OpenXRay/xray-16
 	install = info.install
@@ -29,7 +29,7 @@ pkgbase = openxray-git
 	depends = libjpeg-turbo
 	conflicts = openxray
 	conflicts = openxray-dev
-	source = xray-16::git+https://github.com/OpenXRay/xray-16.git#branch=xd_dev
+	source = xray-16::git+https://github.com/OpenXRay/xray-16.git#branch=dev
 	md5sums = SKIP
 
 pkgname = openxray-git
diff --git a/PKGBUILD b/PKGBUILD
index 2ea4795a30b3..d76b5d36278d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # https://aur.archlinux.org/packages/openxray-git/
 # <openxray@yahoo.com>
 pkgname=openxray-git
-pkgver=1.6.02
+pkgver=1.6.02_11b46a96f
 pkgrel=1 
 pkgdesc="Unofficial X-Ray Engine Linux port by OpenXRay team (Originally developed by GSC Game World)"                                          
 arch=('x86_64') 
@@ -12,7 +12,7 @@ install="info.install"
 makedepends=(gcc git cmake libglvnd libjpeg6-turbo ncurses pcre2 pcre)
 depends=(glew sdl2 openal intel-tbb crypto++ liblockfile freeimage libogg libtheora libvorbis lzo lzop libjpeg-turbo)  
 conflicts=(openxray openxray-dev)
-source=(xray-16::git+https://github.com/OpenXRay/xray-16.git#branch=xd_dev)
+source=(xray-16::git+https://github.com/OpenXRay/xray-16.git#branch=dev)
 md5sums=('SKIP')
 
 pkgver() {
@@ -31,10 +31,11 @@ build() {
    rm -fr bin
    mkdir "$srcdir/xray-16/bin"
    cd "$srcdir/xray-16/bin"
-   # -DCMAKE_BUILD_TYPE=Debug
    cmake .. -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib
+   # -DCMAKE_BUILD_TYPE=Debug
+   # -DMEMORY_ALLOCATOR=standard
    make
 }
 
diff --git a/info.install b/info.install
index ef88f508f7bd..d958c6712230 100644
--- a/info.install
+++ b/info.install
@@ -6,12 +6,11 @@ The OpenXRay project continues the unofficial support and development of the X-R
 
 Attention!!! Keep in mind that this GSC Game World project is in no way authorized, and they remain the copyright holders of all source code.
 
-This package does not provide game resources, to start the game you will need the original game resources of a licensed copy of S.T.A.L.K.E.R.: Call of Pripyat.
-From the original licensed version of STALKER.: Call of Pripyat copy the following directories: levels, localization, mp, patches, resources to ~/.local/share/GSC/SCOP, you can also launch S.T.A.L.K.E.R.: Clear Sky for this you need directories as for S.T.A.L.K.E.R.: Call of Pripyat from the S.T.A.L.K.E.R.: Clear Sky distribution, remove the gamedata symlink and copy the /usr/share/openxray/gamedata/shaders/ directory to it. You can use resources from a physical DVD, GOG or Steam media.
+This package does not provide game resources, to start the game you will need the original game resources of a licensed copy of S.T.A.L.K.E.R.: Call of Pripyat version 1.6.02 and S.T.A.L.K.E.R.: Clear Sky
 
-Attention!!! All directory and file names inside directories must be lowercase.
+From the original licensed version of the game, copy the following directories, localization, mp, patches and resources to ~/.local/share/GSC Game World/S.T.A.L.K.E.R. - Call of Pripyat for S.T.A.L.K.E.R.: Call of Pripyat and ~/.local/share/GSC Game World/S.T.A.L.K.E.R. - Clear Sky for S.T.A.L.K.E.R.: Clear Sky respectively. You can use resources from Steam or physical DVD media, GOG to unpack the distribution of the game, you can use the innoextract program.
 
-You can also run fan modifications for the vanilla version of S.T.A.L.K.E.R.: Call of Pripyat, however, you may need to adapt them.
+Attention!!! All directory and file names inside directories must be lowercase.
 
 EOF