diff --git a/.github/script/check_no_copyleft_libs.sh b/.github/script/check_no_copyleft_libs.sh new file mode 100755 index 000000000..453a5f9fd --- /dev/null +++ b/.github/script/check_no_copyleft_libs.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +# Fail if a Linux package ships, links or depends on a library FLM dropped for +# licensing reasons: FFmpeg and the GPL codecs distro FFmpeg pulls in (x264, +# x265, xvid, libdvdnav/libdvdread), FFTW and GNU readline. +# +# Usage: check_no_copyleft_libs.sh ... +set -euo pipefail + +# Shared-library file names (bundled files and ELF NEEDED entries). +lib_re='^lib(av(codec|format|util|filter|device)|sw(scale|resample)|postproc|x264|x265|xvidcore|dvdnav|dvdread|fftw3[a-z_]*|readline)[.]so' +# Debian binary package names (.deb Depends). +pkg_re='^(libav(codec|format|util|filter|device)|libsw(scale|resample)|libpostproc|libx26[45]|libxvidcore|libdvd(nav|read)|libfftw3|libreadline)' + +status=0 +for pkg in "$@"; do + tmp=$(mktemp -d) + case "$pkg" in + *.deb) + if dpkg-deb -f "$pkg" Depends | tr ',|' '\n\n' | sed 's/^ *//' | grep -E "$pkg_re"; then + echo "::error::$pkg depends on a package listed above" + status=1 + fi + dpkg-deb -x "$pkg" "$tmp" ;; + *.tar.gz) + tar xzf "$pkg" -C "$tmp" ;; + *) + echo "::error::unknown package type: $pkg" + exit 2 ;; + esac + + if find "$tmp" \( -type f -o -type l \) -printf '%f\n' | grep -E "$lib_re"; then + echo "::error::$pkg bundles a library listed above" + status=1 + fi + while IFS= read -r -d '' f; do + if readelf -d "$f" 2>/dev/null | sed -n 's/.*(NEEDED).*\[\(.*\)\]/\1/p' | grep -E "$lib_re"; then + echo "::error::${f#"$tmp"/} in $pkg links a library listed above" + status=1 + fi + done < <(find "$tmp" -type f -print0) + rm -rf "$tmp" + [ "$status" -eq 0 ] && echo "$pkg: no FFmpeg, GPL codec, FFTW or readline libraries" +done +exit "$status" diff --git a/.github/workflows/asr-test.yml b/.github/workflows/asr-test.yml index 4ad8be406..34959124e 100644 --- a/.github/workflows/asr-test.yml +++ b/.github/workflows/asr-test.yml @@ -16,13 +16,12 @@ name: ASR Test # platform) and the same 5 points per set. # # The trigger paths are the Whisper engine, its NPU kernels and prebuilt NPU -# libraries, the FFmpeg, audio front end and FFT code, the audio front ends of +# libraries, the audio decoders, front end and FFT code, the audio front ends of # the chat models that transcribe, and the server files that host # /v1/audio/transcriptions. Those server files also hold every other endpoint, # so any change to them runs this test too. The pull_request and push path -# lists must stay identical. Shared files such as src/CMakeLists.txt (the Linux -# FFmpeg version) and lm_config.hpp are left out, since every change touches -# them. +# lists must stay identical. Shared files such as src/CMakeLists.txt and +# lm_config.hpp are left out, since every change touches them. # # The weekly run catches what no commit changes: Whisper weights republished # on Hugging Face, and NPU driver or firmware updates on the runners. @@ -45,11 +44,9 @@ on: - 'src/include/audio/**' - 'src/common/AutoModel/*_audio.cpp' - 'src/detail/gemma4e_npu/gemma4e_audio*' - - 'src/include/fftw3.h' - 'src/include/pocketfft/**' - - 'src/lib/libfftw3*' - - 'src/lib/av*' - - 'src/lib/sw*' + - 'src/include/dr_libs/**' + - 'src/cmake/FlmAudioCodecs.cmake' - 'src/server/rest_handler.cpp' - 'src/server/server.cpp' - 'src/server/multipart.cpp' @@ -74,11 +71,9 @@ on: - 'src/include/audio/**' - 'src/common/AutoModel/*_audio.cpp' - 'src/detail/gemma4e_npu/gemma4e_audio*' - - 'src/include/fftw3.h' - 'src/include/pocketfft/**' - - 'src/lib/libfftw3*' - - 'src/lib/av*' - - 'src/lib/sw*' + - 'src/include/dr_libs/**' + - 'src/cmake/FlmAudioCodecs.cmake' - 'src/server/rest_handler.cpp' - 'src/server/server.cpp' - 'src/server/multipart.cpp' diff --git a/.github/workflows/debian-portable.yml b/.github/workflows/debian-portable.yml index 56c5859a9..39e21fb1d 100644 --- a/.github/workflows/debian-portable.yml +++ b/.github/workflows/debian-portable.yml @@ -91,6 +91,8 @@ jobs: echo "Created tarball with symlinks preserved" # The default backend is XRT, so confirm libxrt is bundled. tar tzf $GITHUB_WORKSPACE/fastflowlm_${VERSION}_linux.tar.gz | grep libxrt + $GITHUB_WORKSPACE/.github/script/check_no_copyleft_libs.sh \ + $GITHUB_WORKSPACE/fastflowlm_${VERSION}_linux.tar.gz - name: Upload portable build artifact uses: actions/upload-artifact@v4 @@ -140,6 +142,8 @@ jobs: LICENSE_RUNTIME.txt \ LICENSE_BINARY.txt \ THIRD_PARTY_NOTICES.txt + "$GITHUB_WORKSPACE/.github/script/check_no_copyleft_libs.sh" \ + "$GITHUB_WORKSPACE/models-from-source_fastflowlm_${VERSION}_linux.tar.gz" - name: Upload models-from-source build artifact uses: actions/upload-artifact@v4 @@ -149,28 +153,6 @@ jobs: retention-days: 7 if-no-files-found: error - - name: Collect FFmpeg logs - if: always() - shell: bash - run: | - set -euxo pipefail - OUT="${RUNNER_TEMP}/ffmpeg-logs" - mkdir -p "${OUT}" - find "${GITHUB_WORKSPACE}" -type f \ - \( -name "configure.log" -o -name "build.log" -o -name "config.log" \) \ - -path "*/ffmpeg-build/*" \ - -print \ - -exec cp --parents {} "${OUT}" \; || true - - - name: Upload FFmpeg logs artifact - if: always() - uses: actions/upload-artifact@v4 - with: - name: ffmpeg-logs-${{ github.job }}-run${{ github.run_number }}-attempt${{ github.run_attempt }} - path: ${{ runner.temp }}/ffmpeg-logs - if-no-files-found: warn - retention-days: 14 - build-HRX-portable: runs-on: ubuntu-latest strategy: @@ -254,18 +236,8 @@ jobs: echo "Created tarball with symlinks preserved" # This build selects the HRX backend, so confirm libhrx is bundled. tar tzf $GITHUB_WORKSPACE/HRX_fastflowlm_${VERSION}_linux.tar.gz | grep libhrx - # FFmpeg is linked statically from an LGPL source build, so neither flm - # nor the tarball may carry a shared FFmpeg (distro builds are GPL) or - # the GPL codecs it would drag in. - if readelf -d flm-real | grep -E 'NEEDED.*lib(av|sw|postproc)'; then - echo "::error::flm-real links a shared FFmpeg library" - exit 1 - fi - if tar tzf $GITHUB_WORKSPACE/HRX_fastflowlm_${VERSION}_linux.tar.gz \ - | grep -E 'lib/lib(av(codec|format|util|filter|device)|sw(scale|resample)|postproc|x264|x265|xvidcore)[.]so'; then - echo "::error::tarball bundles a shared FFmpeg or GPL codec library" - exit 1 - fi + $GITHUB_WORKSPACE/.github/script/check_no_copyleft_libs.sh \ + $GITHUB_WORKSPACE/HRX_fastflowlm_${VERSION}_linux.tar.gz - name: Upload portable build artifact uses: actions/upload-artifact@v4 @@ -275,28 +247,6 @@ jobs: retention-days: 7 if-no-files-found: error - - name: Collect FFmpeg logs - if: always() - shell: bash - run: | - set -euxo pipefail - OUT="${RUNNER_TEMP}/ffmpeg-logs" - mkdir -p "${OUT}" - find "${GITHUB_WORKSPACE}" -type f \ - \( -name "configure.log" -o -name "build.log" -o -name "config.log" \) \ - -path "*/ffmpeg-build/*" \ - -print \ - -exec cp --parents {} "${OUT}" \; || true - - - name: Upload FFmpeg logs artifact - if: always() - uses: actions/upload-artifact@v4 - with: - name: ffmpeg-logs-${{ github.job }}-run${{ github.run_number }}-attempt${{ github.run_attempt }} - path: ${{ runner.temp }}/ffmpeg-logs - if-no-files-found: warn - retention-days: 14 - test-summary: runs-on: ubuntu-latest needs: build-portable @@ -307,11 +257,10 @@ jobs: echo "# Portable Build Test Results" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo "✅ FLM built successfully with portable distribution" >> $GITHUB_STEP_SUMMARY - echo "✅ FFmpeg statically linked (no external FFmpeg dependencies)" >> $GITHUB_STEP_SUMMARY + echo "✅ No FFmpeg, GPL codec, FFTW or readline libraries shipped or linked" >> $GITHUB_STEP_SUMMARY echo "✅ XRT and XDNA plugin bundled with distribution" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo "## Build Configuration" >> $GITHUB_STEP_SUMMARY - echo "- **FFmpeg**: Statically linked (built from source)" >> $GITHUB_STEP_SUMMARY echo "- **XRT**: Dynamically linked, bundled in lib/" >> $GITHUB_STEP_SUMMARY echo "- **XDNA plugin**: Bundled in lib/" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml index be81cc65d..4db12c5fe 100644 --- a/.github/workflows/ubuntu-build.yml +++ b/.github/workflows/ubuntu-build.yml @@ -95,6 +95,8 @@ jobs: dpkg-buildpackage -b -us -uc mv ../fastflowlm_${DEB_VERSION}_amd64.deb ./fastflowlm_${DEB_VERSION}_${{ matrix.distro }}${{ matrix.version }}_amd64.deb ls -lah ./fastflowlm_${DEB_VERSION}_${{ matrix.distro }}${{ matrix.version }}_amd64.deb + .github/script/check_no_copyleft_libs.sh \ + ./fastflowlm_${DEB_VERSION}_${{ matrix.distro }}${{ matrix.version }}_amd64.deb - name: Upload Debian package artifact uses: actions/upload-artifact@v4 diff --git a/Dockerfile b/Dockerfile index 90410ade7..367654d39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,16 +31,11 @@ RUN apt update && apt install -y \ dpkg-dev \ fakeroot \ git \ - libavcodec-dev \ - libavformat-dev \ - libavutil-dev \ libboost-dev \ libboost-program-options-dev \ libcurl4-openssl-dev \ libdrm-dev \ libedit-dev \ - libswresample-dev \ - libswscale-dev \ libxrt-dev \ nasm \ ninja-build \ diff --git a/THIRD_PARTY_NOTICES.txt b/THIRD_PARTY_NOTICES.txt index f67913cc3..75eb44b89 100644 --- a/THIRD_PARTY_NOTICES.txt +++ b/THIRD_PARTY_NOTICES.txt @@ -8,65 +8,42 @@ licensed under the FastFlowLM NPU Binary License (LICENSE_BINARY.txt). FastFlowLM distributions include, or are built from, the third-party components listed below. Each component is licensed by its copyright holders under the terms shown. The full texts of the Apache License 2.0, -the GNU Lesser General Public License v2.1, the Boost Software License 1.0 -and the MIT License appear at the end of this file. +the Boost Software License 1.0 and the MIT License appear at the end of +this file. Components ------------------------------------------------------------------------------ - 1. FFmpeg - 2. libcurl - 3. zlib - 4. Abseil - 5. Protocol Buffers - 6. Boost.Program_options - 7. Xilinx Runtime (XRT) - 8. aiebu - 9. tokenizers-cpp - 10. Hugging Face Tokenizers - 11. SentencePiece - 12. Darts-clone - 13. esaxx - 14. msgpack-c - 15. Oniguruma - 16. Rust crates - 17. pocketfft - 18. JSON for Modern C++ (nlohmann/json) - 19. Minja - 20. base64 - 21. biovault_bfloat16 - 22. Unicode data (unicode-ident Rust crate) - 23. Microsoft Visual C++ Runtime - 24. libjpeg-turbo - 25. LodePNG - 26. Opus (libopus) - 27. libogg - 28. libvorbis - 29. dr_libs (dr_wav, dr_flac, dr_mp3) + 1. libcurl + 2. zlib + 3. Abseil + 4. Protocol Buffers + 5. Boost.Program_options + 6. Xilinx Runtime (XRT) + 7. aiebu + 8. tokenizers-cpp + 9. Hugging Face Tokenizers + 10. SentencePiece + 11. Darts-clone + 12. esaxx + 13. msgpack-c + 14. Oniguruma + 15. Rust crates + 16. pocketfft + 17. JSON for Modern C++ (nlohmann/json) + 18. Minja + 19. base64 + 20. biovault_bfloat16 + 21. Unicode data (unicode-ident Rust crate) + 22. Microsoft Visual C++ Runtime + 23. libjpeg-turbo + 24. LodePNG + 25. Opus (libopus) + 26. libogg + 27. libvorbis + 28. dr_libs (dr_wav, dr_flac, dr_mp3) ============================================================================== -1. FFmpeg -============================================================================== - -License: GNU Lesser General Public License v2.1 or later (LGPL-2.1-or-later) -Homepage: https://ffmpeg.org -Used in: libavcodec, libavdevice, libavfilter, libavformat, libavutil, - libswresample and libswscale. Windows: shared libraries - (avcodec-61.dll, avdevice-61.dll, avfilter-10.dll, avformat-61.dll, - avutil-59.dll, swresample-5.dll, swscale-8.dll), FFmpeg 7.x - configured without --enable-gpl or --enable-nonfree. Linux portable - package: FFmpeg n7.1 built from source without --enable-gpl or - --enable-nonfree. Source code is available from - https://ffmpeg.org/download.html and - https://github.com/FFmpeg/FFmpeg. - -Copyright (c) 2000-2024 the FFmpeg developers - -Licensed under the GNU Lesser General Public License, version 2.1 or -(at your option) any later version. The license text is reproduced at -the end of this file. - -============================================================================== -2. libcurl +1. libcurl ============================================================================== License: curl License @@ -97,13 +74,13 @@ be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder. ============================================================================== -3. zlib +2. zlib ============================================================================== License: zlib License Homepage: https://zlib.net -Used in: Windows: zlib1.dll (1.3.1). Linux portable package: statically - linked. +Used in: Windows: zlib1.dll (1.3.1), used by libcurl.dll. Linux portable + packages: libz.so.1, bundled as a dependency of libcurl. Copyright notice: @@ -129,7 +106,7 @@ Copyright notice: jloup@gzip.org madler@alumni.caltech.edu ============================================================================== -4. Abseil +3. Abseil ============================================================================== License: Apache License 2.0 @@ -143,7 +120,7 @@ Licensed under the Apache License, Version 2.0. The license text is reproduced at the end of this file. ============================================================================== -5. Protocol Buffers +4. Protocol Buffers ============================================================================== License: BSD 3-Clause License @@ -186,7 +163,7 @@ standalone and requires a support library to be linked with it. This support library is itself covered by the above license. ============================================================================== -6. Boost.Program_options +5. Boost.Program_options ============================================================================== License: Boost Software License 1.0 @@ -200,7 +177,7 @@ Distributed under the Boost Software License, Version 1.0. The license text is reproduced at the end of this file. ============================================================================== -7. Xilinx Runtime (XRT) +6. Xilinx Runtime (XRT) ============================================================================== License: Apache License 2.0 @@ -214,7 +191,7 @@ Licensed under the Apache License, Version 2.0. The license text is reproduced at the end of this file. ============================================================================== -8. aiebu +7. aiebu ============================================================================== License: MIT License @@ -245,7 +222,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ============================================================================== -9. tokenizers-cpp +8. tokenizers-cpp ============================================================================== License: Apache License 2.0 @@ -258,7 +235,7 @@ Licensed under the Apache License, Version 2.0. The license text is reproduced at the end of this file. ============================================================================== -10. Hugging Face Tokenizers +9. Hugging Face Tokenizers ============================================================================== License: Apache License 2.0 @@ -271,7 +248,7 @@ Licensed under the Apache License, Version 2.0. The license text is reproduced at the end of this file. ============================================================================== -11. SentencePiece +10. SentencePiece ============================================================================== License: Apache License 2.0 @@ -284,7 +261,7 @@ Licensed under the Apache License, Version 2.0. The license text is reproduced at the end of this file. ============================================================================== -12. Darts-clone +11. Darts-clone ============================================================================== License: BSD 2-Clause License @@ -303,7 +280,7 @@ Redistribution and use in source and binary forms, with or without modification, 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 OWNER 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. ============================================================================== -13. esaxx +12. esaxx ============================================================================== License: MIT License @@ -336,7 +313,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ============================================================================== -14. msgpack-c +13. msgpack-c ============================================================================== License: Boost Software License 1.0 @@ -350,7 +327,7 @@ Copyright (C) 2008-2015 FURUHASHI Sadayuki http://www.boost.org/LICENSE_1_0.txt) ============================================================================== -15. Oniguruma +14. Oniguruma ============================================================================== License: BSD 2-Clause License @@ -385,7 +362,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ============================================================================== -16. Rust crates +15. Rust crates ============================================================================== License: Various permissive licenses (listed below) @@ -560,7 +537,7 @@ Used in: Statically linked into flm as dependencies of Hugging Face Copyright (c) David Tolnay ============================================================================== -17. pocketfft +16. pocketfft ============================================================================== License: BSD 3-Clause License @@ -608,7 +585,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ============================================================================== -18. JSON for Modern C++ (nlohmann/json) +17. JSON for Modern C++ (nlohmann/json) ============================================================================== License: MIT License @@ -638,7 +615,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ============================================================================== -19. Minja +18. Minja ============================================================================== License: MIT License @@ -666,7 +643,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ============================================================================== -20. base64 +19. base64 ============================================================================== License: MIT License @@ -696,7 +673,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ============================================================================== -21. biovault_bfloat16 +20. biovault_bfloat16 ============================================================================== License: Apache License 2.0 @@ -710,7 +687,7 @@ Licensed under the Apache License, Version 2.0. The license text is reproduced at the end of this file. ============================================================================== -22. Unicode data (unicode-ident Rust crate) +21. Unicode data (unicode-ident Rust crate) ============================================================================== License: Unicode License v3 @@ -758,7 +735,7 @@ dealings in these Data Files or Software without prior written authorization of the copyright holder. ============================================================================== -23. Microsoft Visual C++ Runtime +22. Microsoft Visual C++ Runtime ============================================================================== License: Microsoft Software License Terms @@ -767,7 +744,7 @@ Used in: Windows: msvcp140.dll, vcruntime140.dll, vcruntime140_1.dll, redistributed under the Visual Studio redistributable terms. ============================================================================== -24. libjpeg-turbo +23. libjpeg-turbo ============================================================================== License: IJG License (libjpeg API library); BSD 3-Clause License (build @@ -859,7 +836,7 @@ The libjpeg-turbo SIMD source code is covered by the zlib License, which is subsumed by the IJG License in the context of the libjpeg API library. ============================================================================== -25. LodePNG +24. LodePNG ============================================================================== License: zlib License @@ -889,7 +866,7 @@ freely, subject to the following restrictions: distribution. ============================================================================== -26. Opus (libopus) +25. Opus (libopus) ============================================================================== License: BSD 3-Clause License @@ -943,7 +920,7 @@ Broadcom Corporation: https://datatracker.ietf.org/ipr/1526/ ============================================================================== -27. libogg +26. libogg ============================================================================== License: BSD 3-Clause License @@ -981,7 +958,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ============================================================================== -28. libvorbis +27. libvorbis ============================================================================== License: BSD 3-Clause License @@ -1019,7 +996,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ============================================================================== -29. dr_libs (dr_wav, dr_flac, dr_mp3) +28. dr_libs (dr_wav, dr_flac, dr_mp3) ============================================================================== License: Public Domain (Unlicense) or MIT No Attribution (MIT-0), at the @@ -1288,512 +1265,6 @@ Apache License 2.0 See the License for the specific language governing permissions and limitations under the License. ------------------------------------------------------------------------------- -GNU Lesser General Public License v2.1 ------------------------------------------------------------------------------- - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Moe Ghoul, President of Vice - -That's all there is to it! - ------------------------------------------------------------------------------ Boost Software License 1.0 ------------------------------------------------------------------------------ diff --git a/debian/control b/debian/control index d96eb7340..f39bdb13c 100644 --- a/debian/control +++ b/debian/control @@ -7,16 +7,11 @@ Build-Depends: debhelper-compat (= 13), cargo, cmake, git, - libavcodec-dev, - libavformat-dev, - libavutil-dev, libboost-dev, libboost-program-options-dev, libcurl4-openssl-dev, libdrm-dev, libedit-dev, - libswresample-dev, - libswscale-dev, libxrt-dev, ninja-build, pkg-config, diff --git a/docs/docs/models/phi.md b/docs/docs/models/phi.md index aa6dc8fbc..defee709d 100644 --- a/docs/docs/models/phi.md +++ b/docs/docs/models/phi.md @@ -69,7 +69,7 @@ cmake --preset linux-core -DFLM_ENABLE_CORE=ON # builds into src/build-core cmake --build --preset linux-core ``` -Both presets read `RYZENAI_CORELIB_INCLUDE_DIR` and `RYZENAI_CORELIB_LIBRARY` from the environment, so set both before configuring. They ship with `FLM_ENABLE_CORE` off so that the preset still configures on a machine without corelib, which is why the option is passed on the command line above. The configure step additionally locates a Boost include directory on Windows only — XRT's `xrt/detail/any.h` reaches for `boost::any` when `__cplusplus` reads below 201703L, which MSVC does unless it is handed `/Zc:__cplusplus`; GCC and Clang report C++20 honestly, so nothing there needs Boost. Everything else — XRT, FFmpeg, curl — is the ordinary FastFlowLM dependency set; the core option does not relax any of it. +Both presets read `RYZENAI_CORELIB_INCLUDE_DIR` and `RYZENAI_CORELIB_LIBRARY` from the environment, so set both before configuring. They ship with `FLM_ENABLE_CORE` off so that the preset still configures on a machine without corelib, which is why the option is passed on the command line above. The configure step additionally locates a Boost include directory on Windows only — XRT's `xrt/detail/any.h` reaches for `boost::any` when `__cplusplus` reads below 201703L, which MSVC does unless it is handed `/Zc:__cplusplus`; GCC and Clang report C++20 honestly, so nothing there needs Boost. Everything else — XRT, curl — is the ordinary FastFlowLM dependency set; the core option does not relax any of it. The `src/test/phi4_core` suite is still Windows-only and is not configured on Linux; a Linux build is a compile-and-link path, not a tested one. diff --git a/docs/linux-getting-started.md b/docs/linux-getting-started.md index 8b65a74d0..20d7b2dcf 100644 --- a/docs/linux-getting-started.md +++ b/docs/linux-getting-started.md @@ -122,7 +122,7 @@ In short: if 1.1 firmware breaks probing on stock 6.19, do not keep forcing the 1. Ensure all required development packages are installed: ```sh sudo apt install ninja - sudo apt install libavformat-dev libavutil-dev libavcodec-dev libswresample-dev libswscale-dev libxrt-dev uuid-dev libdrm-dev + sudo apt install libedit-dev libxrt-dev uuid-dev libdrm-dev ``` 2. Clone the repository and pull all submodules: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ea4e97a8..2ccafacc3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -176,110 +176,6 @@ else() endif() endif() -# ——————————————————————————————————————————————— -# Portable Linux build (XRT or HRX backend): statically link FFmpeg (and zlib) -# so the self-contained tarball neither depends on nor bundles the host's -# libavformat/libavcodec/.... Distro FFmpeg is configured with --enable-gpl and -# pulls in GPL codecs (x264, x265, xvid), so it must never end up in the -# tarball; this source build is LGPL (no --enable-gpl). FFmpeg and zlib are -# fetched and built from source; the resulting .a archives are linked into flm -# below. Non-portable builds keep using the system FFmpeg via pkg-config. -# ——————————————————————————————————————————————— -if(FLM_PORTABLE_BUILD AND NOT WIN32) - include(FetchContent) - message(STATUS "Portable build: FFmpeg and zlib will be built statically") - - # ——— FFmpeg (static) ——— - set(FFMPEG_GIT_REPO "https://github.com/FFmpeg/FFmpeg.git" CACHE STRING "FFmpeg Git repository URL") - set(FFMPEG_GIT_TAG "n7.1" CACHE STRING "FFmpeg Git tag/branch to fetch") - FetchContent_Declare(ffmpeg_source - GIT_REPOSITORY ${FFMPEG_GIT_REPO} - GIT_TAG ${FFMPEG_GIT_TAG} - GIT_SHALLOW TRUE) - message(STATUS "Fetching FFmpeg sources...") - FetchContent_Populate(ffmpeg_source) - - set(FFMPEG_SOURCE_DIR ${ffmpeg_source_SOURCE_DIR}) - set(FFMPEG_BUILD_DIR ${CMAKE_BINARY_DIR}/ffmpeg-build) - set(FFMPEG_INSTALL_DIR ${CMAKE_BINARY_DIR}/ffmpeg-install) - file(MAKE_DIRECTORY ${FFMPEG_BUILD_DIR}) - - message(STATUS "Configuring FFmpeg for static build...") - execute_process( - COMMAND ${FFMPEG_SOURCE_DIR}/configure - --prefix=${FFMPEG_INSTALL_DIR} - --enable-static - --disable-shared - --disable-programs - --disable-doc - --disable-htmlpages - --disable-manpages - --disable-podpages - --disable-txtpages - --enable-pic - --enable-zlib - --enable-avcodec - --enable-avformat - --enable-avutil - --enable-swscale - --enable-swresample - --disable-vaapi - --disable-libdrm - --disable-bzlib - --disable-lzma - WORKING_DIRECTORY ${FFMPEG_BUILD_DIR} - RESULT_VARIABLE FFMPEG_CONFIGURE_RESULT - OUTPUT_FILE ${FFMPEG_BUILD_DIR}/configure.log - ERROR_FILE ${FFMPEG_BUILD_DIR}/configure.log) - if(NOT FFMPEG_CONFIGURE_RESULT EQUAL 0) - message(FATAL_ERROR "FFmpeg configure failed. Check ${FFMPEG_BUILD_DIR}/configure.log") - endif() - - message(STATUS "Building FFmpeg static libraries...") - # FFmpeg compilation is memory-intensive, so cap parallelism at 4. - if(DEFINED CMAKE_BUILD_PARALLEL_LEVEL AND CMAKE_BUILD_PARALLEL_LEVEL GREATER 4) - set(FFMPEG_BUILD_JOBS 4) - elseif(DEFINED CMAKE_BUILD_PARALLEL_LEVEL) - set(FFMPEG_BUILD_JOBS ${CMAKE_BUILD_PARALLEL_LEVEL}) - else() - set(FFMPEG_BUILD_JOBS 2) - endif() - execute_process( - COMMAND make -j${FFMPEG_BUILD_JOBS} - WORKING_DIRECTORY ${FFMPEG_BUILD_DIR} - RESULT_VARIABLE FFMPEG_BUILD_RESULT - OUTPUT_FILE ${FFMPEG_BUILD_DIR}/build.log - ERROR_FILE ${FFMPEG_BUILD_DIR}/build.log) - if(NOT FFMPEG_BUILD_RESULT EQUAL 0) - message(FATAL_ERROR "FFmpeg build failed. Check ${FFMPEG_BUILD_DIR}/build.log") - endif() - - message(STATUS "Installing FFmpeg static libraries...") - execute_process( - COMMAND make install - WORKING_DIRECTORY ${FFMPEG_BUILD_DIR} - RESULT_VARIABLE FFMPEG_INSTALL_RESULT) - if(NOT FFMPEG_INSTALL_RESULT EQUAL 0) - message(FATAL_ERROR "FFmpeg install failed") - endif() - - set(FFMPEG_BUILT_FROM_SOURCE TRUE) - set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INSTALL_DIR}/include) - set(FFMPEG_LIBRARY_DIRS ${FFMPEG_INSTALL_DIR}/lib) - message(STATUS "FFmpeg built successfully (static): ${FFMPEG_LIBRARY_DIRS}") - - # ——— zlib (static) ——— - message(STATUS "Fetching zlib source...") - FetchContent_Declare(zlib_source - GIT_REPOSITORY "https://github.com/madler/zlib.git" - GIT_TAG "v1.3.1" - GIT_SHALLOW TRUE) - FetchContent_MakeAvailable(zlib_source) - set(ZLIB_BUILT_FROM_SOURCE TRUE) - set(ZLIB_STATIC_LIB ${zlib_source_BINARY_DIR}/libz.a) - message(STATUS "zlib built successfully (static): ${ZLIB_STATIC_LIB}") -endif() - # ——————————————————————————————————————————————— # Add tokenizers-cpp subproject # ——————————————————————————————————————————————— @@ -398,17 +294,17 @@ endif() # ——————————————————————————————————————————————— # Opt-in Windows dependency prefix. # -# Windows otherwise has exactly two routes for Boost/curl/FFmpeg: a vcpkg +# Windows otherwise has exactly two routes for Boost/curl: a vcpkg # toolchain, or the bare CI runner's hardcoded C:/dev paths and CI-specific # library names. A developer box with neither can point this at one prefix # laid out as /include + /lib -- in practice a conda env's -# Library dir (conda-forge boost, libcurl, ffmpeg) -- and each block that +# Library dir (conda-forge boost, libcurl) -- and each block that # applies the CI runner's include dirs, definitions, link dirs and library # names switches to it. # Empty (the default) leaves both existing routes exactly as they were. # ——————————————————————————————————————————————— set(FLM_WIN_DEPS_PREFIX "" CACHE PATH - "Windows only: take Boost/curl/FFmpeg from /include and /lib (e.g. a conda env's Library dir) instead of the CI runner's C:/dev paths") + "Windows only: take Boost/curl from /include and /lib (e.g. a conda env's Library dir) instead of the CI runner's C:/dev paths") if(FLM_WIN_DEPS_PREFIX) if(NOT WIN32) message(FATAL_ERROR "FLM_WIN_DEPS_PREFIX is a Windows-only route") @@ -418,9 +314,9 @@ if(FLM_WIN_DEPS_PREFIX) "different dependency routes; use one") endif() # The library names a conda-forge Library dir ships: unversioned Boost and - # curl import libs (both are DLL builds), FFmpeg import libs. + # curl import libs (both are DLL builds). set(FLM_WIN_DEPS_PREFIX_LIBS - avformat avcodec avutil swscale swresample libcurl boost_program_options) + libcurl boost_program_options) foreach(_flm_dep IN LISTS FLM_WIN_DEPS_PREFIX_LIBS) if(NOT EXISTS "${FLM_WIN_DEPS_PREFIX}/lib/${_flm_dep}.lib") message(FATAL_ERROR "FLM_WIN_DEPS_PREFIX: missing " @@ -439,29 +335,22 @@ if(WIN32) # installed Boost version. find_package(Boost CONFIG REQUIRED COMPONENTS program_options) find_package(CURL CONFIG REQUIRED) - find_package(FFMPEG REQUIRED) endif() - # A third, opt-in route (FLM_WIN_DEPS_PREFIX, declared above) takes Boost, - # curl and FFmpeg from one local prefix, wired next to each CI-runner block. + # A third, opt-in route (FLM_WIN_DEPS_PREFIX, declared above) takes Boost + # and curl from one local prefix, wired next to each CI-runner block. # Otherwise (the bare self-hosted CI runner) there is no vcpkg toolchain and # no Boost in vcpkg: Boost is a standalone b2 build under C:/dev/boost_1_88_0 - # and curl/ffmpeg are linked by raw name from the vcpkg lib dir. That + # and curl is linked by raw name from the vcpkg lib dir. That # path is wired via the include/link dirs and raw library names guarded by # NOT VCPKG_TOOLCHAIN below. else() find_package(Boost CONFIG REQUIRED COMPONENTS program_options) # The Linux build environment installs these via apt, which provides the # CMake FindCURL module and pkg-config files rather than CMake package - # configs. Resolve CURL via the module and FFmpeg via pkg-config. + # configs. Resolve CURL via the module and libedit via pkg-config. find_package(CURL REQUIRED) find_package(Threads REQUIRED) find_package(PkgConfig REQUIRED) - # Portable builds link FFmpeg statically (built from source above), so the - # system FFmpeg is only resolved via pkg-config for non-portable builds. - if(NOT FFMPEG_BUILT_FROM_SOURCE) - pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET - libavformat libavcodec libavutil libswscale libswresample) - endif() # Line editing comes from libedit (BSD-3-Clause), which implements the # readline API; GNU readline is GPL-3 and must not be linked. Portable builds # skip it (the CLI falls back to a plain line reader via the @@ -479,7 +368,6 @@ target_include_directories(flm PUBLIC ${CMAKE_SOURCE_DIR}/runner ${CMAKE_SOURCE_DIR}/server ${CMAKE_SOURCE_DIR}/pull - ${FFMPEG_INCLUDE_DIRS} ) # XRT backend: add the XRT headers (HRX carries its own via the hrx::hrx target). @@ -545,8 +433,7 @@ endif() target_link_directories(flm PUBLIC ${FLM_ENGINE_LIB_DIR} # per-backend prebuilt engine libs (lib/xrt or lib/hrx) - ${CMAKE_SOURCE_DIR}/lib # shared third-party runtime libs (ffmpeg/curl/... on Windows) - ${FFMPEG_LIBRARY_DIRS} + ${CMAKE_SOURCE_DIR}/lib # shared third-party runtime libs (curl/... on Windows) ) # XRT backend: add the XRT runtime library dir (aiebu ships in lib/). @@ -675,7 +562,6 @@ if(WIN32 AND VCPKG_TOOLCHAIN) # Local/managed vcpkg: link the imported targets from the CONFIG packages # found above (versioned import-lib names resolved automatically). target_link_libraries(flm PUBLIC - ${FFMPEG_LIBRARIES} Boost::program_options CURL::libcurl ) @@ -688,35 +574,11 @@ elseif(WIN32) # Bare CI runner: link the native deps by raw name from the standalone Boost # + vcpkg lib dirs wired above (no CMake package configs there). target_link_libraries(flm PUBLIC - avformat - avcodec - avutil - swscale - swresample libcurl libboost_program_options-vc143-mt-x64-1_88 ) -elseif(FFMPEG_BUILT_FROM_SOURCE) - # Portable Linux: link the static FFmpeg archives built above (plus zlib) so - # flm carries no libav*/libsw* runtime dependency. - if(ZLIB_BUILT_FROM_SOURCE) - set(_flm_zlib_lib ${ZLIB_STATIC_LIB}) - else() - set(_flm_zlib_lib z) - endif() - target_link_libraries(flm PUBLIC - ${FFMPEG_LIBRARY_DIRS}/libavformat.a - ${FFMPEG_LIBRARY_DIRS}/libavcodec.a - ${FFMPEG_LIBRARY_DIRS}/libavutil.a - ${FFMPEG_LIBRARY_DIRS}/libswscale.a - ${FFMPEG_LIBRARY_DIRS}/libswresample.a - ${_flm_zlib_lib} - Boost::program_options - CURL::libcurl - ) else() target_link_libraries(flm PUBLIC - ${FFMPEG_LIBRARIES} Boost::program_options CURL::libcurl ) diff --git a/src/CMakePresets.json b/src/CMakePresets.json index fb6b0aaa1..208e031a7 100644 --- a/src/CMakePresets.json +++ b/src/CMakePresets.json @@ -25,7 +25,7 @@ { "name": "linux-portable", "displayName": "Linux Portable Build", - "description": "Linux portable build - bundles XRT/XDNA libraries, builds FFmpeg statically", + "description": "Linux portable build - bundles XRT/XDNA libraries", "inherits": "linux-default", "cacheVariables": { "FLM_PORTABLE_BUILD": "ON" diff --git a/src/README.md b/src/README.md index 5b8895298..2a3f41881 100644 --- a/src/README.md +++ b/src/README.md @@ -63,7 +63,7 @@ cmake --build build --target check_dependencies ### Static Build (Portable Binary) -FastFlowLM can be built as a portable static binary with XRT and FFmpeg bundled in. This eliminates the need for system dependencies and creates a truly self-contained executable. +FastFlowLM can be built as a portable static binary with XRT bundled in. This eliminates the need for system dependencies and creates a truly self-contained executable. **Simple static build:** @@ -74,16 +74,13 @@ cmake --build build -j$(nproc) ``` This will: -1. Check if XRT and FFmpeg are installed via pkg-config -2. If not found, automatically fetch from source: - - XRT (v2.21.75) - - FFmpeg (v7.1) -3. Build both as static libraries -4. Link them into the flm binary +1. Check if XRT is installed via pkg-config +2. If not found, automatically fetch it from source (v2.21.75) +3. Build it as a static library +4. Link it into the flm binary **What gets statically linked:** - ✅ XRT (Xilinx Runtime) -- ✅ FFmpeg (libavformat, libavcodec, libavutil, libswscale, libswresample) **What remains dynamic:** - XDNA driver plugin (runtime plugin - see below) @@ -102,14 +99,13 @@ cmake --build build -j$(nproc) ```bash cmake --preset linux-static \ - -DXRT_GIT_TAG=2.21.75 \ - -DFFMPEG_GIT_TAG=n7.1 + -DXRT_GIT_TAG=2.21.75 cmake --build build -j$(nproc) ``` **Benefits:** - ✅ Maximum portability - fewer system dependencies -- ✅ No system XRT or FFmpeg installation required +- ✅ No system XRT installation required - ✅ Reproducible builds with pinned versions - ✅ Simpler deployment - ✅ Works across different Linux distributions diff --git a/src/WinSetup.md b/src/WinSetup.md index 6bdaea42a..31bb6f256 100644 --- a/src/WinSetup.md +++ b/src/WinSetup.md @@ -86,19 +86,6 @@ All steps in Win11 (powershell where needed). git clone https://github.com/microsoft/vcpkg.git ``` -7. Install ffmpeg. - ``` - # install Chocolatey (if you haven't already) - Set-ExecutionPolicy Bypass -Scope Process -Force; ` - [System.Net.ServicePointManager]::SecurityProtocol = ` - [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; ` - iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - - # Using Chocolatey - choco install ffmpeg[zlib] - ``` - - ## Quick Start 1. Open a powershell diff --git a/src/inno/flm.iss b/src/inno/flm.iss index 9a440badc..07287b6df 100644 --- a/src/inno/flm.iss +++ b/src/inno/flm.iss @@ -82,16 +82,9 @@ Source: "mha.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "vcruntime140.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "vcruntime140_1.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "abseil_dll.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "avcodec-61.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "avdevice-61.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "avfilter-10.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "avformat-61.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "avutil-59.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "libprotobuf-lite.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "libprotobuf.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "libprotoc.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "swresample-5.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "swscale-8.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion ; Application icon (used for shortcuts) diff --git a/src/lib/avcodec-61.dll b/src/lib/avcodec-61.dll deleted file mode 100644 index 350198c6d..000000000 Binary files a/src/lib/avcodec-61.dll and /dev/null differ diff --git a/src/lib/avdevice-61.dll b/src/lib/avdevice-61.dll deleted file mode 100644 index 3c6bbb3ff..000000000 Binary files a/src/lib/avdevice-61.dll and /dev/null differ diff --git a/src/lib/avfilter-10.dll b/src/lib/avfilter-10.dll deleted file mode 100644 index c815f30dd..000000000 Binary files a/src/lib/avfilter-10.dll and /dev/null differ diff --git a/src/lib/avformat-61.dll b/src/lib/avformat-61.dll deleted file mode 100644 index e80e9ad7a..000000000 Binary files a/src/lib/avformat-61.dll and /dev/null differ diff --git a/src/lib/avutil-59.dll b/src/lib/avutil-59.dll deleted file mode 100644 index a93f056b9..000000000 Binary files a/src/lib/avutil-59.dll and /dev/null differ diff --git a/src/lib/swresample-5.dll b/src/lib/swresample-5.dll deleted file mode 100644 index c6782f9dc..000000000 Binary files a/src/lib/swresample-5.dll and /dev/null differ diff --git a/src/lib/swscale-8.dll b/src/lib/swscale-8.dll deleted file mode 100644 index 4662d6606..000000000 Binary files a/src/lib/swscale-8.dll and /dev/null differ diff --git a/src/wix/flm.wxs b/src/wix/flm.wxs index 743d0a7eb..9d3cb564b 100644 --- a/src/wix/flm.wxs +++ b/src/wix/flm.wxs @@ -221,21 +221,6 @@ - - - - - - - - - - - - - - - @@ -245,12 +230,6 @@ - - - - - -