From bc1b307555a7ecf22e7f4e88286283ca468fd5cd Mon Sep 17 00:00:00 2001
From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Wed, 1 Nov 2017 18:40:42 +0100
Subject: [PATCH] sound/fdk-aac: Update to latest commit

Update to latest commit upstream
Add optimization option

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
---
 sound/fdk-aac/Config.in | 12 ++++++++++++
 sound/fdk-aac/Makefile  | 20 +++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 sound/fdk-aac/Config.in

diff --git a/sound/fdk-aac/Config.in b/sound/fdk-aac/Config.in
new file mode 100644
index 000000000..252b29077
--- /dev/null
+++ b/sound/fdk-aac/Config.in
@@ -0,0 +1,12 @@
+menu "Configuration"
+	depends on PACKAGE_fdk-aac
+
+config FDK-AAC_OPTIMIZE_SPEED
+	bool "Optimize for speed"
+	default n
+	help
+		This enables additional optmization and 
+		increases performance considerably at 
+		the expense of binary size.
+
+endmenu
diff --git a/sound/fdk-aac/Makefile b/sound/fdk-aac/Makefile
index e7918bda8..9d1f381f9 100644
--- a/sound/fdk-aac/Makefile
+++ b/sound/fdk-aac/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fdk-aac
-PKG_VERSION:=0.1.5
+PKG_VERSION:=0.1.5-20171030
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net>
 PKG_LICENSE:=Fraunhofer-FDK-AAC-for-Android
@@ -17,12 +17,22 @@ PKG_LICENSE_FILES:=NOTICE
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/mstorsjo/fdk-aac/
 PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=74c1a2a4f831285cbd93ec1427f1670d3c5c5e52
+PKG_SOURCE_VERSION:=1e3515e03e2dbdbd48dacc31ef75d25c201a4c51
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=d2ff3ca03842e96f3f18619f8a27ea03fb5d1e2266e4010cbb4803bf6e1fe62b
+PKG_MIRROR_HASH:=80ac4644e07d5101f8e17e73df3dba4c69e143f5f9054ac3a201fb44a5fec8d0
 
 PKG_FIXUP:=autoreconf
 
+PKG_CONFIG_DEPENDS:= CONFIG_FDK-AAC_OPTIMIZE_SPEED
+
+ifeq ($(CONFIG_FDK-AAC_OPTIMIZE_SPEED),y)
+	TARGET_CFLAGS := $(filter-out -Os,$(TARGET_CFLAGS))
+	TARGET_CFLAGS += $(TARGET_CFLAGS) -O2 -flto
+	TARGET_CXXFLAGS := $(filter-out -Os,$(TARGET_CXXFLAGS))
+	TARGET_CXXFLAGS += $(TARGET_CXXFLAGS) -O2 -flto
+	TARGET_LDFLAGS += $(TARGET_LDFLAGS) -flto
+endif
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fdk-aac
@@ -37,6 +47,10 @@ define Package/fdk-aac/description
   Port of the Fraunhofer FDK AAC Codec Library for Android
 endef
 
+define Package/fdk-aac/config
+	source "$(SOURCE)/Config.in"
+endef
+
 define Package/fdk-aac/install	
 	$(INSTALL_DIR) $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/.libs/*.so* $(1)/usr/lib/