diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-11 16:15:50 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-11 16:15:50 +0200 |
commit | ca208d49d8ff8a485cf7e3236b22069ab3440502 (patch) | |
tree | 31fb2acb54ccd3d4434df3fdcdfa9ed40a8da41f /package/libvpx | |
parent | a132130166cac1c44f248f6934f014403335965a (diff) | |
parent | 061b10e2adbf4c45c10453a8fe61f57f7c739585 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libvpx')
-rw-r--r-- | package/libvpx/Makefile | 15 | ||||
-rw-r--r-- | package/libvpx/patches/patch-vp8_vp8cx_arm_mk | 11 |
2 files changed, 9 insertions, 17 deletions
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 646f85669..9fc3e67a9 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -4,24 +4,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libvpx -PKG_VERSION:= 0.9.7 +PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= bd888cffde8d9c3061c7fd719b0cd4ce -PKG_DESCR:= VP8 codec library +PKG_MD5SUM:= 7ae163ac3196c79ec2f0904280078a45 +PKG_DESCR:= VP8/VP9 codec library PKG_SECTION:= libs PKG_URL:= http://www.webmproject.org/about/ PKG_SITES:= http://webm.googlecode.com/files/ -PKG_SYSTEM_DEPENDS:= sharp-zaurus ibm-x40 lemote-yeelong +PKG_SYSTEM_DEPENDS:= raspberry-pi sharp-zaurus ibm-x40 lemote-yeelong -DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}-p1.tar.bz2 -WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}-p1 +DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}.tar.bz2 +WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= minimal +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) +CONFIGURE_ARGS+= --target=armv6-linux-gcc +endif ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) CONFIGURE_ARGS+= --target=armv5te-linux-gcc endif diff --git a/package/libvpx/patches/patch-vp8_vp8cx_arm_mk b/package/libvpx/patches/patch-vp8_vp8cx_arm_mk deleted file mode 100644 index 9c170c84f..000000000 --- a/package/libvpx/patches/patch-vp8_vp8cx_arm_mk +++ /dev/null @@ -1,11 +0,0 @@ ---- libvpx-v0.9.7-p1.orig/vp8/vp8cx_arm.mk 2011-08-15 23:02:45.000000000 +0200 -+++ libvpx-v0.9.7-p1/vp8/vp8cx_arm.mk 2011-09-17 18:09:12.317990227 +0200 -@@ -18,7 +18,7 @@ VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/ - VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c - VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.h - VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/encodemb_arm.h --VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/picklpf_arm.c -+VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/picklpf_arm.c - VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c - VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.h - VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c |