From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id vx5RIzK1DGEUwQAAgWs5BA (envelope-from ) for ; Fri, 06 Aug 2021 06:06:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sB1fHjK1DGGWCQAAB5/wlQ (envelope-from ) for ; Fri, 06 Aug 2021 04:06:10 +0000 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 9105014FFB for ; Fri, 6 Aug 2021 06:06:09 +0200 (CEST) Received: from localhost ([::1]:41364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBr7Y-00019M-KP for larch@yhetil.org; Fri, 06 Aug 2021 00:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBr7S-000167-SV for guix-patches@gnu.org; Fri, 06 Aug 2021 00:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mBr7S-000692-MS for guix-patches@gnu.org; Fri, 06 Aug 2021 00:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mBr7S-0000wP-DZ for guix-patches@gnu.org; Fri, 06 Aug 2021 00:06:02 -0400 Subject: bug#34879: [PATCH] gnu: yamagi-quake2: Update to 7.40. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 06 Aug 2021 04:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 34879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: nee Cc: 34879-done@debbugs.gnu.org, me@tobias.gr Mail-Followup-To: 34879@debbugs.gnu.org, maxim.cournoyer@gmail.com, nee-git@hidamari.blue Received: via spool by 34879-done@debbugs.gnu.org id=D34879.16282227063540 (code D ref 34879); Fri, 06 Aug 2021 04:06:02 +0000 Received: (at 34879-done) by debbugs.gnu.org; 6 Aug 2021 04:05:06 +0000 Received: from localhost ([127.0.0.1]:48821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBr6Y-0000v0-97 for submit@debbugs.gnu.org; Fri, 06 Aug 2021 00:05:06 -0400 Received: from mail-qv1-f44.google.com ([209.85.219.44]:33288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBr6W-0000uR-EP for 34879-done@debbugs.gnu.org; Fri, 06 Aug 2021 00:05:05 -0400 Received: by mail-qv1-f44.google.com with SMTP id em4so4282631qvb.0 for <34879-done@debbugs.gnu.org>; Thu, 05 Aug 2021 21:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=bli9URJcZXju67kJbtzyvtJJjJAFcy05rYvWbaBqjIA=; b=LcMVWAkKMrmZLuqwLNAjz5LwOvlKoOlxVe12VmPSDiRiQ9qxw0Z1/1wGDFWuGaGEes Yj7v9+44gwqKs9PTCk96yR/OLDiUD1lFLoWP2+AqHVvyyzKX9RXU6JFuAWzU36raCCFB Jw2ceaPUzJMUN49sND/mJWlWFBjnrto3zywTySmu2hn2T19PcIwIclw39JmGkLe8lflC 2J6zB646R6hP+HaBQ5GS79ZSti7RAWc/B80yyV6W5cEol251WvpFyoOuLDPVf4o3axIH qeNtdbEW6bi2EXKtcZbTjgBdteLiZmSo4AjQO3xZWQ38QSEDHsEtPBgq4pS/k/5cYYOc jfhQ== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=bli9URJcZXju67kJbtzyvtJJjJAFcy05rYvWbaBqjIA=; b=WGsvK5DlZRzrFHPKlBCSGtN77G+Jy3TrxQNembqZcWZD+TqqIhAiwZ2xzwbc4kb1pl CcWY8KhGvlYDfcu4k0hknbg1Bqf+av0xH/M0ZXshMvWGrMoEoGCPPpCnoxfngdzXTITz j8V/LlsFCmdWVG2CI0rRjZjkKd7zSORyb7Xh1JmXPopip3mitY6pA8Ws5sd0wYX+tITr /xvnEiuFQUi/xQFX3viyBSFoIWEET4b3jPuymeOjsNAZvc8xSH1nsCDCY5FafETK57I8 3ICXLnbKXwNx4c8nopQ3cl/OAOektC9AGObboSvnFia2zhJaJeT97uSxrm+xGSGHjx6Q FvqA== X-Gm-Message-State: AOAM533tcA7DDdzS8DJk+6dkHN1Oetxvd4p09M6+We7NjAQ/Y0A7r5hk aFR/fJGkcOMSlyXnS8rFxCUi+H1RXnxWaxnZ X-Google-Smtp-Source: ABdhPJy+14XSwDTPLspKgWMHeMt8u161pp0dL9pvCnNuo5jSZJR2FCKFQ7iOP4lraNP6k6DZPB+mWg== X-Received: by 2002:a05:6214:2b0b:: with SMTP id jx11mr8955057qvb.17.1628222698614; Thu, 05 Aug 2021 21:04:58 -0700 (PDT) Received: from hurd (dsl-151-109.b2b2c.ca. [66.158.151.109]) by smtp.gmail.com with ESMTPSA id l4sm211679qtr.67.2021.08.05.21.04.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 21:04:58 -0700 (PDT) From: Maxim Cournoyer References: <874l83be27.fsf@nckx> <3e8808c3-0dde-f149-9573-3525bb2f680f@hidamari.blue> Date: Fri, 06 Aug 2021 00:04:52 -0400 In-Reply-To: <3e8808c3-0dde-f149-9573-3525bb2f680f@hidamari.blue> (nee's message of "Mon, 1 Apr 2019 23:15:28 +0200") Message-ID: <87bl6bkyl7.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628222770; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to: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=bli9URJcZXju67kJbtzyvtJJjJAFcy05rYvWbaBqjIA=; b=lnhlZpVtL3veEtVnbw+eymV3EMGXjPM8A//o/34Z3NS6PYo7T2eIZLhM6tP/xpwOimzbQd 9zFNUKy33opAyOIGJHwwaTKzPCMIkEVLgmMnOzq9mXfMgnXtB8OP6wLbDh6R86RXOdfNXC hOmOtAokDgqYC2GfCkUF0zW3+Mv3jNNO+NYJMci3QXpe46mSahqYMRDe6O7vRHR8ofTFBN vEUu4uZTPX+93WneO8dG6+PztwRMtzMOiwUGfzNJbD9EGzvkHse1XOUTw5g7rUPd6SKFJ2 jJM9u+y9ANesiPtk9Sn8njG4L6OYLgtDOpT9Bu6SUyoJDaB6NqYyCqnmffUWnQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628222770; a=rsa-sha256; cv=none; b=fV482itnzcXcrw72yUtrgkJ2/Gwn5a9eQ5RbgvjieskrCT7ZWgtTSiEyT3jM584UCUtutC Ro2w61QUDu3vGJnrNdBgOK+xMD3JTUuCu3Xjh0bxAgqechnMatu5HenOttf+0gk32LzKzc kUzsoROe5YBCmIbXbbimyFUVC83Nrk+BRp26GtZo9Q0KWy+jtwcNtcPlg0TXHwnFDrrv0g 5u389jrW7EuHvuPMozxMVE7nJpTkJfDKzJ1XtEWIXYNSDq9EM2P/NkVtvd9YlpN4poL2wv 8Rkn3EiFJcNYf8X9Tfel6Pb0nrVRubUWTOcOKXGAIoOkymEgb2FaaDgJ9zZNtw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=LcMVWAkK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=LcMVWAkK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9105014FFB X-Spam-Score: -1.32 X-Migadu-Scanner: scn1.migadu.com X-TUID: DtsumOtMjE9w Hi! nee writes: [...] > I think it's the best to just hard-code the path where it loads those > libraries. That prevents it from loading outdated or garbage collected > ones before the compiled one. Also curl doesn't have a default fallback > in the Makefile. > > Try the new patch and do this to the config: > echo 'set al_driver "/tmp/non-existing-garbage-collected-library"' >> > ~/.yq2/baseq2/config.cfg > echo 'set cl_libcurl "/tmp/non-existing-garbage-collected-library"' >> > ~/.yq2/baseq2/config.cfg > > I tested this new patch and the old patch, and the new one works while > the old one logs to stdout that failed to load curl and openal with that > config and falls back to sdl-audio. > > Happy hacking! > > From a268a6d5390e562f4ed5cc28784f7d83a2eb6f9d Mon Sep 17 00:00:00 2001 > From: nee > Date: Fri, 15 Mar 2019 20:56:47 +0100 > Subject: [PATCH] gnu: yamagi-quake2: Update to 7.40. > > * gnu/packages/games.scm (yamagi-quake2): Update to 7.40. > [arguments](phases): Add 'hard-code-dynamicly-loaded-libs phase. > [inputs]: Add curl. > --- > gnu/packages/games.scm | 34 +++++++++++++++++++++++----------- > 1 file changed, 23 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index 46b58e352c..69e259f044 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -5023,7 +5023,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.") > (define-public yamagi-quake2 > (package > (name "yamagi-quake2") > - (version "7.10") > + (version "7.40") We're now at 7.45 on master but loading the OpenAL library was failing... [...] > - ;; link openAL instead of using dlopen at runtime > - "DLOPEN_OPENAL=\"no\"" > - ;; an optional directory where it will look for quake2 data files > - ;; in addition to the current working directory > + ;; An optional directory where it will look for quake2 data files > + ;; In addition to the current working directory > "WITH_SYSTEMWIDE=yes" > "WITH_SYSTEMDIR=\"/opt/quake2\"") > #:phases > (modify-phases %standard-phases > (delete 'configure) > + (add-before 'build 'hard-code-dynamicly-loaded-libs > + (lambda* (#:key inputs #:allow-other-keys) > + ;; The game writes paths to openal.so and curl.so to ~/.yq2/... > + ;; Workaround: hard-code the compiled paths where it load them, > + ;; this prevents loading old or a garbage collected libraries > + (substitute* "src/client/sound/qal.c" > + (("al_driver->string") > + (string-append "\""(assoc-ref inputs "openal") > + "/lib/libopenal.so\""))) > + (substitute* "src/client/curl/qcurl.c" > + (("cl_libcurl->string") > + (string-append "\"" (assoc-ref inputs "curl") > + "/lib/libcurl.so\""))))) ... until I applied the above forgotten patch! Finally applied as c64c49b152. Thank you! Closing. Maxim