From e463cbd0f2a1311b871013088ff013c126418bbe Mon Sep 17 00:00:00 2001
From: Aryan Salmanpour <aryan.salmanpour@amd.com>
Date: Wed, 23 Oct 2024 13:54:23 -0400
Subject: [PATCH] Find the minimum supported libva version 1.16 when building
 rocdecode (#437)

* Find the minimum supported libva version 1.16 when building rocdecode

* Update the changelog

* Update the Error message if libva-amdgpu-dev/libva-amdgpu-devel not found

* Add missing comma
---
 CHANGELOG.md          | 1 +
 CMakeLists.txt        | 2 +-
 cmake/FindLibva.cmake | 8 ++++----
 rocDecode-setup.py    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13bceec93f..918a34d139 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Documentation for rocDecode is available at
 ### Changes
 
 * Clang - Default CXX compiler
+* FindLibva - Correctly find the minimum supported va-api 1.16
 
 ### Removals
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e37f53e019..904dfcab71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,6 +327,6 @@ else()
     message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install rocm-hip-runtime-dev!")
   endif()
   if(NOT Libva_FOUND)
-    message(FATAL_ERROR "-- ERROR!: libva Not Found - please install libva-dev/libva-devel!")
+    message(FATAL_ERROR "-- ERROR!: libva Not Found - please install libva-amdgpu-dev/libva-amdgpu-devel!")
   endif()
 endif()
diff --git a/cmake/FindLibva.cmake b/cmake/FindLibva.cmake
index 5c194422ff..b9198b2a54 100644
--- a/cmake/FindLibva.cmake
+++ b/cmake/FindLibva.cmake
@@ -21,9 +21,9 @@
 #
 ################################################################################
 
-find_library(LIBVA_LIBRARY NAMES va HINTS /usr/lib/x86_64-linux-gnu /usr/lib64 /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64)
-find_library(LIBVA_DRM_LIBRARY NAMES va-drm HINTS /usr/lib/x86_64-linux-gnu /usr/lib64 /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64)
-find_path(LIBVA_INCLUDE_DIR NAMES va/va.h PATHS /usr/include /opt/amdgpu/include)
+find_library(LIBVA_LIBRARY NAMES va HINTS /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64 /usr/lib/x86_64-linux-gnu /usr/lib64)
+find_library(LIBVA_DRM_LIBRARY NAMES va-drm HINTS /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64 /usr/lib/x86_64-linux-gnu /usr/lib64)
+find_path(LIBVA_INCLUDE_DIR NAMES va/va.h PATHS /opt/amdgpu/include NO_DEFAULT_PATH)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Libva DEFAULT_MSG LIBVA_INCLUDE_DIR LIBVA_LIBRARY)
@@ -40,7 +40,7 @@ if(Libva_FOUND)
   set(va_ver_micro ${CMAKE_MATCH_1})
   message("-- ${White}Found Libva Version: ${va_ver_major}.${va_ver_minor}.${va_ver_micro}${ColourReset}")
 
-  if((${va_ver_major} GREATER_EQUAL 1) AND (${va_ver_minor} GREATER_EQUAL 5))
+  if((${va_ver_major} GREATER_EQUAL 1) AND (${va_ver_minor} GREATER_EQUAL 16))
     message("-- ${White}\tLibva Version Supported${ColourReset}")
   else()
     set(Libva_FOUND FALSE)
diff --git a/rocDecode-setup.py b/rocDecode-setup.py
index 4d8d54decb..fb3ee1d4ab 100644
--- a/rocDecode-setup.py
+++ b/rocDecode-setup.py
@@ -195,7 +195,7 @@ ffmpegDebianPackages = [
 
 # RPM Packages
 coreRPMPackages = [
-    'libva-amdgpu-devel'
+    'libva-amdgpu-devel',
     'rocm-hip-runtime-devel',
 ]
 runtimeRPMPackages = [