From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1055315-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C4FC138334 for <garchives@archives.gentoo.org>; Fri, 2 Nov 2018 21:24:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19C65E092C; Fri, 2 Nov 2018 21:24:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2045E092C for <gentoo-commits@lists.gentoo.org>; Fri, 2 Nov 2018 21:24:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 015C6335C38 for <gentoo-commits@lists.gentoo.org>; Fri, 2 Nov 2018 21:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 574D8435 for <gentoo-commits@lists.gentoo.org>; Fri, 2 Nov 2018 21:24:04 +0000 (UTC) From: "Matt Turner" <mattst88@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org> Message-ID: <1541193832.eb3fef9a8f43d4b973eaad8b162e8dcd3d992a3f.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/, media-libs/mesa/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch media-libs/mesa/mesa-18.2.4.ebuild X-VCS-Directories: media-libs/mesa/files/ media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: eb3fef9a8f43d4b973eaad8b162e8dcd3d992a3f X-VCS-Branch: master Date: Fri, 2 Nov 2018 21:24:04 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ad88bd5d-3a2a-4ad5-8352-98e011375154 X-Archives-Hash: bec3c76afe05f4ce73b621df873616ae commit: eb3fef9a8f43d4b973eaad8b162e8dcd3d992a3f Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Nov 2 21:23:03 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Nov 2 21:23:52 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3fef9a media-libs/mesa: Add upstream patch to avoid build failure Closes: https://bugs.gentoo.org/670094 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...2.4-meson-link-gallium-nine-with-pthreads.patch | 34 ++++++++++++++++++++++ media-libs/mesa/mesa-18.2.4.ebuild | 4 +++ 2 files changed, 38 insertions(+) diff --git a/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch b/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch new file mode 100644 index 00000000000..11d4f9cac07 --- /dev/null +++ b/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch @@ -0,0 +1,34 @@ +From 7652931d33b36c93b2e84713baa8c283d568402e Mon Sep 17 00:00:00 2001 +From: Dylan Baker <dylan@pnwbakers.com> +Date: Thu, 1 Nov 2018 14:12:57 -0700 +Subject: [PATCH] meson: link gallium nine with pthreads + +In some cases (not building with llvm, which automatically pulls in +pthreads) nine needs to be directly linked with pthreads. Fixes building +on x86 (32 bit) without llvm. + +Distro bug: https://bugs.gentoo.org/670094 +Fixes: 6b4c7047d57178d3362a710ad503057c6a582ca3 + ("meson: build gallium nine state_tracker") +Tested-by: Rafal Lalik <rafallalik@gmail.com> +Reviewed-by: Matt Turner <mattst88@gmail.com> +--- + src/gallium/targets/d3dadapter9/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build +index bd05b4f9692..bc72b1110a0 100644 +--- a/src/gallium/targets/d3dadapter9/meson.build ++++ b/src/gallium/targets/d3dadapter9/meson.build +@@ -53,7 +53,7 @@ libgallium_nine = shared_library( + libswkmsdri, + ], + dependencies : [ +- dep_selinux, dep_expat, dep_libdrm, dep_llvm, ++ dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread, + driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, + driver_i915, driver_svga, + ], +-- +2.16.4 + diff --git a/media-libs/mesa/mesa-18.2.4.ebuild b/media-libs/mesa/mesa-18.2.4.ebuild index 2b4e1542fc5..16b4ad7ea3b 100644 --- a/media-libs/mesa/mesa-18.2.4.ebuild +++ b/media-libs/mesa/mesa-18.2.4.ebuild @@ -231,6 +231,10 @@ x86? ( ) )" +PATCHES=( + "${FILESDIR}"/${P}-meson-link-gallium-nine-with-pthreads.patch +) + llvm_check_deps() { local flags=${MULTILIB_USEDEP} if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi