Change the faad build to use fixed point math if emulated floating point is in use (based on CONFIG_SOFT_FLOAT). Adds a config option to force the use of floating point math.
Signed-off-by: Andy Leiserson <[email protected]> --- libs/faad2/Config.in | 12 ++++++++++++ libs/faad2/Makefile | 17 ++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 libs/faad2/Config.in diff --git a/libs/faad2/Config.in b/libs/faad2/Config.in new file mode 100644 index 0000000..0033676 --- /dev/null +++ b/libs/faad2/Config.in @@ -0,0 +1,12 @@ +config FAAD2_ALWAYS_USE_FLOATING_POINT + depends on PACKAGE_libfaad2 + bool "Build FAAD2 to use floating-point math even if using soft floats." + default n + help + By default, libfaad2 will be built to use fixed point rather + than floating point math if emulated floating point operations + are being used. (See the CONFIG_SOFT_FLOAT option.) Set this + option if you would like to use floating point math regardless + of whether floating point emulation is in use. + + For the best real-time decoding ability, leave this option off. diff --git a/libs/faad2/Makefile b/libs/faad2/Makefile index 3505e66..025234e 100644 --- a/libs/faad2/Makefile +++ b/libs/faad2/Makefile @@ -9,12 +9,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=faad2 PKG_VERSION:=2.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/faac PKG_MD5SUM:=4c332fa23febc0e4648064685a3d4332 +PKG_CONFIG_DEPENDS := \ + CONFIG_SOFT_FLOAT \ + CONFIG_FAAD2_ALWAYS_USE_FLOATING_POINT + PKG_FIXUP:=autoreconf PKG_INSTALL:=1 @@ -22,6 +26,12 @@ include $(INCLUDE_DIR)/package.mk TARGET_CFLAGS += $(FPIC) +# Use fixed point math, if we're using soft floats, and the user didn't +# specifically ask to use floats anyways. +ifeq ($(CONFIG_SOFT_FLOAT)-$(CONFIG_FAAD2_ALWAYS_USE_FLOATING_POINT),y-) +TARGET_CFLAGS+= -DFIXED_POINT +endif + define Package/faad2/Default URL:=http://www.audiocoding.com/faad2.html TITLE:=Freeware Advanced Audio Decoder @@ -52,6 +62,11 @@ $(call Package/faad2/Default) CATEGORY:=Libraries TITLE+=library DEPENDS:=@BUILD_PATENTED + MENU:=1 +endef + +define Package/libfaad2/config + source "$(SOURCE)/Config.in" endef define Package/libfaad2/description -- 1.7.10.4 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
