From fdccfe47341cd8ed11c1a7e497f46af08536d9be Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Tue, 13 Feb 2018 15:43:05 +1100
Subject: recipes/openh264: update to 1.7.0

---
 recipes/openh264/0001-Add-version-suffix.patch     | 54 ----------------------
 .../0002-Remove-fembed-bitcode-for-iOS-build.patch | 25 ----------
 2 files changed, 79 deletions(-)
 delete mode 100644 recipes/openh264/0001-Add-version-suffix.patch
 delete mode 100644 recipes/openh264/0002-Remove-fembed-bitcode-for-iOS-build.patch

(limited to 'recipes/openh264')

diff --git a/recipes/openh264/0001-Add-version-suffix.patch b/recipes/openh264/0001-Add-version-suffix.patch
deleted file mode 100644
index 7bb9515d..00000000
--- a/recipes/openh264/0001-Add-version-suffix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6bd06197e2ec7af8a7b41fa2b291c4834feb5649 Mon Sep 17 00:00:00 2001
-From: Zaheer Abbas Merali <zaheermerali@gmail.com>
-Date: Tue, 13 Jan 2015 11:15:25 -0800
-Subject: [PATCH] Add version suffix
-
----
- Makefile                  | 2 +-
- build/platform-android.mk | 5 +++--
- build/platform-linux.mk   | 1 +
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 372a63f..b9d7e74 100644
---- a/Makefile
-+++ b/Makefile
-@@ -207,7 +207,7 @@ libraries: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX)
- 
- # No point in building dylib for ios
- ifneq (ios, $(OS))
--libraries: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
-+libraries: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
- endif
- 
- LIBRARIES += $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
-diff --git a/build/platform-android.mk b/build/platform-android.mk
-index 5cc6261..d5fd8b5 100644
---- a/build/platform-android.mk
-+++ b/build/platform-android.mk
-@@ -1,9 +1,10 @@
- ARCH = arm
- include $(SRC_PATH)build/arch.mk
-+SHAREDLIB_DIR = $(PREFIX)/lib
- SHAREDLIBSUFFIX = so
- # Android APK/JARs expect libraries to be unversioned
--SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX)
--SHLDFLAGS =
-+SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX).$(SHAREDLIBVERSION)
-+SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
- NDKLEVEL = 12
- ifeq ($(ARCH), arm)
-   ifneq ($(APP_ABI), armeabi)
-diff --git a/build/platform-linux.mk b/build/platform-linux.mk
-index b6419d1..3a0941b 100644
---- a/build/platform-linux.mk
-+++ b/build/platform-linux.mk
-@@ -1,4 +1,5 @@
- include $(SRC_PATH)build/arch.mk
-+SHAREDLIB_DIR = $(PREFIX)/lib
- SHAREDLIBSUFFIX = so
- SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX).$(SHAREDLIBVERSION)
- SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
--- 
-2.8.1
-
diff --git a/recipes/openh264/0002-Remove-fembed-bitcode-for-iOS-build.patch b/recipes/openh264/0002-Remove-fembed-bitcode-for-iOS-build.patch
deleted file mode 100644
index f34f6b1e..00000000
--- a/recipes/openh264/0002-Remove-fembed-bitcode-for-iOS-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 273749d669fc1e73298ca2fb265b32a512f512ce Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <jan@centricular.com>
-Date: Sat, 3 Sep 2016 03:26:14 +1000
-Subject: [PATCH] Remove -fembed-bitcode for iOS build.
-
-To keep support for XCode 6
----
- build/platform-ios.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/platform-ios.mk b/build/platform-ios.mk
-index 4ec8919..5bcb28e 100644
---- a/build/platform-ios.mk
-+++ b/build/platform-ios.mk
-@@ -12,6 +12,6 @@ SDK_MIN = 5.1
- 
- XCODE=$(shell xcode-select -p)
- SDKROOT = $(XCODE)/Platforms/$(SDKTYPE).platform/Developer/SDKs/$(SDKTYPE)$(SDK).sdk
--CFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN) -DAPPLE_IOS -fembed-bitcode
-+CFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN) -DAPPLE_IOS
- LDFLAGS += -arch $(ARCH) -isysroot $(SDKROOT) -miphoneos-version-min=$(SDK_MIN)
- 
--- 
-2.3.2 (Apple Git-55)
-
-- 
cgit v1.2.3