From patchwork Sat Oct 12 17:30:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1175734 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rBfm2q8zz9s4Y for ; Sun, 13 Oct 2019 04:30:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CE1858780A; Sat, 12 Oct 2019 17:30:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A3VdNAgDeUfL; Sat, 12 Oct 2019 17:30:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B3369877A8; Sat, 12 Oct 2019 17:30:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id CD0A11BF31C for ; Sat, 12 Oct 2019 17:30:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 242D320483 for ; Sat, 12 Oct 2019 17:30:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7fjjomCtjzM7 for ; Sat, 12 Oct 2019 17:30:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by silver.osuosl.org (Postfix) with ESMTPS id C1E082011B for ; Sat, 12 Oct 2019 17:30:16 +0000 (UTC) Received: from fwd30.aul.t-online.de (fwd30.aul.t-online.de [172.20.26.135]) by mailout01.t-online.de (Postfix) with SMTP id 71D8C42185A3; Sat, 12 Oct 2019 19:30:14 +0200 (CEST) Received: from fli4l.lan.fli4l (GJW4TqZEwhWoXGSwQvO4mLdo55ecyOjAnVmAjdEoxU5MehpMraUwLSQ08N5nO8wZd4@[84.161.190.184]) by fwd30.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iJLDY-0YeR720; Sat, 12 Oct 2019 19:30:12 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:45362) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1iJLDX-0000eA-Gl; Sat, 12 Oct 2019 19:30:12 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 19:30:11 +0200 Message-Id: <20191012173011.11419-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: GJW4TqZEwhWoXGSwQvO4mLdo55ecyOjAnVmAjdEoxU5MehpMraUwLSQ08N5nO8wZd4 X-TOI-MSGID: a93458f3-5d5c-4212-af9e-6adc794b8973 Subject: [Buildroot] [PATCH 1/1] package/mesa3d-headers: fix install of dri.pc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Due to the switch of mesa3d to the meson build system the upstream tarball does not include dri.pc.in anymore, it is created during the build now: https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/drivers/dri/meson.build?h=19.2#n93 In order to provide dri.pc we need to add a version taken from a dri- based mesa3d build to our source repository, by doing so we can reduce the number of sed commands. Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/dri.pc | 10 ++++++++++ package/mesa3d-headers/mesa3d-headers.mk | 9 ++------- 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 package/mesa3d-headers/dri.pc diff --git a/package/mesa3d-headers/dri.pc b/package/mesa3d-headers/dri.pc new file mode 100644 index 0000000000..bd9a33b6c6 --- /dev/null +++ b/package/mesa3d-headers/dri.pc @@ -0,0 +1,10 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include + +dridriverdir=/usr/lib/dri + +Name: dri +Description: Direct Rendering Infrastructure +Version: @VERSION@ +Cflags: -I${includedir} diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 8670184742..99d6e52498 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -34,13 +34,8 @@ 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:@\(exec_\)\?prefix@:/usr:' \ - -e 's:@libdir@:$${exec_prefix}/lib:' \ - -e 's:@includedir@:$${prefix}/include:' \ - -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \ - -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ - -e 's:@DRI_PC_REQ_PRIV@::' \ - $(@D)/src/mesa/drivers/dri/dri.pc.in \ + sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ + package/mesa3d-headers/dri.pc \ >$(@D)/src/mesa/drivers/dri/dri.pc endef