[Buildroot] [git commit] package/libvpl: update configure options
Julien Olivain via buildroot <[email protected]>
| Newsgroups | net.busybox.buildroot |
|---|---|
| Message-ID | <[email protected]> |
commit: https://gitlab.com/buildroot.org/buildroot/-/commit/53c29cf0466a1cb73739af2acdce61024df9650c branch: https://gitlab.com/buildroot.org/buildroot/-/tree/master Upstream removed configure option INSTALL_EXAMPLE_CODE with commit https://github.com/intel/libvpl/commit/8434de3cbc2c06822e43d4b24cfd543a6bce1bfb which was first released with version 2.11.0. Upstream re-added a similar configure option named INSTALL_EXAMPLE_CODE with commits https://github.com/intel/libvpl/commit/f8d989160e3817cd9c18716120dccc1c8c23e915 https://github.com/intel/libvpl/commit/7c803c85383b011c1552d06585588ab7a8fcc4d3 which were first released with version 2.15.0. Buildroot bumped the package to 2.15.0 with 8e713dcc88e24c47593abb84c9aa15f09610ae11 and forgot to rename the configure option. Remove libva/x11/wayland-related configure option due to upstream commit https://github.com/intel/libvpl/commit/8434de3cbc2c06822e43d4b24cfd543a6bce1bfb which was first released with version 2.11.0. Remove the selection of optional packages for these dependencies as well. Removed unneeded libatomic handling. Signed-off-by: Bernd Kuhls <[email protected]> Signed-off-by: Julien Olivain <[email protected]> --- package/libvpl/Config.in | 7 ------- package/libvpl/libvpl.mk | 28 +--------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/package/libvpl/Config.in b/package/libvpl/Config.in index 5a370ed2e3..eac901f9a8 100644 --- a/package/libvpl/Config.in +++ b/package/libvpl/Config.in @@ -10,13 +10,6 @@ config BR2_PACKAGE_LIBVPL depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND - # libva support needs a libdrm with intel driver - select BR2_PACKAGE_LIBDRM_INTEL if BR2_PACKAGE_LIBVA && \ - (BR2_i386 || BR2_x86_64) && \ - BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 help oneAPI Video Processing Library (oneVPL) dispatcher, tools, and examples diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index e5ab9ac8ee..53a576a0a7 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -13,32 +13,6 @@ LIBVPL_DEPENDENCIES = host-pkgconf LIBVPL_CONF_OPTS = \ -DBUILD_TOOLS=OFF \ - -DINSTALL_EXAMPLE_CODE=OFF - -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -LIBVPL_CONF_OPTS += \ - -DCMAKE_CXX_FLAGS="-latomic" -endif - -ifeq ($(BR2_PACKAGE_LIBVA),y) -LIBVPL_CONF_OPTS += -DENABLE_VA=ON -LIBVPL_DEPENDENCIES += libva -else -LIBVPL_CONF_OPTS += -DENABLE_VA=OFF -endif - -ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBVPL_CONF_OPTS += -DENABLE_WAYLAND=ON -LIBVPL_DEPENDENCIES += wayland wayland-protocols -else -LIBVPL_CONF_OPTS += -DENABLE_WAYLAND=OFF -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -LIBVPL_CONF_OPTS += -DENABLE_X11=ON -LIBVPL_DEPENDENCIES += libxcb xlib_libX11 -else -LIBVPL_CONF_OPTS += -DENABLE_X11=OFF -endif + -DINSTALL_EXAMPLES=OFF $(eval $(cmake-package)) _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot