From fdcc64ca2ee8d81a65d6eca770677f0d1f8ec06f Mon Sep 17 00:00:00 2001 From: "Yew, Chang Ching" Date: Tue, 25 May 2021 14:47:15 +0800 Subject: onevpl: Add X11 support to legacy tools Signed-off-by: Teng, Jin Chung Signed-off-by: Yew, Chang Ching Signed-off-by: Anuj Mittal --- .../0001-Add-X11-support-to-legacy-tools.patch | 50 ++++++++++++++++++++++ recipes-multimedia/onevpl/onevpl_2021.2.2.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 recipes-multimedia/onevpl/onevpl/0001-Add-X11-support-to-legacy-tools.patch (limited to 'recipes-multimedia') diff --git a/recipes-multimedia/onevpl/onevpl/0001-Add-X11-support-to-legacy-tools.patch b/recipes-multimedia/onevpl/onevpl/0001-Add-X11-support-to-legacy-tools.patch new file mode 100644 index 00000000..fd7faa82 --- /dev/null +++ b/recipes-multimedia/onevpl/onevpl/0001-Add-X11-support-to-legacy-tools.patch @@ -0,0 +1,50 @@ +From 3c485ba902da0a4a2e9fc43b34eb9174c739929e Mon Sep 17 00:00:00 2001 +From: "Yew, Chang Ching" +Date: Fri, 21 May 2021 14:11:44 +0800 +Subject: [PATCH] Add X11 support to legacy tools + +Upstream-Status: Pending + +Signed-off-by: jinchung +Signed-off-by: Yew, Chang Ching +--- + tools/legacy/sample_common/CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/tools/legacy/sample_common/CMakeLists.txt b/tools/legacy/sample_common/CMakeLists.txt +index 5cf69d3..db4de3d 100644 +--- a/tools/legacy/sample_common/CMakeLists.txt ++++ b/tools/legacy/sample_common/CMakeLists.txt +@@ -32,6 +32,7 @@ if(UNIX) + src/vm/time_linux.cpp + src/vm/atomic_linux.cpp + src/vm/thread_linux.cpp ++ src/vaapi_utils_x11.cpp + src/vaapi_utils_drm.cpp) + else() + list( +@@ -67,6 +68,8 @@ if(UNIX) + find_package(PkgConfig REQUIRED) + pkg_check_modules(PKG_LIBVA libva libva-drm) + pkg_check_modules(PKG_LIBDRM libdrm) ++ pkg_check_modules(PKG_X11 x11) ++ pkg_check_modules(PKG_LIBVA_X11 libva-x11>=1.10.0) + if(PKG_LIBVA_FOUND) + target_compile_definitions(${TARGET} PUBLIC -DLIBVA_SUPPORT) + target_include_directories(${TARGET} PUBLIC ${PKG_LIBVA_INCLUDE_DIRS}) +@@ -79,6 +82,12 @@ if(UNIX) + else() + message(WARNING "libva-drm not found: building without libVA DRM support") + endif() ++ if(PKG_X11_FOUND) ++ target_compile_definitions(${TARGET} PUBLIC -DLIBVA_X11_SUPPORT) ++ target_include_directories(${TARGET} PUBLIC ${PKG_X11_LIBRARY_DIRS}) ++ else() ++ message(WARNING "x11 modules not found: building without libVA X11 support") ++ endif() + + target_link_libraries(${TARGET} ${CMAKE_DL_LIBS}) + +-- +2.31.1 + diff --git a/recipes-multimedia/onevpl/onevpl_2021.2.2.bb b/recipes-multimedia/onevpl/onevpl_2021.2.2.bb index fe5599ca..566d84d4 100644 --- a/recipes-multimedia/onevpl/onevpl_2021.2.2.bb +++ b/recipes-multimedia/onevpl/onevpl_2021.2.2.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \ SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https \ file://0001-cmake-Allow-build-env-to-set-variables.patch \ + file://0001-Add-X11-support-to-legacy-tools.patch \ " SRCREV = "17968d8d2299352f5a9e09388d24e81064c81c87" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf