Commit c8e99546 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: Update to vpx 1.3.0

parent 4573489d
5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa libvpx-v1.1.0.tar.bz2 af26766a3336155c5bc7b8cce7c23228de054287b990f9cacdc35273384a7af4999c01bb623d12143f40107036308a8b3207081efe67936748503c30c985fd6b libvpx-v1.3.0.tar.bz2
--- libvpx/build/make/gen_asm_deps.sh.orig 2013-03-13 01:39:54.000000000 +0100
+++ libvpx/build/make/gen_asm_deps.sh 2013-03-13 01:41:41.000000000 +0100
@@ -42,7 +42,7 @@
[ -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
--- libvpx/vp8/common/generic/systemdependent.c 2013-03-14 15:39:20.284261976 +0100
+++ libvpx.new/vp8/common/generic/systemdependent.c 2013-03-14 15:39:01.423974364 +0100
@@ -87,7 +87,7 @@
#endif
-#if HAVE_PTHREAD_H
+#if HAVE_PTHREAD_H && !defined(_WIN32)
#include <pthread.h>
static void once(void (*func)(void))
{
# libvpx # libvpx
VPX_VERSION := v1.1.0 VPX_VERSION := v1.3.0
VPX_URL := http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2 VPX_URL := http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2
$(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2: $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
...@@ -11,14 +11,9 @@ $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2: ...@@ -11,14 +11,9 @@ $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/vpx/libvpx-no-cross.patch $(APPLY) $(SRC)/vpx/libvpx-no-cross.patch
$(APPLY) $(SRC)/vpx/libvpx-no-abi.patch
$(APPLY) $(SRC)/vpx/windows.patch $(APPLY) $(SRC)/vpx/windows.patch
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
$(APPLY) $(SRC)/vpx/libvpx-mac.patch $(APPLY) $(SRC)/vpx/libvpx-mac.patch
$(APPLY) $(SRC)/vpx/libvpx-mac-mountain-lion.patch
endif
ifdef HAVE_WIN32
$(APPLY) $(SRC)/vpx/libvpx-win32.patch
endif endif
ifneq ($(which bash),/bin/bash) ifneq ($(which bash),/bin/bash)
sed -i.orig \ sed -i.orig \
...@@ -83,10 +78,9 @@ endif ...@@ -83,10 +78,9 @@ endif
VPX_CONF := \ VPX_CONF := \
--enable-runtime-cpu-detect \ --enable-runtime-cpu-detect \
--disable-install-bins \ --disable-install-bins \
--disable-install-srcs \
--disable-install-libs \
--disable-install-docs \ --disable-install-docs \
--disable-examples \ --disable-examples \
--disable-unit-tests \
--disable-vp8-decoder --disable-vp8-decoder
ifndef HAVE_WIN32 ifndef HAVE_WIN32
VPX_CONF += --enable-pic VPX_CONF += --enable-pic
...@@ -100,15 +94,6 @@ endif ...@@ -100,15 +94,6 @@ endif
.vpx: libvpx .vpx: libvpx
cd $< && CROSS=$(VPX_CROSS) ./configure --target=$(VPX_TARGET) \ cd $< && CROSS=$(VPX_CROSS) ./configure --target=$(VPX_TARGET) \
$(VPX_CONF) $(VPX_CONF) --prefix=$(PREFIX)
cd $< && $(MAKE) install cd $< && $(MAKE) install
rm -Rf -- "$(PREFIX)/include/vpx/"
mkdir -p -- "$(PREFIX)/include/vpx/"
# Of course! Why the hell would it be listed or in make install?
cp $</vpx/*.h $</vpx_ports/*.h "$(PREFIX)/include/vpx/"
rm -f -- "$(PREFIX)/include/vpx/config.h"
$(RANLIB) $</libvpx.a
# Of course! Why the hell would it be listed or in make install?
mkdir -p -- "$(PREFIX)/lib"
install -- $</libvpx.a "$(PREFIX)/lib/libvpx.a"
touch $@ touch $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment