Skip to content

Commit a721963

Browse files
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>
1 parent c743ca3 commit a721963

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND)
336336
# (AMD build of libva 2.16) should be used if distro's libva is too old
337337
set(ROCDECODE_DEBIAN_RUNTIME_PACKAGE_LIST "hip-runtime-amd, libva-drm2 (>= 2.16.0) | libva-amdgpu-drm2, mesa-amdgpu-va-drivers")
338338
# Unfortunately RPM has a mix of naming schemes; RHEL has "libva", SLE has "libva2-drm2"
339-
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")
339+
set(ROCDECODE_RPM_RUNTIME_PACKAGE_LIST "hip-runtime-amd, (libva or libva-drm2), mesa-amdgpu-va-drivers")
340340
# Add rocprofiler-register dependencies
341341
if(ROCDECODE_ENABLE_ROCPROFILER_REGISTER)
342342
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)
349349
set(ROCDECODE_DEBIAN_DEV_PACKAGE_LIST "${ROCDECODE_DEBIAN_DEV_PACKAGE_LIST}, libstdc++-12-dev")
350350
endif()
351351
# TBD - RPM packages need Fusion Packages - "libavcodec-devel, libavformat-devel, libavutil-devel"
352-
set(ROCDECODE_RPM_DEV_PACKAGE_LIST "hip-devel, (libva-devel >= 2.16.0 or libva-amdgpu-devel), pkg-config")
352+
set(ROCDECODE_RPM_DEV_PACKAGE_LIST "hip-devel, libva-devel, pkg-config")
353353

354354
# '%{?dist}' breaks manual builds on debian systems due to empty Provides
355355
execute_process(

rocDecode-setup.py

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -196,26 +196,15 @@ def ERROR_CHECK(waitval):
196196

197197
# RPM Packages
198198
if "centos" in os_info_data or "redhat" in os_info_data:
199-
if "VERSION_ID=7" in os_info_data or "VERSION_ID=8" in os_info_data:
200-
coreRPMPackages = [
201-
'libva-amdgpu-devel',
202-
'hip-devel'
203-
]
204-
runtimeRPMPackages = [
205-
'libva-amdgpu',
206-
'mesa-amdgpu-va-drivers',
207-
'libva-utils'
208-
]
209-
else:
210-
coreRPMPackages = [
211-
'libva-devel',
212-
'hip-devel'
213-
]
214-
runtimeRPMPackages = [
215-
'libva',
216-
'mesa-amdgpu-va-drivers',
217-
'libva-utils'
218-
]
199+
coreRPMPackages = [
200+
'libva-devel',
201+
'hip-devel'
202+
]
203+
runtimeRPMPackages = [
204+
'libva',
205+
'mesa-amdgpu-va-drivers',
206+
'libva-utils'
207+
]
219208
else:
220209
coreRPMPackages = [
221210
'libva-devel',

0 commit comments

Comments
 (0)