patches: update patch 12

patches/0012-contrib-add-arch-option-for-platforms-where-the-arch.patch

@@ -1,16 +1,15 @@
-From 428ecc9c3c98c37501d9bf79fb4025f51e67f0d8 Mon Sep 17 00:00:00 2001
+From f8d45c80b2901cb3109c5b07cdaf4953b491be66 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:27:43 +0200
-Subject: [PATCH 12/15] contrib: add arch option for platforms where the arch
+Subject: [PATCH 12/16] contrib: add arch option for platforms where the arch
  triplet would be ambigous
 
 ---
- contrib/bootstrap    | 11 ++++++++++-
- contrib/src/main.mak |  2 ++
- 2 files changed, 12 insertions(+), 1 deletion(-)
+ contrib/bootstrap | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/contrib/bootstrap b/contrib/bootstrap
-index 6bf7bd5..8bbb167 100755
+index e5c7022..cc170a2 100755
 --- a/contrib/bootstrap
 +++ b/contrib/bootstrap
 @@ -30,6 +30,7 @@ usage()
@@ -39,7 +38,7 @@ index 6bf7bd5..8bbb167 100755
  		*)
  			echo "Unrecognized options $1"
  			usage
-@@ -206,6 +211,7 @@ test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
+@@ -188,6 +193,7 @@ test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
  test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
  test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
  test -z "$GPL" || add_make_enabled "GPL"
@@ -47,32 +46,18 @@ index 6bf7bd5..8bbb167 100755
  
  #
  # Checks
-@@ -219,7 +225,10 @@ case "${OS}" in
+@@ -200,7 +206,10 @@ case "${OS}" in
+ 			check_macosx_sdk
  			add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
  		else
- 			check_ios_sdk
 -			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
-+			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
-+			if [ "$ARCH" != "arm64" ]; then
-+				add_make_enabled "HAVE_ARMV7A"
-+			fi
++ 			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
++ 			if [ "$ARCH" != "arm64" ]; then
++ 				add_make_enabled "HAVE_ARMV7A"
++ 			fi
  		fi
  		;;
  	*bsd*)
-diff --git a/contrib/src/main.mak b/contrib/src/main.mak
-index 66cc31e..9026819 100644
---- a/contrib/src/main.mak
-+++ b/contrib/src/main.mak
-@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
- ifneq ($(HOST),$(BUILD))
- HAVE_CROSS_COMPILE = 1
- endif
-+ifeq ($(ARCH),)
- ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
-+endif
- 
- ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
- HAVE_WIN64 := 1
 -- 
 1.8.3.4 (Apple Git-47)