From a721963b3c5dd2fa242b011c460d857106717eb3 Mon Sep 17 00:00:00 2001
From: Jeremy Newton <Mystro256@users.noreply.github.com>
Date: Tue, 21 Oct 2025 13:19:51 -0400
Subject: [PATCH] Drop libva-amdgpu use for RHEL8 (#660)

After further inspection, it looks like libva is new enough for decode
support, so we've dropped the requirement on the mesa end. Some encode
features are missing on < 2.16, but as per our current RHEL8 support
policy, these features are no longer supported.

Ubuntu 22.04 is still supported to have a full encode feature set, so we
can't drop the libva requirement quite yet.

SWDEV-548213

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>
---
 CMakeLists.txt     |  4 ++--
 rocDecode-setup.py | 29 +++++++++--------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 854e7a3063..d533a365a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,7 +336,7 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
   # (AMD build of libva 2.16) should be used if distro's libva is too old
   set(ROCDECODE_DEBIAN_RUNTIME_PACKAGE_LIST  "hip-runtime-amd, libva-drm2 (>= 2.16.0) | libva-amdgpu-drm2, mesa-amdgpu-va-drivers")
   # Unfortunately RPM has a mix of naming schemes; RHEL has "libva", SLE has "libva2-drm2"
-  set(ROCDECODE_RPM_RUNTIME_PACKAGE_LIST  "hip-runtime-amd, (libva >= 2.16.0 or libva-drm2 >= 2.16.0 or libva-amdgpu), mesa-amdgpu-va-drivers")
+  set(ROCDECODE_RPM_RUNTIME_PACKAGE_LIST  "hip-runtime-amd, (libva or libva-drm2), mesa-amdgpu-va-drivers")
   # Add rocprofiler-register dependencies
   if(ROCDECODE_ENABLE_ROCPROFILER_REGISTER)
     set(ROCDECODE_DEBIAN_RUNTIME_PACKAGE_LIST "${ROCDECODE_DEBIAN_RUNTIME_PACKAGE_LIST}, rocprofiler-register")
@@ -349,7 +349,7 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
     set(ROCDECODE_DEBIAN_DEV_PACKAGE_LIST "${ROCDECODE_DEBIAN_DEV_PACKAGE_LIST}, libstdc++-12-dev")
   endif()
   # TBD - RPM packages need Fusion Packages - "libavcodec-devel, libavformat-devel, libavutil-devel"
-  set(ROCDECODE_RPM_DEV_PACKAGE_LIST  "hip-devel, (libva-devel >= 2.16.0 or libva-amdgpu-devel), pkg-config")
+  set(ROCDECODE_RPM_DEV_PACKAGE_LIST  "hip-devel, libva-devel, pkg-config")
   
   # '%{?dist}' breaks manual builds on debian systems due to empty Provides
   execute_process(
diff --git a/rocDecode-setup.py b/rocDecode-setup.py
index c74e308c74..22f0a2829b 100644
--- a/rocDecode-setup.py
+++ b/rocDecode-setup.py
@@ -196,26 +196,15 @@ ffmpegDebianPackages = [
 
 # RPM Packages
 if "centos" in os_info_data or "redhat" in os_info_data:
-    if "VERSION_ID=7" in os_info_data or "VERSION_ID=8" in os_info_data:
-        coreRPMPackages = [
-            'libva-amdgpu-devel',
-            'hip-devel'
-        ]
-        runtimeRPMPackages = [
-            'libva-amdgpu',
-            'mesa-amdgpu-va-drivers',
-            'libva-utils'
-        ]
-    else:
-        coreRPMPackages = [
-            'libva-devel',
-            'hip-devel'
-        ]
-        runtimeRPMPackages = [
-            'libva',
-            'mesa-amdgpu-va-drivers',
-            'libva-utils'
-        ]
+    coreRPMPackages = [
+        'libva-devel',
+        'hip-devel'
+    ]
+    runtimeRPMPackages = [
+        'libva',
+        'mesa-amdgpu-va-drivers',
+        'libva-utils'
+    ]
 else:
     coreRPMPackages = [
         'libva-devel',