builds- UNTESTED THOUGH.

12 files changed, 186 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8f8faa78c30..ccec132ac8ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,58 @@
 # Generated by mksrcinfo v8
-# Tue Sep 13 11:18:39 UTC 2016
+# Tue Sep 13 16:23:38 UTC 2016
 pkgbase = zandronum-hg
 	pkgdesc = OpenGL ZDoom port with Client/Server multiplayer. (Development branch checkout)
-	pkgver = 0.0000001
+	pkgver = r9707.dd165ac5fc29
 	pkgrel = 1
 	url = https://zandronum.com
+	install = zandronum-hg.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = gcc
-	depends = sdl libjpeg6-turbo glu openssl fluidsynth
+	makedepends = zlib
+	makedepends = sdl
+	makedepends = libjpeg-turbo
+	makedepends = nasm
+	makedepends = gtk2
+	makedepends = cmake
+	makedepends = mercurial
+	makedepends = fluidsynth
+	makedepends = mesa
+	makedepends = glu
+	depends = sdl
+	depends = libjpeg6-turbo
+	depends = glu
+	depends = openssl
+	depends = fluidsynth
 	optdepends = timidity++: midi support
+	optdepends = freedoom: free IWAD
+	optdepends = gtk2: for a GUI selection screen
 	provides = zandronum
+	provides = zandronum2
 	conflicts = zandronum
+	conflicts = zandronum-dev
 	source = zandronum::hg+https://bitbucket.org/Torr_Samaho/zandronum
+	source = LICENSE
+	source = zandronum-hg.launcher
+	source = zandronum-hg-server.launcher
+	source = zandronum-hg.launcher.sig
+	source = zandronum-hg-server.launcher.sig
+	source = LICENSE.sig
 	sha512sums = SKIP
+	sha512sums = b928f3211ff31f17fc2d754728e299b5783e1b946b4019713718b7613e13ff0a7c4f02087c0ab4f137f7a0de57a2bfeaa6ed63285d0e6063d2b4734b097ce9e1
+	sha512sums = 7595135cc49c02278b9871afe5291e45fb6811b858b900f52f6b606239aafc02f6f046f0de516922fad4cac2236320fde9711040a18c0a639f3b1be26fd54404
+	sha512sums = ffa128418e045dc8a978f10a09964f385e0097a71fb6e62396447707a0c396d7526f24b3fc74c33aecca109b79aa8a36c309774904293909182dd80637e9c5e1
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	source_i686 = http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz
+	source_i686 = fmodapi42416linux.tar.gz.sig
+	sha512sums_i686 = 5d4350de3683a8f990447cd8d870ef5b10787ae06e0533f4376ee3c8113fffa8723fcc7a8703bb556c8e9600915087ea078a77049aee34e7f79adf9ae32ebdc4
+	sha512sums_i686 = SKIP
+	source_x86_64 = http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz
+	source_x86_64 = fmodapi42416linux64.tar.gz.sig
+	sha512sums_x86_64 = edc851730c81da4423bd0f10a433c46b4a8bdad901b32f628087b40cec088760a441228ee47a75e17844c195e7abf79e02439c39b5fdeeb9689572dcd9104ade
+	sha512sums_x86_64 = SKIP
 
 pkgname = zandronum-hg
 
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..9a80825a3f92
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,39 @@
+Zandronum
+Copyright (c) 2012, Zandronum Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the Zandronum Development Team nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+4. Redistributions in any form must be accompanied by information on how to
+   obtain complete source code for the software and any accompanying software
+   that uses the software. The source code must either be included in the
+   distribution or be available for no more than the cost of distribution plus
+   a nominal fee, and must be freely redistributable under reasonable
+   conditions. For an executable file, complete source code means the source
+   code for all modules it contains. It does not include source code for
+   modules or files that typically accompany the major components of the
+   operating system on which the executable file runs.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The above copyright and license notice applies to distributions of Zandronum in
+source and binary form.  Some source files contain additional notices of
+original copyright by their contributors; see each source for details.
diff --git a/LICENSE.sig b/LICENSE.sig
new file mode 100644
index 000000000000..8f2ae47224d8
--- /dev/null
+++ b/LICENSE.sig
diff --git a/PKGBUILD b/PKGBUILD
index 17533f8f3de8..4d1d8302379f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,114 @@
 validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # Bug reports can be filed at https://bugs.square-r00t.net/index.php?project=3
 # News updates for packages can be followed at https://devblog.square-r00t.net
+# Since this is a development build and people may want to have both the latest stable AND development,
+# it installs alongside rather than as a conflict of zandronum2.
+# Adapted from https://wiki.zandronum.com/Compiling_Zandronum_on_Linux#Arch_Linux
 pkgname=zandronum-hg
