Changes between Version 315 and Version 316 of BuildInstructions

Timestamp:

Apr 9, 2018, 10:44:30 AM (6 years ago)

Author:

Itms

Comment:

Add libsodium and remove old distros

BuildInstructions

@@ -96 +96 @@
  * libogg
  * libpng
+ * libsodium (>= 1.0.14, follow the instructions at https://download.libsodium.org/doc/installation/ if your distro is behind)
  * libvorbis
  * libxcursor
@@ -129 +130 @@
    * With these dependencies you have to run:
      * `./update-workspaces.sh --with-system-nvtt`
+ * On all versions **except Ubuntu 18.04**, you will need to [https://download.libsodium.org/doc/installation/ install libsodium manually].
+   * On **Ubuntu 18.04**, `sudo apt-get install libsodium-dev`.
  * If you want to use a packaged **mozjs38**, available for example in [https://launchpad.net/~wfg/+archive/ubuntu/0ad.dev/+packages 0ad.dev PPA]:
    * you should replace `libnspr4-dev` with `libmozjs-38-dev` and run `update-workspace.sh` with `--with-system-mozjs38`.
- * On systems **earlier than Debian 8/jessie and Ubuntu 14.04/trusty**:
-   * you should run `update-workspace.sh` with `--without-miniupnpc` if you don't have `libminiupnpc-dev` >= 1.6;
-   * you should replace `libwxgtk3.0-dev` with `libwxgtk2.8-dev`;
  * When not using system nvidia-texture-tools, `libnvtt-dev` can be omitted, but `cmake` is needed to build the bundled NVTT.
  * You can also use `libcurl4-openssl-dev` instead of `libcurl4-gnutls-dev` (it's not possible to install both at once), but [http://lintian.debian.org/tags/possible-gpl-code-linked-with-openssl.html note that openssl is not GPL compatible and the resulting binaries could not be redistributed].
@@ -143 +143 @@
 #!sh
 urpmi gcc-c++ python subversion zip cmake boost-devel libcurl-devel         \
-    libenet-devel libgloox-devel libpng-devel libvorbis-devel \
+    libenet-devel libgloox-devel libpng-devel libsodium-devel libvorbis-devel \
     libxml2-devel libwxgtku2.8-devel openal-soft-devel libicu-devel
 }}}
@@ -152 +152 @@
 #!sh
 sudo dnf install gcc-c++ python subversion zip cmake patch   \
-    boost-devel libcurl-devel enet-devel libpng-devel libvorbis-devel \
+    boost-devel libcurl-devel enet-devel libpng-devel libsodium-devel libvorbis-devel \
     libxml2-devel openal-soft-devel pkgconfig SDL2-devel wxGTK-devel  \
     gloox-devel libicu-devel miniupnpc-devel nspr-devel
 }}}
 
-* Fedora 21 or earlier has gloox-devel <= 1.0.9, so you need to build it from sources (https://camaya.net/gloox/) or install a newer (>=1.0.10) version by other way.
 * To submit a patch for review via arcanist ([wiki:Phabricator), php is needed:  `dnf install php-cli php-xml`.
 
@@ -166 +165 @@
 #!sh
 sudo zypper install gcc-c++ python subversion zip cmake boost-devel         \
-    libcurl-devel libenet-devel libpng-devel libvorbis-devel  \
-    libxml2-devel openal-soft-devel pkg-config wxGTK-devel libSDL2-devel     \
+    libcurl-devel libenet-devel libpng-devel libsodium-devel libvorbis-devel  \
+    libxml2-devel openal-soft-devel pkg-config wxWidgets-devel libSDL2-devel     \
     gloox-devel libicu-devel miniupnpc-devel
 }}}
-Users of openSUSE 11.4 and later should install the wxWidgets-devel package instead of wxGTK-devel.
 
 ==== !ArchLinux ====
 {{{
 #!sh
-pacman -S --needed boost cmake curl enet gcc gloox icu libgl libogg libpng libvorbis libxcursor libxml2 miniupnpc patch sdl2 subversion wxgtk zip zlib
+pacman -S --needed boost cmake curl enet gcc gloox icu libgl libogg libpng libsodium libvorbis libxcursor libxml2 miniupnpc patch sdl2 subversion wxgtk zip zlib
 }}}
 
@@ -181 +179 @@
 {{{
 #!sh
-sudo xbps-install -Syv base-devel boost-devel cmake curl gcc icu-devel libcurl-devel libenet-devel libogg-devel libopenal-devel libpng-devel libvorbis-devel libXcursor libxml2 MesaLib-devel miniupnpc-devel nspr-devel patch pkg-config SDL2-devel wxWidgets-devel zip zlib
+sudo xbps-install -Syv base-devel boost-devel cmake curl gcc icu-devel libcurl-devel libenet-devel libogg-devel libopenal-devel libpng-devel libsodium-devel libvorbis-devel libXcursor libxml2 MesaLib-devel miniupnpc-devel nspr-devel patch pkg-config SDL2-devel wxWidgets-devel zip zlib
 }}}
 If there are issues, install more header files depending on the compiler's error message.
@@ -395 +393 @@
 #!sh
 pkg install boost-libs cmake curl enet gloox gmake iconv libGL libogg          \
-     libvorbis libxml2 miniupnpc nspr openal pkgconf png sdl2 subversion        \
+     libsodium libvorbis libxml2 miniupnpc nspr openal pkgconf png sdl2 subversion        \
      wx30-gtk2 zip
 }}}
@@ -422 +420 @@
 {{{
 #!sh
-pkg_add -i boost cmake curl enet g++ gcc gloox gmake icu4c libexecinfo libogg  \
+pkg_add -i boost cmake curl enet g++ gcc gloox gmake icu4c libexecinfo libogg libsodium \
     libxml miniupnpc nspr openal png sdl2 subversion zip
 }}}