diff --git a/projects/rocjpeg/CHANGELOG.md b/projects/rocjpeg/CHANGELOG.md index 0454cc904e..d4160873b4 100644 --- a/projects/rocjpeg/CHANGELOG.md +++ b/projects/rocjpeg/CHANGELOG.md @@ -17,6 +17,7 @@ Documentation for rocJPEG 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 @@ -32,4 +33,4 @@ Documentation for rocJPEG is available at * amdgpu-core - `1:6.1.60100-1741643` * libva-dev - `2.7.0-2` / `2.14.0-1` * mesa-amdgpu-va-drivers - `1:24.1.0` -* rocJPEG Setup Script - `V1.1.0` +* rocJPEG Setup Script - `V1.2.0` diff --git a/projects/rocjpeg/CMakeLists.txt b/projects/rocjpeg/CMakeLists.txt index 196e11f1e0..5708408551 100644 --- a/projects/rocjpeg/CMakeLists.txt +++ b/projects/rocjpeg/CMakeLists.txt @@ -180,10 +180,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 set(rocJPEG_DEBIAN_PACKAGE_LIST "rocm-hip-runtime, libva2, libdrm-amdgpu1, mesa-amdgpu-va-drivers") - set(rocJPEG_RPM_PACKAGE_LIST "rocm-hip-runtime, libva, libdrm-amdgpu, mesa-amdgpu-dri-drivers") + set(rocJPEG_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(rocJPEG_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev, libva-dev, pkg-config") if(UBUNTU_22_FOUND) set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST "${rocJPEG_DEBIAN_DEV_PACKAGE_LIST}, libstdc++-12-dev") diff --git a/projects/rocjpeg/README.md b/projects/rocjpeg/README.md index 18362ef001..b25c553d33 100644 --- a/projects/rocjpeg/README.md +++ b/projects/rocjpeg/README.md @@ -39,8 +39,6 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP ```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 @@ -61,6 +59,8 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP > ```shell > sudo apt install libstdc++-12-dev > ``` +> +> * Additional RPM Packages required for `RHEL`/`SLES` - `libdrm-amdgpu` >[!NOTE] > @@ -211,4 +211,4 @@ page. * amdgpu-core - `1:6.1.60100-1741643` * libva-dev - `2.7.0-2` / `2.14.0-1` * mesa-amdgpu-va-drivers - `1:24.1.0` -* rocJPEG Setup Script - `V1.1` +* rocJPEG Setup Script - `V1.2.0` diff --git a/projects/rocjpeg/rocJPEG-setup.py b/projects/rocjpeg/rocJPEG-setup.py index 7625fc3215..18f24ce492 100644 --- a/projects/rocjpeg/rocJPEG-setup.py +++ b/projects/rocjpeg/rocJPEG-setup.py @@ -28,7 +28,7 @@ else: import subprocess __copyright__ = "Copyright (c) 2024, AMD rocJPEG" -__version__ = "1.1.0" +__version__ = "1.2.0" __email__ = "mivisionx.support@amd.com" __status__ = "Shipping" @@ -140,12 +140,16 @@ coreDebianU22Packages = [ ] # RPM Packages +libvaNameRPM = "libva" +if os.path.exists('/usr/bin/zypper'): + libvaNameRPM = "libva2" coreRPMPackages = [ 'rocm-hip-runtime-devel', + str(libvaNameRPM), 'libva', 'libva-devel', 'libdrm-amdgpu', - 'mesa-amdgpu-dri-drivers', + 'mesa-amdgpu-va-drivers', 'libva-utils' ]