From 69ac148c4dbc4958038960da34fbf8d984943473 Mon Sep 17 00:00:00 2001
From: Kiriti Gowda <kiritigowda@gmail.com>
Date: Wed, 1 May 2024 11:35:49 -0700
Subject: [PATCH] Packaging Updates - RPM package changes (#328)

* RPM Deps - Updates

* SLES - Handle Package name diff

[ROCm/rocdecode commit: 68d8b629d1f96466691ab36080813537c56f4e1a]
---
 projects/rocdecode/CHANGELOG.md             | 3 ++-
 projects/rocdecode/CMakeLists.txt           | 6 +++++-
 projects/rocdecode/README.md                | 7 ++++---
 projects/rocdecode/docs/install/install.rst | 2 +-
 projects/rocdecode/rocDecode-setup.py       | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/projects/rocdecode/CHANGELOG.md b/projects/rocdecode/CHANGELOG.md
index 27291772c8..cb9ea5df46 100644
--- a/projects/rocdecode/CHANGELOG.md
+++ b/projects/rocdecode/CHANGELOG.md
@@ -17,6 +17,7 @@ Documentation for rocDecode is available at
 
 * Dependencies - Updates to core dependencies
 * LibVA Headers - Use public headers
+* mesa-amdgpu-va-drivers - RPM Package available on RPM from ROCm 6.2
 
 ### Fixes
 
@@ -33,7 +34,7 @@ Documentation for rocDecode is available at
 * libva-dev - `2.7.0-2` / `2.14.0-1`
 * mesa-amdgpu-va-drivers - `1:24.1.0`
 * FFmpeg - `4.2.7` / `4.4.2-0`
-* rocDecode Setup Script - `V1.8.0`
+* rocDecode Setup Script - `V2.0.0`
 
 ## rocDecode 0.5.0
 
diff --git a/projects/rocdecode/CMakeLists.txt b/projects/rocdecode/CMakeLists.txt
index ecbe3b9c97..2dd407bb1d 100644
--- a/projects/rocdecode/CMakeLists.txt
+++ b/projects/rocdecode/CMakeLists.txt
@@ -190,10 +190,14 @@ if(HIP_FOUND AND Libva_FOUND)
   # Find Ubuntu 22.04 - Add libstdc++-12-dev package deps for Dev Package
   file(READ "/etc/os-release" OS_RELEASE)
   string(REGEX MATCH "22.04" UBUNTU_22_FOUND ${OS_RELEASE})
+  string(REGEX MATCH "SLES" SLES_FOUND ${OS_RELEASE})
 
   # Set the dependent packages - TBD: mesa-amdgpu-va-drivers should bring libdrm-amdgpu, but unavailable on RPM
   set(rocDecode_DEBIAN_PACKAGE_LIST  "rocm-hip-runtime, libva2, libdrm-amdgpu1, mesa-amdgpu-va-drivers")
-  set(rocDecode_RPM_PACKAGE_LIST     "rocm-hip-runtime, libva, libdrm-amdgpu, mesa-amdgpu-dri-drivers")
+  set(rocDecode_RPM_PACKAGE_LIST     "rocm-hip-runtime, libva, libdrm-amdgpu, mesa-amdgpu-va-drivers")
+  if(SLES_FOUND)
+    set(rocDecode_RPM_PACKAGE_LIST     "rocm-hip-runtime, libva2, libdrm-amdgpu, mesa-amdgpu-va-drivers")
+  endif()
   # Set the dev dependent packages
   set(rocDecode_DEBIAN_DEV_PACKAGE_LIST  "rocm-hip-runtime-dev, libva-dev, pkg-config, ffmpeg, libavcodec-dev, libavformat-dev, libavutil-dev")
   if(UBUNTU_22_FOUND)
diff --git a/projects/rocdecode/README.md b/projects/rocdecode/README.md
index 7d10d904bf..c364f895ae 100644
--- a/projects/rocdecode/README.md
+++ b/projects/rocdecode/README.md
@@ -35,8 +35,6 @@ access the video decoding features available on your GPU.
   ```shell
   sudo apt install mesa-amdgpu-va-drivers
   ```
-> [!NOTE]
-> RPM Packages for `RHEL`/`SLES` - `libdrm-amdgpu mesa-amdgpu-dri-drivers`
 
 * CMake `3.5` or later
 
@@ -62,6 +60,9 @@ access the video decoding features available on your GPU.
 >  ```shell
 >  sudo apt install libstdc++-12-dev
 >  ```
+>
+> * Additional RPM Packages required for `RHEL`/`SLES` - `libdrm-amdgpu`
+
 
 >[!NOTE]
 > * All package installs are shown with the `apt` package manager. Use the appropriate package manager for your operating system.
@@ -229,4 +230,4 @@ page.
 * libva-dev - `2.7.0-2` / `2.14.0-1`
 * mesa-amdgpu-va-drivers - `1:24.1.0`
 * FFmpeg - `4.2.7` / `4.4.2-0`
-* rocDecode Setup Script - `V1.8.0`
+* rocDecode Setup Script - `V2.0.0`
diff --git a/projects/rocdecode/docs/install/install.rst b/projects/rocdecode/docs/install/install.rst
index c49d3c4912..90b77ea034 100644
--- a/projects/rocdecode/docs/install/install.rst
+++ b/projects/rocdecode/docs/install/install.rst
@@ -28,7 +28,7 @@ Tested configurations
 
 * FFmpeg: 4.2.7/4.4.2-0
 
-* rocDecode Setup Script: V1.7.2
+* rocDecode Setup Script: V2.0.0
 
 Supported codecs
 ========================================
diff --git a/projects/rocdecode/rocDecode-setup.py b/projects/rocdecode/rocDecode-setup.py
index 864935daa6..c608c6bae1 100644
--- a/projects/rocdecode/rocDecode-setup.py
+++ b/projects/rocdecode/rocDecode-setup.py
@@ -28,7 +28,7 @@ else:
     import subprocess
 
 __copyright__ = "Copyright (c) 2023 - 2024, AMD ROCm rocDecode"
-__version__ = "1.8.0"
+__version__ = "2.0.0"
 __email__ = "mivisionx.support@amd.com"
 __status__ = "Shipping"
 
@@ -165,7 +165,7 @@ coreRPMPackages = [
     str(libvaNameRPM),
     'libva-devel',
     'libdrm-amdgpu',
-    'mesa-amdgpu-dri-drivers',
+    'mesa-amdgpu-va-drivers',
     'libva-utils'
 ]