From 5287358ff33ec4920a677a58152ad040151b843f Mon Sep 17 00:00:00 2001 From: Julien Boibessot Date: Wed, 4 Mar 2015 19:37:22 +0100 Subject: [PATCH] package/kodi: Use i.MX VPU (video codec) when available Tested on i.MX6. [Thomas: drop comment in Config.in help text, hard to maintain for all platforms.] Signed-off-by: Julien Boibessot Signed-off-by: Thomas Petazzoni --- package/kodi/kodi.mk | 5 +++++ package/openswan/openswan.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 0a6fe7cfce..f40fc313fd 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -61,6 +61,11 @@ KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads LIBS="-lvcos -lvchostif" endif +ifeq ($(BR2_PACKAGE_LIBFSLVPUWRAP),y) +KODI_DEPENDENCIES += libfslvpuwrap +KODI_CONF_OPTS += --enable-codec=imxvpu +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) KODI_CONF_OPTS += --enable-libcap KODI_DEPENDENCIES += libcap diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index ba36f7cb1f..3c878c9c46 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -11,7 +11,7 @@ OPENSWAN_LICENSE_FILES = COPYING LICENSE OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2 OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \ - USERCOMPILE="$(TARGET_CFLAGS) -fPIE" INC_USRLOCAL=/usr \ + USERCOMPILE="$(TARGET_CFLAGS)" INC_USRLOCAL=/usr \ USE_KLIPS=false USE_MAST=false USE_NM=false ifeq ($(BR2_PACKAGE_LIBCURL),y) -- 2.30.2