Merge pull request #967 from arthenica/fix-github-actions

fix rubberband x86-64 builds on xcode 15.x

.github/workflows/android-build-scripts.yml

@@ -35,7 +35,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
@@ -66,7 +66,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
@@ -97,7 +97,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
@@ -126,7 +126,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
@@ -155,7 +155,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:

.github/workflows/ios-build-scripts.yml

@@ -27,63 +27,63 @@ on:
       - 'ios.sh'
 
 jobs:
-  build-main-on-macos-monterey:
+  build-main-on-macos-sonoma:
-    name: ios main on monterey
+    name: ios main on sonoma
+    runs-on: macos-14
+    strategy:
+      matrix:
+        xcode: [ '14.3.1', '15.3' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+      - name: prerequisites
+        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./ios.sh --xcframework --enable-ios-audiotoolbox --enable-ios-avfoundation --enable-ios-bzip2 --enable-ios-libiconv --enable-ios-videotoolbox --enable-ios-zlib
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-main-on-macos-ventura:
+    name: ios main on ventura
+    runs-on: macos-13
+    strategy:
+      matrix:
+        xcode: [ '14.3.1', '15.2' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+      - name: prerequisites
+        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./ios.sh --xcframework --enable-ios-audiotoolbox --enable-ios-avfoundation --enable-ios-bzip2 --enable-ios-libiconv --enable-ios-videotoolbox --enable-ios-zlib
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-lts-on-macos-monterey:
+    name: ios lts on monterey
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.0.1' ]
+        xcode: [ '13.4.1', '14.2' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./ios.sh --xcframework --enable-ios-audiotoolbox --enable-ios-avfoundation --enable-ios-bzip2 --enable-ios-libiconv --enable-ios-videotoolbox --enable-ios-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - 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
-    strategy:
-      matrix:
-        xcode: [ '12.5.1', '13.2.1' ]
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v2
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./ios.sh --xcframework --enable-ios-audiotoolbox --enable-ios-avfoundation --enable-ios-bzip2 --enable-ios-libiconv --enable-ios-videotoolbox --enable-ios-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - 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
-    strategy:
-      matrix:
-        xcode: [ '11.7', '12.4' ]
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v2
       - name: prerequisites
         run: brew install autoconf automake libtool pkg-config curl git cmake nasm
       - name: set up xcode

.github/workflows/linux-build-scripts.yml

@@ -30,7 +30,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: prerequisites
         run: sudo apt-get install clang llvm lld libclang-14-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
       - name: run the build script
@@ -48,7 +48,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: prerequisites
         run: sudo apt-get install clang llvm lld libclang-14-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
       - name: run the build script
@@ -66,7 +66,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: prerequisites
         run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
       - name: run the build script
@@ -84,7 +84,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: prerequisites
         run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
       - name: run the build script

.github/workflows/macos-build-scripts.yml

@@ -27,63 +27,63 @@ on:
       - 'macos.sh'
 
 jobs:
-  build-main-on-macos-monterey:
+  build-main-on-macos-sonoma:
-    name: macos main on monterey
+    name: macos main on sonoma
+    runs-on: macos-14
+    strategy:
+      matrix:
+        xcode: [ '14.3.1', '15.3' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+      - name: prerequisites
+        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./macos.sh --xcframework --enable-macos-audiotoolbox --enable-macos-avfoundation --enable-macos-bzip2 --enable-macos-coreimage --enable-macos-libiconv --enable-macos-opencl --enable-macos-opengl --enable-macos-videotoolbox --enable-macos-zlib
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-main-on-macos-ventura:
+    name: macos main on ventura
+    runs-on: macos-13
+    strategy:
+      matrix:
+        xcode: [ '14.3.1', '15.2' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+      - name: prerequisites
+        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./macos.sh --xcframework --enable-macos-audiotoolbox --enable-macos-avfoundation --enable-macos-bzip2 --enable-macos-coreimage --enable-macos-libiconv --enable-macos-opencl --enable-macos-opengl --enable-macos-videotoolbox --enable-macos-zlib
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-lts-on-macos-monterey:
+    name: macos lts on monterey
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.0.1' ]
+        xcode: [ '13.4.1', '14.2' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./macos.sh --xcframework --enable-macos-audiotoolbox --enable-macos-avfoundation --enable-macos-bzip2 --enable-macos-coreimage --enable-macos-libiconv --enable-macos-opencl --enable-macos-opengl --enable-macos-videotoolbox --enable-macos-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - 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
-    strategy:
-      matrix:
-        xcode: [ '12.5.1', '13.2.1' ]
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v2
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./macos.sh --xcframework --enable-macos-audiotoolbox --enable-macos-avfoundation --enable-macos-bzip2 --enable-macos-coreimage --enable-macos-libiconv --enable-macos-opencl --enable-macos-opengl --enable-macos-videotoolbox --enable-macos-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - 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
-    strategy:
-      matrix:
-        xcode: [ '11.7', '12.4' ]
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v2
       - name: prerequisites
         run: brew install autoconf automake libtool pkg-config curl git cmake nasm
       - name: set up xcode

.github/workflows/periodic-builds-android.yml

@@ -16,7 +16,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branches }}
       - name: set up adopt jdk 17
@@ -54,7 +54,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branches }}
       - name: set up adopt jdk 17

.github/workflows/periodic-builds-apple.yml

@@ -5,18 +5,18 @@ on:
     - cron:  '0 1 * * 0'
 
 jobs:
-  build-ios-main-on-macos-ventura:
+  build-ios-main-on-macos-sonoma:
-    name: ios main on ventura
+    name: ios main on sonoma
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '14.3.1' ]
+        xcode: [ '14.3.1', '15.3' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
@@ -36,13 +36,13 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '14.2' ]
+        xcode: [ '13.4.1' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
@@ -57,18 +57,18 @@ 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:
+  build-macos-main-on-macos-sonoma:
-    name: macos main on ventura
+    name: macos main on sonoma
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '14.3.1' ]
+        xcode: [ '14.3.1', '15.3' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
@@ -88,13 +88,13 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '14.2' ]
+        xcode: [ '13.4.1' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
@@ -109,18 +109,18 @@ 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:
+  build-tvos-main-on-macos-sonoma:
-    name: tvos main on ventura
+    name: tvos main on sonoma
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '14.3.1' ]
+        xcode: [ '14.3.1', '15.3' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
@@ -140,13 +140,13 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '14.2' ]
+        xcode: [ '13.4.1' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites

.github/workflows/tvos-build-scripts.yml

@@ -27,63 +27,63 @@ on:
       - 'tvos.sh'
 
 jobs:
-  build-main-on-macos-monterey:
+  build-main-on-macos-sonoma:
-    name: tvos main on monterey
+    name: tvos main on sonoma
+    runs-on: macos-14
+    strategy:
+      matrix:
+        xcode: [ '14.3.1', '15.3' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+      - name: prerequisites
+        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./tvos.sh --xcframework --enable-tvos-bzip2 --enable-tvos-audiotoolbox --enable-tvos-libiconv --enable-tvos-videotoolbox --enable-tvos-zlib
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-main-on-macos-ventura:
+    name: tvos main on ventura
+    runs-on: macos-13
+    strategy:
+      matrix:
+        xcode: [ '14.3.1', '15.2' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+      - name: prerequisites
+        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./tvos.sh --xcframework --enable-tvos-bzip2 --enable-tvos-audiotoolbox --enable-tvos-libiconv --enable-tvos-videotoolbox --enable-tvos-zlib
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-lts-on-macos-monterey:
+    name: tvos lts on monterey
     runs-on: macos-12
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.0.1' ]
+        xcode: [ '13.4.1', '14.2' ]
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./tvos.sh --xcframework --enable-tvos-bzip2 --enable-tvos-audiotoolbox --enable-tvos-libiconv --enable-tvos-videotoolbox --enable-tvos-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - 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
-    strategy:
-      matrix:
-        xcode: [ '12.5.1', '13.2.1' ]
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v2
-      - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake nasm
-      - name: set up xcode
-        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
-      - name: run the build script
-        run: ./tvos.sh --xcframework --enable-tvos-bzip2 --enable-tvos-audiotoolbox --enable-tvos-libiconv --enable-tvos-videotoolbox --enable-tvos-zlib
-      - name: print build logs
-        if: ${{ always() }}
-        run: cat build.log
-      - 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
-    strategy:
-      matrix:
-        xcode: [ '11.7', '12.4' ]
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v2
       - name: prerequisites
         run: brew install autoconf automake libtool pkg-config curl git cmake nasm
       - name: set up xcode

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
-  # WORKAROUND TO REMOVE -force_cpusubtype_ALL FLAG DUE TO THE FOLLOWING ERROR
+${SED_INLINE} 's/-force_cpusubtype_ALL//g' ${BASEDIR}/src/${LIB_NAME}/configure
-  # 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
 
 PKG_CONFIG= ./configure \
   --prefix="${LIB_INSTALL_PREFIX}" \

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
 }

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
 }
@@ -223,6 +223,9 @@ get_app_specific_cflags() {
   libwebp | xvidcore)
     APP_FLAGS="-fno-common -DPIC"
     ;;
+  openh264 | openssl | x265)
+    APP_FLAGS="-Wno-unused-function"
+    ;;
   sdl)
     APP_FLAGS="-DPIC -Wno-declaration-after-statement -Wno-unused-function -D__IPHONEOS__"
     ;;
