upgrade to newer apple platform runners

arthenica · Apr 19, 2024 · 8d0563e · 8d0563e
1 parent 13d46b1
commit 8d0563e
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 66 deletions.
diff --git a/.github/workflows/ios-build-scripts.yml b/.github/workflows/ios-build-scripts.yml
@@ -27,12 +27,12 @@ on:
       - 'ios.sh'
 
 jobs:
-  build-main-on-macos-monterey:
-    name: ios main on monterey
-    runs-on: macos-12
+  build-main-on-macos-sonoma:
+    name: ios main on sonoma
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.0.1' ]
+        xcode: [ '14.3.1', '15.3' ]
     defaults:
       run:
         shell: bash
@@ -50,12 +50,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-main-on-macos-bigsur:
-    name: ios main on big sur
-    runs-on: macos-11
+  build-main-on-macos-ventura:
+    name: ios main on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '12.5.1', '13.2.1' ]
+        xcode: [ '14.3.1', '15.2' ]
     defaults:
       run:
         shell: bash
@@ -73,12 +73,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-lts-on-macos-bigsur:
-    name: ios lts on big sur
-    runs-on: macos-11
+  build-lts-on-macos-monterey:
+    name: ios lts on monterey
+    runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '11.7', '12.4' ]
+        xcode: [ '13.4.1', '14.2' ]
     defaults:
       run:
         shell: bash

diff --git a/.github/workflows/macos-build-scripts.yml b/.github/workflows/macos-build-scripts.yml
@@ -27,12 +27,12 @@ on:
       - 'macos.sh'
 
 jobs:
-  build-main-on-macos-monterey:
-    name: macos main on monterey
-    runs-on: macos-12
+  build-main-on-macos-sonoma:
+    name: macos main on sonoma
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.0.1' ]
+        xcode: [ '14.3.1', '15.3' ]
     defaults:
       run:
         shell: bash
@@ -50,12 +50,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-main-on-macos-bigsur:
-    name: macos main on big sur
-    runs-on: macos-11
+  build-main-on-macos-ventura:
+    name: macos main on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '12.5.1', '13.2.1' ]
+        xcode: [ '14.3.1', '15.2' ]
     defaults:
       run:
         shell: bash
@@ -73,12 +73,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-lts-on-macos-bigsur:
-    name: macos lts on big sur
-    runs-on: macos-11
+  build-lts-on-macos-monterey:
+    name: macos lts on monterey
+    runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '11.7', '12.4' ]
+        xcode: [ '13.4.1', '14.2' ]
     defaults:
       run:
         shell: bash

diff --git a/.github/workflows/periodic-builds-apple.yml b/.github/workflows/periodic-builds-apple.yml
@@ -5,12 +5,12 @@ on:
     - cron:  '0 1 * * 0'
 
 jobs:
-  build-ios-main-on-macos-ventura:
-    name: ios main on ventura
-    runs-on: macos-13
+  build-ios-main-on-macos-sonoma:
+    name: ios main on sonoma
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '14.3.1' ]
+        xcode: [ '14.3.1', '15.3' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -36,7 +36,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '14.2' ]
+        xcode: [ '13.4.1' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -57,12 +57,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-macos-main-on-macos-ventura:
-    name: macos main on ventura
-    runs-on: macos-13
+  build-macos-main-on-macos-sonoma:
+    name: macos main on sonoma
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '14.3.1' ]
+        xcode: [ '14.3.1', '15.3' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -88,7 +88,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '14.2' ]
+        xcode: [ '13.4.1' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -109,12 +109,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-tvos-main-on-macos-ventura:
-    name: tvos main on ventura
-    runs-on: macos-13
+  build-tvos-main-on-macos-sonoma:
+    name: tvos main on sonoma
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '14.3.1' ]
+        xcode: [ '14.3.1', '15.3' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -140,7 +140,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '14.2' ]
+        xcode: [ '13.4.1' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:

diff --git a/.github/workflows/tvos-build-scripts.yml b/.github/workflows/tvos-build-scripts.yml
@@ -27,12 +27,12 @@ on:
       - 'tvos.sh'
 
 jobs:
-  build-main-on-macos-monterey:
-    name: tvos main on monterey
-    runs-on: macos-12
+  build-main-on-macos-sonoma:
+    name: tvos main on sonoma
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.0.1' ]
+        xcode: [ '14.3.1', '15.3' ]
     defaults:
       run:
         shell: bash
@@ -50,12 +50,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-main-on-macos-bigsur:
-    name: tvos main on big sur
-    runs-on: macos-11
+  build-main-on-macos-ventura:
+    name: tvos main on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '12.5.1', '13.2.1' ]
+        xcode: [ '14.3.1', '15.2' ]
     defaults:
       run:
         shell: bash
@@ -73,12 +73,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-lts-on-macos-bigsur:
-    name: tvos lts on big sur
-    runs-on: macos-11
+  build-lts-on-macos-monterey:
+    name: tvos lts on monterey
+    runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '11.7', '12.4' ]
+        xcode: [ '13.4.1', '14.2' ]
     defaults:
       run:
         shell: bash

diff --git a/scripts/apple/libvorbis.sh b/scripts/apple/libvorbis.sh
@@ -10,12 +10,9 @@ ${SED_INLINE} 's/\-mno-ieee-fp//g' "${BASEDIR}"/src/"${LIB_NAME}"/configure.ac |
 # ALWAYS REGENERATE BUILD FILES - NECESSARY TO APPLY THE WORKAROUNDS
 autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1
 
