Merge from bittboy/buildroot@db180c0

package/vo-aacenc/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_VO_AACENC
+	bool "vo-aacenc"
+	help
+	  This library contains an encoder implementation of the
+	  Advanced Audio Coding (AAC) audio codec. The library is
+	  based on a codec implementation by VisualOn as part of the
+	  Stagefright framework from the Google Android project.
+
+	  http://sourceforge.net/projects/opencore-amr/

package/vo-aacenc/vo-aacenc.hash

@@ -0,0 +1,2 @@
+# Locally computed:
+sha256  e51a7477a359f18df7c4f82d195dab4e14e7414cbd48cf79cc195fc446850f36  vo-aacenc-0.1.3.tar.gz

package/vo-aacenc/vo-aacenc.mk

@@ -0,0 +1,46 @@
+################################################################################
+#
+# vo-aacenc
+#
+################################################################################
+
+VO_AACENC_VERSION = 0.1.3
+VO_AACENC_SITE = http://downloads.sourceforge.net/project/opencore-amr/vo-aacenc
+VO_AACENC_LICENSE = Apache-2.0
+VO_AACENC_LICENSE_FILES = COPYING
+VO_AACENC_INSTALL_STAGING = YES
+
+VO_AACENC_CFLAGS = $(TARGET_CFLAGS)
+
+# arm specific asm optimizations
+ifeq ($(BR2_arm),y)
+
+ifeq ($(BR2_ARM_CPU_HAS_ARM),y)
+# vo-aacenc has ARM assembly code that cannot be compiled in Thumb2
+# mode, so we must force the traditional ARM mode.
+VO_AACENC_CFLAGS += -marm
+
+ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
+VO_AACENC_CONF_OPTS += --enable-armv7neon
+# mfpu=neon needed to assemble neon code
+VO_AACENC_CFLAGS += -mfpu=neon
+else
+VO_AACENC_CONF_OPTS += --disable-armv7neon
+
+ifeq ($(BR2_ARM_CPU_ARMV4),)
+VO_AACENC_CONF_OPTS += --enable-armv5e
+else
+VO_AACENC_CONF_OPTS += --disable-armv5e
+endif
+
+endif # !neon
+
+else
+VO_AACENC_CONF_OPTS += --disable-armv7neon --disable-armv5e
+endif # has-arm
+endif # arm
+
+VO_AACENC_CONF_ENV = \
+	CFLAGS="$(VO_AACENC_CFLAGS)"
+
+$(eval $(autotools-package))