From 5c23f0494dc39394d3486bf825501b604a798ba3 Mon Sep 17 00:00:00 2001 From: TheChoconut Date: Fri, 18 Nov 2022 00:44:57 +0100 Subject: [PATCH] lazy load libamcodec, only require libamcodec.so --- cmake/FindAmlogic.cmake | 16 ++-------------- src/platform.c | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/cmake/FindAmlogic.cmake b/cmake/FindAmlogic.cmake index df8bda4..0f731f0 100644 --- a/cmake/FindAmlogic.cmake +++ b/cmake/FindAmlogic.cmake @@ -4,18 +4,6 @@ find_path(AMLOGIC_INCLUDE_DIR PATHS /usr/local/include/amcodec /usr/osmc/include/amcodec /usr/include/amcodec /usr/include/) mark_as_advanced(AMLOGIC_INCLUDE_DIR) -find_library(AMAVUTILS_LIBRARY - NAMES libamavutils.so - DOC "Path to Amlogic Audio Video Utils Library" - PATHS /usr/lib/aml_libs /usr/osmc/lib /usr/local/lib /usr/lib) -mark_as_advanced(AMAVUTILS_LIBRARY) - -find_library(AMADEC_LIBRARY - NAMES libamadec.so - DOC "Path to Amlogic Audio Decoder Library" - PATHS /usr/lib/aml_libs /usr/osmc/lib /usr/local/lib /usr/lib) -mark_as_advanced(AMADEC_LIBRARY) - find_library(AMCODEC_LIBRARY NAMES libamcodec.so DOC "Path to Amlogic Video Codec Library" @@ -23,7 +11,7 @@ find_library(AMCODEC_LIBRARY mark_as_advanced(AMCODEC_LIBRARY) include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Amlogic DEFAULT_MSG AMLOGIC_INCLUDE_DIR AMCODEC_LIBRARY AMADEC_LIBRARY AMAVUTILS_LIBRARY) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Amlogic DEFAULT_MSG AMLOGIC_INCLUDE_DIR AMCODEC_LIBRARY) -set(AMLOGIC_LIBRARIES ${AMCODEC_LIBRARY} ${AMADEC_LIBRARY} ${AMAVUTILS_LIBRARY}) +set(AMLOGIC_LIBRARIES ${AMCODEC_LIBRARY}) set(AMLOGIC_INCLUDE_DIRS ${AMLOGIC_INCLUDE_DIR}) diff --git a/src/platform.c b/src/platform.c index edd7b3a..acfb1c1 100644 --- a/src/platform.c +++ b/src/platform.c @@ -61,7 +61,7 @@ enum platform platform_check(char* name) { #endif #ifdef HAVE_AML if (std || strcmp(name, "aml") == 0) { - void *handle = dlopen("libmoonlight-aml.so", RTLD_NOW | RTLD_GLOBAL); + void *handle = dlopen("libmoonlight-aml.so", RTLD_LAZY | RTLD_GLOBAL); if (handle != NULL && access("/dev/amvideo", F_OK) != -1) return AML; }