From patchwork Sat Mar 16 05:09:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 1470 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 991BE16DB1; Sat, 16 Mar 2019 05:11:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D98E016DB1 for ; Sat, 16 Mar 2019 05:11:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:37385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h51bA-0006tG-8Q for patchwork@mira.cbaines.net; Sat, 16 Mar 2019 01:11:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h51b7-0006t2-BA for guix-patches@gnu.org; Sat, 16 Mar 2019 01:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h51b5-0005rm-Kz for guix-patches@gnu.org; Sat, 16 Mar 2019 01:11:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h51b4-0005qM-Qf for guix-patches@gnu.org; Sat, 16 Mar 2019 01:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h51b4-0000L6-Hr for guix-patches@gnu.org; Sat, 16 Mar 2019 01:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34879] [PATCH] gnu: yamagi-quake2: Update to 7.40. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Mar 2019 05:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: nee Received: via spool by 34879-submit@debbugs.gnu.org id=B34879.15527130041118 (code B ref 34879); Sat, 16 Mar 2019 05:11:02 +0000 Received: (at 34879) by debbugs.gnu.org; 16 Mar 2019 05:10:04 +0000 Received: from localhost ([127.0.0.1]:45737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h51a7-0000Hx-Ey for submit@debbugs.gnu.org; Sat, 16 Mar 2019 01:10:03 -0400 Received: from tobias.gr ([80.241.217.52]:56860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h51a4-0000HJ-N7 for 34879@debbugs.gnu.org; Sat, 16 Mar 2019 01:10:02 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 63adb7da; Sat, 16 Mar 2019 05:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:references:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=vPHCUl6HLgveRFQzq13K/v bSipNYvbcGKiivktkhBxQ=; b=WWBN+0fmwgTUaRqwrSjtNP5uBs/mJodT7z2FXd YmAY6/i8XRye9cvhme501h1WSZe5mvyJUVPKAui6w5I5SqCKOaap8PncjC1VwRlj ylGDcyY7D+Y34tx5WvOMTKladNuLqZ2hGkPlPKGnfTPRLGNDfg0heeSscvUIoivN 4gnBYtrXMNJ5OCp2YDgtvPVn0GHRdAMZh5MYcaWCeE6n3UQwHtomS0GWgovli0Zm 7IFZfnmHabsmvaDusuKp1IYwMfqTPf46GFmrt84AKKVpzHEOJQ0woq6jI90LhOwM kyZ/Q9sEJGGN+KzSKlamEfNe9Y/Mv1XFuNiFmLRJpjVWi20g== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 5f251348 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sat, 16 Mar 2019 05:09:41 +0000 (UTC) From: Tobias Geerinckx-Rice References: In-reply-to: Date: Sat, 16 Mar 2019 06:09:36 +0100 Message-ID: <874l83be27.fsf@nckx> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 34879@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches nee wrote: > Subject: [PATCH] gnu: yamagi-quake2: Update to 7.40. It's unfortunately not that simple. :-( This version completely changes how it loads OpenAL. The attached patch keeps everything working, but embeds an absolute store reference in the user's configuration file after the first run: λ grep /gnu/store ~/.yq2/baseq2/config.cfg set al_driver "/gnu/store/…-openal-1.19.1/lib/libopenal.so.1" Any ideas, anyone? T G-R From 0048a70ed05f704e2d620c5033bbb0799d025afc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:26:34 +0100 Subject: [PATCH 01/25] gnu: yamagi-quake2: Update to 7.40. * gnu/packages/games.scm (yamagi-quake2): Update to 7.40. [arguments]: Drop removed DLOPEN_OPENAL from #:make-flags and add a new 'embed-library-path' phase to link it by hand. [inputs]: Add curl. --- gnu/packages/games.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 46b58e352c..e7102a0403 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5023,36 +5023,43 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (define-public yamagi-quake2 (package (name "yamagi-quake2") - (version "7.10") + (version "7.40") (source (origin (method url-fetch) (uri (string-append "https://deponie.yamagi.org/quake2/quake2-" version ".tar.xz")) (sha256 - (base32 - "0psinbg25mysd58k99s1n34w31w5hj1vppb39gdjb0zqi6sl6cps")))) + (base32 "0aci73r15m1wbkrhpysxzdg77a294ywxfkd141gi5qgc2lwbsbqw")))) (build-system gnu-build-system) (arguments `(#:tests? #f #:make-flags (list "CC=gcc" - ;; 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) + (delete 'configure) ; no configure script + (add-after 'unpack 'embed-library-path + ;; The option (DLOPEN_OPENAL=no) to link the OpenAL library at + ;; compile time was removed. Pass an absolute file name to + ;; Sys_LoadLibrary to emulate it. + (lambda* (#:key inputs #:allow-other-keys) + (let ((openal (assoc-ref inputs "openal"))) + (substitute* "Makefile" + (("libopenal\\.so\\.[^\"]*" name) + (string-append openal "/lib/" name))) + #t))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (mkdir-p (string-append out "/lib")) (mkdir-p (string-append out "/bin")) ;; The yamagi-quake2 binary must be in the same directory - ;; as it's engine libraries, but symlinking it to /bin is okay + ;; as its engine libraries, but symlinking it to /bin is okay. ;; https://github.com/yquake2/yquake2/blob/master/stuff/packaging.md (copy-recursively "release" (string-append out "/lib/yamagi-quake2")) @@ -5060,7 +5067,8 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (string-append out "/bin/yamagi-quake2")) (symlink (string-append out "/lib/yamagi-quake2/q2ded") (string-append out "/bin/yamagi-q2ded")))))))) - (inputs `(("sdl2" ,sdl2) + (inputs `(("curl" ,curl) + ("sdl2" ,sdl2) ("mesa" ,mesa) ("libvorbis" ,libvorbis) ("zlib" ,zlib) -- 2.20.1