diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-15 20:57:56 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-15 20:57:56 +0200 |
| commit | e228dce45adc4f39671131dd0f0611e29ab85bf8 (patch) | |
| tree | edef8e22a8f58c666ae65174174a3fc760bfe2d8 /package/libvpx | |
| parent | 562a3446c4e13dc3c770ca86b062961d3dba4b31 (diff) | |
| parent | bae480656aac1ec7ad3c2582bd6efe431298bcee (diff) | |
Merge branch 'master' of openadk.org:/git/openadk
Diffstat (limited to 'package/libvpx')
| -rw-r--r-- | package/libvpx/Makefile | 15 | ||||
| -rw-r--r-- | package/libvpx/patches/patch-build_make_configure_sh | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 73fd74f7b..c442d0981 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libvpx -PKG_VERSION:= 1.1.0 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 7ae163ac3196c79ec2f0904280078a45 +PKG_VERSION:= 1.2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f8de058e6ba14555144583a2d031fe19 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:= raspberry-pi sharp-zaurus ibm-x40 lemote-yeelong qemu-i686 +PKG_ARCH_DEPENDS:= !avr32 DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}.tar.bz2 WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION} @@ -22,6 +22,9 @@ 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_QEMU_ARM),y) +CONFIGURE_ARGS+= --target=armv5te-linux-gcc +endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIGURE_ARGS+= --target=armv6-linux-gcc endif @@ -84,6 +87,10 @@ CONFIGURE_ARGS+= --prefix=/usr \ --enable-shared ALL_TARGET:= +post-extract: + chmod a+x $(WRKBUILD)/build/make/*.sh + chmod a+x $(WRKBUILD)/build/make/*.pl + libvpx-install: $(INSTALL_DIR) $(IDIR_LIBVPX)/usr/lib $(CP) $(WRKINST)/usr/lib/libvpx.so* \ diff --git a/package/libvpx/patches/patch-build_make_configure_sh b/package/libvpx/patches/patch-build_make_configure_sh index 42ab9785a..829ede0c8 100644 --- a/package/libvpx/patches/patch-build_make_configure_sh +++ b/package/libvpx/patches/patch-build_make_configure_sh @@ -1,6 +1,6 @@ ---- libvpx-v0.9.7-p1.orig/build/make/configure.sh 2011-08-15 23:02:45.000000000 +0200 -+++ libvpx-v0.9.7-p1/build/make/configure.sh 2011-09-17 17:48:07.667986440 +0200 -@@ -287,7 +287,7 @@ check_cpp() { +--- libvpx-v1.2.0.orig/build/make/configure.sh 2013-09-04 20:49:22.000000000 +0200 ++++ libvpx-v1.2.0/build/make/configure.sh 2013-10-14 20:15:20.000000000 +0200 +@@ -305,7 +305,7 @@ check_cpp() { check_ld() { log check_ld "$@" check_cc $@ \ |