X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..13b56fedb6fe542bdd7e113d7887c6e2f6f2b271:/packages/libvpx/configure.patch

diff --git a/packages/libvpx/configure.patch b/packages/libvpx/configure.patch
index 05b4114b..f81d9d09 100644
--- a/packages/libvpx/configure.patch
+++ b/packages/libvpx/configure.patch
@@ -1,12 +1,31 @@
-diff -u -r ../libvpx-v1.3.0/configure ./configure
---- ../libvpx-v1.3.0/configure	2014-01-10 21:12:42.000000000 +0100
-+++ ./configure	2014-03-03 21:21:38.000000000 +0100
-@@ -505,7 +505,7 @@
-         # Can only build shared libs on a subset of platforms. Doing this check
-         # here rather than at option parse time because the target auto-detect
-         # magic happens after the command line has been parsed.
--        if ! enabled linux; then
-+        if ! enabled linux && ! enabled android; then
-             if enabled gnu; then
+diff -u -r ../libvpx-1.6.1/build/make/configure.sh ./build/make/configure.sh
+--- ../libvpx-1.6.1/build/make/configure.sh	2017-01-12 20:27:27.000000000 +0000
++++ ./build/make/configure.sh	2017-07-27 01:11:03.641678047 +0000
+@@ -891,7 +891,6 @@
+           setup_gnu_toolchain
+           arch_int=${tgt_isa##armv}
+           arch_int=${arch_int%%te}
+-          check_add_asflags --defsym ARCHITECTURE=${arch_int}
+           tune_cflags="-mtune="
+           if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
+             if [ -z "${float_abi}" ]; then
+@@ -1021,7 +1020,6 @@
+           else
+             echo "Assuming standalone build with NDK toolchain."
+             echo "See build/make/Android.mk for details."
+-            check_add_ldflags -static
+             soft_enable unit_tests
+           fi
+           ;;
+diff -u -r ../libvpx-1.6.1/configure ./configure
+--- ../libvpx-1.6.1/configure	2017-01-12 20:27:27.000000000 +0000
++++ ./configure	2017-07-27 01:09:43.590546540 +0000
+@@ -500,7 +500,7 @@
+             # Supported platforms
+             ;;
+         *)
+-            if enabled gnu; then
++            if enabled gnu || enabled android; then
                  echo "--enable-shared is only supported on ELF; assuming this is OK"
              else
+                 die "--enable-shared only supported on ELF, OS/2, and Darwin for now"