-pkgver=0.0000001
+pkgver=r9707.dd165ac5fc29
 pkgrel=1
+_fmod_ver_true="4.24.16"
+_fmod_ver="$(echo ${_fmod_ver_true} | sed -e 's/\.//g')"
 pkgdesc="OpenGL ZDoom port with Client/Server multiplayer. (Development branch checkout)"
 arch=('i686' 'x86_64')
 url="https://zandronum.com"
 license=('custom')
-depends=('sdl libjpeg6-turbo glu openssl fluidsynth')
-optdepends=('timidity++: midi support')
-makedepends=('gcc')
+depends=('sdl' 'libjpeg6-turbo' 'glu' 'openssl' 'fluidsynth')
+optdepends=('timidity++: midi support'
+            'freedoom: free IWAD'
+            'gtk2: for a GUI selection screen')
+makedepends=('zlib' 'sdl' 'libjpeg-turbo' 'nasm' 'gtk2' 'cmake' 'mercurial' 'fluidsynth' 'mesa' 'glu')
 _pkgname=zandronum
-provides=("zandronum")
-conflicts=("zandronum")
-install=
+provides=("zandronum" "zandronum2")
+conflicts=("zandronum" "zandronum-dev")
+install=zandronum-hg.install
 changelog=
 noextract=()
-source=("zandronum::hg+https://bitbucket.org/Torr_Samaho/zandronum")
+source=("zandronum::hg+https://bitbucket.org/Torr_Samaho/zandronum"
+	"LICENSE"
+        "${pkgname}.launcher"
+        "${pkgname}-server.launcher"
+        "${pkgname}.launcher.sig"
+        "${pkgname}-server.launcher.sig"
+        "LICENSE.sig")
+source_x86_64=("http://zandronum.com/essentials/fmod/fmodapi${_fmod_ver}linux64.tar.gz"
+	       "fmodapi${_fmod_ver}linux64.tar.gz.sig")
+source_i686=("http://zandronum.com/essentials/fmod/fmodapi${_fmod_ver}linux.tar.gz"
+	     "fmodapi${_fmod_ver}linux.tar.gz.sig")
 # see https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git_Submodules if you require git submodules
-sha512sums=('SKIP')
+sha512sums=('SKIP'
+	    'b928f3211ff31f17fc2d754728e299b5783e1b946b4019713718b7613e13ff0a7c4f02087c0ab4f137f7a0de57a2bfeaa6ed63285d0e6063d2b4734b097ce9e1'
+            '7595135cc49c02278b9871afe5291e45fb6811b858b900f52f6b606239aafc02f6f046f0de516922fad4cac2236320fde9711040a18c0a639f3b1be26fd54404'
+            'ffa128418e045dc8a978f10a09964f385e0097a71fb6e62396447707a0c396d7526f24b3fc74c33aecca109b79aa8a36c309774904293909182dd80637e9c5e1'
+            'SKIP'
+            'SKIP'
+            'SKIP')
+sha512sums_x86_64=('edc851730c81da4423bd0f10a433c46b4a8bdad901b32f628087b40cec088760a441228ee47a75e17844c195e7abf79e02439c39b5fdeeb9689572dcd9104ade'
+		   'SKIP')
+sha512sums_i686=('5d4350de3683a8f990447cd8d870ef5b10787ae06e0533f4376ee3c8113fffa8723fcc7a8703bb556c8e9600915087ea078a77049aee34e7f79adf9ae32ebdc4'
+		 'SKIP')
 pkgver() {
-  cd "${pkgname}"
+  cd "${_pkgname}"
   printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
 }
