AI/rocm-systems
2
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

Lib VA/DRM - Fix & Updates (#266)

Quellcode durchsuchen 
* lib VA/DRM - Fix & Updates

* Setup - Add lib drm dev

* Setup - Updates
Dieser Commit ist enthalten in:
Kiriti Gowda
2024-02-28 09:29:50 -08:00
committet von GitHub
Ursprung a94c6ef3bc
Commit a46f98b044
4 geänderte Dateien mit 16 neuen und 13 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
CMakeLists.txt
+5 -5
Datei anzeigen
@@ -191,15 +191,15 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_FOUND)
string(REGEX MATCH "22.04" UBUNTU_22_FOUND ${OS_RELEASE})
# Set the dependent packages
set(rocDecode_DEBIAN_PACKAGE_LIST "rocm-hip-runtime, mesa-amdgpu-multimedia")
set(rocDecode_RPM_PACKAGE_LIST "rocm-hip-runtime, mesa-amdgpu-multimedia")
set(rocDecode_DEBIAN_PACKAGE_LIST "rocm-hip-runtime, libdrm-amdgpu, mesa-amdgpu-multimedia")
set(rocDecode_RPM_PACKAGE_LIST "rocm-hip-runtime, libdrm-amdgpu, mesa-amdgpu-multimedia")
# Set the dev dependent packages - TBD: mesa-amdgpu-multimedia-devel name will be changed to -dev
set(rocDecode_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev, mesa-amdgpu-multimedia-devel, pkg-config, ffmpeg, libavcodec-dev, libavformat-dev, libavutil-dev")
set(rocDecode_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev, libdrm-amdgpu-dev, mesa-amdgpu-multimedia-devel, pkg-config, ffmpeg, 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 - "ffmpeg, libavcodec-devel, libavformat-devel, libavutil-devel"
set(rocDecode_RPM_DEV_PACKAGE_LIST "rocm-hip-runtime-devel, mesa-amdgpu-multimedia-devel, pkg-config")
set(rocDecode_RPM_DEV_PACKAGE_LIST "rocm-hip-runtime-devel, libdrm-amdgpu-devel, mesa-amdgpu-multimedia-devel, pkg-config")
# '%{?dist}' breaks manual builds on debian systems due to empty Provides
execute_process(
@@ -328,6 +328,6 @@ else()
message(FATAL_ERROR "-- ERROR!: libva Not Found - please install mesa-amdgpu-multimedia-devel!")
endif()
if(NOT Libdrm_FOUND)
message(FATAL_ERROR "-- ERROR!: libdrm Not Found - please install mesa-amdgpu-multimedia-devel!")
message(FATAL_ERROR "-- ERROR!: libdrm Not Found - please install libdrm-amdgpu-dev/libdrm-amdgpu-devel!")
endif()
endif()
cmake/FindLibdrm.cmake
+2 -2
Datei anzeigen
@@ -21,8 +21,8 @@
#
################################################################################
find_library(LIBDRM_LIBRARY NAMES drm HINTS /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64 /usr/lib64)
find_path(LIBDRM_INCLUDE_DIR NAMES drm.h PATHS /opt/amdgpu/include/libdrm /usr/include/libdrm)
find_library(LIBDRM_LIBRARY NAMES drm HINTS /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64 NO_DEFAULT_PATH)
find_path(LIBDRM_INCLUDE_DIR NAMES drm.h PATHS /opt/amdgpu/include/libdrm NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libdrm DEFAULT_MSG LIBDRM_INCLUDE_DIR LIBDRM_LIBRARY)
cmake/FindLibva.cmake
+3 -3
Datei anzeigen
@@ -21,9 +21,9 @@
#
################################################################################
find_library(LIBVA_LIBRARY NAMES va HINTS /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64)
find_library(LIBVA_DRM_LIBRARY NAMES va-drm HINTS /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64)
find_path(LIBVA_INCLUDE_DIR NAMES va/va.h PATHS /opt/amdgpu/include)
find_library(LIBVA_LIBRARY NAMES va HINTS /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64 NO_DEFAULT_PATH)
find_library(LIBVA_DRM_LIBRARY NAMES va-drm HINTS /opt/amdgpu/lib/x86_64-linux-gnu /opt/amdgpu/lib64 NO_DEFAULT_PATH)
find_path(LIBVA_INCLUDE_DIR NAMES va/va.h PATHS /opt/amdgpu/include NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libva DEFAULT_MSG LIBVA_INCLUDE_DIR LIBVA_LIBRARY)
rocDecode-setup.py
+6 -3
Datei anzeigen
@@ -28,7 +28,7 @@ else:
import subprocess
__copyright__ = "Copyright (c) 2023 - 2024, AMD ROCm rocDecode"
__version__ = "1.4"
__version__ = "1.5"
__email__ = "mivisionx.support@amd.com"
__status__ = "Shipping"
@@ -124,11 +124,14 @@ os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' ' +
if "Ubuntu" in platfromInfo:
os.system('sudo -v')
os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
' install vainfo mesa-amdgpu-multimedia-devel libstdc++-12-dev')
' install vainfo libdrm-amdgpu-dev mesa-amdgpu-multimedia-devel')
if "22.04" in platform.freedesktop_os_release().get("VERSION_ID"):
os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
' install libstdc++-12-dev')
else:
os.system('sudo -v')
os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
' install mesa-amdgpu-multimedia-devel')
' install libdrm-amdgpu-devel mesa-amdgpu-multimedia-devel')
# rocDecode Dev Requirements
if developerInstall == 'ON':