Skip to content

Commit

Permalink
Update patches for the new libvpx revision.
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Sep 21, 2023
1 parent 2c464cf commit dbaa6eb
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 110 deletions.
4 changes: 1 addition & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
libvpx/0001* eol=lf
libvpx/0003* eol=lf
libvpx/0004* eol=lf
libvpx/0005* eol=lf
libvpx/0002* eol=lf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
index dffed7431..590833de9 100755
index 1e1db05bb..0e4313e56 100755
--- a/build/make/gen_msvs_vcxproj.sh
+++ b/build/make/gen_msvs_vcxproj.sh
@@ -348,9 +348,6 @@ generate_vcxproj() {
tag_content PlatformToolset v143
@@ -366,9 +366,6 @@ generate_vcxproj() {
fi
fi
tag_content CharacterSet Unicode
- if [ "$config" = "Release" ]; then
Expand Down
82 changes: 0 additions & 82 deletions libvpx/0001-support-vs-2022.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
index 590833de9..81dd7698a 100755
index 0e4313e56..4f8eba245 100755
--- a/build/make/gen_msvs_vcxproj.sh
+++ b/build/make/gen_msvs_vcxproj.sh
@@ -423,6 +423,7 @@ generate_vcxproj() {
@@ -441,6 +441,7 @@ generate_vcxproj() {
tag_content CompileAsWinRT false
tag_content PrecompiledHeader NotUsing
tag_content SDLCheck false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/libs.mk b/libs.mk
index 7cd973bd1..d96b50b46 100644
index f6f6cc94c..ea31c00ea 100644
--- a/libs.mk
+++ b/libs.mk
@@ -280,6 +280,42 @@ PROJECTS-yes += vp9rc.$(VCPROJ_SFX)
vp9rc.$(VCPROJ_SFX): vpx_config.asm
vp9rc.$(VCPROJ_SFX): $(RTCD)
@@ -294,6 +294,42 @@ PROJECTS-yes += vpxrc.$(VCPROJ_SFX)
vpxrc.$(VCPROJ_SFX): vpx_config.asm
vpxrc.$(VCPROJ_SFX): $(RTCD)

+# List of all platforms supported for vpx.pc target
+ifneq ($(findstring x86_64,$(TOOLCHAIN)),)
Expand Down Expand Up @@ -35,7 +35,7 @@ index 7cd973bd1..d96b50b46 100644
+ $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
+ $(qexec)echo 'Requires:' >> $@
+ $(qexec)echo 'Conflicts:' >> $@
+ $(qexec)echo 'Libs: -L$${libdir} -l$(CODEC_LIB)' >> $@
+ $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
+ $(qexec)echo 'Libs.private:' >> $@
+ $(qexec)echo 'Cflags: -I$${includedir}' >> $@
+INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
Expand Down
15 changes: 0 additions & 15 deletions libvpx/0005-downgrade-macos-target-to-10-12.patch

This file was deleted.

0 comments on commit dbaa6eb

Please sign in to comment.