+prepare() {
+  if [[ "${CARCH}" == 'x86_64' ]];
+  then
+    export fmod_dir_suffix='64'
+  else
+    export fmod_dir_suffix=''
+  fi
+}
 build() {
-        cd "${srcdir}/${_pkgname}/src"
+	export FMODFOLDER="${srcdir}/fmodapi${_fmod_ver}linux${fmod_dir_suffix}"
+	export FMODFILE="libfmodex${fmod_dir_suffix}-${_fmod_ver_true}"
+
+	# Client/Server
+        cd "${srcdir}/${_pkgname}"
+	if [ -d "client" ];
+	then
+	  cd client
+	  make clean
+          cd "${srcdir}/${_pkgname}"
+	  rm -rf client
+	  mkdir -p client
+	else
+	  mkdir -p client
+	fi
+	cd "${srcdir}/${_pkgname}/client"
+	cmake -DCMAKE_BUILD_TYPE=Release -DFMOD_LIBRARY=${FMODFOLDER}/api/lib/${FMODFILE}.so -DFMOD_INCLUDE_DIR=${FMODFOLDER}/api/inc ..
+        make prefix=${pkgdir}/usr
+
+	# Dedicated Server
+        cd "${srcdir}/${_pkgname}"
+	if [ -d "server" ];
+	then
+	  cd server
+	  make clean
+          cd "${srcdir}/${_pkgname}"
+	  rm -rf server
+	  mkdir -p server
+	else
+	  mkdir -p server
+	fi
+	cd "${srcdir}/${_pkgname}/server"
+	cmake -DCMAKE_BUILD_TYPE=Release -DSERVERONLY=ON ..
         make prefix=${pkgdir}/usr
 }
 package() {
-        install -D -m755 ${srcdir}/${_pkgname}/src/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
-        install -D -m644 ${srcdir}/${_pkgname}/docs/README.html.en ${pkgdir}/usr/share/doc/${_pkgname}/README.html
+        install -d -m 755 "${pkgdir}/usr/share/${pkgname}/lib"
+        install -D -m 644 "${srcdir}/${_pkgname}/client/${_pkgname}.pk3" "${pkgdir}/usr/share/${pkgname}/"
+        install -D -m 644 "${srcdir}/${_pkgname}/client/skulltag_actors.pk3" "${pkgdir}/usr/share/${pkgname}/"
+        install -D -m 755 "${srcdir}/${_pkgname}/client/output_sdl/liboutput_sdl.so" "${pkgdir}/usr/share/${pkgname}/lib/"
+        install -D -m 755 "${srcdir}/${_pkgname}/client/${_pkgname}" "${pkgdir}/usr/share/${pkgname}/"
+        install -D -m 755 "${srcdir}/${_pkgname}/server/${_pkgname}-server" "${pkgdir}/usr/share/${pkgname}/"
+        install -D -m 755 "${srcdir}/${pkgname}.launcher" "${pkgdir}/usr/share/${pkgname}/"
+        install -D -m 755 "${srcdir}/${pkgname}-server.launcher" "${pkgdir}/usr/share/${pkgname}/"
+	install -D -m 755 "${srcdir}/fmodapi${_fmod_ver}linux${fmod_dir_suffix}/api/lib/libfmodex${fmod_dir_suffix}-${_fmod_ver_true}.so" "${pkgdir}/usr/share/${pkgname}/lib/"
+
+        install -d -m 755 "${pkgdir}/usr/bin"
+        cd ${pkgdir}/usr/bin
+        ln -sf /usr/share/${pkgname}/${pkgname}.launcher ${pkgname}
+        ln -sf /usr/share/${pkgname}/${pkgname}-server.launcher ${pkgname}-server
+
 }
diff --git a/fmodapi42416linux.tar.gz.sig b/fmodapi42416linux.tar.gz.sig
new file mode 100644
index 000000000000..eb975ef85058
--- /dev/null
+++ b/fmodapi42416linux.tar.gz.sig
diff --git a/fmodapi42416linux64.tar.gz.sig b/fmodapi42416linux64.tar.gz.sig
new file mode 100644
index 000000000000..02746648161f
--- /dev/null
+++ b/fmodapi42416linux64.tar.gz.sig
diff --git a/zandronum-hg-server.launcher b/zandronum-hg-server.launcher
new file mode 100755
index 000000000000..fa8d210c6650
--- /dev/null
+++ b/zandronum-hg-server.launcher
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=/usr/share/zandronum-dev/lib
+exec /usr/share/zandronum-dev/zandronum-server "${@}"
diff --git a/zandronum-hg-server.launcher.sig b/zandronum-hg-server.launcher.sig
new file mode 100644
index 000000000000..f4dd61d78a81
--- /dev/null
+++ b/zandronum-hg-server.launcher.sig
diff --git a/zandronum-hg.install b/zandronum-hg.install
new file mode 100644
index 000000000000..1ff7aaefa722
--- /dev/null
+++ b/zandronum-hg.install
@@ -0,0 +1,4 @@
+## arg 1:  the new package version
+post_install() {
+ echo ":: Zandronum looks for IWADs (e.g. doom2.wad) in CWD, ~/.zandronum and /usr/local/share"
+}
diff --git a/zandronum-hg.install.sig b/zandronum-hg.install.sig
new file mode 100644
index 000000000000..aec0572d36ef
--- /dev/null
+++ b/zandronum-hg.install.sig
diff --git a/zandronum-hg.launcher b/zandronum-hg.launcher
new file mode 100755
index 000000000000..48c5cd72e993
--- /dev/null
+++ b/zandronum-hg.launcher
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=/usr/share/zandronum-dev/lib
+exec /usr/share/zandronum-dev/zandronum "${@}"
diff --git a/zandronum-hg.launcher.sig b/zandronum-hg.launcher.sig
new file mode 100644
index 000000000000..21c29297f3cf
--- /dev/null
+++ b/zandronum-hg.launcher.sig