fix rubberband x86-64 builds on xcode 15.x

This commit is contained in:
Taner Sener 2024-04-18 22:23:31 +01:00
parent 80d6af6949
commit 9d2d4b1073
3 changed files with 23 additions and 26 deletions

View File

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

View File

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

View File

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