X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e58281b9f95b6dd38d650c7a92131f6fba9830c6..73d77d8ac7562cd897c84c6cbcadc6346cd6dc27:/packages/libvpx/configure.patch

diff --git a/packages/libvpx/configure.patch b/packages/libvpx/configure.patch
index 77743a30..f81d9d09 100644
--- a/packages/libvpx/configure.patch
+++ b/packages/libvpx/configure.patch
@@ -1,12 +1,31 @@
-diff -u -r ../libvpx-1.5.0/configure ./configure
---- ../libvpx-1.5.0/configure	2015-11-09 17:12:38.000000000 -0500
-+++ ./configure	2015-11-17 15:20:15.792584646 -0500
-@@ -507,7 +507,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 && ! enabled os2; then
-+        if ! enabled linux && ! enabled os2 && ! 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"