Github messages for voidlinux
 help / color / mirror / Atom feed
From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dolphin-emu: embed correct version
Date: Tue, 28 Dec 2021 13:33:33 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34738@inbox.vuxu.org> (raw)

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

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages dolphin-emu-version
https://github.com/void-linux/void-packages/pull/34738

dolphin-emu: embed correct version
#### Testing the changes
- I tested the changes in this PR: **briefly**

the version detected when not building from a git repository is not
precise enough to allow netplay to work

I only tested if the version is embedded correctly, not if netplay works, @Hnaguski or @RhymeJob, could you test this?

Closes: #34691


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-version-34738.patch --]
[-- Type: text/x-diff, Size: 1352 bytes --]

From 002a7c557b344cc331da35107780ba438f791d2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 28 Dec 2021 13:28:26 +0100
Subject: [PATCH] dolphin-emu: embed correct version

the version detected when not building from a git repository is not
precise enough to allow netplay to work

Closes: #34691
---
 srcpkgs/dolphin-emu/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 35ac6a3910df..e6bad8702ce7 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,14 +1,17 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
 version=5.0.15445
-revision=1
+revision=2
 _dolphin_commit=db02b50d2ecdfbbc21e19aadc57253c353069f77
 _mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
 wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
-configure_args="-DUSE_SHARED_ENET=ON"
+configure_args="-DUSE_SHARED_ENET=ON
+ -DDOLPHIN_WC_DESCRIBE=${version%.*}-${version##*.}
+ -DDOLPHIN_WC_REVISION=$_dolphin_commit
+ -DDOLPHIN_WC_BRANCH=master"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="
  zlib-devel glew-devel libusb-devel qt5-devel miniupnpc-devel libevdev-devel

             reply	other threads:[~2021-12-28 12:33 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-28 12:33 paper42 [this message]
2021-12-29  2:52 ` RhymeJob
2021-12-29 14:55 ` [PR PATCH] [Merged]: " paper42

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34738@inbox.vuxu.org \
    --to=paper42@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).