Update package libvpx

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
pull/240/head
Timothy Gu 11 years ago
parent b26bfe9e64
commit d21f215f48

@ -3,39 +3,21 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From 01c0e284b4d458fade9f8b2288863f3dd4dbc81a Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 25 May 2012 23:36:41 +0200
Subject: [PATCH 1/4] add Libs.private to vpx.pc
diff --git a/libs.mk b/libs.mk
index e2ba737..209f77e 100644
--- a/libs.mk
+++ b/libs.mk
@@ -242,6 +242,7 @@ vpx.pc: config.mk libs.mk
$(qexec)echo 'Requires:' >> $@
$(qexec)echo 'Conflicts:' >> $@
$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
+ $(qexec)echo 'Libs.private: -lpthread' >> $@
$(qexec)echo 'Cflags: -I$${includedir}' >> $@
INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
--
1.7.11.5
From 73c1c32c41b75a432fbe092fb621474a760d0f51 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 25 May 2012 23:40:00 +0200
Subject: [PATCH 2/4] linking as test is not good for cross compiling
From 1408d07fb86254ae1aded0e8cf38e7e0c2550550 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 5 Sep 2013 14:25:31 -0700
Subject: [PATCH 1/2] Linking as test is not good for cross compiling
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
---
configure | 3 ---
1 file changed, 3 deletions(-)
diff --git a/configure b/configure
index 62e1ffb..0c4faf9 100755
index be36e56..987b2e9 100755
--- a/configure
+++ b/configure
@@ -481,9 +481,6 @@ process_detect() {
@@ -490,9 +490,6 @@ process_detect() {
}
fi
check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
@ -46,14 +28,25 @@ index 62e1ffb..0c4faf9 100755
check_header stdint.h
check_header pthread.h
--
1.7.11.5
From 88bedac576559c599f3084b4eaa61a2ef85cfd06 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 25 May 2012 23:40:55 +0200
Subject: [PATCH 3/4] fix bin/bash
1.8.1.2
From bada4be247273378809a30bf9a0ca7d9c9d2b936 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 5 Sep 2013 14:28:28 -0700
Subject: [PATCH 2/2] Fix /bin/bash
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
---
build/make/armlink_adapter.sh | 2 +-
build/make/configure.sh | 2 +-
build/make/gen_asm_deps.sh | 2 +-
build/make/gen_msvs_def.sh | 2 +-
build/make/gen_msvs_proj.sh | 2 +-
build/make/gen_msvs_sln.sh | 2 +-
build/make/version.sh | 2 +-
configure | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/build/make/armlink_adapter.sh b/build/make/armlink_adapter.sh
index b53669c..71cf7e9 100755
@ -66,7 +59,7 @@ index b53669c..71cf7e9 100755
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##
diff --git a/build/make/configure.sh b/build/make/configure.sh
index 3c772e5..032b5e8 100755
index c99a01c..9023dee 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1,4 +1,4 @@
@ -76,7 +69,7 @@ index 3c772e5..032b5e8 100755
## configure.sh
##
diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
index 717f870..81b7095 100755
index 0b4e3aa..158ec34 100755
--- a/build/make/gen_asm_deps.sh
+++ b/build/make/gen_asm_deps.sh
@@ -1,4 +1,4 @@
@ -126,7 +119,7 @@ index 3efb956..b3a9c23 100755
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##
diff --git a/configure b/configure
index 0c4faf9..5d1db69 100755
index 987b2e9..d581cf2 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
@ -136,30 +129,4 @@ index 0c4faf9..5d1db69 100755
## configure
##
--
1.7.11.5
From 3d905203699e813027233bd0f19b05d44b98470d Mon Sep 17 00:00:00 2001
From: MXE
Date: Mon, 17 Sep 2012 20:23:14 +1000
Subject: [PATCH 4/4] Fix for building on OSX
Taken from:
https://gerrit.chromium.org/gerrit/#/c/26027/
diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
index 81b7095..158ec34 100755
--- a/build/make/gen_asm_deps.sh
+++ b/build/make/gen_asm_deps.sh
@@ -42,7 +42,7 @@ done
[ -n "$srcfile" ] || show_help
sfx=${sfx:-asm}
-includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
+includes=$(LC_ALL=C egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
#" restore editor state
for inc in ${includes}; do
--
1.7.11.5
1.8.1.2

@ -3,8 +3,8 @@
PKG := libvpx
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.1.0
$(PKG)_CHECKSUM := 356af5f770c50cd021c60863203d8f30164f6021
$(PKG)_VERSION := 1.2.0
$(PKG)_CHECKSUM := 33fb2df4ee5b06637dc492dafe49425ead117a24
$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://webm.googlecode.com/files/$($(PKG)_FILE)

Loading…
Cancel
Save