Skip to content

Commit dbaa6eb

Browse files
committed
Update patches for the new libvpx revision.
1 parent 2c464cf commit dbaa6eb

6 files changed

+11
-110
lines changed

.gitattributes

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
libvpx/0001* eol=lf
2-
libvpx/0003* eol=lf
3-
libvpx/0004* eol=lf
4-
libvpx/0005* eol=lf
2+
libvpx/0002* eol=lf

libvpx/0003-disable-forced-lto-in-release.patch libvpx/0001-disable-forced-lto-in-release.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
2-
index dffed7431..590833de9 100755
2+
index 1e1db05bb..0e4313e56 100755
33
--- a/build/make/gen_msvs_vcxproj.sh
44
+++ b/build/make/gen_msvs_vcxproj.sh
5-
@@ -348,9 +348,6 @@ generate_vcxproj() {
6-
tag_content PlatformToolset v143
5+
@@ -366,9 +366,6 @@ generate_vcxproj() {
6+
fi
77
fi
88
tag_content CharacterSet Unicode
99
- if [ "$config" = "Release" ]; then

libvpx/0001-support-vs-2022.patch

-82
This file was deleted.

libvpx/0004-enable-multi-processor-compilation.patch libvpx/0002-enable-multi-processor-compilation.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
2-
index 590833de9..81dd7698a 100755
2+
index 0e4313e56..4f8eba245 100755
33
--- a/build/make/gen_msvs_vcxproj.sh
44
+++ b/build/make/gen_msvs_vcxproj.sh
5-
@@ -423,6 +423,7 @@ generate_vcxproj() {
5+
@@ -441,6 +441,7 @@ generate_vcxproj() {
66
tag_content CompileAsWinRT false
77
tag_content PrecompiledHeader NotUsing
88
tag_content SDLCheck false

libvpx/0002-generate-vpx-pc-with-msvs.patch libvpx/0003-generate-vpx-pc-with-msvs.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/libs.mk b/libs.mk
2-
index 7cd973bd1..d96b50b46 100644
2+
index f6f6cc94c..ea31c00ea 100644
33
--- a/libs.mk
44
+++ b/libs.mk
5-
@@ -280,6 +280,42 @@ PROJECTS-yes += vp9rc.$(VCPROJ_SFX)
6-
vp9rc.$(VCPROJ_SFX): vpx_config.asm
7-
vp9rc.$(VCPROJ_SFX): $(RTCD)
5+
@@ -294,6 +294,42 @@ PROJECTS-yes += vpxrc.$(VCPROJ_SFX)
6+
vpxrc.$(VCPROJ_SFX): vpx_config.asm
7+
vpxrc.$(VCPROJ_SFX): $(RTCD)
88

99
+# List of all platforms supported for vpx.pc target
1010
+ifneq ($(findstring x86_64,$(TOOLCHAIN)),)
@@ -35,7 +35,7 @@ index 7cd973bd1..d96b50b46 100644
3535
+ $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
3636
+ $(qexec)echo 'Requires:' >> $@
3737
+ $(qexec)echo 'Conflicts:' >> $@
38-
+ $(qexec)echo 'Libs: -L$${libdir} -l$(CODEC_LIB)' >> $@
38+
+ $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
3939
+ $(qexec)echo 'Libs.private:' >> $@
4040
+ $(qexec)echo 'Cflags: -I$${includedir}' >> $@
4141
+INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc

libvpx/0005-downgrade-macos-target-to-10-12.patch

-15
This file was deleted.

0 commit comments

Comments
 (0)