From b2a3cd7366b1132282f8a71421c0260095bc702c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 4 Jun 2015 11:10:08 +0200
Subject: update libvpx to latest stable version
---
package/libvpx/Makefile | 11 +++---
package/libvpx/patches/patch-build_make_Makefile | 24 -------------
.../libvpx/patches/patch-build_make_configure_sh | 40 ----------------------
package/libvpx/patches/patch-build_make_rtcd_sh | 18 ----------
package/libvpx/patches/patch-configure | 18 ----------
.../patch-vp8_common_arm_bilinearfilter_arm_c | 15 --------
6 files changed, 5 insertions(+), 121 deletions(-)
delete mode 100644 package/libvpx/patches/patch-build_make_Makefile
delete mode 100644 package/libvpx/patches/patch-build_make_configure_sh
delete mode 100644 package/libvpx/patches/patch-build_make_rtcd_sh
delete mode 100644 package/libvpx/patches/patch-configure
delete mode 100644 package/libvpx/patches/patch-vp8_common_arm_bilinearfilter_arm_c
(limited to 'package/libvpx')
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
index bd9cd9029..3b2c11562 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -4,21 +4,20 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libvpx
-PKG_VERSION:= 1.3.0
-PKG_RELEASE:= 3
-PKG_HASH:= d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9
+PKG_VERSION:= 1.4.0
+PKG_RELEASE:= 1
+PKG_HASH:= f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
PKG_DESCR:= vp8/vp9 codec library
PKG_SECTION:= libs/video
PKG_URL:= http://www.webmproject.org/about/
-PKG_SITES:= https://webm.googlecode.com/files/
+PKG_SITES:= http://storage.googleapis.com/downloads.webmproject.org/releases/webm/
PKG_OPTS:= dev
PKG_BUILDDEP_IBM_X40:= yasm-host
PKG_BUILDDEP_QEMU_X86:= yasm-host
PKG_ARCH_DEPENDS:= !m68k
-DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}.tar.bz2
-WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/libvpx/patches/patch-build_make_Makefile b/package/libvpx/patches/patch-build_make_Makefile
deleted file mode 100644
index 8a7c04d2d..000000000
--- a/package/libvpx/patches/patch-build_make_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- libvpx-v1.2.0.orig/build/make/Makefile 2013-10-14 20:16:36.000000000 +0200
-+++ libvpx-v1.2.0/build/make/Makefile 2014-01-06 11:06:33.806841128 +0100
-@@ -210,8 +210,8 @@ endif
- define linker_template
- $(1): $(filter-out -%,$(2))
- $(1):
-- $(if $(quiet),@echo " [LD] $$@")
-- $(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
-+ $(if $(quiet),@echo " [CC] $$@")
-+ $(qexec)$$(CC) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
- endef
- define linkerxx_template
- $(1): $(filter-out -%,$(2))
-@@ -250,8 +250,8 @@ define so_template
- #
- # This needs further abstraction for dealing with non-GNU linkers.
- $(1):
-- $(if $(quiet),@echo " [LD] $$@")
-- $(qexec)$$(LD) -shared $$(LDFLAGS) \
-+ $(if $(quiet),@echo " [CC] $$@")
-+ $(qexec)$$(CC) -shared $$(LDFLAGS) \
- -Wl,--no-undefined -Wl,-soname,$$(SONAME) \
- -Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \
- $$(filter %.o,$$?) $$(extralibs)
diff --git a/package/libvpx/patches/patch-build_make_configure_sh b/package/libvpx/patches/patch-build_make_configure_sh
deleted file mode 100644
index c080a4c05..000000000
--- a/package/libvpx/patches/patch-build_make_configure_sh
+++ /dev/null
@@ -1,40 +0,0 @@
---- libvpx-v1.2.0.orig/build/make/configure.sh 2013-10-14 20:16:36.000000000 +0200
-+++ libvpx-v1.2.0/build/make/configure.sh 2014-01-06 11:27:27.889747488 +0100
-@@ -305,7 +305,7 @@ check_cpp() {
- check_ld() {
- log check_ld "$@"
- check_cc $@ \
-- && check_cmd ${LD} ${LDFLAGS} "$@" -o ${TMP_X} ${TMP_O} ${extralibs}
-+ && check_cmd ${CC} ${LDFLAGS} "$@" -o ${TMP_X} ${TMP_O} ${extralibs}
- }
-
- check_header(){
-@@ -952,7 +952,7 @@ process_common_toolchain() {
-
- esac
- ;;
-- mips*)
-+ mips32*)
- link_with_cc=gcc
- setup_gnu_toolchain
- tune_cflags="-mtune="
-@@ -964,6 +964,19 @@ process_common_toolchain() {
- check_add_asflags -march=${tgt_isa}
- check_add_asflags -KPIC
- ;;
-+ mips64*)
-+ link_with_cc=gcc
-+ setup_gnu_toolchain
-+ tune_cflags="-mtune="
-+ if enabled dspr2; then
-+ check_add_cflags -mips32r2 -mdspr2
-+ disable fast_unaligned
-+ fi
-+ # use cflags from adk
-+ #check_add_cflags -march=${tgt_isa}
-+ #check_add_asflags -march=${tgt_isa}
-+ check_add_asflags -KPIC
-+ ;;
- ppc*)
- enable ppc
- bits=${tgt_isa##ppc}
diff --git a/package/libvpx/patches/patch-build_make_rtcd_sh b/package/libvpx/patches/patch-build_make_rtcd_sh
deleted file mode 100644
index 75ddffe61..000000000
--- a/package/libvpx/patches/patch-build_make_rtcd_sh
+++ /dev/null
@@ -1,18 +0,0 @@
---- libvpx-v1.2.0.orig/build/make/rtcd.sh 2013-10-14 20:16:36.000000000 +0200
-+++ libvpx-v1.2.0/build/make/rtcd.sh 2014-01-06 11:24:01.457213627 +0100
-@@ -338,6 +338,15 @@ case $arch in
- fi
- mips
- ;;
-+ mips64)
-+ ALL_ARCHS=$(filter mips64)
-+ dspr2=$([ -f "$config_file" ] && eval echo $(grep HAVE_DSPR2 "$config_file"))
-+ HAVE_DSPR2="${dspr2#*=}"
-+ if [ "$HAVE_DSPR2" = "yes" ]; then
-+ ALL_ARCHS=$(filter mips64 dspr2)
-+ fi
-+ mips
-+ ;;
- armv5te)
- ALL_ARCHS=$(filter edsp)
- arm
diff --git a/package/libvpx/patches/patch-configure b/package/libvpx/patches/patch-configure
deleted file mode 100644
index b53e47b8a..000000000
--- a/package/libvpx/patches/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- libvpx-v1.2.0.orig/configure 2013-10-14 20:16:36.000000000 +0200
-+++ libvpx-v1.2.0/configure 2014-01-06 11:22:14.096914325 +0100
-@@ -98,6 +98,7 @@ all_platforms="${all_platforms} armv7-li
- all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8
- all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8
- all_platforms="${all_platforms} mips32-linux-gcc"
-+all_platforms="${all_platforms} mips64-linux-gcc"
- all_platforms="${all_platforms} ppc32-darwin8-gcc"
- all_platforms="${all_platforms} ppc32-darwin9-gcc"
- all_platforms="${all_platforms} ppc32-linux-gcc"
-@@ -210,6 +211,7 @@ ARCH_EXT_LIST="
- neon
-
- mips32
-+ mips64
- dspr2
-
- mmx
diff --git a/package/libvpx/patches/patch-vp8_common_arm_bilinearfilter_arm_c b/package/libvpx/patches/patch-vp8_common_arm_bilinearfilter_arm_c
deleted file mode 100644
index 1a5757a9a..000000000
--- a/package/libvpx/patches/patch-vp8_common_arm_bilinearfilter_arm_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libvpx-v0.9.7-p1.orig/vp8/common/arm/bilinearfilter_arm.c 2011-08-15 23:02:45.000000000 +0200
-+++ libvpx-v0.9.7-p1/vp8/common/arm/bilinearfilter_arm.c 2011-09-17 18:14:27.977994106 +0200
-@@ -29,10 +29,10 @@ void vp8_filter_block2d_bil_armv6
- unsigned short FData[36*16]; /* Temp data buffer used in filtering */
-
- /* First filter 1-D horizontally... */
-- vp8_filter_block2d_bil_first_pass_armv6(src_ptr, FData, src_pitch, Height + 1, Width, HFilter);
-+ //vp8_filter_block2d_bil_first_pass_armv6(src_ptr, FData, src_pitch, Height + 1, Width, HFilter);
-
- /* then 1-D vertically... */
-- vp8_filter_block2d_bil_second_pass_armv6(FData, dst_ptr, dst_pitch, Height, Width, VFilter);
-+ //vp8_filter_block2d_bil_second_pass_armv6(FData, dst_ptr, dst_pitch, Height, Width, VFilter);
- }
-
-
--
cgit v1.2.3