Github messages for voidlinux
 help / color / mirror / Atom feed
From: SpidFightFR <SpidFightFR@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: vkdoom-0.9.
Date: Sun, 08 Oct 2023 11:10:52 +0200	[thread overview]
Message-ID: <20231008091052.SMy_qpWcsGWCrhteI4j4tp4vEmHy4-la8QcDBQLI6Xg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46506@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1111 bytes --]

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages vkdoom-void
https://github.com/void-linux/void-packages/pull/46506

New package: vkdoom-0.9.
#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


Hey fellas ! 
I'll be making this PR for something new on my side: adding a package to void.

The package is VKDoom, it's a ZDoom port, focused around Vulkan and modern technologies.
Compared to GZDoom (already in the repos), we could potentially see a visual upgrade, in vkdoom.

It's not released yet, so this PR will be a draft for now. But i'll make sure to post a new template, tested, when it's released.

Peace ! :v: 

A patch file from https://github.com/void-linux/void-packages/pull/46506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vkdoom-void-46506.patch --]
[-- Type: text/x-diff, Size: 3848 bytes --]

From f1a35f26849138d773f2a21ad6abbe673bfc998e Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Sun, 8 Oct 2023 09:00:45 +0000
Subject: [PATCH] New package: vkdoom-0.9.

---
 srcpkgs/vkdoom/patches/vkdoom-fix-build.patch | 15 +++++++++++++
 srcpkgs/vkdoom/patches/vkdoom-fix-pk3.patch   | 22 +++++++++++++++++++
 srcpkgs/vkdoom/template                       | 16 ++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 srcpkgs/vkdoom/patches/vkdoom-fix-build.patch
 create mode 100644 srcpkgs/vkdoom/patches/vkdoom-fix-pk3.patch
 create mode 100644 srcpkgs/vkdoom/template

diff --git a/srcpkgs/vkdoom/patches/vkdoom-fix-build.patch b/srcpkgs/vkdoom/patches/vkdoom-fix-build.patch
new file mode 100644
index 0000000000000..f25d3971684f6
--- /dev/null
+++ b/srcpkgs/vkdoom/patches/vkdoom-fix-build.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76c3584..d933da6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -277,7 +277,9 @@ else()
+ 			include ( FindPkgConfig )
+ 			pkg_check_modules( MUSL_FTS musl-fts )
+ 			if ( MUSL_FTS_FOUND )
+-				set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${MUSL_FTS_LDFLAGS}" )
++                          foreach(flags IN LISTS MUSL_FTS_LDFLAGS)
++                            set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${flags}" )
++                          endforeach()
+ 			else ( MUSL_FTS_FOUND )
+ 				message (ERROR "fts_* functions not found in the system" )
+ 			endif ( MUSL_FTS_FOUND )
diff --git a/srcpkgs/vkdoom/patches/vkdoom-fix-pk3.patch b/srcpkgs/vkdoom/patches/vkdoom-fix-pk3.patch
new file mode 100644
index 0000000000000..6e8a8870c433c
--- /dev/null
+++ b/srcpkgs/vkdoom/patches/vkdoom-fix-pk3.patch
@@ -0,0 +1,22 @@
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index a054d59..b742011 100644
+--- a/src/gameconfigfile.cpp
++++ b/src/gameconfigfile.cpp
+@@ -120,6 +120,8 @@ FGameConfigFile::FGameConfigFile ()
+ 		// Arch Linux likes them in /usr/share/doom
+ 		// Debian likes them in /usr/share/games/doom
+ 		// I assume other distributions don't do anything radically different
++                // Adds the correct locations of the pk3file for Voidlinux
++		SetValueForKey ("Path", "/usr/local/share/vkdoom", true);
+ 		SetValueForKey ("Path", "/usr/local/share/doom", true);
+ 		SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ 		SetValueForKey ("Path", "/usr/share/doom", true);
+@@ -142,6 +144,8 @@ FGameConfigFile::FGameConfigFile ()
+ 		SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
+ 		SetValueForKey ("Path", "$HOME/.local/share/games/doom", true);
+ 		SetValueForKey ("Path", SHARE_DIR, true);
++                // Adds the correct locations of the pk3file for Voidlinux
++		SetValueForKey ("Path", "/usr/local/share/vkdoom", true);
+ 		SetValueForKey ("Path", "/usr/local/share/doom", true);
+ 		SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ 		SetValueForKey ("Path", "/usr/share/doom", true);
diff --git a/srcpkgs/vkdoom/template b/srcpkgs/vkdoom/template
new file mode 100644
index 0000000000000..e9c3dfd34e635
--- /dev/null
+++ b/srcpkgs/vkdoom/template
@@ -0,0 +1,16 @@
+# Template file for 'vkdoom'
+pkgname=vkdoom
+version=0.9
+revision=1
+archs="~i686* ~arm*"
+build_style=cmake
+configure_args="-DINSTALL_PK3_PATH=share/vkdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
+hostmakedepends="pkg-config tar xz"
+makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel libvpx-devel libwebp-devel"
+short_desc="Advanced Doom source port focused around Vulkan and modern computers"
+maintainer="SpidFightFR <spidfight@swisscows.email>"
+license="GPL-3.0-or-later"
+homepage="https://vkdoom.org/"
+distfiles="https://github.com/dpjudas/VkDoom/archive/v${version}.tar.gz"
+checksum="5fbc28079ce03dc710a99ceb8480cdac4c177645757fc2bd3588bfc3ed4cb613"
+nocross=yes

  parent reply	other threads:[~2023-10-08  9:10 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-07 14:43 [PR PATCH] " SpidFightFR
2023-10-07 16:19 ` SpidFightFR
2023-10-08  8:50 ` [PR PATCH] [Updated] " SpidFightFR
2023-10-08  8:52 ` SpidFightFR
2023-10-08  8:56 ` [PR PATCH] [Updated] " SpidFightFR
2023-10-08  9:10 ` SpidFightFR [this message]
2023-10-10  6:58 ` SpidFightFR
2023-10-10  6:59 ` SpidFightFR
2023-10-10  7:01 ` [PR PATCH] [Updated] " SpidFightFR
2024-01-09  1:47 ` github-actions
2024-01-09  5:57 ` SpidFightFR
2024-02-11 13:10 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-11 13:12 ` SpidFightFR
2024-02-11 13:12 ` SpidFightFR
2024-02-11 13:13 ` SpidFightFR
2024-02-11 13:14 ` SpidFightFR
2024-05-12  1:48 ` github-actions
2024-05-12  7:58 ` SpidFightFR

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231008091052.SMy_qpWcsGWCrhteI4j4tp4vEmHy4-la8QcDBQLI6Xg@z \
    --to=spidfightfr@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).