[vlc-commits] contrib/vpx: Drop patch libvpx-mac.patch

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Jun  8 08:59:07 2019 +0200| [1dea933c2d6554f4aebe7130c33f829309ce6c6e] | committer: David Fuhrmann

contrib/vpx: Drop patch libvpx-mac.patch

This is a null-op patch, osx_sdk_dir is not used anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1dea933c2d6554f4aebe7130c33f829309ce6c6e
---

 contrib/src/vpx/libvpx-mac.patch | 43 ----------------------------------------
 contrib/src/vpx/rules.mak        |  1 -
 2 files changed, 44 deletions(-)

diff --git a/contrib/src/vpx/libvpx-mac.patch b/contrib/src/vpx/libvpx-mac.patch
deleted file mode 100644
index 7e412834c5..0000000000
--- a/contrib/src/vpx/libvpx-mac.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- libvpx-1.4.0/build/make/configure.sh.orig	2015-05-05 16:03:00.504713016 +0200
-+++ libvpx-1.4.0/build/make/configure.sh	2015-05-05 16:05:52.358003947 +0200
-@@ -751,6 +751,12 @@
-       ;;
-   esac
- 
-+  if [ -d "${sdk_path}" ]; then
-+      case "${sdk_path}" in
-+         darwin*) osx_sdk_dir=${sdk_path} ;;
-+      esac
-+  fi
-+
-   case ${toolchain} in
-     *-darwin8-*)
-       add_cflags  "-mmacosx-version-min=10.4"
---- libvpx-1.4.0/build/make/configure.sh.orig	2015-05-05 16:06:31.502087047 +0200
-+++ libvpx-1.4.0/build/make/configure.sh	2015-05-05 16:09:41.525727635 +0200
-@@ -651,6 +651,12 @@
-         ;;
-     esac
- 
-+    if [ -d "${sdk_path}" ]; then
-+        case "${sdk_path}" in
-+           darwin*) osx_sdk_dir=${sdk_path} ;;
-+        esac
-+    fi
-+
-     # detect tgt_os
-     case "$gcctarget" in
-       *darwin8*)
-@@ -751,12 +757,6 @@
-       ;;
-   esac
- 
--  if [ -d "${sdk_path}" ]; then
--      case "${sdk_path}" in
--         darwin*) osx_sdk_dir=${sdk_path} ;;
--      esac
--  fi
--
-   case ${toolchain} in
-     *-darwin8-*)
-       add_cflags  "-mmacosx-version-min=10.4"
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 3bc11cb064..b4234fe7f7 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -15,7 +15,6 @@ $(TARBALLS)/libvpx-$(VPX_VERSION).tar.gz:
 
 libvpx: libvpx-$(VPX_VERSION).tar.gz .sum-vpx
 	$(UNPACK)
-	$(APPLY) $(SRC)/vpx/libvpx-mac.patch
 	$(APPLY) $(SRC)/vpx/libvpx-ios.patch
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/vpx/libvpx-android.patch