From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1345595-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 68CBD158086
for <garchives@archives.gentoo.org>; Sat, 4 Dec 2021 00:54:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1BD642BC01B;
Sat, 4 Dec 2021 00:54:33 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id D89242BC01B
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Dec 2021 00:54:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 81CF0343360
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Dec 2021 00:54:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id F3D48213
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Dec 2021 00:54:29 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1638579259.872bf6f1f8baed1e7f76ef593df2b87da9a0eac8.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/blender/blender-3.0.0.ebuild media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
X-VCS-Directories: media-gfx/blender/files/ media-gfx/blender/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 872bf6f1f8baed1e7f76ef593df2b87da9a0eac8
X-VCS-Branch: master
Date: Sat, 4 Dec 2021 00:54:29 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4d2a086e-9e0c-4c8c-9fd5-9ae81c69f550
X-Archives-Hash: af012b83c0b54c572519cdeb7417f16b
commit: 872bf6f1f8baed1e7f76ef593df2b87da9a0eac8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 4 00:53:59 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 4 00:54:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872bf6f1
media-gfx/blender: fix linking against libXxf86vm
See: https://developer.blender.org/D13464
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/blender/blender-3.0.0.ebuild | 4 +++
...ntern-ghost-fix-typo-in-finding-XF86VMODE.patch | 31 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/media-gfx/blender/blender-3.0.0.ebuild b/media-gfx/blender/blender-3.0.0.ebuild
index ad4ed0c1d319..65bfc2f8e6d4 100644
--- a/media-gfx/blender/blender-3.0.0.ebuild
+++ b/media-gfx/blender/blender-3.0.0.ebuild
@@ -123,6 +123,10 @@ BDEPEND="
nls? ( sys-devel/gettext )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch b/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
new file mode 100644
index 000000000000..51d8ded23366
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
@@ -0,0 +1,31 @@
+https://developer.blender.org/D13464
+
+From 781c56f054b4c7717739752336427a811f7633eb Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 4 Dec 2021 00:38:59 +0000
+Subject: [PATCH] intern/ghost: fix typo in finding XF86VMODE
+
+---
+ intern/ghost/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 4164231..663598e 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -245,10 +245,10 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
+ if(WITH_X11_XF86VMODE)
+ add_definitions(-DWITH_X11_XF86VMODE)
+ list(APPEND INC_SYS
+- ${X11_xf86vmode_INCLUDE_PATH}
++ ${X11_Xxf86vmode_INCLUDE_PATH}
+ )
+ list(APPEND LIB
+- ${X11_Xf86vmode_LIB}
++ ${X11_Xxf86vmode_LIB}
+ )
+ endif()
+
+--
+2.34.1
+