@@ -232,9 +235,6 @@ get_app_specific_cflags() {
   soxr | snappy)
     APP_FLAGS="-std=gnu99 -Wno-unused-function -DPIC"
     ;;
-  openh264 | openssl | x265)
-    APP_FLAGS="-Wno-unused-function"
-    ;;
   *)
     APP_FLAGS="-std=c99 -Wno-unused-function"
     ;;
@@ -310,7 +310,7 @@ get_cxxflags() {
     echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
   rubberband)
-    echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
+    echo "-fno-rtti -Wno-c++11-narrowing ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
   srt | tesseract | zimg)
     echo "-std=c++11 ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"

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
 }
@@ -102,7 +102,6 @@ get_arch_specific_cflags() {
 }
 
 get_size_optimization_cflags() {
-
   local ARCH_OPTIMIZATION=""
   case ${ARCH} in
   arm64)
@@ -117,7 +116,6 @@ get_size_optimization_cflags() {
 }
 
 get_size_optimization_asm_cflags() {
-
   local ARCH_OPTIMIZATION=""
   case $1 in
   jpeg | ffmpeg)
@@ -139,20 +137,19 @@ get_size_optimization_asm_cflags() {
 }
 
 get_app_specific_cflags() {
-
   local APP_FLAGS=""
   case $1 in
-  fontconfig)
-    APP_FLAGS="-std=c99 -Wno-unused-function"
-    ;;
   ffmpeg)
     APP_FLAGS="-Wno-unused-function -Wno-deprecated-declarations"
     ;;
   ffmpeg-kit)
     APP_FLAGS="-std=c99 -Wno-unused-function -Wall -Wno-deprecated-declarations -Wno-pointer-sign -Wno-switch -Wno-unused-result -Wno-unused-variable -DPIC -fobjc-arc"
     ;;
