[PR PATCH] dolphin-emu: embed correct version

[PR PATCH] dolphin-emu: embed correct version

[paper42]

[-- 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

Re: dolphin-emu: embed correct version

[RhymeJob]

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

New comment by RhymeJob on void-packages repository

https://github.com/void-linux/void-packages/pull/34738#issuecomment-1002370598

Comment:
This seems to have resolved the issue for me.

Re: [PR PATCH] [Merged]: dolphin-emu: embed correct version

[paper42]

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

There's a merged pull request on the void-packages repository

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

Description:
#### 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