From 768c026301f808f85f62c257dc69c868fe7eb14a Mon Sep 17 00:00:00 2001
From: Kiriti Gowda <kiritigowda@gmail.com>
Date: Fri, 3 Oct 2025 10:05:42 -0700
Subject: [PATCH] Packaging - HIP updates (#189)

---
 CMakeLists.txt   |  8 ++++----
 README.md        |  5 +++++
 rocJPEG-setup.py | 12 ++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7aabafb401..768c0f368d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,19 +345,19 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
   string(REGEX MATCH "22.04" UBUNTU_22_FOUND ${OS_RELEASE})
 
   # Set the dependent packages
-  set(rocJPEG_DEBIAN_PACKAGE_LIST  "rocm-hip-runtime, libva-drm2 (>= 2.16.0) | libva-amdgpu-drm2, mesa-amdgpu-va-drivers")
-  set(rocJPEG_RPM_PACKAGE_LIST     "rocm-hip-runtime, (libva >= 2.16.0 or libva-drm2 >= 2.16.0 or libva-amdgpu), mesa-amdgpu-va-drivers")
+  set(rocJPEG_DEBIAN_PACKAGE_LIST  "hip-runtime-amd, libva-drm2 (>= 2.16.0) | libva-amdgpu-drm2, mesa-amdgpu-va-drivers")
+  set(rocJPEG_RPM_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(ROCJPEG_ENABLE_ROCPROFILER_REGISTER)
     set(rocJPEG_DEBIAN_PACKAGE_LIST "${rocJPEG_DEBIAN_PACKAGE_LIST}, rocprofiler-register")
     set(rocJPEG_RPM_PACKAGE_LIST "${rocJPEG_RPM_PACKAGE_LIST}, rocprofiler-register")
   endif()
 
-  set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST  "rocm-hip-runtime-dev, libva-dev (>= 2.16.0) | libva-amdgpu-dev")
+  set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST  "hip-dev, libva-dev (>= 2.16.0) | libva-amdgpu-dev")
   if(UBUNTU_22_FOUND)
     set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST "${rocJPEG_DEBIAN_DEV_PACKAGE_LIST}, libstdc++-12-dev")
   endif()
-  set(rocJPEG_RPM_DEV_PACKAGE_LIST  "rocm-hip-runtime-devel, (libva-devel >= 2.16.0 or libva-amdgpu-devel)")
+  set(rocJPEG_RPM_DEV_PACKAGE_LIST  "hip-devel, (libva-devel >= 2.16.0 or libva-amdgpu-devel)")
 
   # '%{?dist}' breaks manual builds on debian systems due to empty Provides
   execute_process(
diff --git a/README.md b/README.md
index 8e320a1acc..38bbce9e26 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,11 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP
 > [!NOTE]
 > RPM Packages for `RHEL`/`SLES` - `libva-amdgpu mesa-amdgpu-va-drivers`
 
+* HIP
+  ```shell
+  sudo apt install hip-dev
+  ```
+
 > [!IMPORTANT]
 > * Required compiler support
 >   * C++17
diff --git a/rocJPEG-setup.py b/rocJPEG-setup.py
index 79553b6311..abb09bac46 100644
--- a/rocJPEG-setup.py
+++ b/rocJPEG-setup.py
@@ -154,17 +154,17 @@ if userName == 'root':
 # source install - common package dependencies
 commonPackages = [
     'cmake',
-    '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 = [
@@ -183,7 +183,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',
@@ -193,7 +193,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',
@@ -203,7 +203,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',