libdrm, libva の依存が不要っぽいので削除

shiguredo · Dec 11, 2024 · 79baba5 · 79baba5
1 parent 9d4c1b5
commit 79baba5
Show file tree

Hide file tree

Showing 19 changed files with 0 additions and 383 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -248,9 +248,6 @@ jobs:
           wget https://apt.llvm.org/llvm.sh
           chmod a+x llvm.sh
           sudo ./llvm.sh 18
-
-          # Intel Media SDK のために libva-dev, libdrm-dev を入れる
-          DEBIAN_FRONTEND=noninteractive sudo apt-get -y install libva-dev libdrm-dev
       - name: Install deps for ${{ matrix.platform.name }}
         if: matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'armv8'
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -503,21 +503,15 @@ elseif (SORA_TARGET_OS STREQUAL "ubuntu")
   endif()
 
   if (USE_VPL_ENCODER)
-    find_package(Libdrm REQUIRED)
-    find_package(Libva REQUIRED)
     find_package(VPL REQUIRED)
     target_include_directories(sora PRIVATE /usr/local/cuda/include)
     target_sources(sora
       PRIVATE
         src/hwenc_vpl/vpl_session_impl.cpp
         src/hwenc_vpl/vpl_video_decoder.cpp
         src/hwenc_vpl/vpl_video_encoder.cpp
-        src/hwenc_vpl/vaapi_utils_drm.cpp
-        src/hwenc_vpl/vaapi_utils.cpp
     )
     target_link_libraries(sora PRIVATE "$<BUILD_INTERFACE:VPL::dispatcher>")
-    # va と drm は依存に含める
-    target_link_libraries(sora PUBLIC Libdrm::drm Libva::va Libva::va_drm)
     # vpl を要求したくないので libsora.a に含める
     list(APPEND BUNDLE_STATIC_LIBS $<TARGET_FILE:VPL::dispatcher>)
   endif()
@@ -547,8 +541,6 @@ install(EXPORT sora-config
 install(
   FILES
     cmake/FindWebRTC.cmake
-    cmake/FindLibdrm.cmake
-    cmake/FindLibva.cmake
   DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake
 )
 install(FILES LICENSE NOTICE.md

diff --git a/cmake/FindLibdrm.cmake b/cmake/FindLibdrm.cmake
diff --git a/cmake/FindLibva.cmake b/cmake/FindLibva.cmake
diff --git a/examples/messaging_recvonly_sample/ubuntu-20.04_x86_64/CMakeLists.txt b/examples/messaging_recvonly_sample/ubuntu-20.04_x86_64/CMakeLists.txt
@@ -23,8 +23,6 @@ find_package(Boost REQUIRED COMPONENTS json filesystem)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(messaging_recvonly_sample)
 set_target_properties(messaging_recvonly_sample PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/examples/messaging_recvonly_sample/ubuntu-22.04_x86_64/CMakeLists.txt b/examples/messaging_recvonly_sample/ubuntu-22.04_x86_64/CMakeLists.txt
@@ -23,8 +23,6 @@ find_package(Boost REQUIRED COMPONENTS json filesystem)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(messaging_recvonly_sample)
 set_target_properties(messaging_recvonly_sample PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/examples/messaging_recvonly_sample/ubuntu-24.04_x86_64/CMakeLists.txt b/examples/messaging_recvonly_sample/ubuntu-24.04_x86_64/CMakeLists.txt
@@ -23,8 +23,6 @@ find_package(Boost REQUIRED COMPONENTS json filesystem)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(messaging_recvonly_sample)
 set_target_properties(messaging_recvonly_sample PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/examples/sdl_sample/ubuntu-20.04_x86_64/CMakeLists.txt b/examples/sdl_sample/ubuntu-20.04_x86_64/CMakeLists.txt
@@ -25,8 +25,6 @@ find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(sdl_sample)
 set_target_properties(sdl_sample PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/examples/sdl_sample/ubuntu-22.04_x86_64/CMakeLists.txt b/examples/sdl_sample/ubuntu-22.04_x86_64/CMakeLists.txt
@@ -25,8 +25,6 @@ find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(sdl_sample)
 set_target_properties(sdl_sample PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/examples/sdl_sample/ubuntu-24.04_x86_64/CMakeLists.txt b/examples/sdl_sample/ubuntu-24.04_x86_64/CMakeLists.txt
@@ -25,8 +25,6 @@ find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(sdl_sample)
 set_target_properties(sdl_sample PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/examples/sumomo/ubuntu-20.04_x86_64/CMakeLists.txt b/examples/sumomo/ubuntu-20.04_x86_64/CMakeLists.txt
@@ -25,8 +25,6 @@ find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(sumomo)
 set_target_properties(sumomo PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/examples/sumomo/ubuntu-22.04_x86_64/CMakeLists.txt b/examples/sumomo/ubuntu-22.04_x86_64/CMakeLists.txt
@@ -25,8 +25,6 @@ find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(sumomo)
 set_target_properties(sumomo PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/examples/sumomo/ubuntu-24.04_x86_64/CMakeLists.txt b/examples/sumomo/ubuntu-24.04_x86_64/CMakeLists.txt
@@ -25,8 +25,6 @@ find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Libva REQUIRED)
-find_package(Libdrm REQUIRED)
 
 add_executable(sumomo)
 set_target_properties(sumomo PROPERTIES CXX_STANDARD 20 C_STANDARD 20)

diff --git a/src/hwenc_vpl/vaapi_utils.cpp b/src/hwenc_vpl/vaapi_utils.cpp
diff --git a/src/hwenc_vpl/vaapi_utils.h b/src/hwenc_vpl/vaapi_utils.h