From 4a74bd5f5ae1cb141f502e37997fbe81cf769483 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 3 Jul 2014 12:06:46 +0200 Subject: [PATCH] Fix compil + removed openh264 patch --- Makefile | 9 ++------- submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b75b52be3..e011a47af 100644 --- a/Makefile +++ b/Makefile @@ -217,22 +217,17 @@ OPENH264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/openh264 OPENH264_BUILD_DIR_ARM=$(OPENH264_BUILD_DIR)/arm OPENH264_BUILD_DIR_X86=$(OPENH264_BUILD_DIR)/x86 -$(OPENH264_SRC_DIR)/patch.stamp: $(TOPDIR)/patches/openh264-permissive.patch - cd $(OPENH264_SRC_DIR) && patch -p1 < $(TOPDIR)/patches/openh264-permissive.patch && touch $(OPENH264_SRC_DIR)/patch.stamp - -openh264-patch: $(OPENH264_SRC_DIR)/patch.stamp - openh264-install-headers: mkdir -p $(OPENH264_SRC_DIR)/include/wels rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/codec/api/svc/* $(OPENH264_SRC_DIR)/include/wels/. -copy-openh264-x86: openh264-patch openh264-install-headers +copy-openh264-x86: openh264-install-headers mkdir -p $(OPENH264_BUILD_DIR) mkdir -p $(OPENH264_BUILD_DIR_X86) cd $(OPENH264_BUILD_DIR_X86) \ && rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* . -copy-openh264-arm: openh264-patch openh264-install-headers +copy-openh264-arm: openh264-install-headers mkdir -p $(OPENH264_BUILD_DIR) mkdir -p $(OPENH264_BUILD_DIR_ARM) cd $(OPENH264_BUILD_DIR_ARM) \ diff --git a/submodules/linphone b/submodules/linphone index 556b859e5..e28bd61d7 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 556b859e5e46f47dd421c85582d553755ee3e9fa +Subproject commit e28bd61d73c918513a4db3dffe043e8af9b9fb7d