From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UFmMOKpremPo6AAAbAwnHQ (envelope-from ) for ; Sun, 20 Nov 2022 19:02:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uNGDOKpremMm8gAA9RJhRA (envelope-from ) for ; Sun, 20 Nov 2022 19:02:18 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B0B6E21CF6 for ; Sun, 20 Nov 2022 19:02:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owodn-0003oo-2q; Sun, 20 Nov 2022 13:02:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owodm-0003od-AE for guix-patches@gnu.org; Sun, 20 Nov 2022 13:02:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owodm-00080u-1Z for guix-patches@gnu.org; Sun, 20 Nov 2022 13:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owodl-0005kM-MY for guix-patches@gnu.org; Sun, 20 Nov 2022 13:02:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59416] [PATCH 1/1] gnu: ppsspp: Drop OGLCompiler and OSDependent from glslang libs. References: <20221120175605.23736-1-i@dan.games> In-Reply-To: <20221120175605.23736-1-i@dan.games> Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Nov 2022 18:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59416 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59416@debbugs.gnu.org Received: via spool by 59416-submit@debbugs.gnu.org id=B59416.166896728722046 (code B ref 59416); Sun, 20 Nov 2022 18:02:01 +0000 Received: (at 59416) by debbugs.gnu.org; 20 Nov 2022 18:01:27 +0000 Received: from localhost ([127.0.0.1]:44530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owodC-0005jW-Rv for submit@debbugs.gnu.org; Sun, 20 Nov 2022 13:01:27 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:52661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owodB-0005jK-CR for 59416@debbugs.gnu.org; Sun, 20 Nov 2022 13:01:26 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id AD329320055E for <59416@debbugs.gnu.org>; Sun, 20 Nov 2022 13:01:19 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 20 Nov 2022 13:01:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm2; t=1668967279; x=1669053679; bh=0cv0THgRQf 4PFASMKAY+tUOYM25rtQBgIvcLQdYRkxI=; b=T9chjK+KxhQ26W3YCeRhy4EKEi zs3dbf1EC5UNdmHZ0RWcLe/qNfotjThXGLVQH3S1O16wdhow3BFgjEq/g6XudtOt RPshFMGJLH/iu1GwjSvbuCB0nrEs1onnCZ873ovnNIERGK8kSZWLE/iNBnNVTxAr vSByphPZ3rEceRze9p5MSzoOsIt8grRCB77Kql0zDUbJjD5z+IRB5TjdYs57f+k3 2AUbCOrQ9X2QLDhplQS9qgpQkDNYeWKPYKsSWFwO9O3HyOSLWve1NkdOBHFDBKwj JBZ0omQXkPLegJcX0DKWPzAKXqFAzTTzS//gvhh53KPq+YbtNyGEvpNhP/XA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1668967279; x=1669053679; bh=0cv0THgRQf4PFASMKAY+tUOYM25r tQBgIvcLQdYRkxI=; b=jiczOj0YTjHwg3+zylnuhqfLQGpsSQmJ3g5J46eUkPkP 3YPPpxQuv5jeS0uYakohquo4pD62J6CTJDB1bJy3s9gZckPeW6g5FllWNFE1P1mu LlwcTnsLxhtAd11zrZVMPwiWXLli6j55AX7ZLFzWrSuU0MJczV8/wBacAQcEJpUB bOmcQXRm8ZxaPjAcedChs3jwAgxsX88ODnOOUwfsfbSDl6emqyREAUlgmoSShWnC nRU6yO32rs+mKDxPO455VxI/SoIaHkREBVzihVF9PGiJGo5LNFgSodpYl5rBnEFY wuu1UrXzZjgU91IKZRlnO9HGgCBe8csFiOTT5eoXDg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrheeggdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpedttddutdejvdegvdetfeeiieevleffteehfffgveeuieetleelveefvdduveejgf enucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <59416@debbugs.gnu.org>; Sun, 20 Nov 2022 13:01:18 -0500 (EST) From: dan Date: Mon, 21 Nov 2022 02:00:58 +0800 Message-Id: <20221120180058.24278-1-i@dan.games> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668967338; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0cv0THgRQf4PFASMKAY+tUOYM25rtQBgIvcLQdYRkxI=; b=sQuoOIFjfnBHJOw4htHxdwvoYs9Cy39AM8B5VRTABn8IjYIW5AQczgCDV0sOiRBnvYksW9 7ZoXSIRzQ4yNFFkmfAYhLHa/q4Zphe/RRZDtqDqMpRQYufGhE5WuDXEYoVS6pp7VLgqSXa PL+lF3G0Y9a882qCfcJCbuhBytcpoGfbqyjEv7C03/u/o2QCF9LzgcR0oD54YVOEIPOXyL H1UJ+BGudeicR63pMHv5wX8Xgwbh3Mtwi251V6sJDoJ2GV38shOFRNXUC0tt0ancaDfK6e xkHffL0UcvOSk95ysII8nSB0mN1XuOi3mxiSM3tEvKgzMRT93iZuoKqGdJvAIw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668967338; a=rsa-sha256; cv=none; b=NZFVRWQgYV3Qwtxteo4hWFQTnuSH0bC59zN9S2OphozZfH89ap4a6pao722UhK725u5iy2 dDGdUTTw+gGBW8SrYIv+e7xuWyqRiEOpyH6UjV57kDT4IEakCcLVjSgskcpuDVm9shj+mL ZoC7z10CJKQyGQIQyJ3CVFils7Hu7GQcLClAGJvvLNOnTt9/j6zo8YoB+UJWyUrBozULkJ SAULbRvWQrSusU/RAS+qbqiHNXLqyCNG+Ep2utLYzvw7e15hCnyXLXO/4JhBsCU14X1Ac0 NENQigIcZYr6CF1MDltftR+WLmXyl0YzrcsWBqM7s0lG9pLKQasKW3YEIBhLBQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm2 header.b=T9chjK+K; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=jiczOj0Y; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.39 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm2 header.b=T9chjK+K; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=jiczOj0Y; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B0B6E21CF6 X-Spam-Score: 3.39 X-Migadu-Scanner: scn1.migadu.com X-TUID: 19FnZ206WBet * gnu/packages/emulators.scm (ppsspp) [arguments]: Drop OGLCompiler and OSDependent from lists of glslang libraries. --- gnu/packages/emulators.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 28d3e0ca9a..2ed5420aca 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -2317,7 +2318,14 @@ (define-public ppsspp ;; Since we are not including git as an input, PPSSPP is confused ;; about its version. Let's fix that here. (substitute* "git-version.cmake" - (("unknown") ,version)))))) + (("unknown") ,version)) + ;; We've updated the glslang in guix to match the latest vulkan-sdk + ;; version, while the glslang ppsspp vendored is a 2-year old + ;; version. We have to manually remove these from glslang libs + ;; list to successfully build the package. For more info, see: + ;; https://github.com/KhronosGroup/glslang/commit/7cd519511c32d7e86d901c7ed231cb84c652d18d + (substitute* "CMakeLists.txt" + (("OGLCompiler OSDependent") "")))))) (build-system cmake-build-system) (native-inputs (list pkg-config python)) (inputs (list bash -- 2.38.1