[vlc-commits] Revert "contrib: vpx: update to 1.2.0"
Rafaël Carré
git at videolan.org
Tue Oct 15 14:22:53 CEST 2013
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Oct 15 14:20:46 2013 +0200| [5daf549fa226ba2de2c522a6a204a51a2bad5863] | committer: Rafaël Carré
Revert "contrib: vpx: update to 1.2.0"
This reverts commit 7e2edc0d901a4ffe1fc429a81cccdb69dc186372.
http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2
is a release tarball
http://webm.googlecode.com/files/libvpx-v1.2.0.tar.bz2
is a daily updated git snapshot
libvpx has no release tarballs (or releases) anymore apparently.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5daf549fa226ba2de2c522a6a204a51a2bad5863
---
contrib/src/vpx/SHA512SUMS | 2 +-
contrib/src/vpx/libvpx-no-abi.patch | 26 +++++++++++++-------------
contrib/src/vpx/libvpx-win32.patch | 11 +++++++++++
contrib/src/vpx/rules.mak | 11 ++++++-----
contrib/src/vpx/win32.patch | 20 --------------------
contrib/src/vpx/windows.patch | 13 +++++++++++++
6 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index eb874d4..1a97c3a 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-bf3fc0b4c3cd91ff5bdb8dec6753af484c2c3d4410835f7ef223e15f7ba65cb15415ad69315889ced52627c0ae5662397d1db52dbf11e39fffe7f133ccfff5b9 libvpx-v1.2.0.tar.bz2
+5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa libvpx-v1.1.0.tar.bz2
diff --git a/contrib/src/vpx/libvpx-no-abi.patch b/contrib/src/vpx/libvpx-no-abi.patch
index 8db8292..648e3b7 100644
--- a/contrib/src/vpx/libvpx-no-abi.patch
+++ b/contrib/src/vpx/libvpx-no-abi.patch
@@ -1,13 +1,13 @@
---- libvpx-v1.2.0/build/make/configure.sh.orig 2013-10-14 14:22:30.218929454 +0200
-+++ libvpx-v1.2.0/build/make/configure.sh 2013-10-14 14:23:38.986930059 +0200
-@@ -782,8 +782,8 @@
- check_add_asflags --defsym ARCHITECTURE=${arch_int}
- tune_cflags="-mtune="
- if [ ${tgt_isa} == "armv7" ]; then
-- check_add_cflags -march=armv7-a -mfloat-abi=softfp
-- check_add_asflags -march=armv7-a -mfloat-abi=softfp
-+ check_add_cflags -march=armv7-a
-+ check_add_asflags -march=armv7-a
-
- if enabled neon
- then
+--- libvpx-v1.1.0/build/make/configure.sh.orig 2012-05-09 01:14:00.000000000 +0200
++++ libvpx.new/build/make/configure.sh 2013-03-10 16:48:48.562884896 +0100
+@@ -738,8 +737,8 @@
+ check_add_cflags -mfpu=neon #-ftree-vectorize
+ check_add_asflags -mfpu=neon
+ fi
+- check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp
+- check_add_asflags -mcpu=cortex-a8 -mfloat-abi=softfp #-march=armv7-a
++ check_add_cflags -march=armv7-a -mcpu=cortex-a8
++ check_add_asflags -mcpu=cortex-a8 #-march=armv7-a
+ else
+ check_add_cflags -march=${tgt_isa}
+ check_add_asflags -march=${tgt_isa}
diff --git a/contrib/src/vpx/libvpx-win32.patch b/contrib/src/vpx/libvpx-win32.patch
new file mode 100644
index 0000000..fcf9862
--- /dev/null
+++ b/contrib/src/vpx/libvpx-win32.patch
@@ -0,0 +1,11 @@
+--- 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))
+ {
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index a38bbf3..df8c314 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,6 +1,6 @@
# libvpx
-VPX_VERSION := v1.2.0
+VPX_VERSION := v1.1.0
VPX_URL := http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2
$(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
@@ -12,13 +12,14 @@ libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
$(UNPACK)
$(APPLY) $(SRC)/vpx/libvpx-no-cross.patch
$(APPLY) $(SRC)/vpx/libvpx-no-abi.patch
- $(APPLY) $(SRC)/vpx/libvpx-mac.patch
-ifdef HAVE_WIN32
- $(APPLY) $(SRC)/vpx/win32.patch
-endif
+ $(APPLY) $(SRC)/vpx/windows.patch
ifdef HAVE_MACOSX
+ $(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
ifneq ($(which bash),/bin/bash)
sed -i.orig \
s,^\#!/bin/bash,\#!`which bash`,g \
diff --git a/contrib/src/vpx/win32.patch b/contrib/src/vpx/win32.patch
deleted file mode 100644
index c2ff292..0000000
--- a/contrib/src/vpx/win32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libvpx/libs.mk.orig 2013-10-14 14:32:39.610934820 +0200
-+++ libvpx/libs.mk 2013-10-14 14:32:52.146934930 +0200
-@@ -230,7 +230,7 @@
- $(qexec)echo 'Requires:' >> $@
- $(qexec)echo 'Conflicts:' >> $@
- $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
-- $(qexec)echo 'Libs.private: -lm -lpthread' >> $@
-+ $(qexec)echo 'Libs.private: -lm' >> $@
- $(qexec)echo 'Cflags: -I$${includedir}' >> $@
- INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
- INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
-@@ -427,7 +427,7 @@
- lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))\
- $(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\
- $(LIBVPX_TEST_OBJS) \
-- -L. -lvpx -lgtest -lpthread -lm)\
-+ -L. -lvpx -lgtest -lm)\
- )))\
- $(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\
-
diff --git a/contrib/src/vpx/windows.patch b/contrib/src/vpx/windows.patch
new file mode 100644
index 0000000..d722d21
--- /dev/null
+++ b/contrib/src/vpx/windows.patch
@@ -0,0 +1,13 @@
+--- libvpx/vp8/common/generic/systemdependent.c.orig 2013-03-13 01:01:48.404990528 +0100
++++ libvpx/vp8/common/generic/systemdependent.c 2013-03-13 01:02:35.928991544 +0100
+@@ -18,6 +18,10 @@
+ #endif
+ #include "vp8/common/onyxc_int.h"
+
++#if defined(_WIN32)
++# include <windows.h>
++#endif
++
+ #if CONFIG_MULTITHREAD
+ #if HAVE_UNISTD_H && !defined(__OS2__)
+ #include <unistd.h>
More information about the vlc-commits
mailing list