From 775a3f80fb36ccb5e3e51592a585fa80097747f1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Oct 2013 15:25:17 +0200 Subject: add qemu-arm --- package/libvpx/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/libvpx') diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 73fd74f7b..e9e102f22 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -5,15 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libvpx PKG_VERSION:= 1.1.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 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:= raspberry-pi sharp-zaurus ibm-x40 lemote-yeelong qemu-i686 - DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}.tar.bz2 WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION} @@ -22,6 +20,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 -- cgit v1.2.3 From ff4464fa8aef54dbfb124ec22cf4138ebb7219d1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Oct 2013 20:53:07 +0200 Subject: update to latest upstream version --- package/ffmpeg/Makefile | 6 +++--- package/libvpx/Makefile | 10 +++++++--- package/libvpx/patches/patch-build_make_configure_sh | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) (limited to 'package/libvpx') diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 131d1856a..550b8e103 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 2.0.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= dd71a1baedb2daa3e4d21e0651daa918 +PKG_VERSION:= 2.0.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6c5cfed204d8a108325d1fc439ab734a PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_FDEPENDS:= libpthread diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index e9e102f22..f0ce9380d 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libvpx -PKG_VERSION:= 1.1.0 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 7ae163ac3196c79ec2f0904280078a45 +PKG_VERSION:= 1.2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6f07da6f5a7f40fdaef0d976d6da3b54 PKG_DESCR:= VP8/VP9 codec library PKG_SECTION:= libs PKG_URL:= http://www.webmproject.org/about/ @@ -85,6 +85,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 $@ \ -- cgit v1.2.3 From 7370b88579c339400040338251f68708fbb4b3bb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 15 Oct 2013 10:10:19 +0200 Subject: fix md5sum --- package/libvpx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libvpx') diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index f0ce9380d..c68f128cb 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libvpx PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6f07da6f5a7f40fdaef0d976d6da3b54 +PKG_MD5SUM:= f8de058e6ba14555144583a2d031fe19 PKG_DESCR:= VP8/VP9 codec library PKG_SECTION:= libs PKG_URL:= http://www.webmproject.org/about/ -- cgit v1.2.3 From 1b7d3a76da05162c455659c2619cdb4f60feb8d6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 15 Oct 2013 14:37:26 +0200 Subject: disable avr32 --- package/ffmpeg/Makefile | 2 +- package/libvpx/Makefile | 2 ++ package/mpd/Makefile | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'package/libvpx') diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 550b8e103..045b9edec 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -13,7 +13,7 @@ PKG_FDEPENDS:= libpthread PKG_URL:= http://www.ffmpeg.org/ PKG_SITES:= http://www.ffmpeg.org/releases/ -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !avr32 !cris PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG #PKGSD_FFPLAY:= ffmpeg based video player diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index c68f128cb..c442d0981 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= libs PKG_URL:= http://www.webmproject.org/about/ PKG_SITES:= http://webm.googlecode.com/files/ +PKG_ARCH_DEPENDS:= !avr32 + DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}.tar.bz2 WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION} diff --git a/package/mpd/Makefile b/package/mpd/Makefile index d8ad8eac5..3f4470c3c 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -15,6 +15,8 @@ PKG_BUILDDEP:= glib PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.17/ +PKG_ARCH_DEPENDS:= !avr32 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR -- cgit v1.2.3