From patchwork Sat Oct 5 09:48:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1172158 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="USYVgNSp"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lhl318xNz9sPv for ; Sat, 5 Oct 2019 19:48:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8E4D784439; Sat, 5 Oct 2019 09:48:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RwYvCSVyFO21; Sat, 5 Oct 2019 09:48:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A37CF84461; Sat, 5 Oct 2019 09:48:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9F5511BF5DB for ; Sat, 5 Oct 2019 09:48:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 99DA987B85 for ; Sat, 5 Oct 2019 09:48:26 +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 XYoa8FwEuqRh for ; Sat, 5 Oct 2019 09:48:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 56A0D87B4B for ; Sat, 5 Oct 2019 09:48:25 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id j11so4068464wrp.1 for ; Sat, 05 Oct 2019 02:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fVi2DRlLuhKp25/xYo6Jr+08cE1iek0HHT1Kc9X9FNU=; b=USYVgNSp6y3zMDgbDDs8VxZLYdHodMp++4p0ePrbpicZDNSAyZ8rhcv5/C9wKEueYC UHSGRLegq2FR1KiMj9m4Z/IdZk6KsJhR0+NJo8wZaNAWWRC+Ra+Ro3wOWoUOJhIisWkv PcQKhQ03zCweJLW3Vc70PCQOrvyOwF5F7TpJ0FQM15pAoNydEW46yRNI1qYpu0ql3Xjc wlKlMVgg2jFLIBgm6RWnIEZrbJGXAG9qZsMBXKR/gkvEUCYdN4ZdN19C1YJ3ALZE2Ya0 usGH0rrn7gjSmOaPQfTwBF0ixDiMPQ2tCYmS/3x8E/i6QcS3WViQn0ueWO/Hx/Lg7jr7 dk2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fVi2DRlLuhKp25/xYo6Jr+08cE1iek0HHT1Kc9X9FNU=; b=Xavtv4GnN29ntrLN+z8ir0Vs11v5a0T/EooF5GRUVYEFjG+MrwTb/enNyncsvseGKd QX/PYfazKJSkd/tefm0R7GX6V9nXMCW9UyYcrveVhFZs9X/2sZFrwbRzYQftnduTtrQt PjiFPvLeWStE5yxrG8fTv3XxQ/kvymjOgB19ol45c+IOgmKYTR31EpsorfzqJMFs1A5s 7ilor/ixu4wQMeoK30t/WyQRKg/kYMFSQRsZl5r7Ix8od+jb8FkVWoySZrOo3hHq2qVI pVqEJvNxsQsSDO4yqdNACNUxbQigM2bha64dR1bfB3f0O9+EhRR52GuAy5u8ryaDdxp5 ZdmQ== X-Gm-Message-State: APjAAAV7dbvMLxBp+1qhGuViu0MRiIHIX+Hf17/jIrE/JauLMpWmsrkc 624v/X76eO98W3epkd1gnoqX6rf6 X-Google-Smtp-Source: APXvYqz9TTvLUfVScu/iFj1Szi9ZMV+OxO2ZBwHPOC5zwvhWhPnmP93dfxhYifrP3sl9pj0c/onguQ== X-Received: by 2002:adf:8024:: with SMTP id 33mr1492889wrk.315.1570268903306; Sat, 05 Oct 2019 02:48:23 -0700 (PDT) Received: from localhost.localdomain (2a01cb0589880c00405dfcd6cc31e8fe.ipv6.abo.wanadoo.fr. [2a01:cb05:8988:c00:405d:fcd6:cc31:e8fe]) by smtp.gmail.com with ESMTPSA id h125sm15312426wmf.31.2019.10.05.02.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 02:48:22 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 5 Oct 2019 11:48:17 +0200 Message-Id: <20191005094818.1956334-3-romain.naour@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191005094818.1956334-1-romain.naour@gmail.com> References: <20191005094818.1956334-1-romain.naour@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/4] package/mesa3d: add xlib_libXv dependency to mesa3d xvmc 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: Bernd Kuhls , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From [1] "Prior to xvmc 1.0.12 libxvmc incorrectly required libxv, but that was fixed. This results in compilation failures for the gallium xvmc tracker and tools. This patch fixes that by explicitly linking to libxv." Add xlib_libXv dependency to mesa3d when BR2_PACKAGE_MESA3D_XVMC is set. [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=e456a053c3d6ec4f3d4581edcad05c72dfdaa407 Signed-off-by: Romain Naour Cc: Bernd Kuhls Tested-by: Bernd Kuhls --- .../0004-meson-Link-xvmc-with-libxv.patch | 78 +++++++++++++++++++ package/mesa3d/Config.in | 1 + package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 package/mesa3d/0004-meson-Link-xvmc-with-libxv.patch diff --git a/package/mesa3d/0004-meson-Link-xvmc-with-libxv.patch b/package/mesa3d/0004-meson-Link-xvmc-with-libxv.patch new file mode 100644 index 0000000000..821d282932 --- /dev/null +++ b/package/mesa3d/0004-meson-Link-xvmc-with-libxv.patch @@ -0,0 +1,78 @@ +From 1fbb69a58c3dc9d604f5c7851bd3c144af687539 Mon Sep 17 00:00:00 2001 +From: Dylan Baker +Date: Thu, 26 Sep 2019 15:42:59 -0700 +Subject: [PATCH] meson: Link xvmc with libxv + +Prior to xvmc 1.0.12 libxvmc incorrectly required libxv, but that was +fixed. This results in compilation failures for the gallium xvmc tracker +and tools. This patch fixes that by explicitly linking to libxv. + +Fixes: 22a817af8a89eb3c762fc3e07b443a3ce37d7416 + ("meson: build gallium xvmc state tracker") +Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1844 +Reviewed-by: Adam Jackson + +[Romain: backported to 19.2] +(cherry picked from commit e456a053c3d6ec4f3d4581edcad05c72dfdaa407) +Signed-off-by: Romain Naour +--- + meson.build | 4 +++- + src/gallium/state_trackers/xvmc/meson.build | 10 +++++++--- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 4afd8ca663b..d536ef5a76d 100644 +--- a/meson.build ++++ b/meson.build +@@ -502,10 +502,12 @@ elif not (with_gallium_r600 or with_gallium_nouveau) + endif + endif + dep_xvmc = null_dep ++dep_xv = null_dep + with_gallium_xvmc = false + if _xvmc != 'false' + dep_xvmc = dependency('xvmc', version : '>= 1.0.6', required : _xvmc == 'true') +- with_gallium_xvmc = dep_xvmc.found() ++ dep_xv = dependency('xv', required : _xvmc == 'true') ++ with_gallium_xvmc = dep_xvmc.found() and dep_xv.found() + endif + + xvmc_drivers_path = get_option('xvmc-libs-path') +diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build +index d120d533eef..4b7aad51125 100644 +--- a/src/gallium/state_trackers/xvmc/meson.build ++++ b/src/gallium/state_trackers/xvmc/meson.build +@@ -23,7 +23,9 @@ libxvmc_st = static_library( + files('attributes.c', 'block.c', 'context.c', 'surface.c', 'subpicture.c'), + c_args : [c_vis_args], + include_directories : [inc_common], +- dependencies : [dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3], ++ dependencies : [ ++ dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xv, ++ ], + ) + + # These tests will not work without a working xvmc configuration. +@@ -36,7 +38,8 @@ if with_tools.contains('xvmc') + _name, + files('tests/test_@0@.c'.format(x), 'tests/testlib.c'), + dependencies : [ +- dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw, ++ dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, ++ dep_xvmcw, dep_xv, + ], + install: true, + ) +@@ -46,7 +49,8 @@ if with_tools.contains('xvmc') + 'xvmc_bench', + files('tests/xvmc_bench.c', 'tests/testlib.c'), + dependencies : [ +- dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw, ++ dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, ++ dep_xvmcw, dep_xv, + ], + install: true, + ) +-- +2.23.0 + diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 5bec4405b7..f4c5c02e3b 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -230,6 +230,7 @@ config BR2_PACKAGE_MESA3D_XVMC depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + select BR2_PACKAGE_XLIB_LIBXV select BR2_PACKAGE_XLIB_LIBXVMC help XvMC state tracker (needs r600 or nouveau gallium drivers). diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 35fe2bdbe5..0afa84e761 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -217,7 +217,7 @@ MESA3D_CONF_OPTS += -Dgles1=false -Dgles2=false endif ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) -MESA3D_DEPENDENCIES += xlib_libXvMC +MESA3D_DEPENDENCIES += xlib_libXv xlib_libXvMC MESA3D_CONF_OPTS += -Dgallium-xvmc=true else MESA3D_CONF_OPTS += -Dgallium-xvmc=false