From 0aa7692451ed4e9dc4beef2c9a9da38eb107cc0a Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 16 Jan 2017 12:12:59 +0000 Subject: Updated libvpx to 1.6.1. 2017-01-09 v1.6.1 "Long Tailed Duck" This release improves upon the VP9 encoder and speeds up the encoding and decoding processes. - Upgrading: This release is ABI compatible with 1.6.0. - Enhancements: Faster VP9 encoding and decoding. High bit depth builds now provide similar speed for 8 bit encode and decode for x86 targets. Other platforms and higher bit depth improvements are in progress. - Bug Fixes: A variety of fuzzing issues. --- multimedia/libvpx/Makefile | 15 +++---- multimedia/libvpx/distinfo | 18 ++++---- multimedia/libvpx/patches/patch-aa | 30 ++++++------- multimedia/libvpx/patches/patch-ab | 10 ++--- multimedia/libvpx/patches/patch-ad | 20 ++++----- multimedia/libvpx/patches/patch-test_sad__test.cc | 50 ---------------------- .../patches/patch-test_sixtap__predict__test.cc | 28 ------------ 7 files changed, 44 insertions(+), 127 deletions(-) delete mode 100644 multimedia/libvpx/patches/patch-test_sad__test.cc delete mode 100644 multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc (limited to 'multimedia/libvpx') diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile index 4671e4bf85b..319620d15b1 100644 --- a/multimedia/libvpx/Makefile +++ b/multimedia/libvpx/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2016/08/16 23:53:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.67 2017/01/16 12:12:59 wiz Exp $ -DISTNAME= libvpx-1.6.0 +DISTNAME= libvpx-1.6.1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/} GITHUB_PROJECT= libvpx @@ -33,13 +33,10 @@ GCC_REQD+= 4.4 BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm .endif -REPLACE_BASH= configure \ - build/make/configure.sh \ - build/make/version.sh \ - build/make/gen_asm_deps.sh \ - build/make/rtcd.sh \ - examples/gen_example_text.sh \ - examples/gen_example_code.sh +REPLACE_BASH= configure +REPLACE_BASH+= build/make/configure.sh +REPLACE_BASH+= build/make/version.sh +REPLACE_BASH+= build/make/gen_asm_deps.sh REPLACE_PERL= build/make/ads2gas.pl diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo index f47dfec5e93..71339c014db 100644 --- a/multimedia/libvpx/distinfo +++ b/multimedia/libvpx/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.32 2016/08/16 23:53:25 ryoon Exp $ +$NetBSD: distinfo,v 1.33 2017/01/16 12:12:59 wiz Exp $ -SHA1 (libvpx-1.6.0.tar.gz) = 959e4e8f28819e38fb1593cf3d294ef89f083b87 -RMD160 (libvpx-1.6.0.tar.gz) = 89f243ce65bb067c7103e4e1f9e49a8b2a084a41 -SHA512 (libvpx-1.6.0.tar.gz) = 1cbd8872517c79eb2815409fa080096e7dcbb3f018574d978871a58b96ca29e38d3a36efe9427913feda0fbf4ebce2669eb09c280e2cd9d55d4ed2dad8a7dbb1 -Size (libvpx-1.6.0.tar.gz) = 2476097 bytes -SHA1 (patch-aa) = 297ef73d6491a70888c9e887424c009627d55400 -SHA1 (patch-ab) = fcf929c039acbd8b1787cd0d8ee0600df2d3751a +SHA1 (libvpx-1.6.1.tar.gz) = 9e41a6bb2b991f5542c264676ac452114cda9c7c +RMD160 (libvpx-1.6.1.tar.gz) = d8f27afbdec026460e26486914fb092f5ef1e70d +SHA512 (libvpx-1.6.1.tar.gz) = 13b7eb515d026b302b8c484d6f06df067feb5aed4ceac953d85fe84fd684dab07e89ddbf80b4f395c6d9127709422156287e5754f49246050b2e18930adb3970 +Size (libvpx-1.6.1.tar.gz) = 2493087 bytes +SHA1 (patch-aa) = 0025e7eff1efbd44069f797d1c37c5efa19fb183 +SHA1 (patch-ab) = 6d0703e07785214113b81775fefad46485b048c7 SHA1 (patch-ac) = 17410f43ff9952d616be3211ca697f37c107610a -SHA1 (patch-ad) = baa186625ee1cdab150827eed36402b096922e4b +SHA1 (patch-ad) = 72801b4a7fbcc8152ab2fde065ad8eaa284c5016 SHA1 (patch-build_make_gen_asm_deps.sh) = c55bd4d0e12176b73ba62c3c4741b58de77923e6 SHA1 (patch-configure) = 3b3064995ca840e4d918e52e66a071ff4dfc05b2 -SHA1 (patch-test_sad__test.cc) = 139852577c9331860094d1822c8597e524bec842 -SHA1 (patch-test_sixtap__predict__test.cc) = 5ca4e4072ba16f185617dceb2c09e55eb74bb100 diff --git a/multimedia/libvpx/patches/patch-aa b/multimedia/libvpx/patches/patch-aa index 3eb63642e02..18f5742e6b6 100644 --- a/multimedia/libvpx/patches/patch-aa +++ b/multimedia/libvpx/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ +$NetBSD: patch-aa,v 1.11 2017/01/16 12:12:59 wiz Exp $ ---- build/make/Makefile.orig 2015-11-09 22:12:38.000000000 +0000 +--- build/make/Makefile.orig 2017-01-12 20:27:27.000000000 +0000 +++ build/make/Makefile -@@ -151,7 +151,7 @@ $(BUILD_PFX)%.c.d: %.c +@@ -147,7 +147,7 @@ $(BUILD_PFX)%.c.d: %.c $(BUILD_PFX)%.c.o: %.c $(if $(quiet),@echo " [CC] $@") $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@)) @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ $(BUILD_PFX)%.cc.d: %.cc $(if $(quiet),@echo " [DEP] $@") -@@ -161,7 +161,7 @@ $(BUILD_PFX)%.cc.d: %.cc +@@ -157,7 +157,7 @@ $(BUILD_PFX)%.cc.d: %.cc $(BUILD_PFX)%.cc.o: %.cc $(if $(quiet),@echo " [CXX] $@") $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@)) @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ $(BUILD_PFX)%.cpp.d: %.cpp $(if $(quiet),@echo " [DEP] $@") -@@ -171,7 +171,7 @@ $(BUILD_PFX)%.cpp.d: %.cpp +@@ -167,7 +167,7 @@ $(BUILD_PFX)%.cpp.d: %.cpp $(BUILD_PFX)%.cpp.o: %.cpp $(if $(quiet),@echo " [CXX] $@") $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@)) @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ $(BUILD_PFX)%.asm.d: %.asm $(if $(quiet),@echo " [DEP] $@") -@@ -182,7 +182,8 @@ $(BUILD_PFX)%.asm.d: %.asm +@@ -178,7 +178,8 @@ $(BUILD_PFX)%.asm.d: %.asm $(BUILD_PFX)%.asm.o: %.asm $(if $(quiet),@echo " [AS] $@") $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@)) @@ -37,10 +37,10 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ + $(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \ + $(AS) $(ASFLAGS) -o $@ $< - $(BUILD_PFX)%.s.d: %.s + $(BUILD_PFX)%.S.d: %.S $(if $(quiet),@echo " [DEP] $@") -@@ -193,7 +194,8 @@ $(BUILD_PFX)%.s.d: %.s - $(BUILD_PFX)%.s.o: %.s +@@ -189,7 +190,8 @@ $(BUILD_PFX)%.S.d: %.S + $(BUILD_PFX)%.S.o: %.S $(if $(quiet),@echo " [AS] $@") $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@)) - $(qexec)$(AS) $(ASFLAGS) -o $@ $< @@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ .PRECIOUS: %.c.S %.c.S: CFLAGS += -DINLINE_ASM -@@ -258,13 +260,15 @@ define linker_template +@@ -254,13 +256,15 @@ define linker_template $(1): $(filter-out -%,$(2)) $(1): $(if $(quiet),@echo " [LD] $$@") @@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ endef # make-3.80 has a bug with expanding large input strings to the eval function, # which was triggered in some cases by the following component of -@@ -277,8 +281,12 @@ endef +@@ -273,8 +277,12 @@ endef define install_map_template $(DIST_DIR)/$(1): $(2) $(if $(quiet),@echo " [INSTALL] $$@") @@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ endef define archive_template -@@ -287,7 +295,9 @@ define archive_template +@@ -283,7 +291,9 @@ define archive_template # for creating them. $(1): $(if $(quiet),@echo " [AR] $$@") @@ -93,7 +93,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ endef define so_template -@@ -381,9 +391,9 @@ clean:: +@@ -377,9 +387,9 @@ clean:: rm -f .bins .install-bins $(BINS) LIBS=$(call enabled,LIBS) @@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ $(foreach lib,$(filter %so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib)))) $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib)))) $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dll,$(LIBS)),$(eval $(call dll_template,$(lib)))) -@@ -392,11 +402,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_ +@@ -388,11 +398,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_ ifeq ($(MAKECMDGOALS),dist) INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS) endif @@ -119,7 +119,7 @@ $NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $ ifeq ($(CONFIG_EXTERNAL_BUILD),yes) PROJECTS=$(call enabled,PROJECTS) -@@ -447,7 +457,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes) +@@ -442,7 +452,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes) BUILD_TARGETS += .projects INSTALL_TARGETS += .install-projects endif diff --git a/multimedia/libvpx/patches/patch-ab b/multimedia/libvpx/patches/patch-ab index b45b031995f..3d06fcec8ce 100644 --- a/multimedia/libvpx/patches/patch-ab +++ b/multimedia/libvpx/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.7 2016/08/16 23:53:25 ryoon Exp $ +$NetBSD: patch-ab,v 1.8 2017/01/16 12:12:59 wiz Exp $ ---- libs.mk.orig 2016-07-21 01:15:41.000000000 +0000 +--- libs.mk.orig 2017-01-12 20:27:27.000000000 +0000 +++ libs.mk -@@ -169,7 +169,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea +@@ -172,7 +172,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea endif else INSTALL-LIBS-$(CONFIG_STATIC) += $(LIBSUBDIR)/libvpx.a @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.7 2016/08/16 23:53:25 ryoon Exp $ endif CODEC_SRCS=$(call enabled,CODEC_SRCS) -@@ -226,8 +225,8 @@ endif +@@ -229,8 +228,8 @@ endif else LIBVPX_OBJS=$(call objs,$(CODEC_SRCS)) OBJS-yes += $(LIBVPX_OBJS) @@ -20,4 +20,4 @@ $NetBSD: patch-ab,v 1.7 2016/08/16 23:53:25 ryoon Exp $ +$(BUILD_PFX)libvpx.a: $(LIBVPX_OBJS) SO_VERSION_MAJOR := 4 - SO_VERSION_MINOR := 0 + SO_VERSION_MINOR := 1 diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad index ee8e158e5b4..b993d89ac2d 100644 --- a/multimedia/libvpx/patches/patch-ad +++ b/multimedia/libvpx/patches/patch-ad @@ -1,11 +1,11 @@ -$NetBSD: patch-ad,v 1.20 2016/08/16 23:53:25 ryoon Exp $ +$NetBSD: patch-ad,v 1.21 2017/01/16 12:12:59 wiz Exp $ *BSD and qnx are identified as linux. Add another SDK path on Mac OS X. All sparc cpus can not do unaligned access. Detect NetBSD ARMv7 hardfloat toolchain. ---- build/make/configure.sh.orig 2016-07-21 01:15:41.000000000 +0000 +--- build/make/configure.sh.orig 2017-01-12 20:27:27.000000000 +0000 +++ build/make/configure.sh @@ -1,4 +1,4 @@ -#!/bin/sh @@ -13,16 +13,16 @@ Detect NetBSD ARMv7 hardfloat toolchain. ## ## configure.sh ## -@@ -683,7 +683,7 @@ process_common_toolchain() { - armv6*) - tgt_isa=armv6 +@@ -680,7 +680,7 @@ process_common_toolchain() { + aarch64*) + tgt_isa=arm64 ;; - armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf) + armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf | armv7*-netbsd*-*hf) tgt_isa=armv7 float_abi=hard ;; -@@ -735,7 +735,7 @@ process_common_toolchain() { +@@ -732,7 +732,7 @@ process_common_toolchain() { [ -z "$tgt_isa" ] && tgt_isa=x86 tgt_os=win32 ;; @@ -31,7 +31,7 @@ Detect NetBSD ARMv7 hardfloat toolchain. tgt_os=linux ;; *solaris2.10) -@@ -778,6 +778,9 @@ process_common_toolchain() { +@@ -775,6 +775,9 @@ process_common_toolchain() { mips*) enable_feature mips ;; @@ -41,7 +41,7 @@ Detect NetBSD ARMv7 hardfloat toolchain. esac # PIC is probably what we want when building shared libs -@@ -1415,7 +1418,7 @@ EOF +@@ -1382,7 +1385,7 @@ EOF check_cc </dev/null 2>&1 && enable_feature big_endian # Try to find which inline keywords are supported -@@ -1431,11 +1434,33 @@ EOF - *-android-gcc) +@@ -1399,11 +1402,33 @@ EOF + # bionic includes basic pthread functionality, obviating -lpthread. ;; *) - check_header pthread.h && add_extralibs -lpthread diff --git a/multimedia/libvpx/patches/patch-test_sad__test.cc b/multimedia/libvpx/patches/patch-test_sad__test.cc deleted file mode 100644 index 129e7c258ec..00000000000 --- a/multimedia/libvpx/patches/patch-test_sad__test.cc +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-test_sad__test.cc,v 1.4 2015/11/18 14:09:25 ryoon Exp $ - ---- test/sad_test.cc.orig 2015-11-09 22:12:38.000000000 +0000 -+++ test/sad_test.cc -@@ -29,21 +29,33 @@ typedef unsigned int (*SadMxNFunc)(const - int src_stride, - const uint8_t *ref_ptr, - int ref_stride); -+#if __cplusplus >= 201103L -+typedef std::tuple SadMxNParam; -+#else - typedef std::tr1::tuple SadMxNParam; -+#endif - - typedef uint32_t (*SadMxNAvgFunc)(const uint8_t *src_ptr, - int src_stride, - const uint8_t *ref_ptr, - int ref_stride, - const uint8_t *second_pred); -+#if __cplusplus >= 201103L -+typedef std::tuple SadMxNAvgParam; -+#else - typedef std::tr1::tuple SadMxNAvgParam; -+#endif - - typedef void (*SadMxNx4Func)(const uint8_t *src_ptr, - int src_stride, - const uint8_t *const ref_ptr[], - int ref_stride, - uint32_t *sad_array); -+#if __cplusplus >= 201103L -+typedef std::tuple SadMxNx4Param; -+#else - typedef std::tr1::tuple SadMxNx4Param; -+#endif - - using libvpx_test::ACMRandom; - -@@ -480,7 +492,11 @@ TEST_P(SADx4Test, SrcAlignedByWidth) { - source_data_ = tmp_source_data; - } - -+#if __cplusplus >= 201103L -+using std::make_tuple; -+#else - using std::tr1::make_tuple; -+#endif - - //------------------------------------------------------------------------------ - // C functions diff --git a/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc b/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc deleted file mode 100644 index c70ca98634e..00000000000 --- a/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-test_sixtap__predict__test.cc,v 1.3 2016/08/16 23:53:25 ryoon Exp $ - ---- test/sixtap_predict_test.cc.orig 2016-07-21 01:15:41.000000000 +0000 -+++ test/sixtap_predict_test.cc -@@ -32,7 +32,11 @@ typedef void (*SixtapPredictFunc)(uint8_ - uint8_t *dst_ptr, - int dst_pitch); - -+#if __cplusplus >= 201103L -+typedef std::tuple SixtapPredictParam; -+#else - typedef std::tr1::tuple SixtapPredictParam; -+#endif - - class SixtapPredictTest - : public ::testing::TestWithParam { -@@ -184,7 +188,11 @@ TEST_P(SixtapPredictTest, TestWithRandom - } - } - -+#if __cplusplus >= 201103L -+using std::make_tuple; -+#else - using std::tr1::make_tuple; -+#endif - - INSTANTIATE_TEST_CASE_P( - C, SixtapPredictTest, ::testing::Values( -- cgit v1.2.3