From patchwork Sun Sep 15 07:53:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 67957 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 65A1527BBEA; Sun, 15 Sep 2024 08:57:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B15D127BBE2 for ; Sun, 15 Sep 2024 08:57:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1spk7o-0007XA-Rq; Sun, 15 Sep 2024 03:56:52 -0400 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 1spk7m-0007Wr-TB for guix-patches@gnu.org; Sun, 15 Sep 2024 03:56:50 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1spk7m-00072U-K5 for guix-patches@gnu.org; Sun, 15 Sep 2024 03:56:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=b0/lXG7g/JwhLsASYuPLzqzEZRZWv/CHhNfjZHiMvgw=; b=Ecb0erupvQcDT/QR15HvB0s/hkAID7R5q6MMvBBMl0j9M+n4zkhjcKNGHOLocuvChI9HbI17Tby1Pj/fAW12AOC7ouDC+f3ObsRCmNU/CLBbsG63H3u18397+7PLrGY7n8w3hplw+Xh/yuant8tmXe/meseFTWnXEXO1RjHcIACzciSCnLHA7nkjNAXU9L6H7LkHTn+Qcsh/Znt5B1fVKtE99XOMV69+AY5AJ07K+3I/cZVfF5HvlFpj0+f8GAD/8gSUd7EePYxZTuDUA0o+dEdQrsfuMlEvVOLGUAv2ByLxYdwf/Tw4Xq6oOm0/e28GtlSpcipRO2asY2h23ox2xQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1spk7y-0002VC-4e; Sun, 15 Sep 2024 03:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50654] [PATCH v1 1/1] gnu: Add gemrb-0.9.3. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: phodina@protonmail.com, guix-patches@gnu.org Resent-Date: Sun, 15 Sep 2024 07:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50654 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50654@debbugs.gnu.org Cc: phodina@protonmail.com, Ashvith Shetty , phodina X-Debbugs-Original-Xcc: phodina Received: via spool by 50654-submit@debbugs.gnu.org id=B50654.17263869719546 (code B ref 50654); Sun, 15 Sep 2024 07:57:02 +0000 Received: (at 50654) by debbugs.gnu.org; 15 Sep 2024 07:56:11 +0000 Received: from localhost ([127.0.0.1]:48251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spk78-0002Tu-Vj for submit@debbugs.gnu.org; Sun, 15 Sep 2024 03:56:11 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:60700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spk77-0002TZ-2Z for 50654@debbugs.gnu.org; Sun, 15 Sep 2024 03:56:10 -0400 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2054feabfc3so28441045ad.1 for <50654@debbugs.gnu.org>; Sun, 15 Sep 2024 00:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726386891; x=1726991691; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b0/lXG7g/JwhLsASYuPLzqzEZRZWv/CHhNfjZHiMvgw=; b=Pc29y4+yEFZcorgTdK5AIafSV6SESukDoFAH7kHK/dH62luRXs+QcdzpcOuvYTkXTr vi6jOIj5Ui+/cqKyOMHLvfxCjHkt8smYsyuKkZ4sbgYiIZF62IxfOsSF2Z/qiDA/4YMV FxXm0tlTdWnXvgnJL6mGTnoM5gwlEScpL45ErGsYQTCWcfllyCApQtSUC0HKCrRZsn1z pnlpFpPELQ/bODyFlrlOCQL4AzvtNd1Svn/GHp20ATfyPI6KT5YJUTop/lnH3ulgnAEj AEr3iOj2S2ldkka7C2559AJw3pgCESu7OClqUFNdD/yGQ9ajq20OzHeKHhn4U9l6elvP vWuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726386891; x=1726991691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b0/lXG7g/JwhLsASYuPLzqzEZRZWv/CHhNfjZHiMvgw=; b=iYufkwMgYK/vZsCa8LOE8vorR8gcYnVAmwmgDaOGJStk77lAUzB7QJM4ctUoGBqyME +YWPqGtqMr4868gpuDWwTkF+C9c2AgL0wev5yi8Sh2SQ+eVNRkshra78Q6ypiwrD9CVB V8L7dpCws4ZFckZpX5zqjidqcnKyeILQ5JwdVYo2l38pM3c6pxXdzCKtS9bs27iA6v/h EO4j5GgKarLi+D3maEWMr15S23hmZrmm6JHxi8NSqRahUu27dCNxtpxqg7utd90TzehG Z7DmYoYrqhAksZxkhOK/NDrugtzFGeGs8Xcy3QQF/98QKa3mUKvmdXZnEdB0eIeZkXAc cLHQ== X-Gm-Message-State: AOJu0Yw8xUayP9iMPsdic/ESBZHEQxXxp4do2xDZ0X/fXmMf8vfA0zM3 yTR8CxkoHHjav6Q6XCdr47jF3mxkmDQVrb1n+HPaXmjiKhzkgRhEugLUp4af X-Google-Smtp-Source: AGHT+IH3ck0leTzHIZFlHjQivw0eew+xk2ROFET1zzFHW5mbmOy6jYY2wXN5IXyVGmW/e+KCtYudvQ== X-Received: by 2002:a17:902:f68f:b0:206:88fa:54a6 with SMTP id d9443c01a7336-2076e361a14mr170583705ad.21.1726386890745; Sun, 15 Sep 2024 00:54:50 -0700 (PDT) Received: from wisteria.bbrouter ([150.129.60.164]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-207946d293esm18090145ad.167.2024.09.15.00.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Sep 2024 00:54:50 -0700 (PDT) From: Ashvith Shetty Date: Sun, 15 Sep 2024 13:23:44 +0530 Message-ID: <17a94814fc20d9f59cab7bfe4a181414dc62282d.1726386389.git.ashvithshetty10@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (gemrb-0.9.3): New variable. Change-Id: Ic05eacf362f9a4ebfe88b1e0967e72e824c4f404 --- gnu/packages/games.scm | 41 +++++++++++++++++++ ...rb-add-path-suffixes-for-vlc-headers.patch | 15 +++++++ 2 files changed, 56 insertions(+) create mode 100644 gnu/packages/patches/gemrb-add-path-suffixes-for-vlc-headers.patch diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 26ddde50fe..6fe14a1b15 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -84,6 +84,7 @@ ;;; Copyright © 2024 Sébastien Lerique ;;; Copyright © 2024 James Smith ;;; Copyright © 2024 Jan Wielkiewicz +;;; Copyright © 2024 Ashvith Shetty ;;; ;;; This file is part of GNU Guix. ;;; @@ -11796,6 +11797,46 @@ (define-public steam-devices-udev-rules virtual reality devices.") (license license:expat)))) +(define-public gemrb + (package + (name "gemrb") + (version "0.9.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gemrb/gemrb") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wfmq4z2in18k4znshd7h1i496zlskbci49yp5d54mfxvyp534m5")) + ;; Remove the patch in the next version, as commit d339c0d fixes this + (patches (search-patches + "gemrb-add-path-suffixes-for-vlc-headers.patch")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags `("-DUSE_TESTS=ON" "-DOPENGL_BACKEND=OpenGL") + #:tests? #t)) + (native-inputs (list python-3.10 glibc-locales googletest)) + (inputs (list freetype + libiconv + libpng + libvorbis + openal + sdl2 + sdl2-mixer + vlc + zlib)) + (home-page "https://gemrb.org/") + (synopsis + "GemRB is a portable open-source implementation of Bioware's Infinity Engine") + (description + "GemRB (Game Engine Made with preRendered Background) is a portable + open-source reimplementation of the Infinity Engine that underpinned + Baldur's Gate, Icewind Dale and Planescape: Torment. It sports a + cleaner design, greater extensibility and several innovations.") + (license (list license:gpl2)))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/patches/gemrb-add-path-suffixes-for-vlc-headers.patch b/gnu/packages/patches/gemrb-add-path-suffixes-for-vlc-headers.patch new file mode 100644 index 0000000000..4e678f7fd4 --- /dev/null +++ b/gnu/packages/patches/gemrb-add-path-suffixes-for-vlc-headers.patch @@ -0,0 +1,15 @@ +Add PATH_SUFFIXES to look inside the sub-directory `vlc` - the original statement +only check for `vlc.h` inside the directory `include`, `bin`, etc. +In Guix, however, `vlc.h` lies inside `/gnu/store/-vlc-x.y.z/include/vlc/vlc.h` + +--- a/cmake/modules/FindLIBVLC.cmake ++++ b/cmake/modules/FindLIBVLC.cmake +@@ -29,7 +29,7 @@ FIND_PATH(LIBVLC_INCLUDE_DIR vlc/vlc.h + c:/msys/local/include + NO_DEFAULT_PATH + ) +-FIND_PATH(LIBVLC_INCLUDE_DIR vlc.h) ++FIND_PATH(LIBVLC_INCLUDE_DIR vlc.h PATH_SUFFIXES vlc) + + #Put here path to custom location + #example: /home/user/vlc/lib etc..