summaryrefslogtreecommitdiffstats
path: root/contrib/libvpx
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/libvpx')
-rw-r--r--contrib/libvpx/A00-static-pkg-config.patch26
-rw-r--r--contrib/libvpx/A01-avx-512-detection.patch36
-rw-r--r--contrib/libvpx/A01-pthreads.patch19
-rw-r--r--contrib/libvpx/A02-avx-512-detection2.patch33
-rw-r--r--contrib/libvpx/A03-avx-512-detection3.patch63
-rw-r--r--contrib/libvpx/P03-mingw-pthread-test.patch80
-rw-r--r--contrib/libvpx/P04-darwin-highsierra-detection.patch59
-rw-r--r--contrib/libvpx/module.defs6
8 files changed, 22 insertions, 300 deletions
diff --git a/contrib/libvpx/A00-static-pkg-config.patch b/contrib/libvpx/A00-static-pkg-config.patch
deleted file mode 100644
index 3e0d1bc00..000000000
--- a/contrib/libvpx/A00-static-pkg-config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur libvpx-1.7.0.orig/libs.mk libvpx-1.7.0/libs.mk
---- libvpx-1.7.0.orig/libs.mk 2018-01-24 14:25:44.000000000 -0800
-+++ libvpx-1.7.0/libs.mk 2018-06-02 10:14:26.024150541 -0700
-@@ -333,12 +333,22 @@
- $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
- $(qexec)echo 'Requires:' >> $@
- $(qexec)echo 'Conflicts:' >> $@
-+ifneq ($(CONFIG_SHARED),yes)
-+ifeq ($(HAVE_PTHREAD_H),yes)
-+ $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm -lpthread' >> $@
-+ $(qexec)echo 'Libs.private:' >> $@
-+else
- $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
-+ $(qexec)echo 'Libs.private:' >> $@
-+endif
-+else
-+ $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
- ifeq ($(HAVE_PTHREAD_H),yes)
- $(qexec)echo 'Libs.private: -lm -lpthread' >> $@
- else
- $(qexec)echo 'Libs.private: -lm' >> $@
- endif
-+endif
- $(qexec)echo 'Cflags: -I$${includedir}' >> $@
- INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
- INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
diff --git a/contrib/libvpx/A01-avx-512-detection.patch b/contrib/libvpx/A01-avx-512-detection.patch
deleted file mode 100644
index 5cb1e6039..000000000
--- a/contrib/libvpx/A01-avx-512-detection.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 393f7856587d58292febb0a3e82edc405aab4498 Mon Sep 17 00:00:00 2001
-From: Tom Finegan <[email protected]>
-Date: Thu, 7 Jun 2018 12:35:05 -0700
-Subject: [PATCH] Add avx512 compile test.
-
-Some compiler releases allow the -mavx512f arg without actually
-implementing support. Test for this situation, and disable avx512
-when it is detected by configure.
-
-BUG=webm:1536
-
-Change-Id: I63952153bb4b24aa9f25267ed47a0fe845d61f8b
----
- build/make/configure.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 480b2d0eab..e0e9fd1a73 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -1333,6 +1333,15 @@ EOF
- else
- if [ "$ext" = "avx512" ]; then
- check_gcc_machine_options $ext avx512f avx512cd avx512bw avx512dq avx512vl
-+
-+ # Confirm that the compiler really supports avx512.
-+ check_cc -mavx512f <<EOF || RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx512 " && soft_disable avx512
-+#include <immintrin.h>
-+void f(void) {
-+ __m512i x = _mm512_set1_epi16(0);
-+ (void)x;
-+}
-+EOF
- else
- # use the shortened version for the flag: sse4_1 -> sse4
- check_gcc_machine_option ${ext%_*} $ext
diff --git a/contrib/libvpx/A01-pthreads.patch b/contrib/libvpx/A01-pthreads.patch
new file mode 100644
index 000000000..4ac40ebe0
--- /dev/null
+++ b/contrib/libvpx/A01-pthreads.patch
@@ -0,0 +1,19 @@
+Only in libvpx-1.8.0: .DS_Store
+Only in libvpx-1.8.0/build: .DS_Store
+diff -ur libvpx-1.8.0.orig/libs.mk libvpx-1.8.0/libs.mk
+--- libvpx-1.8.0.orig/libs.mk 2019-02-04 12:02:33.000000000 -0500
++++ libvpx-1.8.0/libs.mk 2019-02-28 10:43:03.000000000 -0500
+@@ -321,11 +321,10 @@
+ $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
+ $(qexec)echo 'Requires:' >> $@
+ $(qexec)echo 'Conflicts:' >> $@
+- $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
+ ifeq ($(HAVE_PTHREAD_H),yes)
+- $(qexec)echo 'Libs.private: -lm -lpthread' >> $@
++ $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm -lpthread' >> $@
+ else
+- $(qexec)echo 'Libs.private: -lm' >> $@
++ $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
+ endif
+ $(qexec)echo 'Cflags: -I$${includedir}' >> $@
+ INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
diff --git a/contrib/libvpx/A02-avx-512-detection2.patch b/contrib/libvpx/A02-avx-512-detection2.patch
deleted file mode 100644
index 3eabe7771..000000000
--- a/contrib/libvpx/A02-avx-512-detection2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 68a9b143d02436729e024f081c8d77b42f2e9d7f Mon Sep 17 00:00:00 2001
-From: Tom Finegan <[email protected]>
-Date: Wed, 13 Jun 2018 09:39:28 -0700
-Subject: [PATCH] Fix avx512 related MSVC build failure.
-
-Check GCC specific AVX512 flags only when GCC is enabled.
-
-Change-Id: I15dc2a0dbf8bce37f4364fedfd34a0a34882104b
----
- build/make/configure.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index e0e9fd1a73..37b410edb6 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -1335,13 +1335,15 @@ EOF
- check_gcc_machine_options $ext avx512f avx512cd avx512bw avx512dq avx512vl
-
- # Confirm that the compiler really supports avx512.
-- check_cc -mavx512f <<EOF || RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx512 " && soft_disable avx512
-+ if enabled gcc; then
-+ check_cc -mavx512f <<EOF || RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx512 " && soft_disable avx512
- #include <immintrin.h>
- void f(void) {
- __m512i x = _mm512_set1_epi16(0);
- (void)x;
- }
- EOF
-+ fi
- else
- # use the shortened version for the flag: sse4_1 -> sse4
- check_gcc_machine_option ${ext%_*} $ext
diff --git a/contrib/libvpx/A03-avx-512-detection3.patch b/contrib/libvpx/A03-avx-512-detection3.patch
deleted file mode 100644
index 6dc09e3a8..000000000
--- a/contrib/libvpx/A03-avx-512-detection3.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ab71db65a5e8aeb107e0eb4d5fd3e03ec7452b86 Mon Sep 17 00:00:00 2001
-From: Tom Finegan <[email protected]>
-Date: Fri, 15 Jun 2018 10:58:11 -0700
-Subject: [PATCH] Clean up avx512 compiler support test.
-
-Moves the check into a function, check_gcc_avx512_compiles,
-that behaves somewhat similarly to check_gcc_machine_options.
-
-Change-Id: I2bef3ddd98e636eef12d9d5e548c43282fac7826
----
- build/make/configure.sh | 32 +++++++++++++++++++++-----------
- 1 file changed, 21 insertions(+), 11 deletions(-)
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 37b410edb6..d2c6b26fa1 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -426,6 +426,26 @@ check_gcc_machine_options() {
- fi
- }
-
-+check_gcc_avx512_compiles() {
-+ if disabled gcc; then
-+ return
-+ fi
-+
-+ check_cc -mavx512f <<EOF
-+#include <immintrin.h>
-+void f(void) {
-+ __m512i x = _mm512_set1_epi16(0);
-+ (void)x;
-+}
-+EOF
-+ compile_result=$?
-+ if [ ${compile_result} -ne 0 ]; then
-+ log_echo " disabling avx512: not supported by compiler"
-+ disable_feature avx512
-+ RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx512 "
-+ fi
-+}
-+
- write_common_config_banner() {
- print_webm_license config.mk "##" ""
- echo '# This file automatically generated by configure. Do not edit!' >> config.mk
-@@ -1333,17 +1353,7 @@ EOF
- else
- if [ "$ext" = "avx512" ]; then
- check_gcc_machine_options $ext avx512f avx512cd avx512bw avx512dq avx512vl
--
-- # Confirm that the compiler really supports avx512.
-- if enabled gcc; then
-- check_cc -mavx512f <<EOF || RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx512 " && soft_disable avx512
--#include <immintrin.h>
--void f(void) {
-- __m512i x = _mm512_set1_epi16(0);
-- (void)x;
--}
--EOF
-- fi
-+ check_gcc_avx512_compiles
- else
- # use the shortened version for the flag: sse4_1 -> sse4
- check_gcc_machine_option ${ext%_*} $ext
diff --git a/contrib/libvpx/P03-mingw-pthread-test.patch b/contrib/libvpx/P03-mingw-pthread-test.patch
deleted file mode 100644
index 704bac746..000000000
--- a/contrib/libvpx/P03-mingw-pthread-test.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 38dc27cc6d03383cf1764e03697137e2f330d550 Mon Sep 17 00:00:00 2001
-From: Martin Storsjo <[email protected]>
-Date: Sat, 14 Apr 2018 23:40:46 +0300
-Subject: [PATCH] configure: Test linking pthreads before using it
-
-This avoids enabling pthreads if only pthreads-w32 is available.
-pthreads-w32 provides pthread.h but has a link library with a
-different name (libpthreadGC2.a).
-
-Generally, always using win32 threads when on windows would be
-sensible.
-
-However, libstdc++ can be configured to use pthreads (winpthreads), and
-in these cases, standard C++ headers can pollute the namespace with
-pthreads declarations, which break the win32 threads headers that
-declare similar symbols - leading us to prefer pthreads on windows
-whenever available (see d167a1ae and bug 1132).
-
-Change-Id: Icd668ccdaf3aeabb7fa4e713e040ef3d67546f00
----
- build/make/configure.sh | 12 +++++++++++-
- configure | 9 ++++++++-
- 2 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 60fc36e430..72376373c4 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -319,6 +319,12 @@ check_ld() {
- && check_cmd ${LD} ${LDFLAGS} "$@" -o ${TMP_X} ${TMP_O} ${extralibs}
- }
-
-+check_lib() {
-+ log check_lib "$@"
-+ check_cc $@ \
-+ && check_cmd ${LD} ${LDFLAGS} -o ${TMP_X} ${TMP_O} "$@" ${extralibs}
-+}
-+
- check_header(){
- log check_header "$@"
- header=$1
-@@ -1484,7 +1490,11 @@ EOF
- # bionic includes basic pthread functionality, obviating -lpthread.
- ;;
- *)
-- check_header pthread.h && add_extralibs -lpthread
-+ check_lib -lpthread <<EOF && enable_feature pthread_h && add_extralibs -lpthread
-+#include <pthread.h>
-+#include <stddef.h>
-+int main(void) { return pthread_create(NULL, NULL, NULL, NULL); }
-+EOF
- ;;
- esac
- fi
-diff --git a/configure b/configure
-index 2f198e9a61..3174a9f4b5 100755
---- a/configure
-+++ b/configure
-@@ -573,13 +573,20 @@ process_detect() {
- check_ld() {
- true
- }
-+ check_lib() {
-+ true
-+ }
- fi
- check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
- check_ld <<EOF || die "Toolchain is unable to link executables"
- int main(void) {return 0;}
- EOF
- # check system headers
-- check_header pthread.h
-+ check_lib -lpthread <<EOF && enable_feature pthread_h
-+#include <pthread.h>
-+#include <stddef.h>
-+int main(void) { return pthread_create(NULL, NULL, NULL, NULL); }
-+EOF
- check_header unistd.h # for sysconf(3) and friends.
-
- check_header vpx/vpx_integer.h -I${source_path} && enable_feature vpx_ports
diff --git a/contrib/libvpx/P04-darwin-highsierra-detection.patch b/contrib/libvpx/P04-darwin-highsierra-detection.patch
deleted file mode 100644
index ae52dec20..000000000
--- a/contrib/libvpx/P04-darwin-highsierra-detection.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 95a71057f09f6b94e08ad2206ee8856a5695cf4f Mon Sep 17 00:00:00 2001
-From: Johann <[email protected]>
-Date: Mon, 12 Mar 2018 14:54:48 -0700
-Subject: [PATCH] autodetect macOS High Sierra
-
-Add darwin17 target
-
-Change-Id: I349a2f6a0396c59269f567a03ae813e3e59ccefa
----
- build/make/configure.sh | 8 ++++++++
- configure | 2 ++
- 2 files changed, 10 insertions(+)
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index d7e40b83f1..20a38e8146 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -757,6 +757,10 @@ process_common_toolchain() {
- tgt_isa=x86_64
- tgt_os=darwin16
- ;;
-+ *darwin17*)
-+ tgt_isa=x86_64
-+ tgt_os=darwin17
-+ ;;
- x86_64*mingw32*)
- tgt_os=win64
- ;;
-@@ -885,6 +889,10 @@ process_common_toolchain() {
- add_cflags "-mmacosx-version-min=10.12"
- add_ldflags "-mmacosx-version-min=10.12"
- ;;
-+ *-darwin17-*)
-+ add_cflags "-mmacosx-version-min=10.13"
-+ add_ldflags "-mmacosx-version-min=10.13"
-+ ;;
- *-iphonesimulator-*)
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
- add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
-diff --git a/configure b/configure
-index 6e7630ebac..32652c447e 100755
---- a/configure
-+++ b/configure
-@@ -129,6 +129,7 @@ all_platforms="${all_platforms} x86-darwin13-gcc"
- all_platforms="${all_platforms} x86-darwin14-gcc"
- all_platforms="${all_platforms} x86-darwin15-gcc"
- all_platforms="${all_platforms} x86-darwin16-gcc"
-+all_platforms="${all_platforms} x86-darwin17-gcc"
- all_platforms="${all_platforms} x86-iphonesimulator-gcc"
- all_platforms="${all_platforms} x86-linux-gcc"
- all_platforms="${all_platforms} x86-linux-icc"
-@@ -149,6 +150,7 @@ all_platforms="${all_platforms} x86_64-darwin13-gcc"
- all_platforms="${all_platforms} x86_64-darwin14-gcc"
- all_platforms="${all_platforms} x86_64-darwin15-gcc"
- all_platforms="${all_platforms} x86_64-darwin16-gcc"
-+all_platforms="${all_platforms} x86_64-darwin17-gcc"
- all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
- all_platforms="${all_platforms} x86_64-linux-gcc"
- all_platforms="${all_platforms} x86_64-linux-icc"
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index 838f3a226..d10b0d91b 100644
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -1,9 +1,9 @@
$(eval $(call import.MODULE.defs,LIBVPX,libvpx))
$(eval $(call import.CONTRIB.defs,LIBVPX))
-LIBVPX.FETCH.url = https://download.handbrake.fr/contrib/libvpx-1.7.0.tar.gz
-LIBVPX.FETCH.url += https://github.com/webmproject/libvpx/archive/v1.7.0.tar.gz
-LIBVPX.FETCH.sha256 = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
+LIBVPX.FETCH.url = https://download.handbrake.fr/contrib/libvpx-1.8.0.tar.gz
+LIBVPX.FETCH.url += https://github.com/webmproject/libvpx/archive/v1.8.0.tar.gz
+LIBVPX.FETCH.sha256 = 86df18c694e1c06cc8f83d2d816e9270747a0ce6abe316e93a4f4095689373f6
LIBVPX.CONFIGURE.args.host =
LIBVPX.CONFIGURE.deps =
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 12:28:41 +0000