From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 998351382C5 for ; Fri, 23 Mar 2018 23:36:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9655FE09D0; Fri, 23 Mar 2018 23:36:45 +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 5691FE09D0 for ; Fri, 23 Mar 2018 23:36:45 +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 06709335C2E for ; Fri, 23 Mar 2018 23:36:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AEA0266 for ; Fri, 23 Mar 2018 23:36:42 +0000 (UTC) From: "Matt Turner" 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" Message-ID: <1521848171.e90994a1177a1bd1651e3a0f216319e1e80d0e66.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch media-libs/vulkan-loader/vulkan-loader-9999.ebuild X-VCS-Directories: media-libs/vulkan-loader/ media-libs/vulkan-loader/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e90994a1177a1bd1651e3a0f216319e1e80d0e66 X-VCS-Branch: master Date: Fri, 23 Mar 2018 23:36:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b8e5edc4-9b53-48b2-9e9e-5cc63ca8d096 X-Archives-Hash: ce8a85f922fcacb95fd92166f400b0cc commit: e90994a1177a1bd1651e3a0f216319e1e80d0e66 Author: Nick Sarnie gmail com> AuthorDate: Wed Mar 21 23:01:33 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Mar 23 23:36:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90994a1 media-libs/vulkan-loader: Remove now-unneeded patch from 9999 Not needed after upstream https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/commit/4efbd5c81cfb9071757e446d57957aa81e9d9374 (Thanks Chewi!) Signed-off-by: Nick Sarnie gmail.com> Closes: https://github.com/gentoo/gentoo/pull/7544 .../vulkan-loader-9999-no-external-sources.patch | 33 ---------------------- media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 2 -- 2 files changed, 35 deletions(-) diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch deleted file mode 100644 index 0100d1356c4..00000000000 --- a/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 641052deaaa6a570a6c284d5407ac1bbd60d3d53 Mon Sep 17 00:00:00 2001 -From: Nick Sarnie -Date: Sun, 11 Mar 2018 11:18:25 -0400 -Subject: [PATCH] Do not require external sources to build - -Signed-off-by: Nick Sarnie ---- - CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 34e10dc3..5fb97b7c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -361,7 +361,6 @@ add_custom_target(generate_helper_files DEPENDS - vk_dispatch_table_helper.h - vk_extension_helper.h - vk_typemap_helper.h -- spirv_tools_commit_id.h - ) - set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER}) - -@@ -376,7 +375,6 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h) - run_vk_xml_generate(helper_file_generator.py vk_object_types.h) - run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) - run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) --run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) - - - --- -2.16.2 - diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index bb9cb32772d..67822d5a388 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -7,8 +7,6 @@ PYTHON_COMPAT=( python3_{4,5,6} ) if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" inherit git-r3 - - PATCHES=( "${FILESDIR}/${P}-no-external-sources.patch" ) else KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"