From 44f01b878eb3bc0a5738df04fed3defafd14e3ab Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Tue, 7 Jan 2020 14:07:53 +0800 Subject: [PATCH 18/18] rkmpp dependent libdrm or libion. Signed-off-by: Frank Liu --- configure | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6d79529..21a75b5 100755 --- a/configure +++ b/configure @@ -325,6 +325,7 @@ External library support: --disable-dxva2 disable Microsoft DirectX 9 video acceleration code [autodetect] --disable-ffnvcodec disable dynamically linked Nvidia code [autodetect] --enable-libdrm enable DRM code (Linux) [no] + --enable-libion enable libion code (Linux) [no] --enable-libmfx enable Intel MediaSDK (AKA Quick Sync Video) code via libmfx [no] --enable-libnpp enable Nvidia Performance Primitives-based code [no] --enable-mmal enable Broadcom Multi-Media Abstraction Layer (Raspberry Pi) via MMAL [no] @@ -1716,6 +1717,7 @@ EXTERNAL_LIBRARY_LIST=" libcodec2 libdc1394 libdrm + libion libflite libfontconfig libfreetype @@ -6076,6 +6078,8 @@ enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lc enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.5.115" davs2.h davs2_decoder_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion +enabled libion && require_pkg_config libion libion ion.h ion_open + enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && warn "using libfdk without pkg-config"; } } @@ -6240,8 +6244,8 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP enabled librga && require librga "rga/RgaApi.h" c_RkRgaInit -lrga enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create && require_pkg_config rockchip_mpp "rockchip_mpp >= 1.3.7" rockchip/rk_mpi.h mpp_create && - { enabled libdrm || - die "ERROR: rkmpp requires --enable-libdrm"; } && + { enabled libdrm || enabled libion || + die "ERROR: rkmpp requires --enable-libdrm or --enable-libion"; } && { enabled librga || die "ERROR: rkmpp requires --enable-librga"; } } -- 2.17.1