Remove XPLUS modification.

3 files changed, 13 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f80b31b1d4f..8fddef3def91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = serioussam
-	pkgdesc = Serious Sam Classic native Linux version with XPLUS Modification.
+	pkgdesc = Serious Sam Classic native Linux version.
 	pkgver = 1.10.4
-	pkgrel = 9
+	pkgrel = 10
 	url = https://github.com/tx00100xt/SeriousSamClassic
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index b819fc00563e..8fe27acdd39c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,10 @@
 
 pkgname=serioussam
 pkginstdir=serioussam
-xplus_tfe=SamTFE-XPLUS.tar.xz
-xplus_tse=SamTSE-XPLUS.tar.xz
 pkgver=1.10.4
 _srcname="SeriousSamClassic-$pkgver"
-pkgrel=9
-pkgdesc="Serious Sam Classic native Linux version with XPLUS Modification."
+pkgrel=10
+pkgdesc="Serious Sam Classic native Linux version."
 arch=('i686' 'x86_64')
 url="https://github.com/tx00100xt/SeriousSamClassic"
 license=('GPL2')
@@ -17,29 +15,11 @@ makedepends=('cmake' 'make' 'sed')
 conflicts=('serioussam-vk')
 install=serioussam.install
 source=("https://github.com/tx00100xt/SeriousSamClassic/archive/refs/tags/v$pkgver.tar.gz"
-    "https://github.com/tx00100xt/serioussam-mods/raw/main/SamTFE-XPLUS/SamTFE-XPLUS.tar.xz.partaa"
-	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTFE-XPLUS/SamTFE-XPLUS.tar.xz.partab"
-	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTFE-XPLUS/SamTFE-XPLUS.tar.xz.partac"
-	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTSE-XPLUS/SamTSE-XPLUS.tar.xz.partaa"
-	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTSE-XPLUS/SamTSE-XPLUS.tar.xz.partab"
-	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTSE-XPLUS/SamTSE-XPLUS.tar.xz.partac"
     "serioussam-tfe.desktop"
     "serioussam-tse.desktop"
     "serioussam.xpm"
     "sam-1.10.4-to-1.10.5-pre.patch")
