Skip to content

Commit 34eae0b

Browse files
committed
Update libvpx to 1.15.1
Version 1.14.0 has a known security issue: CVE-2024-5197
1 parent fd7c94c commit 34eae0b

File tree

2 files changed

+31
-23
lines changed

2 files changed

+31
-23
lines changed

patches/vpx.patch

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
--- libvpx-1.11.0.orig/build/make/Makefile 2021-10-06 19:41:19.000000000 +0200
2-
+++ libvpx-1.11.0/build/make/Makefile 2022-03-28 10:41:12.000000000 +0200
3-
@@ -320,7 +320,7 @@
1+
diff -urN libvpx-1.15.1.orig/build/make/Makefile libvpx-1.15.1/build/make/Makefile
2+
--- libvpx-1.15.1.orig/build/make/Makefile 2025-01-10 20:30:59.000000000 +0100
3+
+++ libvpx-1.15.1/build/make/Makefile 2025-05-16 12:51:03.935009212 +0200
4+
@@ -350,7 +350,7 @@
45
$(if $(quiet),@echo " [LD] $$@")
56
$(qexec)$$(LD) -dynamiclib $$(LDFLAGS) \
67
-exported_symbols_list $$(EXPORTS_FILE) \
@@ -9,7 +10,7 @@
910
-o $$@ \
1011
$$(filter %.o,$$^) $$(extralibs)
1112
endef
12-
@@ -336,6 +336,20 @@
13+
@@ -366,6 +366,20 @@
1314
$$(filter %.o,$$^) $$(extralibs) $$(EXPORTS_FILE)
1415
endef
1516

@@ -30,17 +31,18 @@
3031

