fedora43-patches.diff

--- a/download_tarballs.sh
+++ b/download_tarballs.sh
@@ -6,7 +6,7 @@
 # The point, we need robust re-tries, as sometimes the download fails, and we need to be able to re-try.
 # and verify that the download was successful.
 
-manifestJsonFile="/tmp/workdir/generated_build_manifest.json"
+manifestJsonFile="${WORKDIR:-$PWD}/generated_build_manifest.json"
 
 report_on_failed_downloads() {
     local librariesRaw="$(jq -r '.[] | .library_name' "$manifestJsonFile")"
@@ -122,14 +122,14 @@
 download_tarballs_called_number=0
 num_completed=$(actual_number_of_downloads_completed)
 num_to_download=$(number_of_tarballs_to_download)
-echo "Starting to download ${num_to_download} tarball images"
+echo "Starting to download ${num_to_download} tarballs"
 while [ $num_completed -lt $num_to_download ] && [ $number_of_times_to_retry -gt $download_tarballs_called_number ]; do
     ((download_tarballs_called_number++))
     download_tarballs
     sleep 5
     num_completed=$(actual_number_of_downloads_completed)
     num_to_download=$(number_of_tarballs_to_download)
-    echo "Downloaded ${num_completed} of ${num_to_download} tarball images on pass ${download_tarballs_called_number}"
+    echo "Downloaded ${num_completed} of ${num_to_download} tarballs on pass ${download_tarballs_called_number}"
 done
 
 if [ $num_completed -lt $num_to_download ]; then
@@ -137,5 +137,5 @@
     report_on_failed_downloads
     exit 1
 fi
-echo "Successfully Downloaded the ${num_completed} tarball images after $download_tarballs_called_number attempts"
+echo "Successfully Downloaded the ${num_completed} tarballs after $download_tarballs_called_number attempts"
 exit 0

--- a/build_source.sh
+++ b/build_source.sh
@@ -5,8 +5,8 @@
 #       which is useful for debugging
 set -e
 
-manifestJsonFile="/tmp/workdir/generated_build_manifest.json"
-manifestJsonVersionsFile="/tmp/workdir/generated_build_versions_manifest.json"
+manifestJsonFile="${WORKDIR:-$PWD}/generated_build_manifest.json"
+manifestJsonVersionsFile="${WORKDIR:-$PWD}/generated_build_versions_manifest.json"
 
 OS_NAME=$(uname -s)
 is_ubuntu=false
@@ -186,7 +186,7 @@
 
 build_libsvtav1() {
     cd Build && \
-    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_BUILD_TYPE=Release -DBUILD_DEC=OFF -DBUILD_SHARED_LIBS=OFF .. \
+    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_BUILD_TYPE=Release -DBUILD_DEC=OFF -DBUILD_SHARED_LIBS=OFF .. && 
     make && \
     make install
 }
@@ -333,7 +333,6 @@
     ./configure --disable-debug \
         --disable-doc \
         --disable-ffplay \
-        --enable-fontconfig \
         --enable-gpl \
         --enable-libaom \
         --enable-libaribb24 \
@@ -450,7 +449,7 @@
         echo "-------------------- Running callback: build_${lib_name} --------------------"
         build_${callback_lib_name} ${build_dir}
         echo "Finished building $lib_name removing build directory [${build_dir}]"
-        cd /tmp/workdir
+        cd "$(dirname "$manifestJsonFile")"
         rm -rf $build_dir
     done
 }

--- a/install_ffmpeg.sh
+++ b/install_ffmpeg.sh
@@ -65,6 +65,7 @@
 
     if $is_fedora; then
         copy_linked_libs_by_path "/usr/lib64" /usr/local/lib64
+        copy_linked_libs_by_path "/lib64" /usr/local/lib64
     fi
     copy_linked_libs_by_path "${PREFIX}/lib64" /usr/local/lib64
     copy_linked_libs_by_path "${PREFIX}/lib" /usr/local/lib