-if [[ ${FFMPEG_KIT_BUILD_TYPE} != "macos" ]]; then
-
-  # WORKAROUND TO REMOVE -force_cpusubtype_ALL FLAG DUE TO THE FOLLOWING ERROR
-  # ld: -force_cpusubtype_ALL and -bitcode_bundle (Xcode setting ENABLE_BITCODE=YES) cannot be used together
-  ${SED_INLINE} 's/-force_cpusubtype_ALL//g' ${BASEDIR}/src/${LIB_NAME}/configure
-fi
+# WORKAROUND TO REMOVE -force_cpusubtype_ALL FLAG DUE TO THE FOLLOWING ERROR
+# ld: -force_cpusubtype_ALL and -bitcode_bundle (Xcode setting ENABLE_BITCODE=YES) cannot be used together
+${SED_INLINE} 's/-force_cpusubtype_ALL//g' ${BASEDIR}/src/${LIB_NAME}/configure
 
 PKG_CONFIG= ./configure \
   --prefix="${LIB_INSTALL_PREFIX}" \

diff --git a/scripts/function-apple.sh b/scripts/function-apple.sh
@@ -1287,6 +1287,15 @@ EOF
 create_libiconv_system_package_config() {
   local LIB_ICONV_VERSION=$(grep '_LIBICONV_VERSION' "${SDK_PATH}"/usr/include/iconv.h | grep -Eo '0x.*' | grep -Eo '.*    ')
 
+  # AFTER XCODE 15.0, libcharset DOES NOT CONTAIN ALL ARCHITECTURES WE SUPPORT
+  if [[ -n "$DETECTED_IOS_SDK_VERSION" && $(compare_versions "$DETECTED_IOS_SDK_VERSION" "17.0") -ge 0 ]] ||
+   [[ -n "$DETECTED_MACOS_SDK_VERSION" && $(compare_versions "$DETECTED_MACOS_SDK_VERSION" "14.0") -ge 0 ]] ||
+   [[ -n "$DETECTED_TVOS_SDK_VERSION" && $(compare_versions "$DETECTED_TVOS_SDK_VERSION" "17.0") -ge 0 ]]; then
+    local _REQUIRES_LIBS="-liconv"
+  else
+    local _REQUIRES_LIBS="-liconv -lcharset"
+  fi
+
   cat >"${INSTALL_PKG_CONFIG_DIR}/libiconv.pc" <<EOF
 prefix=${SDK_PATH}/usr
 exec_prefix=\${prefix}
@@ -1298,7 +1307,7 @@ Description: Character set conversion library
 Version: ${LIB_ICONV_VERSION}
 
 Requires:
-Libs: -L\${libdir} -liconv -lcharset
+Libs: -L\${libdir} ${_REQUIRES_LIBS}
 Cflags: -I\${includedir}
 EOF
 }

diff --git a/scripts/function-ios.sh b/scripts/function-ios.sh
@@ -111,13 +111,13 @@ get_common_cflags() {
 
   case ${ARCH} in
   i386 | x86-64 | arm64-simulator)
-    echo "-fstrict-aliasing -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -Wno-incompatible-function-pointer-types -isysroot ${SDK_PATH}"
     ;;
   *-mac-catalyst)
-    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DMACOSX ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DMACOSX ${LTS_BUILD_FLAG}${BUILD_DATE} -Wno-incompatible-function-pointer-types -isysroot ${SDK_PATH}"
     ;;
   *)
-    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -Wno-incompatible-function-pointer-types -isysroot ${SDK_PATH}"
     ;;
   esac
 }

diff --git a/scripts/function-macos.sh b/scripts/function-macos.sh
@@ -82,10 +82,10 @@ get_common_cflags() {
 
   case ${ARCH} in
   arm64)
-    echo "-fstrict-aliasing -DMACOSX ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing -DMACOSX ${LTS_BUILD_FLAG}${BUILD_DATE} -Wno-incompatible-function-pointer-types -isysroot ${SDK_PATH}"
     ;;
   *)
-    echo "-fstrict-aliasing -DMACOSX ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing -DMACOSX ${LTS_BUILD_FLAG}${BUILD_DATE} -Wno-incompatible-function-pointer-types -isysroot ${SDK_PATH}"
     ;;
   esac
 }
@@ -149,7 +149,7 @@ get_app_specific_cflags() {
     APP_FLAGS="-std=c99 -Wno-unused-function"
     ;;
   gnutls)
-    APP_FLAGS="-std=c99 -Wno-unused-function -D_GL_USE_STDLIB_ALLOC=1"
+    APP_FLAGS="-std=c99 -Wno-unused-function -Wno-implicit-int -D_GL_USE_STDLIB_ALLOC=1"
     ;;
   jpeg)
     APP_FLAGS="-Wno-nullability-completeness"

diff --git a/scripts/function-tvos.sh b/scripts/function-tvos.sh
@@ -85,10 +85,10 @@ get_common_cflags() {
 
   case ${ARCH} in
   arm64)
-    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DTVOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing ${BITCODE_FLAGS} -DTVOS ${LTS_BUILD_FLAG}${BUILD_DATE} -Wno-incompatible-function-pointer-types -isysroot ${SDK_PATH}"
     ;;
   x86-64 | arm64-simulator)
-    echo "-fstrict-aliasing -DTVOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+    echo "-fstrict-aliasing -DTVOS ${LTS_BUILD_FLAG}${BUILD_DATE} -Wno-incompatible-function-pointer-types -isysroot ${SDK_PATH}"
     ;;
   esac
 }