diff --git a/multimedia/x265/files/patch-source_CMakeLists.txt b/multimedia/x265/files/patch-source_CMakeLists.txt index 5a3fdb3cca3d..8026004c5378 100644 --- a/multimedia/x265/files/patch-source_CMakeLists.txt +++ b/multimedia/x265/files/patch-source_CMakeLists.txt @@ -1,44 +1,53 @@ --- source/CMakeLists.txt 2023-10-22 22:08:10.704150000 -0400 +++ source/CMakeLists.txt 2023-10-22 22:10:02.947579000 -0400 @@ -43,7 +43,7 @@ set(ARM_ALIASES armv6l armv7l aarch64) list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) -set(POWER_ALIASES ppc64 ppc64le) +set(POWER_ALIASES powerpc64 powerpc64le ppc64 ppc64le) list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH) if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1") set(X86 1) @@ -122,6 +122,7 @@ option(ENABLE_LIBVMAF "Enable VMAF" OFF) if(ENABLE_LIBVMAF) add_definitions(-DENABLE_LIBVMAF) + include_directories(${VMAF_INCLUDE_DIR}) endif() endif(UNIX) +@@ -474,7 +475,7 @@ if(POWER) + # IBM Power8 + option(ENABLE_ALTIVEC "Enable ALTIVEC profiling instrumentation" ON) + if(ENABLE_ALTIVEC) +- add_definitions(-DHAVE_ALTIVEC=1 -maltivec -mabi=altivec) ++ add_definitions(-DHAVE_ALTIVEC=1 -maltivec) + add_definitions(-flax-vector-conversions -fpermissive) + else() + add_definitions(-DHAVE_ALTIVEC=0) @@ -593,12 +594,6 @@ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) endif() -if(SVTHEVC_FOUND) - install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbApi.h" DESTINATION include) - install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbErrorCodes.h" DESTINATION include) - install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${LIB_INSTALL_DIR}) -endif() - install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED)) if(MSVC_IDE) @@ -650,7 +645,10 @@ if(EXTRA_LIB) target_link_libraries(x265-shared ${EXTRA_LIB}) endif() - target_link_libraries(x265-shared ${PLATFORM_LIBS}) + if(ENABLE_LIBVMAF) + target_link_libraries(x265-shared ${VMAF}) + endif() + target_link_libraries(x265-shared ${PLATFORM_LIBS}) if(SVTHEVC_FOUND) target_link_libraries(x265-shared ${SVT_HEVC_LIBRARY}) endif(SVTHEVC_FOUND)