-noextract=("SamTFE-XPLUS.tar.xz.partaa"
-	"SamTFE-XPLUS.tar.xz.partab"
-	"SamTFE-XPLUS.tar.xz.partac"
-	"SamTSE-XPLUS.tar.xz.partaa"
-	"SamTSE-XPLUS.tar.xz.partab"
-	"SamTSE-XPLUS.tar.xz.partac")
 sha256sums=('c42e1434e03f713ffc60aa627f0a24c64287598bc5ee7cdbd2cbe91aa363ef51'
-            '01b2e2d4dbdb65b2f1e174fbd6606d70806e97b6a45047ed6c58e7b801f6a879'
-            'f8f35bcc54ed888b72b8660319ad089b7243b9e8d83aefabdb8f0111fcb0b728'
-            '3da6b8588115cf31cb67e15f527dc8b6a83da16fe35ac8c7b78ed9522e0211a4'
-            '28a90da56de5d6591a2e65154778030ba28b375d29556fd7e1db085d2c00b877'
-            '93fe183a2f0a35989b3d1678dddb1c5976cda94747d4186c6f36af4ccf144443'
-            '8282f527b54e9d8fe009640b7634560f3b4bf0fc9b72cdc2f865f1c226339d35'
             '1e36d7b0d11f68729aa5c79ac9a44157d4af0bf61060040ab92a37d96ca89aba'
             '49680c65d26b264a1d7735c6310fcc5d0ac0e0e56273d3bccf539c0c87d31b2b'
             '1fd56e04072372e1e8dab0bae40da1519d82a28895cbe5661b18561ee9ea47b4'
@@ -54,35 +34,18 @@ prepare(){
   # Prepare patch
   cat sam-1.10.4-to-1.10.5-pre.patch > "$srcdir/$_srcname/sam-1.10.4-to-1.10.5-pre.patch"
 
-  # Prepare XPLUS archive
-  cat "$xplus_tfe".part* > "$xplus_tfe"
-  cat "$xplus_tse".part* > "$xplus_tse"
-
-  # Install the XPLUS Modification data.
-  tar -xJvf "$srcdir/$xplus_tfe" -C "$srcdir/$_srcname/SamTFE/"
-  tar -xJvf "$srcdir/$xplus_tse" -C "$srcdir/$_srcname/SamTSE/"
-  chmod -R o=rx "$srcdir/$_srcname/SamTFE/Mods/XPLUS"
-  chmod -R o=rx "$srcdir/$_srcname/SamTSE/Mods/XPLUS"
-  chmod -R g=rx "$srcdir/$_srcname/SamTFE/Mods/XPLUS"
-  chmod -R g=rx "$srcdir/$_srcname/SamTSE/Mods/XPLUS"
-
   # Making building TFE scripts.
   cd "$srcdir/$_srcname/SamTFE/Sources/"
   sed -i 's/cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo/cmake -DCMAKE_BUILD_TYPE=Release/g' build-linux"$_bits".sh
   sed 's/cmake -DCMAKE_BUILD_TYPE=Release/cmake -DTFE=TRUE -DCMAKE_BUILD_TYPE=Release/g' build-linux"$_bits".sh > build-linux"$_bits"-tfe.sh
-  sed -i 's/cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo/cmake -DCMAKE_BUILD_TYPE=Release/g' build-linux"$_bits"xplus.sh
-  sed 's/cmake -DCMAKE_BUILD_TYPE=Release/cmake -DTFE=TRUE -DXPLUS=TRUE -DCMAKE_BUILD_TYPE=Release/g' build-linux"$_bits"xplus.sh > build-linux"$_bits"xplus-tfe.sh
   # sed -i 's/Threaded version" FALSE/Threaded version" TRUE/g' CMakeLists.txt
   chmod 755 build-linux"$_bits"-tfe.sh
-  chmod 755 build-linux"$_bits"xplus-tfe.sh
 
   # Making building TSE scripts.
   cd "$srcdir/$_srcname/SamTSE/Sources/"
   sed -i 's/cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo/cmake -DCMAKE_BUILD_TYPE=Release/g' build-linux"$_bits".sh
-  sed -i 's/cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo/cmake -DCMAKE_BUILD_TYPE=Release -DXPLUS=TRUE/g' build-linux"$_bits"xplus.sh
   # sed -i 's/Threaded version" FALSE/Threaded version" TRUE/g' CMakeLists.txt
   chmod 755 build-linux"$_bits".sh
-  chmod 755 build-linux"$_bits"xplus.sh
 
   cd "$srcdir/$_srcname"
   # patch
@@ -94,17 +57,10 @@ build(){
   cd "$srcdir/$_srcname/SamTFE/Sources/"
   ./build-linux"$_bits"-tfe.sh
 
-  # Building Serious Sam Classic The First Encounter XPLUS Modification.
-  cd "$srcdir/$_srcname/SamTFE/Sources/"
-  ./build-linux"$_bits"xplus-tfe.sh
-
   # Building Serious Sam Classic The Second Encounter.
   cd "$srcdir/$_srcname/SamTSE/Sources/"
   ./build-linux"$_bits".sh
 
-  # Building Serious Sam Classic The Second Encounter XPLUS Modification.
-  cd "$srcdir/$_srcname/SamTSE/Sources/"
-  ./build-linux"$_bits"xplus.sh
 
   # Removed Serious Sam Classic tmp stuff.
   cd "$srcdir/$_srcname/SamTFE/"
@@ -159,11 +115,6 @@ package(){
   install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/libShaders.so $pkgdir/usr/lib/serioussamse
   install -D -m0755 $srcdir/$_srcname/SamTSE/Bin/libamp11lib.so $pkgdir/usr/lib/serioussamse
 
-  install -D -m0755 $srcdir/$_srcname/SamTFE/Mods/XPLUS/Bin/libGame.so $pkgdir/usr/lib/serioussam/Mods/XPLUS
-  install -D -m0755 $srcdir/$_srcname/SamTFE/Mods/XPLUS/Bin/libEntities.so $pkgdir/usr/lib/serioussam/Mods/XPLUS
-  install -D -m0755 $srcdir/$_srcname/SamTSE/Mods/XPLUS/Bin/libGameMP.so $pkgdir/usr/lib/serioussamse/Mods/XPLUS
-  install -D -m0755 $srcdir/$_srcname/SamTSE/Mods/XPLUS/Bin/libEntitiesMP.so $pkgdir/usr/lib/serioussamse/Mods/XPLUS
-
   rm -fr "$srcdir/$_srcname/SamTFE/Bin"
   rm -fr "$srcdir/$_srcname/SamTSE/Bin"
   rm -fr "$srcdir/$_srcname/SamTFE/Mods/XPLUS/Bin"
diff --git a/serioussam.install b/serioussam.install
index 6c1ca0cbe137..09596765971c 100644
--- a/serioussam.install
+++ b/serioussam.install
@@ -28,5 +28,14 @@ post_install() {
 	echo "      - 1_04_patch.gro"
 	echo "      - 1_07_patch.gro"
 	echo "     ***************************************************************************************"
+	echo "     Note:"
+	echo "     If you want a clean game with no mods, you can just install package serioussam or"
+	echo "     serioussam-vk. The game data can be placed anywhere in your home directory. At the"
+	echo "     first start, the game will scan the home directory, and if, for example, you have the"
+	echo "     Steam version of the game installed, the game itself will find the data and write the"
+	echo "     path to it in the configuration file. Copying data to /usr/share is not required." 
+	echo "     Just don't forget to place the SE1_10b.gro file where the game data is located." 
+	echo "     For the First Encounter and for the Second Encounter too."
+	echo "     ***************************************************************************************"
 	echo ""
 }