+  fontconfig)
+    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"
@@ -166,6 +163,9 @@ get_app_specific_cflags() {
   libwebp | xvidcore)
     APP_FLAGS="-fno-common -DPIC"
     ;;
+  openh264 | x265)
+    APP_FLAGS="-Wno-unused-function"
+    ;;
   sdl)
     APP_FLAGS="-DPIC -Wno-unused-function -D__MACOSX__"
     ;;
@@ -175,9 +175,6 @@ get_app_specific_cflags() {
   soxr | snappy)
     APP_FLAGS="-std=gnu99 -Wno-unused-function -DPIC"
     ;;
-  openh264 | x265)
-    APP_FLAGS="-Wno-unused-function"
-    ;;
   *)
     APP_FLAGS="-std=c99 -Wno-unused-function"
     ;;
@@ -227,9 +224,6 @@ get_cxxflags() {
   local BITCODE_FLAGS=""
 
   case $1 in
-  x265)
-    echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
-    ;;
   gnutls)
     echo "-std=c++11 -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
@@ -246,11 +240,14 @@ get_cxxflags() {
     echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
   rubberband)
-    echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
+    echo "-fno-rtti -Wno-c++11-narrowing ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
   srt | tesseract | zimg)
     echo "-std=c++11 ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
+  x265)
+    echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
+    ;;
   *)
     echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;

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
 }
@@ -181,6 +181,9 @@ get_app_specific_cflags() {
   ffmpeg)
     APP_FLAGS="-Wno-unused-function -Wno-deprecated-declarations"
     ;;
+  ffmpeg-kit)
+    APP_FLAGS="-std=c99 -Wno-unused-function -Wall -Wno-deprecated-declarations -Wno-pointer-sign -Wno-switch -Wno-unused-result -Wno-unused-variable -DPIC -fobjc-arc"
+    ;;
   gnutls)
     APP_FLAGS="-std=c99 -Wno-unused-function -D_GL_USE_STDLIB_ALLOC=1"
     ;;
@@ -196,8 +199,8 @@ get_app_specific_cflags() {
   libwebp | xvidcore)
     APP_FLAGS="-fno-common -DPIC"
     ;;
-  ffmpeg-kit)
+  openh264 | x265)
-    APP_FLAGS="-std=c99 -Wno-unused-function -Wall -Wno-deprecated-declarations -Wno-pointer-sign -Wno-switch -Wno-unused-result -Wno-unused-variable -DPIC -fobjc-arc"
+    APP_FLAGS="-Wno-unused-function"
     ;;
   sdl)
     APP_FLAGS="-DPIC -Wno-unused-function -D__TVOS__"
@@ -208,9 +211,6 @@ get_app_specific_cflags() {
   soxr | snappy)
     APP_FLAGS="-std=gnu99 -Wno-unused-function -DPIC"
     ;;
-  openh264 | x265)
-    APP_FLAGS="-Wno-unused-function"
-    ;;
   *)
     APP_FLAGS="-std=c99 -Wno-unused-function"
     ;;
@@ -267,9 +267,6 @@ get_cxxflags() {
   esac
 
   case $1 in
-  x265)
-    echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
-    ;;
   gnutls)
     echo "-std=c++11 -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
@@ -286,11 +283,14 @@ get_cxxflags() {
     echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
   rubberband)
-    echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
+    echo "-fno-rtti -Wno-c++11-narrowing ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
   srt | tesseract | zimg)
     echo "-std=c++11 ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;
+  x265)
+    echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
+    ;;
   *)
     echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
     ;;