sdk update

NatronGitHub · Sep 5, 2021 · b246ad1 · b246ad1
1 parent c72ac10
commit b246ad1
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 26 deletions.
diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile b/tools/MacPorts/multimedia/ffmpeg/Portfile
@@ -18,7 +18,7 @@ conflicts           ffmpeg-devel
 # Please increase the revision of mpv whenever ffmpeg's version is updated.
 epoch               1
 version             4.4
-revision            2
+revision            3
 license             LGPL-2.1+
 categories          multimedia
 maintainers         {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
@@ -151,6 +151,7 @@ configure.args      --enable-swscale \
                     --enable-fontconfig \
                     --enable-libfreetype \
                     --enable-libfribidi \
+                    --enable-zlib \
                     --disable-libaom \
                     --disable-libjack \
                     --disable-libopencore-amrnb \
@@ -167,11 +168,18 @@ configure.args      --enable-swscale \
                     --disable-sdl2 \
                     --disable-securetransport \
                     --mandir=${prefix}/share/man \
-                    --enable-shared --enable-pthreads \
+                    --enable-shared \
+                    --enable-pthreads \
                     --cxx=${configure.cxx} \
                     --cc=${configure.cc}
 
 
+# zimg doesn't currently build on 10.7 and below, so only enable it on supported systems
+if { ${os.platform} eq "darwin" && ${os.major} > 11 } {
+    configure.args-append   --enable-libzimg
+    depends_lib-append      port:zimg
+}
+
 platform darwin {
     # disable asm on Tiger
     # libblueray doesn't build on Tiger so disable for now (#39442)
@@ -359,7 +367,8 @@ variant natronmini requires highbitdepth aom conflicts x11 description {Minimal
                     port:fontconfig \
                     port:freetype \
                     port:fribidi \
-                    port:libsdl2
+                    port:libsdl2 \
+                    port:zimg
 
     configure.args-delete \
                     --enable-libass \
@@ -369,6 +378,7 @@ variant natronmini requires highbitdepth aom conflicts x11 description {Minimal
                     --enable-libfreetype \
                     --enable-libfribidi \
                     --enable-sdl2 \
+                    --enable-libzimg \
                     --cc=${configure.cc} \
                     --cxx=${configure.cxx}
 

diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig
@@ -18,7 +18,7 @@ conflicts           ffmpeg-devel
 # Please increase the revision of mpv whenever ffmpeg's version is updated.
 epoch               1
 version             4.4
-revision            2
+revision            3
 license             LGPL-2.1+
 categories          multimedia
 maintainers         {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
@@ -142,6 +142,7 @@ configure.args      --enable-swscale \
                     --enable-fontconfig \
                     --enable-libfreetype \
                     --enable-libfribidi \
+                    --enable-zlib \
                     --disable-libjack \
                     --disable-libopencore-amrnb \
                     --disable-libopencore-amrwb \
@@ -156,10 +157,17 @@ configure.args      --enable-swscale \
                     --disable-sdl2 \
                     --disable-securetransport \
                     --mandir=${prefix}/share/man \
-                    --enable-shared --enable-pthreads \
+                    --enable-shared \
+                    --enable-pthreads \
                     --cc=${configure.cc}
 
 
+# zimg doesn't currently build on 10.7 and below, so only enable it on supported systems
+if { ${os.platform} eq "darwin" && ${os.major} > 11 } {
+    configure.args-append   --enable-libzimg
+    depends_lib-append      port:zimg
+}
+
 platform darwin {
     # disable asm on Tiger
     # libblueray doesn't build on Tiger so disable for now (#39442)

diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile.patch b/tools/MacPorts/multimedia/ffmpeg/Portfile.patch
@@ -1,6 +1,6 @@
---- Portfile.orig	2021-02-13 18:25:46.000000000 -0800
-+++ Portfile	2021-03-03 16:03:16.000000000 -0800
-@@ -78,6 +78,8 @@
+--- Portfile.orig	2021-09-05 11:01:32.000000000 -0700
++++ Portfile	2021-09-05 11:04:30.000000000 -0700
+@@ -81,6 +81,8 @@
                      port:libbluray \
                      port:libvpx \
                      port:gnutls \
@@ -9,9 +9,9 @@
                      port:openjpeg \
                      port:fontconfig \
                      port:freetype \
-@@ -109,6 +111,11 @@
-     compiler.blacklist-append {clang < 422.1.7}
- }
+@@ -117,6 +119,11 @@
+ # warning: unknown warning option '-Wno-bool-operation'; did you mean '-Wno-bool-conversion'? [-Wunknown-warning-option]
+ compiler.blacklist-append {clang < 800}
 
 +# gcc > 4.2 is required, https://trac.ffmpeg.org/ticket/1464
 +# WARNING: gcc 4.2 is outdated and may miscompile FFmpeg. Please use a newer compiler.
@@ -21,7 +21,7 @@
  # The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
  # Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
  default_variants-append +gpl2
-@@ -123,6 +130,8 @@
+@@ -131,6 +138,8 @@
                      --enable-librsvg \
                      --enable-libtheora \
                      --enable-libopenjpeg \
@@ -30,10 +30,10 @@
                      --enable-libmodplug \
                      --enable-libvpx \
                      --enable-libsoxr \
-@@ -134,12 +143,14 @@
-                     --enable-fontconfig \
+@@ -143,12 +152,14 @@
                      --enable-libfreetype \
                      --enable-libfribidi \
+                     --enable-zlib \
 +                    --disable-libaom \
                      --disable-libjack \
                      --disable-libopencore-amrnb \
@@ -45,15 +45,15 @@
                      --disable-indev=jack \
                      --disable-opencl \
                      --disable-outdev=xv \
-@@ -149,6 +160,7 @@
-                     --disable-securetransport \
+@@ -159,6 +170,7 @@
                      --mandir=${prefix}/share/man \
-                     --enable-shared --enable-pthreads \
+                     --enable-shared \
+                     --enable-pthreads \
 +                    --cxx=${configure.cxx} \
                      --cc=${configure.cc}
 
 
-@@ -227,6 +239,24 @@
+@@ -243,6 +255,24 @@
  # configure isn't autoconf and they do use a dep cache
  #
 
@@ -78,7 +78,7 @@
  post-destroot {
      file mkdir ${destroot}${prefix}/share/doc/ffmpeg
      file copy ${worksrcpath}/doc/APIchanges ${destroot}${prefix}/share/doc/ffmpeg
-@@ -254,6 +284,15 @@
+@@ -282,6 +312,15 @@
      set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
  }
  if {${universal_possible} && [variant_isset universal]} {
@@ -94,7 +94,7 @@
      foreach arch ${configure.universal_archs} {
          set merger_host($arch) ""
          lappend merger_configure_args($arch) --arch=${arch}
-@@ -279,11 +318,53 @@
+@@ -307,11 +346,55 @@
  #
      depends_lib-append      port:xorg-libxcb \
                              port:xorg-libXext \
@@ -119,7 +119,8 @@
 +                    port:fontconfig \
 +                    port:freetype \
 +                    port:fribidi \
-+                    port:libsdl2
++                    port:libsdl2 \
++                    port:zimg
 +
 +    configure.args-delete \
 +                    --enable-libass \
@@ -129,6 +130,7 @@
 +                    --enable-libfreetype \
 +                    --enable-libfribidi \
 +                    --enable-sdl2 \
++                    --enable-libzimg \
 +                    --cc=${configure.cc} \
 +                    --cxx=${configure.cxx}
 +
@@ -148,7 +150,7 @@
  }
 
  if {[variant_isset x11]} {
-@@ -332,6 +413,20 @@
+@@ -360,6 +443,20 @@
      depends_lib-delete      port:gnutls
  }
 
@@ -169,7 +171,7 @@
  variant gpl2 description {Enable GPL code, license will be GPL-2+} {
      configure.args-append   --enable-gpl \
                              --enable-postproc \
-@@ -350,6 +445,12 @@
+@@ -378,6 +475,12 @@
      depends_lib-append      port:samba3
 
      license                 GPL-3+

diff --git a/tools/jenkins/include/scripts/pkg/boost.sh b/tools/jenkins/include/scripts/pkg/boost.sh
@@ -4,10 +4,10 @@
 # see http://www.linuxfromscratch.org/blfs/view/cvs/general/boost.html
 # TestImagePNG and TestImagePNGOIIO used to fail with boost 1.66.0, and succeed with boost 1.65.1,
 # but this should be fixed by https://github.com/NatronGitHub/Natron/commit/e360b4dd31a07147f2ad9073a773ff28714c2a69
-BOOST_VERSION=1.75.0
+BOOST_VERSION=1.77.0
 BOOST_LIB_VERSION=$(echo "${BOOST_VERSION//./_}" | sed -e 's/_0$//')
 BOOST_TAR="boost_${BOOST_VERSION//./_}.tar.bz2"
-BOOST_SITE="https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source"
+BOOST_SITE="https://boostorg.jfrog.io/ui/native/main/release/${BOOST_VERSION}/source"
 if download_step; then
     download "$BOOST_SITE" "$BOOST_TAR"
 fi

diff --git a/tools/jenkins/include/scripts/pkg/patchelf.sh b/tools/jenkins/include/scripts/pkg/patchelf.sh
@@ -4,7 +4,7 @@
 # see https://github.com/NixOS/patchelf/releases
 PATCHELF_VERSION=0.13
 PATCHELF_TAR="patchelf-${PATCHELF_VERSION}.tar.bz2"
-PATCHELF_DIR="patchelf-${PATCHELF_VERSION}.20200827.8d3a16e"
+PATCHELF_DIR="patchelf-${PATCHELF_VERSION}.20210805.a949ff2"
 #PATCHELF_VERSION=0.11
 #PATCHELF_TAR="patchelf-${PATCHELF_VERSION}.tar.gz"
 #PATCHELF_DIR="patchelf-${PATCHELF_VERSION}.20200609.d6b2a72"