@@ -86,7 +87,7 @@
 
     # Copy ffmpeg binaries and share directory to /usr/local
     cp -r ${PREFIX}/bin/* /usr/local/bin/
-    cp -r ${PREFIX}/share/ffmpeg /usr/local/share/
+    if [ -d "${PREFIX}/share/ffmpeg" ]; then cp -r ${PREFIX}/share/ffmpeg /usr/local/share/; fi
 
     if [ ! -d /usr/local/include ]; then
         mkdir -p /usr/local/include
@@ -134,7 +135,7 @@
     ldd ${PREFIX}/bin/ffmpeg | cut -d ' ' -f 3 | strings | xargs -I R cp R /tmp/fakeroot/lib/
     for lib in /tmp/fakeroot/lib/*; do strip --strip-all $lib; done
     cp -r ${PREFIX}/bin /tmp/fakeroot/bin/
-    cp -r ${PREFIX}/share/ffmpeg /tmp/fakeroot/share/
+    if [ -d "${PREFIX}/share/ffmpeg" ]; then cp -r ${PREFIX}/share/ffmpeg /tmp/fakeroot/share/; fi
     LD_LIBRARY_PATH=/tmp/fakeroot/lib /tmp/fakeroot/bin/ffmpeg -buildconf
 }
 
@@ -143,7 +144,7 @@
     mkdir -p /tmp/fakeroot/lib
     ldd ${PREFIX}/bin/ffmpeg | cut -d ' ' -f 3 | strings | xargs -I R cp R /tmp/fakeroot/lib/
     cp -r ${PREFIX}/bin /tmp/fakeroot/bin/
-    cp -r ${PREFIX}/share/ffmpeg /tmp/fakeroot/share/
+    if [ -d "${PREFIX}/share/ffmpeg" ]; then cp -r ${PREFIX}/share/ffmpeg /tmp/fakeroot/share/; fi
     LD_LIBRARY_PATH=/tmp/fakeroot/lib /tmp/fakeroot/bin/ffmpeg -buildconf
 }
 

--- a/generate-source-of-truth-ffmpeg-versions.py
+++ b/generate-source-of-truth-ffmpeg-versions.py
@@ -119,7 +119,7 @@
                 "version": X264["version"],
                 "version_link": "https://download.videolan.org/pub/videolan/x264/snapshots/",
                 "release_date": X264["release_date"],
-                "license_name": "GNU General Public License (GPL) version 2",
+                "license_name": "FTL or GPLv2",
                 "license_link": "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html",
                 "build_info": {
                     "download_link": f"https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-{X264['version']}.tar.bz2",
@@ -136,7 +136,7 @@
                 # "https://www.x265.org/downloads/",
                 "version_link": "http://ftp.videolan.org/pub/videolan/x265/",
                 "release_date": X265["release_date"],
-                "license_name": "GNU General Public License (GPL) version 2",
+                "license_name": "FTL or GPLv2",
                 "license_link": "https://bitbucket.org/multicoreware/x265/raw/f8ae7afc1f61ed0db3b2f23f5d581706fe6ed677/COPYING",
                 "build_info": {
                     "download_link": f"http://ftp.videolan.org/pub/videolan/x265/x265_{X265['version']}.tar.gz",
@@ -305,7 +305,7 @@
                 "version": FREETYPE["version"],
                 "version_link": "http://download.savannah.gnu.org/releases/freetype/",
                 "release_date": FREETYPE["release_date"],
-                "license_name": "GNU General Public License (GPL) version 2",
+                "license_name": "FTL or GPLv2",
                 "license_link": "https://www.freetype.org/license.html",
                 "build_info": {
                     "download_link": f"http://download.savannah.gnu.org/releases/freetype/freetype-{FREETYPE['version']}.tar.gz",
@@ -321,7 +321,7 @@
                 "version": LIBVIDSTAB["version"],
                 "version_link": "https://github.com/georgmartius/vid.stab/tags",
                 "release_date": LIBVIDSTAB["release_date"],
-                "license_name": "GNU General Public License (GPL) version 2",
+                "license_name": "FTL or GPLv2",
                 "license_link": "https://github.com/georgmartius/vid.stab/blob/master/LICENSE",
                 "build_info": {
                     "download_link": f"https://github.com/georgmartius/vid.stab/archive/v{LIBVIDSTAB['version']}.tar.gz",
@@ -337,7 +337,7 @@
                 "version": FRIBIDI["version"],
                 "version_link": "https://github.com/fribidi/fribidi/releases",
                 "release_date": FRIBIDI["release_date"],
-                "license_name": "GNU General Public License (GPL) version 2",
+                "license_name": "FTL or GPLv2",
                 "license_link": "https://cgit.freedesktop.org/fribidi/fribidi/plain/COPYING",
                 "build_info": {
                     "download_link": f"https://github.com/fribidi/fribidi/archive/refs/tags/v{FRIBIDI['version']}.tar.gz",
@@ -523,7 +523,7 @@
                 "build_info": {
                     "download_link": f"https://gitlab.gnome.org/GNOME/libxml2/-/archive/v{LIBXML2['version']}/libxml2-v{LIBXML2['version']}.tar.gz",
                     "build_dir": "/tmp/libxml2",
-                    "tarball_name": f"libxml2-{LIBXML2['version']}.tar.gz",
+                    "tarball_name": f"libxml2-v{LIBXML2['version']}.tar.gz",
                     "using_source_build": False,
                 },
             },
@@ -535,7 +535,7 @@
                 "version": LIBBLURAY["version"],
                 "version_link": "https://download.videolan.org/pub/videolan/libbluray/",
                 "release_date": LIBBLURAY["release_date"],
-                "license_name": "GNU General Public License (GPL) version 2",
+                "license_name": "FTL or GPLv2",
                 "license_link": "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html",
                 "build_info": {
                     "download_link": f"https://download.videolan.org/pub/videolan/libbluray/{LIBBLURAY['version']}/libbluray-{LIBBLURAY['version']}.tar.bz2",
@@ -608,7 +608,7 @@
                 "build_info": {
                     "download_link": f"https://github.com/sekrit-twc/zimg/archive/refs/tags/release-{ZIMG['version']}.tar.gz",
                     "build_dir": "/tmp/zimg",
-                    "tarball_name": f"zimg-{ZIMG['version']}.tar.gz",
+                    "tarball_name": f"zimg-release-{ZIMG['version']}.tar.gz",
                 },
             },
         ),

--- a/TOOLBOX.md
+++ b/TOOLBOX.md
@@ -25,6 +25,7 @@
 3. Run the existing helper scripts from this repository inside the toolbox:
    ```bash
    export PREFIX=/opt/ffmpeg
+   export WORKDIR=$PWD  # scripts read manifests from $WORKDIR
    ./generate-source-of-truth-ffmpeg-versions.py --library-list kvazaar,libvmaf,whisper
    ./download_tarballs.sh
    ./build_source.sh