X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=README;h=1bc3d41ede44bccddce077fb89cc366bc0827cb2;hb=817fffe1ef3bd87f2387395f49487cf5255d8daf;hp=0f18d25352666b803093d9fb8a6f8fba3c176124;hpb=d7d1594937aac9e11fc35e84e5a3873c2207136f;p=nageru

diff --git a/README b/README
index 0f18d25..1bc3d41 100644
--- a/README
+++ b/README
@@ -61,6 +61,8 @@ Nageru currently needs:
  - ffmpeg for muxing, and for encoding audio. You will need at least
    version 3.1.
 
+ - libjpeg, for encoding the MJPEG multi-camera stream if requested.
+
  - Working OpenGL; Movit works with almost any modern OpenGL implementation.
    Nageru has been tested with Intel on Mesa (you want 11.2 or newer, due
    to critical stability bugfixes), and with NVIDIA's proprietary drivers.
@@ -71,6 +73,8 @@ Nageru currently needs:
 
  - LuaJIT, for driving the theme engine.
 
+ - Meson, for building.
+
  - Optional: CEF (Chromium Embedded Framework), for HTML graphics.
    If you build without CEF, the HTMLInput class will not be available from
    the theme. You can get binary downloads of CEF from
@@ -78,8 +82,8 @@ Nageru currently needs:
      http://opensource.spotify.com/cefbuilds/index.html
 
    Simply download the right build for your platform (the “minimal” build
-   is fine) and add CEF_DIR=<path>/cef_binary_X.XXXX.XXXX.XXXXXXXX_linux64
-   on the make command line (substituting X with the real version as required).
+   is fine) and add -Dcef_dir=<path>/cef_binary_X.XXXX.XXXX.XXXXXXXX_linux64
+   on the meson command line (substituting X with the real version as required).
 
 
 If on Debian stretch or something similar, you can install everything you need
@@ -92,20 +96,31 @@ with:
     libasound2-dev libx264-dev libbmusb-dev protobuf-compiler \
     libprotobuf-dev
 
-Exceptions as of April 2018:
+Exceptions as of November 2018:
 
   - You will need Movit from testing or unstable; stretch only has 1.4.0.
 
   - You will need bmusb from testing or unstable; stretch only has 0.5.4.
 
-  - Debian does not carry CEF (but it is optional).
+  - You will need a Meson backport; the version in stretch is too old.
+
+  - Debian does not carry CEF (but it is optional). You can get experimental
+    (and not security-supported) CEF Debian packages built for unstable at
+    http://storage.sesse.net/cef/, and then configure Nageru with
+
+     meson obj -Dcef_dir=/usr/lib/x86_64-linux-gnu/cef -Dcef_build_type=system -Dcef_no_icudtl=true
 
 The patches/ directory contains a patch that helps zita-resampler performance.
 It is meant for upstream, but was not in at the time Nageru was released.
 It is taken to be by Steinar H. Gunderson <sesse@google.com> (ie., my ex-work
 email), and under the same license as zita-resampler itself.
 
-To start it, just hook up your equipment, type “make” and then “./nageru”.
+Nageru uses Meson to build. For a default build, type
+
+  meson obj && cd obj && ninja
+
+To start it, just hook up your equipment, and then type “./nageru”.
+
 It is strongly recommended to have the rights to run at real-time priority;
 it will make the USB3 threads do so, which will make them a lot more stable.
 (A reasonable hack for testing is probably just to run it as root using sudo,