Merge remote-tracking branch 'origin/master' into cvanwink/arm64-2

# Conflicts:
#	build-ffmpeg

Author: cvanwinkle

build-ffmpeg

@@ -5,7 +5,7 @@
 
 PROGNAME=$(basename "$0")
 FFMPEG_VERSION=4.4
-SCRIPT_VERSION=1.31rc1
+SCRIPT_VERSION=1.33rc1
 CWD=$(pwd)
 PACKAGES="$CWD/packages"
 WORKSPACE="$CWD/workspace"
@@ -95,6 +95,10 @@ download() {
 
   make_dir "$DOWNLOAD_PATH/$TARGETDIR"
 
+  if [[ "$DOWNLOAD_FILE" == *"patch"* ]]; then
+    return
+  fi
+
   if [ -n "$3" ]; then
     if ! tar -xvf "$DOWNLOAD_PATH/$DOWNLOAD_FILE" -C "$DOWNLOAD_PATH/$TARGETDIR" 2>/dev/null >/dev/null; then
       echo "Failed to extract $DOWNLOAD_FILE"
@@ -334,6 +338,17 @@ fi
 ## build tools
 ##
 
+if build "giflib" "5.2.1"; then
+  download "https://sourceforge.net/projects/giflib/files/giflib-5.2.1.tar.gz"
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+      download "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"
+      execute patch "${PACKAGES}/giflib-5.2.1/Makefile" ${PACKAGES}/Makefile.patch""
+    fi
+  execute make -j $MJOBS
+  execute make PREFIX="${WORKSPACE}" install
+  build_done "giflib" "5.2.1"
+fi
+
 if build "pkg-config" "0.29.2"; then
   download "https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz"
   execute ./configure --silent --prefix="${WORKSPACE}" --with-pc-path="${WORKSPACE}"/lib/pkgconfig --with-internal-glib
@@ -373,7 +388,6 @@ if build "zlib" "1.2.11"; then
   execute make install
   build_done "zlib" "1.2.11"
 fi
-LDFLAGS+=" -L/zlib/lib"
 
 if build "m4" "1.4.19"; then
   download "https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.gz"
@@ -427,12 +441,12 @@ if $NONFREE_AND_GPL; then
   CONFIGURE_OPTIONS+=("--enable-openssl")
 fi
 
-if build "cmake" "3.21.2"; then
-  download "https://cmake.org/files/LatestRelease/cmake-3.21.2.tar.gz"
+if build "cmake" "3.22.0"; then
+  download "https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0.tar.gz"
   execute ./configure --prefix="${WORKSPACE}" --parallel="${MJOBS}" -- -DCMAKE_USE_OPENSSL=OFF
   execute make -j $MJOBS
   execute make install
-  build_done "cmake" "3.21.2"
+  build_done "cmake" "3.22.0"
 fi
 
 ##
@@ -450,30 +464,31 @@ if command_exists "python3"; then
       fi
     done
   fi
-  if build "dav1d" "0.9.2"; then
-    download "https://code.videolan.org/videolan/dav1d/-/archive/0.9.2/dav1d-0.9.2.tar.gz"
-    make_dir build
-    # [ Descript - cvanwink ] 
-    # Set extra CFLAGS for arm64
-    # https://github.com/markus-perl/ffmpeg-build-script/issues/115
-    if $MACOS_M1; then
-      export CFLAGS="-arch arm64"
-    fi
-    if $SHARED_LIBRARIES; then
-      execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=shared --libdir="${WORKSPACE}"/lib
-    else
-      execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
-    fi
-    execute ninja -C build
-    execute ninja -C build install
-    # [ Descript - cvanwink ]
-    # Restore default CFLAGS from line 12
-    if $MACOS_M1; then
-      CFLAGS="-I$WORKSPACE/include"
+  if command_exists "meson"; then
+    if build "dav1d" "0.9.2"; then
+      download "https://code.videolan.org/videolan/dav1d/-/archive/0.9.2/dav1d-0.9.2.tar.gz"
+      make_dir build
+      # [ Descript - cvanwink ] 
+      # Set extra CFLAGS for arm64
+      # https://github.com/markus-perl/ffmpeg-build-script/issues/115
+      if $MACOS_M1; then
+        export CFLAGS="-arch arm64"
+      fi
+      if $SHARED_LIBRARIES; then
+        execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=shared --libdir="${WORKSPACE}"/lib
+      else
+        execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
+      fi
+      execute ninja -C build
+      execute ninja -C build install
+      # [ Descript - cvanwink ]
+      # Restore default CFLAGS from line 12
+      if $MACOS_M1; then
+        CFLAGS="-I$WORKSPACE/include"
+      fi
+      build_done "dav1d" "0.9.2"
     fi
-    build_done "dav1d" "0.9.2"
   fi
-  CONFIGURE_OPTIONS+=("--enable-libdav1d")
 fi
 
 if ! $MACOS_M1; then
@@ -731,22 +746,17 @@ if command_exists "python3"; then
     execute ./waf install
     build_done "serd" "0.30.10"
   fi
-
-  # [ Descript - cvanwink ]
-  # FTP for pcre looks to be down
-  if false; then
-    if build "pcre" "8.44"; then
-      download "https://ftp.pcre.org/pub/pcre/pcre-8.44.tar.gz" "pcre-8.44.tar.gz"
-      if $SHARED_LIBRARIES; then
-        execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static
-      else
-        execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
-      fi
-      execute make -j $MJOBS
-      execute make install
-
-      build_done "pcre" "8.44"
+  if build "pcre" "8.45"; then
+    download "https://altushost-swe.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.gz" "pcre-8.45.tar.gz"
+    if $SHARED_LIBRARIES; then
+      execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static
+    else
+      execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
     fi
+    execute make -j $MJOBS
+    execute make install
+
+    build_done "pcre" "8.45"
   fi
 
   if build "sord" "0.16.8"; then
@@ -911,23 +921,16 @@ fi
 ## image library
 ##
 
-# [ Descript - cvanwink ]
-# Disable libtiff on arm64 and x86_64 as it doesn't compile
-#   ../version:1:1: error: expected unqualified-id
-#   4.3.0
-#   ^
-if false; then
-  if build "libtiff" "4.3.0"; then
-    download "https://download.osgeo.org/libtiff/tiff-4.3.0.tar.gz"
-    if $SHARED_LIBRARIES; then
-      execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static
-    else
-      execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
-    fi
-    execute make -j $MJOBS
-    execute make install
-    build_done "libtiff" "4.3.0"
+if build "libtiff" "4.2.0"; then
+  download "https://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz"
+  if $SHARED_LIBRARIES; then
+    execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static --disable-dependency-tracking --disable-lzma --disable-webp --disable-zstd --without-x
+  else
+    execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-dependency-tracking --disable-lzma --disable-webp --disable-zstd --without-x
   fi
+  execute make -j $MJOBS
+  execute make install
+  build_done "libtiff" "4.2.0"
 fi
 if build "libpng" "1.6.37"; then
   download "https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/libpng-1.6.37.tar.gz/download?use_mirror=gigenet" "libpng-1.6.37.tar.gz"
@@ -942,37 +945,24 @@ if build "libpng" "1.6.37"; then
   execute make install
   build_done "libpng" "1.6.37"
 fi
-# libwebp can fail to compile on Ubuntu if these flags were left set to CFLAGS
-CPPFLAGS=
 
-# [ Descript - cvanwink ]
-# Disable libwebp on arm64 and x86_64 as it doesn't compile on x86_64
-#    Undefined symbols for architecture x86_64:
-#      "_PrintGifError", referenced from:
-#          _GIFDisplayError in gifdec.c.o
-if false; then
-  if build "libwebp" "1.2.0"; then
-    download "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz" "libwebp-1.2.0.tar.gz"
-    if $SHARED_LIBRARIES; then
-      execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static
-    else
-      execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
-    fi
+## does not compile on monterey -> _PrintGifError
+if [[ "$OSTYPE" != "darwin"* ]]; then
+  if build "libwebp" "1.2.1"; then
+    # libwebp can fail to compile on Ubuntu if these flags were left set to CFLAGS
+    CPPFLAGS=
+    download "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz" "libwebp-1.2.1.tar.gz"
+    execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-dependency-tracking --disable-gl --with-zlib-include="${WORKSPACE}"/include/ --with-zlib-lib="${WORKSPACE}"/lib
     make_dir build
     cd build || exit
-    if $SHARED_LIBRARIES; then
-      execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=ON -DENABLE_STATIC=OFF ../
-    else
-      execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ../
-    fi
+    execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ../
     execute make -j $MJOBS
     execute make install
 
-    build_done "libwebp" "1.2.0"
+    build_done "libwebp" "1.2.1"
   fi
   CONFIGURE_OPTIONS+=("--enable-libwebp")
 fi
-
 ##
 ## other library
 ##
@@ -1082,6 +1072,7 @@ if $SHARED_LIBRARIES; then
   --extra-ldflags="${LDFLAGS}" \
   --extra-libs="${EXTRALIBS}" \
   --pkgconfigdir="$WORKSPACE/lib/pkgconfig" \
+  --pkg-config-flags="--static" \
   --prefix="${WORKSPACE}" \
   --extra-version="${EXTRA_VERSION}"
 else