diff --git a/docs/Build/build/GPAC-Build-Guide-for-Linux.md b/docs/Build/build/GPAC-Build-Guide-for-Linux.md index bc277d85..a1f03c91 100644 --- a/docs/Build/build/GPAC-Build-Guide-for-Linux.md +++ b/docs/Build/build/GPAC-Build-Guide-for-Linux.md @@ -58,7 +58,7 @@ You can either: Install the development packages for the third-party libraries GPAC is able to leverage: ```bash -sudo apt install zlib1g-dev libfreetype6-dev libjpeg62-dev libpng-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libnghttp2-dev libopenjp2-7-dev libcaca-dev libxv-dev x11proto-video-dev libgl1-mesa-dev libglu1-mesa-dev x11proto-gl-dev libxvidcore-dev libssl-dev libjack-jackd2-dev libasound2-dev libpulse-dev libsdl2-dev dvb-apps mesa-utils +sudo apt install zlib1g-dev libfreetype6-dev libjpeg62-dev libpng-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libnghttp2-dev libopenjp2-7-dev libcaca-dev libxv-dev x11proto-video-dev libgl1-mesa-dev libglu1-mesa-dev x11proto-gl-dev libxvidcore-dev libssl-dev libjack-jackd2-dev libasound2-dev libpulse-dev libsdl2-dev dvb-apps mesa-utils libcurl4-openssl-dev ``` This list should work on Ubuntu from 14.04 (`trusty`) to at least 22.04 (`jammy`). diff --git a/docs/Build/build/GPAC-Build-Guide-for-OSX.md b/docs/Build/build/GPAC-Build-Guide-for-OSX.md index 0ed7d555..78fbd2dd 100644 --- a/docs/Build/build/GPAC-Build-Guide-for-OSX.md +++ b/docs/Build/build/GPAC-Build-Guide-for-OSX.md @@ -38,10 +38,10 @@ brew install freetype jpeg libpng openjpeg mad faad2 libogg libvorbis theora a52 ```bash # install build tools -port install cmake scons coreutils gettext yasm git wget pkgconfig +sudo port -N install cmake scons coreutils gettext yasm git wget pkgconfig # install dependencies -port install freetype jpeg libpng openjpeg libmad faad2 libogg libvorbis libtheora a52dec ffmpeg x264 aom xvid openssl libsdl2 +sudo port -N install freetype jpeg libpng openjpeg libmad faad2 libogg libvorbis libtheora a52dec ffmpeg6 x264 aom xvid openssl libsdl2 ```
diff --git a/docs/Howtos/nodejs.md b/docs/Howtos/nodejs.md index 0bb7c284..5e69a92b 100644 --- a/docs/Howtos/nodejs.md +++ b/docs/Howtos/nodejs.md @@ -33,10 +33,14 @@ You can then build using: If you don't want to install on your system, you will need to modify the `binding.gyp` file to set the include dir to the root of gpac source tree: -- "include_dirs": ["<(module_root_dir)/../../include"] +``` +"include_dirs": ["<(module_root_dir)/../../include"] +``` + +- If built using configure and make, you will likely have a custom config.h file, and the build tree root must also be indicated together with the `GPAC_HAVE_CONFIG_H` macro. -If built using configure and make, you will likely have a custom config.h file, and the build tree root must also be indicated together with the `GPAC_HAVE_CONFIG_H` macro. - If you build gpac at the top of the gpac source tree (using e.g. `./configure && make`), the build tree root for node will be `<(module_root_dir)/../..`. + - If you build gpac in gpac/bin/mytest, (using e.g. `mkdir bin/mytest && cd bin/mytest && ../../configure && make`), the build tree root for node will be `<(module_root_dir)/../../bin/mytest`. You will also likely need to update the `libraries` property to add the path to your libgpac shared library (typically in bin/gcc of the build tree root). @@ -47,7 +51,7 @@ You will also likely need to update the `libraries` property to add the path to "target_name": "gpac", "sources": [ "./src/gpac_napi.c"], "include_dirs": ["<(module_root_dir)/../../include", "<(module_root_dir)/../.."], - "libraries": [ '-lgpac',"-L<(module_root_dir)/bin/gcc"], + "libraries": [ '-lgpac',"-L<(module_root_dir)/../../bin/gcc"], "defines":["GPAC_HAVE_CONFIG_H"] }] } @@ -765,6 +769,3 @@ You should therefore avoid using shared JS data in your custom filter whenever p In multi-threaded mode, custom filter bindings (`dashin` filter for now) must be called on the main thread. This implies that the filter bound will be forced to run on the main thread. Packets dispatched by a JS-bound filter may still be processed by other threads, unless they are JS shared data packets. - - -