Skip to content

Commit 9cbb61c

Browse files
committed
build-libvpx: fix build on macOS 26
1 parent c1f078b commit 9cbb61c

3 files changed

Lines changed: 46 additions & 0 deletions

File tree

build-libvpx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@ pkgname="libvpx"
1010
pkgdir="${STOWDIR}/${pkgname}"
1111
srcdir="src/libvpx"
1212

13+
target="$(uname -m)-darwin$(uname -r | cut -d . -f 1)-gcc"
14+
1315
echo
1416
echo "*** $0: started"
1517

1618
cd "${srcdir}"
1719

1820
./configure \
1921
--prefix="${pkgdir}" \
22+
--target="${target}" \
2023
--enable-shared \
2124
--enable-runtime-cpu-detect \
2225
--enable-pic \

fetch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ fetch_libvpx() {
120120
local url="https://chromium.googlesource.com/webm/libvpx"
121121
rm -rf src/libvpx
122122
git -C src clone --depth 1 "${url}"
123+
git -C src/libvpx apply --apply --stat "$(realpath patches/libvpx-darwin25.diff)"
123124
}
124125

125126
fetch_libwebp() {

patches/libvpx-darwin25.diff

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
diff --git a/build/make/configure.sh b/build/make/configure.sh
2+
index d1d89aa..5434e83 100644
3+
--- a/build/make/configure.sh
4+
+++ b/build/make/configure.sh
5+
@@ -832,7 +832,7 @@ process_common_toolchain() {
6+
tgt_isa=x86_64
7+
tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'`
8+
;;
9+
- *darwin2[0-4]*)
10+
+ *darwin2[0-5]*)
11+
tgt_isa=`uname -m`
12+
tgt_os=`echo $gcctarget | sed 's/.*\(darwin2[0-9]\).*/\1/'`
13+
;;
14+
@@ -991,7 +991,7 @@ EOF
15+
add_cflags "-mmacosx-version-min=10.15"
16+
add_ldflags "-mmacosx-version-min=10.15"
17+
;;
18+
- *-darwin2[0-4]-*)
19+
+ *-darwin2[0-5]-*)
20+
add_cflags "-arch ${toolchain%%-*}"
21+
add_ldflags "-arch ${toolchain%%-*}"
22+
;;
23+
diff --git a/configure b/configure
24+
index 356bbe2..8eee4e4 100755
25+
--- a/configure
26+
+++ b/configure
27+
@@ -104,6 +104,7 @@ all_platforms="${all_platforms} arm64-darwin21-gcc"
28+
all_platforms="${all_platforms} arm64-darwin22-gcc"
29+
all_platforms="${all_platforms} arm64-darwin23-gcc"
30+
all_platforms="${all_platforms} arm64-darwin24-gcc"
31+
+all_platforms="${all_platforms} arm64-darwin25-gcc"
32+
all_platforms="${all_platforms} arm64-linux-gcc"
33+
all_platforms="${all_platforms} arm64-win64-gcc"
34+
all_platforms="${all_platforms} arm64-win64-vs15"
35+
@@ -169,6 +170,7 @@ all_platforms="${all_platforms} x86_64-darwin21-gcc"
36+
all_platforms="${all_platforms} x86_64-darwin22-gcc"
37+
all_platforms="${all_platforms} x86_64-darwin23-gcc"
38+
all_platforms="${all_platforms} x86_64-darwin24-gcc"
39+
+all_platforms="${all_platforms} x86_64-darwin25-gcc"
40+
all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
41+
all_platforms="${all_platforms} x86_64-linux-gcc"
42+
all_platforms="${all_platforms} x86_64-linux-icc"

0 commit comments

Comments
 (0)