From d216b47dbfa8378b2d04a9fe2dd7786e57fb5a21 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Feb 2021 14:04:21 +0100 Subject: [PATCH] libdrm: add option to build the intel driver libpciaccess is not needed for libdrm itself, only the intel driver depends on it: https://cgit.freedesktop.org/mesa/drm/tree/meson.build#n240 Signed-off-by: Bernd Kuhls --- libs/libdrm/Config.in | 11 +++++++++++ libs/libdrm/Makefile | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 libs/libdrm/Config.in diff --git a/libs/libdrm/Config.in b/libs/libdrm/Config.in new file mode 100644 index 0000000000..32602c736f --- /dev/null +++ b/libs/libdrm/Config.in @@ -0,0 +1,11 @@ +menu "Select libdrm build options" + depends on PACKAGE_libdrm + +config LIBDRM_INTEL + bool "Intel support" + default n + depends on x86_64 || i386 + help + Installs the Intel driver. + +endmenu diff --git a/libs/libdrm/Makefile b/libs/libdrm/Makefile index 36c44e6d45..d05ef93cf7 100644 --- a/libs/libdrm/Makefile +++ b/libs/libdrm/Makefile @@ -16,6 +16,9 @@ PKG_HASH:=d66ad8b5c2441015ac1333e40137bb803c3bde3612ff040286fcc12158ea1bcb PKG_MAINTAINER:=Lucian Cristian PKG_LICENSE:=BSD-3-Clause +PKG_CONFIG_DEPENDS:= \ + CONFIG_LIBDRM_INTEL + PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=meson/host @@ -25,7 +28,7 @@ include ../../devel/meson/meson.mk define Package/libdrm SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libpciaccess + DEPENDS:=+LIBDRM_INTEL:libpciaccess TITLE:=libdrm URL:=https://dri.freedesktop.org/ endef @@ -36,9 +39,12 @@ define Package/libdrm/description of the DRI protocol. endef +define Package/libdrm/config + source "$(SOURCE)/Config.in" +endef + MESON_ARGS += \ - -Dlibkms=false \ - -Dintel=false \ + $(if $(CONFIG_LIBDRM_INTEL),-Dintel=true -Dlibkms=true,-Dintel=false -Dlibkms=false) \ -Dradeon=false \ -Damdgpu=false \ -Dnouveau=false \ @@ -60,14 +66,14 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdrm.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig endef define Package/libdrm/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libdrm))