Revamped pkgbuild, now builds Jedi Outcast

9 files changed, 60 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48ab191abf60..5c3593cbe2eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openjk-git
 	pkgdesc = Open Source Jedi Knight II + III Engine
-	pkgver = r3590.c3d2a806
+	pkgver = r3610.94866c437
 	pkgrel = 1
 	url = https://github.com/JACoders/OpenJK
 	arch = i686
@@ -16,14 +16,18 @@ pkgbase = openjk-git
 	conflicts = openjk
 	source = openjk-git::git+https://github.com/JACoders/OpenJK.git
 	source = openjkmp.png
-	source = openjksp.png
+	source = openja.png
+	source = openjo.png
 	source = openjkmp.desktop
-	source = openjksp.desktop
+	source = openja.desktop
+	source = openjo.desktop
 	sha256sums = SKIP
+	sha256sums = 3e9d36b3f982cc29fb3e4385ddc46e431be9fa045b32a811346f4254fa8d372c
 	sha256sums = 0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969
 	sha256sums = afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903
 	sha256sums = d3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc
-	sha256sums = d03554bd926954218c243a1a97d39ea9700d064a2374f671249a533ebd970375
+	sha256sums = 698792f86b75311a5c96d0b1310d97e242107559d341ea23a705f259e20a5ec2
+	sha256sums = 08812c7d1791b86a842401ecc54f29117d3d8b77369ad04db520561d57df41dd
 
 pkgname = openjk-git
 
diff --git a/.gitignore b/.gitignore
index 31f720bbee45..a17441015021 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@
 !.SRCINFO
 !.gitignore
 !PKGBUILD
-!openjk*.desktop
-!openjk*.png
+!openj*.desktop
+!openj*.png
diff --git a/PKGBUILD b/PKGBUILD
index 553732064c34..88a9647dd616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
+# Maintainer: Zanny <lordzanny@gmail.com>
 # Maintainer: Pavel Lymarev <x-user at bk dot ru>
 # Contributor: Jameson Pugh <imntreal@gmail.com>
 # Contributor: Rene Schoebel (wesley) <schoebel.r at gmail dot com>
 
 pkgname='openjk-git'
-pkgver=r3590.c3d2a806
+pkgver=r3610.94866c437
 pkgrel=1
 pkgdesc="Open Source Jedi Knight II + III Engine"
 arch=('i686' 'x86_64')
@@ -16,15 +17,19 @@ conflicts=('openjk')
 source=(
   "${pkgname}::git+https://github.com/JACoders/OpenJK.git"
   'openjkmp.png'
-  'openjksp.png'
+  'openja.png'
+  'openjo.png'
   'openjkmp.desktop'
-  'openjksp.desktop')
+  'openja.desktop'
+  'openjo.desktop')
 sha256sums=(
   'SKIP'
+  '3e9d36b3f982cc29fb3e4385ddc46e431be9fa045b32a811346f4254fa8d372c'
   '0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969'
   'afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903'
   'd3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc'
-  'd03554bd926954218c243a1a97d39ea9700d064a2374f671249a533ebd970375'
+  '698792f86b75311a5c96d0b1310d97e242107559d341ea23a705f259e20a5ec2'
+  '08812c7d1791b86a842401ecc54f29117d3d8b77369ad04db520561d57df41dd'
 )
 
 pkgver() {
@@ -42,43 +47,43 @@ build() {
   cd build
   cmake ..                                        \
     -DCMAKE_BUILD_TYPE=Release                    \
-    -DCMAKE_INSTALL_PREFIX="/opt/${pkgname/-git}"
+    -DCMAKE_INSTALL_PREFIX="/opt/${pkgname/-git}" \
+    -DBuildJK2SPEngine=on \
+    -DBuildJK2SPGame=on \
+    -DBuildJK2SPRdVanilla=on
   make
 }
 
 package() {
   cd "${pkgname}/build"
 
- _jkarch="${CARCH}"
- echo "${_jkarch}"
+  _jkarch="${CARCH}"
+  echo "${_jkarch}"
 
   make DESTDIR="${pkgdir}" install
 
   install -m 755 -d "${pkgdir}/usr/bin"
 
-  cat > "${pkgdir}/usr/bin/openjk" << EOF
+  for _bin in 'openjk' 'openjk_sp' 'openjkded'; do
+    cat > "${pkgdir}/usr/bin/${_bin}" << EOF
 #!/bin/bash
-cd /opt/${pkgname}/JediAcademy
-exec ./openjk.${_jkarch} $@
+cd /opt/${pkgname/-git}/JediAcademy
+exec ./${_bin}.${_jkarch} \s@
 EOF
-  chmod +x "${pkgdir}/usr/bin/openjk"
-  
-  cat > "${pkgdir}/usr/bin/openjk_sp" << EOF
-#!/bin/bash
-cd /opt/${pkgname}/JediAcademy
-exec ./openjk_sp.${_jkarch} \$@
-EOF
-  chmod +x "${pkgdir}/usr/bin/openjk_sp"
+    chmod +x ${pkgdir}/usr/bin/${_bin}
+  done
 
-  cat > "${pkgdir}/usr/bin/openjkded" << EOF
+  cat > "${pkgdir}/usr/bin/openjo" << EOF
 #!/bin/bash
-cd /opt/${pkgname}/JediAcademy
-exec ./openjkded.${_jkarch} \$@
+cd /opt/${pkgname/-git}/JediOutcast
+exec ./openjo_sp.${_jkarch} \s@
 EOF
-  chmod +x ${pkgdir}/usr/bin/openjkded
+  chmod +x ${pkgdir}/usr/bin/openjo
 
-  install -Dm755 "${srcdir}/openjkmp.png" "${pkgdir}/usr/share/pixmaps/openjkmp.png"
-  install -Dm755 "${srcdir}/openjksp.png" "${pkgdir}/usr/share/pixmaps/openjksp.png"
+  install -Dm644 "${srcdir}/openjkmp.png" "${pkgdir}/usr/share/pixmaps/openjkmp.png"
+  install -Dm644 "${srcdir}/openja.png" "${pkgdir}/usr/share/pixmaps/openja.png"
+  install -Dm644 "${srcdir}/openjo.png" "${pkgdir}/usr/share/pixmaps/openjo.png"
   install -Dm755 "${srcdir}/openjkmp.desktop" "${pkgdir}/usr/share/applications/openjkmp.desktop"
-  install -Dm755 "${srcdir}/openjksp.desktop" "${pkgdir}/usr/share/applications/openjksp.desktop"
+  install -Dm755 "${srcdir}/openja.desktop" "${pkgdir}/usr/share/applications/openja.desktop"
+  install -Dm755 "${srcdir}/openjo.desktop" "${pkgdir}/usr/share/applications/openjo.desktop"
 }
diff --git a/openja.desktop b/openja.desktop
new file mode 100644
index 000000000000..8f38b15170d8
--- /dev/null
+++ b/openja.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Academy Single Player
+Comment="Open Source Jedi Knight II + III Engine - Jedi Academy Single Player"
+Exec=openjk_sp
+Icon=openja
+Terminal=false
+StartupNotify=false
+Categories=Game
diff --git a/openja.png b/openja.png
new file mode 100644
index 000000000000..b3fef102cf1d
--- /dev/null
+++ b/openja.png
diff --git a/openjkmp.png b/openjkmp.png
index b3fef102cf1d..9d1df3c41288 100644
--- a/openjkmp.png
+++ b/openjkmp.png
diff --git a/openjksp.desktop b/openjksp.desktop
deleted file mode 100644
index e6adad93b3ae..000000000000
--- a/openjksp.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=OpenJK Single Player
-Comment="Open Source Jedi Knight II + III Engine - Single Player"
-Exec=openjk_sp
-Icon=openjksp
-Terminal=false
-StartupNotify=false
-Categories=Game
diff --git a/openjo.desktop b/openjo.desktop
new file mode 100644
index 000000000000..98077f5d1e7d
--- /dev/null
+++ b/openjo.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Outcast
+Comment="Open Source Jedi Knight II + III Engine - Jedi Outcast"
+Exec=openjo
+Icon=openjo
+Terminal=false
+StartupNotify=false
+Categories=Game
diff --git a/openjksp.png b/openjo.png
index 862244e852c7..862244e852c7 100644
--- a/openjksp.png
+++ b/openjo.png