From bc5f4d7a3ec1c7ca196ba4c440caf1d5278469e7 Mon Sep 17 00:00:00 2001
From: Kiriti Gowda <kiritigowda@gmail.com>
Date: Thu, 2 Oct 2025 14:24:12 -0700
Subject: [PATCH] Packaging - HIP Updates (#658)

[ROCm/rocdecode commit: 380779e0a82c5411854804f1b3ae5f31c37a006c]
---
 projects/rocdecode/CMakeLists.txt     |  8 ++++----
 projects/rocdecode/README.md          |  5 +++++
 projects/rocdecode/rocDecode-setup.py | 12 ++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/projects/rocdecode/CMakeLists.txt b/projects/rocdecode/CMakeLists.txt
index b63a087bec..eedae33f6d 100644
--- a/projects/rocdecode/CMakeLists.txt
+++ b/projects/rocdecode/CMakeLists.txt
@@ -304,9 +304,9 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
   # Set the dependent packages
   # libva 2.16 (API 1.16) is needed to use mesa-amdgpu-va-drivers, libva-amdgpu
   # (AMD build of libva 2.16) should be used if distro's libva is too old
-  set(ROCDECODE_DEBIAN_RUNTIME_PACKAGE_LIST  "rocm-hip-runtime, libva-drm2 (>= 2.16.0) | libva-amdgpu-drm2, mesa-amdgpu-va-drivers")
+  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  "rocm-hip-runtime, (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 >= 2.16.0 or libva-drm2 >= 2.16.0 or libva-amdgpu), 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")
@@ -314,12 +314,12 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
   endif()
 
   # Set the dev dependent packages
-  set(ROCDECODE_DEBIAN_DEV_PACKAGE_LIST  "rocm-hip-runtime-dev, libva-dev (>= 2.16.0) | libva-amdgpu-dev, pkg-config, libavcodec-dev, libavformat-dev, libavutil-dev")
+  set(ROCDECODE_DEBIAN_DEV_PACKAGE_LIST  "hip-dev, libva-dev (>= 2.16.0) | libva-amdgpu-dev, pkg-config, libavcodec-dev, libavformat-dev, libavutil-dev")
   if(UBUNTU_22_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  "rocm-hip-runtime-devel, (libva-devel >= 2.16.0 or libva-amdgpu-devel), pkg-config")
+  set(ROCDECODE_RPM_DEV_PACKAGE_LIST  "hip-devel, (libva-devel >= 2.16.0 or libva-amdgpu-devel), pkg-config")
   
   # '%{?dist}' breaks manual builds on debian systems due to empty Provides
   execute_process(
diff --git a/projects/rocdecode/README.md b/projects/rocdecode/README.md
index 9379a61105..e09899f01f 100644
--- a/projects/rocdecode/README.md
+++ b/projects/rocdecode/README.md
@@ -56,6 +56,11 @@ access the video decoding features available on your GPU.
 > [!NOTE]
 > RPM Packages for `RHEL`/`SLES` - `libva-amdgpu mesa-amdgpu-va-drivers`
 
+* HIP
+  ```shell
+  sudo apt install hip-dev
+  ```
+
 * [pkg-config](https://en.wikipedia.org/wiki/Pkg-config)
   ```shell
   sudo apt install pkg-config
diff --git a/projects/rocdecode/rocDecode-setup.py b/projects/rocdecode/rocDecode-setup.py
index 5cc3bedfe6..c74e308c74 100644
--- a/projects/rocdecode/rocDecode-setup.py
+++ b/projects/rocdecode/rocDecode-setup.py
@@ -162,17 +162,17 @@ if userName == 'root':
 commonPackages = [
     'cmake',
     'pkg-config',
-    'rocm-hip-runtime'
+    'hip-runtime-amd'
 ]
 
 # Debian packages
 coreDebianPackages = [
     'libva-dev',
-    'rocm-hip-runtime-dev'
+    'hip-dev'
 ]
 coreDebianU22Packages = [
     'libva-amdgpu-dev',
-    'rocm-hip-runtime-dev',
+    'hip-dev',
     'libstdc++-12-dev'
 ]
 runtimeDebianPackages = [
@@ -199,7 +199,7 @@ 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',
-            'rocm-hip-runtime-devel'
+            'hip-devel'
         ]
         runtimeRPMPackages = [
             'libva-amdgpu',
@@ -209,7 +209,7 @@ if "centos" in os_info_data or "redhat" in os_info_data:
     else:
         coreRPMPackages = [
             'libva-devel',
-            'rocm-hip-runtime-devel'
+            'hip-devel'
         ]
         runtimeRPMPackages = [
             'libva',
@@ -219,7 +219,7 @@ if "centos" in os_info_data or "redhat" in os_info_data:
 else:
     coreRPMPackages = [
         'libva-devel',
-        'rocm-hip-runtime-devel'
+        'hip-devel'
     ]
     runtimeRPMPackages = [
         'libva-drm2',