From a013e66d91bb9334597ed7d39b7c1985b60d8ccc Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 8 Oct 2017 18:57:40 +0000 Subject: [PATCH] multimedia/libvpx: unblock build on mips* mips* cannot use lang/gcc*, so let it use GCC 4.2 in base. Other archs may work as well but x86 won't per r422956. --- multimedia/libvpx/Makefile | 2 +- multimedia/libvpx/files/patch-libs.mk | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile index 5e9d1424caf1..d5772202c2ee 100644 --- a/multimedia/libvpx/Makefile +++ b/multimedia/libvpx/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= yasm:devel/yasm USE_GITHUB= yes GH_ACCOUNT= webmproject -USES= compiler:c11 cpe gmake perl5 shebangfix +USES= cpe gmake perl5 shebangfix CPE_VENDOR= john_koleszar HAS_CONFIGURE= yes USE_PERL5= build diff --git a/multimedia/libvpx/files/patch-libs.mk b/multimedia/libvpx/files/patch-libs.mk index d12cd35ad9cd..4017b4b06bbb 100644 --- a/multimedia/libvpx/files/patch-libs.mk +++ b/multimedia/libvpx/files/patch-libs.mk @@ -1,8 +1,19 @@ ---- libs.mk.orig +--- libs.mk.orig 2017-01-12 20:27:27 UTC +++ libs.mk -@@ -232,8 +232,8 @@ - $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@ - $(qexec)echo 'Libs.private: -lm -pthread' >> $@ +@@ -117,8 +117,8 @@ endif + $(BUILD_PFX)third_party/googletest/%.cc.o: CXXFLAGS += -Wno-missing-field-initializers + # Suppress -Wextra warnings in first party code pending investigation. + # https://bugs.chromium.org/p/webm/issues/detail?id=1069 +-$(BUILD_PFX)vp8/encoder/onyx_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered +-$(BUILD_PFX)vp8/decoder/onyxd_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered ++$(BUILD_PFX)vp8/encoder/onyx_if.c.o: CFLAGS += -Wno-extra ++$(BUILD_PFX)vp8/decoder/onyxd_if.c.o: CFLAGS += -Wno-extra + + ifeq ($(CONFIG_MSVS),yes) + CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd) +@@ -339,8 +339,8 @@ else + $(qexec)echo 'Libs.private: -lm' >> $@ + endif $(qexec)echo 'Cflags: -I$${includedir}' >> $@ -INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc -INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc