diff --git a/CMakeLists.txt b/CMakeLists.txt index 527cfadebb..408ec69c06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,16 +98,12 @@ endif() message("-- ${BoldBlue}rocDecode Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}") find_package(HIP QUIET) -find_package(Libdrm QUIET) find_package(Libva QUIET) -if(HIP_FOUND AND Libva_FOUND AND Libdrm_FOUND) +if(HIP_FOUND AND Libva_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) - # LibDRM - include_directories(${LIBDRM_INCLUDE_DIR}) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${LIBDRM_LIBRARY}) # LibVA include_directories(${LIBVA_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${LIBVA_LIBRARY}) @@ -191,15 +187,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, libdrm-amdgpu1, libva-amdgpu-drm2, mesa-amdgpu-va-drivers") - set(rocDecode_RPM_PACKAGE_LIST "rocm-hip-runtime, libdrm-amdgpu, libva-amdgpu, mesa-amdgpu-dri-drivers") + set(rocDecode_DEBIAN_PACKAGE_LIST "rocm-hip-runtime, libva-amdgpu-drm2, libdrm-amdgpu1, mesa-amdgpu-va-drivers") + set(rocDecode_RPM_PACKAGE_LIST "rocm-hip-runtime, libva-amdgpu, libdrm-amdgpu, mesa-amdgpu-dri-drivers") # Set the dev dependent packages - set(rocDecode_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev, libdrm-amdgpu-dev, libva-amdgpu-dev, pkg-config, ffmpeg, libavcodec-dev, libavformat-dev, libavutil-dev") + set(rocDecode_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev, libva-amdgpu-dev, 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, libdrm-amdgpu-devel, libva-amdgpu-devel, pkg-config") + set(rocDecode_RPM_DEV_PACKAGE_LIST "rocm-hip-runtime-devel, libva-amdgpu-devel, pkg-config") # '%{?dist}' breaks manual builds on debian systems due to empty Provides execute_process( @@ -327,7 +323,4 @@ else() if(NOT Libva_FOUND) message(FATAL_ERROR "-- ERROR!: libva Not Found - please install libva-amdgpu-dev/libva-amdgpu-devel!") endif() - if(NOT Libdrm_FOUND) - message(FATAL_ERROR "-- ERROR!: libdrm Not Found - please install libdrm-amdgpu-dev/libdrm-amdgpu-devel!") - endif() endif() diff --git a/README.md b/README.md index 0260841a70..b41401462b 100644 --- a/README.md +++ b/README.md @@ -24,20 +24,12 @@ access the video decoding features available on your GPU. > [!IMPORTANT] > `sudo amdgpu-install --usecase=rocm` -* AMD Libdrm +* AMD multimedia packages ```shell - sudo apt install libdrm-amdgpu-dev + sudo apt install libva-amdgpu-dev libdrm-amdgpu1 mesa-amdgpu-va-drivers ``` - -* AMD Libva - ```shell - sudo apt install libva-amdgpu-dev - ``` - -* AMD VA Drivers - ```shell - sudo apt install mesa-amdgpu-va-drivers - ``` + > [!NOTE] + > RPM Packages for `RHEL`/`SLES` - `libva-amdgpu-devel libdrm-amdgpu mesa-amdgpu-dri-drivers` * CMake `3.5` or later @@ -231,4 +223,4 @@ page. * rocm-core - `6.1.0.60100-28` * amdgpu-core - `1:6.1.60100-1731559` * FFmpeg - `4.2.7` / `4.4.2-0` -* rocDecode Setup Script - `V1.4` +* rocDecode Setup Script - `V1.6` diff --git a/cmake/FindLibdrm.cmake b/cmake/FindLibdrm.cmake deleted file mode 100644 index 3623fee4df..0000000000 --- a/cmake/FindLibdrm.cmake +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# Copyright (c) 2023 - 2024 Advanced Micro Devices, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -################################################################################ - -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) -mark_as_advanced(LIBDRM_INCLUDE_DIR LIBDRM_LIBRARY) - -if(Libdrm_FOUND) - if(NOT TARGET Libdrm::drm) - add_library(Libdrm::drm UNKNOWN IMPORTED) - set_target_properties(Libdrm::drm PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LIBDRM_INCLUDE_DIR}" - IMPORTED_LOCATION "${LIBDRM_LIBRARY}") - endif() - message("-- ${White}Using Libdrm -- \n\tLibraries:${LIBDRM_LIBRARY} \n\tIncludes:${LIBDRM_INCLUDE_DIR}${ColourReset}") -else() - if(Libdrm_FIND_REQUIRED) - message(FATAL_ERROR "{Red}FindLibdrm -- Libdrm NOT FOUND${ColourReset}") - endif() -endif() \ No newline at end of file diff --git a/docs/install/install.rst b/docs/install/install.rst index 7f4fa9aace..b765a5050a 100644 --- a/docs/install/install.rst +++ b/docs/install/install.rst @@ -50,23 +50,11 @@ Prerequisites * Run: ``--usecase=rocm`` * To install rocDecode with minimum requirements, follow the :doc:`quick-start instructions <./quick-start>` -* AMD Libdrm +* AMD multimedia packages .. code:: shell - sudo apt install libdrm-amdgpu-dev - -* AMD Libva - - .. code:: shell - - sudo apt install libva-amdgpu-dev - -* AMD VA Drivers - - .. code:: shell - - sudo apt install mesa-amdgpu-va-drivers + sudo apt install libva-amdgpu-dev libdrm-amdgpu1 mesa-amdgpu-va-drivers * CMake 3.5 or later diff --git a/rocDecode-setup.py b/rocDecode-setup.py index 209aaa0aee..1a2b3f4b1d 100644 --- a/rocDecode-setup.py +++ b/rocDecode-setup.py @@ -28,7 +28,7 @@ else: import subprocess __copyright__ = "Copyright (c) 2023 - 2024, AMD ROCm rocDecode" -__version__ = "1.5" +__version__ = "1.6" __email__ = "mivisionx.support@amd.com" __status__ = "Shipping" @@ -124,14 +124,14 @@ os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' ' + if "Ubuntu" in platfromInfo: os.system('sudo -v') os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check + - ' install vainfo libdrm-amdgpu-dev libva-amdgpu-dev mesa-amdgpu-va-drivers') + ' install vainfo libva-amdgpu-dev libdrm-amdgpu1 mesa-amdgpu-va-drivers') if "22.04" in platform.version(): os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check + ' install libstdc++-12-dev') else: os.system('sudo -v') os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check + - ' install libdrm-amdgpu-devel libva-amdgpu-devel mesa-amdgpu-dri-drivers') + ' install libva-amdgpu-devel libdrm-amdgpu mesa-amdgpu-dri-drivers') # rocDecode Dev Requirements if developerInstall == 'ON':