浏览代码

package/mesa3d-headers: bring back the installation of dri.pc

With the version bump to 22.x, the dri.pc file was no longer deployed as
it was believed to not be provided.

While it was temporarily missing from upstream as part of deprecating
the classic driver, it was reintroduced prior to the 22.0 release via:
  https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ae3569d822c2546c4c748090f8a6c8016f763ea

This file is still necessary to build Xorg server. See previous commits:
  9014c21cac
  7468b60e7c

Fixes: 6c25d1099 ("package/{mesa3d, mesa3d-headers}: bump version to 22.1.3")

Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Vincent Fazio 3 年之前
父节点
当前提交
7d1bae0707
共有 1 个文件被更改,包括 10 次插入0 次删除
  1. 10 0
      package/mesa3d-headers/mesa3d-headers.mk

+ 10 - 0
package/mesa3d-headers/mesa3d-headers.mk

@@ -33,9 +33,19 @@ MESA3D_HEADERS_DIRS += GL
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 
+# Not using $(SED) because we do not want to work in-place, and $(SED)
+# contains -i.
+define MESA3D_HEADERS_BUILD_DRI_PC
+	sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
+		$(MESA3D_HEADERS_PKGDIR)/dri.pc \
+		>$(@D)/src/gallium/frontends/dri/dri.pc
+endef
+
 define MESA3D_HEADERS_INSTALL_DRI_PC
 	$(INSTALL) -D -m 0644 $(@D)/include/GL/internal/dri_interface.h \
 		$(STAGING_DIR)/usr/include/GL/internal/dri_interface.h
+	$(INSTALL) -D -m 0644 $(@D)/src/gallium/frontends/dri/dri.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/dri.pc
 endef
 
 endif # Xorg