3132
#
3233
# Get current configuration
33-
@@ -395,6 +409,7 @@
34+
@@ -425,6 +439,7 @@
3435
$(foreach lib,$(filter %so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
3536
$(foreach lib,$(filter %$(SO_VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
3637
$(foreach lib,$(filter %$(SO_VERSION_MAJOR).dll,$(LIBS)),$(eval $(call dll_template,$(lib))))
3738
+$(foreach lib,$(filter %-$(VERSION_MAJOR).dll,$(LIBS)),$(eval $(call dll_gnu_template,$(lib),-$(VERSION_MAJOR).dll)))
3839

3940
INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
4041
ifeq ($(MAKECMDGOALS),dist)
41-
--- libvpx-1.11.0.orig/build/make/configure.sh 2021-10-06 19:41:19.000000000 +0200
42-
+++ libvpx-1.11.0/build/make/configure.sh 2022-03-29 19:54:58.000000000 +0200
43-
@@ -650,7 +650,10 @@
42+
diff -urN libvpx-1.15.1.orig/build/make/configure.sh libvpx-1.15.1/build/make/configure.sh
43+
--- libvpx-1.15.1.orig/build/make/configure.sh 2025-01-10 20:30:59.000000000 +0100
44+
+++ libvpx-1.15.1/build/make/configure.sh 2025-05-16 12:51:03.935009212 +0200
45+
@@ -703,7 +703,10 @@
4446
--libdir=*)
4547
libdir="${optval}"
4648
;;
@@ -52,7 +54,7 @@
5254
die "Option ${opt} requires argument"
5355
;;
5456
--help|-h)
55-
@@ -679,9 +682,14 @@
57+
@@ -732,9 +735,14 @@
5658
prefix="${prefix%/}"
5759
libdir="${libdir:-${prefix}/lib}"
5860
libdir="${libdir%/}"
@@ -67,17 +69,18 @@
6769
}
6870

6971
post_process_cmdline() {
70-
--- libvpx-1.11.0.orig/configure 2021-10-06 19:41:19.000000000 +0200
71-
+++ libvpx-1.11.0/configure 2022-03-29 19:54:58.000000000 +0200
72-
@@ -501,6 +501,7 @@
72+
diff -urN libvpx-1.15.1.orig/configure libvpx-1.15.1/configure
73+
--- libvpx-1.15.1.orig/configure 2025-01-10 20:30:59.000000000 +0100
74+
+++ libvpx-1.15.1/configure 2025-05-16 12:51:03.935009212 +0200
75+
@@ -532,6 +532,7 @@
7376
DIST_DIR?=\$(DESTDIR)${prefix}
7477
endif
7578
LIBSUBDIR=${libdir##${prefix}/}
7679
+BINSUBDIR=${bindir##${prefix}/}
7780

7881
VERSION_STRING=${VERSION_STRING}
7982

80-
@@ -539,6 +540,8 @@
83+
@@ -570,6 +571,8 @@
8184
*)
8285
if enabled gnu; then
8386
echo "--enable-shared is only supported on ELF; assuming this is OK"
@@ -86,17 +89,18 @@
8689
else
8790
die "--enable-shared only supported on ELF, OS/2, and Darwin for now"
8891
fi
89-
--- libvpx-1.11.0.orig/libs.mk 2021-10-06 19:41:19.000000000 +0200
90-
+++ libvpx-1.11.0/libs.mk 2022-03-29 19:54:58.000000000 +0200
91-
@@ -137,6 +137,7 @@
92+
diff -urN libvpx-1.15.1.orig/libs.mk libvpx-1.15.1/libs.mk
93+
--- libvpx-1.15.1.orig/libs.mk 2025-01-10 20:30:59.000000000 +0100
94+
+++ libvpx-1.15.1/libs.mk 2025-05-16 12:51:03.935009212 +0200
95+
@@ -150,6 +150,7 @@
9296
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx/%
9397
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx_ports/%
9498
INSTALL_MAPS += $(LIBSUBDIR)/% %
9599
+INSTALL_MAPS += $(BINSUBDIR)/% %
96100
INSTALL_MAPS += src/% $(SRC_PATH_BARE)/%
97101
ifeq ($(CONFIG_MSVS),yes)
98102
INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Release/%)
99-
@@ -322,6 +323,13 @@
103+
@@ -336,6 +337,13 @@
100104
LIBVPX_SO_SYMLINKS :=
101105
LIBVPX_SO_IMPLIB := libvpx_dll.a
102106
else
@@ -110,15 +114,15 @@
110114
LIBVPX_SO := libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH)
111115
SHARED_LIB_SUF := .so
112116
EXPORT_FILE := libvpx.ver
113-
@@ -331,6 +339,7 @@
117+
@@ -345,6 +353,7 @@
114118
endif
115119
endif
116120
endif
117121
+endif
118122

119123
LIBS-$(CONFIG_SHARED) += $(BUILD_PFX)$(LIBVPX_SO)\
120124
$(notdir $(LIBVPX_SO_SYMLINKS)) \
121-
@@ -353,6 +362,10 @@ libvpx_dll.a: $(LIBVPX_SO)
125+
@@ -367,6 +376,10 @@
122126
$(qexec)emximp -o $@ $<
123127
CLEAN-OBJS += libvpx_dll.a
124128

@@ -129,8 +133,12 @@
129133
define libvpx_symlink_template
130134
$(1): $(2)
131135
@echo " [LN] $(2) $$@"
132-
@@ -371,3 +384,3 @@
136+
@@ -383,7 +396,7 @@
137+
138+
133139
INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBVPX_SO_SYMLINKS)
134140
-INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO)
135141
+INSTALL-LIBS-$(CONFIG_SHARED) += $(if $(filter win%,$(TGT_OS)),$(BINSUBDIR),$(LIBSUBDIR))/$(LIBVPX_SO)
136142
INSTALL-LIBS-$(CONFIG_SHARED) += $(if $(LIBVPX_SO_IMPLIB),$(LIBSUBDIR)/$(LIBVPX_SO_IMPLIB))
143+
144+

scripts/build-ffmpeg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ def calculate_sha256(filename: str) -> str:
152152
),
153153
Package(
154154
name="vpx",
155-
source_url="https://github.com/webmproject/libvpx/archive/v1.14.0.tar.gz",
156-
sha256="5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa",
157-
source_filename="vpx-1.14.0.tar.gz",
155+
source_url="https://github.com/webmproject/libvpx/archive/v1.15.1.tar.gz",
156+
sha256="6cba661b22a552bad729bd2b52df5f0d57d14b9789219d46d38f73c821d3a990",
157+
source_filename="vpx-1.15.1.tar.gz",
158158
build_arguments=[
159159
"--disable-examples",
160160
"--disable-tools",

0 commit comments

Comments
 (0)