Re: [PR PATCH] [Updated] snes9x-gtk: update to 1.61.

[tm512 <tm512@users.noreply.github.com>]

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

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

https://github.com/tm512/void-packages snes9x-gtk
https://github.com/void-linux/void-packages/pull/39487

snes9x-gtk: update to 1.61.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snes9x-gtk-39487.patch --]
[-- Type: text/x-diff, Size: 3333 bytes --]

From 0a481579bb06c6dc78dfc98019045927413f2a86 Mon Sep 17 00:00:00 2001
From: tm512 <elykdav@gmail.com>
Date: Mon, 26 Sep 2022 21:56:08 -0700
Subject: [PATCH 1/2] snes9x-gtk: update to 1.61.

---
 srcpkgs/snes9x-gtk/template | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/snes9x-gtk/template b/srcpkgs/snes9x-gtk/template
index 400db12b0292..e4c5b3c8012b 100644
--- a/srcpkgs/snes9x-gtk/template
+++ b/srcpkgs/snes9x-gtk/template
@@ -1,18 +1,30 @@
 # Template file for 'snes9x-gtk'
 pkgname=snes9x-gtk
-version=1.60
+version=1.61
 revision=1
+_spirvcrossver=1458bae62ec67ea7d12c5a13b740e23ed4bb226c
+_glslangver=bcf6a2430e99e8fc24f9f266e99316905e6d5134
 wrksrc="snes9x-${version}"
-build_wrksrc="gtk"
+create_wrksrc=yes
+build_wrksrc="snes9x-${version}/gtk"
 build_style=meson
 hostmakedepends="gettext-devel glib-devel pkg-config intltool"
-makedepends="minizip-devel gtk+3-devel SDL2-devel xorg-server-devel"
+makedepends="minizip-devel gtk+3-devel gtkmm-devel SDL2-devel xorg-server-devel"
 short_desc="SNES Emulator"
 maintainer="Hinterwaeldlers <mguethle@xunit.de>"
 license="LGPL-2.1-or-later"
 homepage="http://www.snes9x.com/"
-distfiles="https://github.com/snes9xgit/snes9x/archive/$version.tar.gz"
-checksum=861c8c0ab1d302d9df51e5ac4717a0069b33614a3f22bf3ab17ebf3405e58722
+distfiles="https://github.com/snes9xgit/snes9x/archive/${version}.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Cross/archive/${_spirvcrossver}.tar.gz
+ https://github.com/KhronosGroup/glslang/archive/${_glslangver}.tar.gz"
+checksum="ce7aad69c3041ba4c33690e9e7d21ceb1b9283d85759b1bf683dfb8c473511bb
+ 6ad0c3c9492699e46bd16d6ef8cacd8bb74b02b032d3ee3f16a6335554efc45f
+ a3e604397adb2224178d3eb409eab8b8c13a96a42432483d498105c90828c380"
 
 nocross="cannot run test program while cross compiling"
 
+post_extract() {
+	rm -rf snes9x-${version}/shaders/{SPIRV-Cross,glslang}
+	mv SPIRV-Cross-${_spirvcrossver} snes9x-${version}/shaders/SPIRV-Cross
+	mv glslang-${_glslangver} snes9x-${version}/shaders/glslang
+}

From 3753b1f022f3ae8c966d662b0ecfe4958a164530 Mon Sep 17 00:00:00 2001
From: tm512 <elykdav@gmail.com>
Date: Mon, 26 Sep 2022 23:08:03 -0700
Subject: [PATCH 2/2] snes9x-gtk: include custom non-commercial license, fix
 "license" field

---
 srcpkgs/snes9x-gtk/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/snes9x-gtk/template b/srcpkgs/snes9x-gtk/template
index e4c5b3c8012b..34b25ea97dfd 100644
--- a/srcpkgs/snes9x-gtk/template
+++ b/srcpkgs/snes9x-gtk/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel glib-devel pkg-config intltool"
 makedepends="minizip-devel gtk+3-devel gtkmm-devel SDL2-devel xorg-server-devel"
 short_desc="SNES Emulator"
 maintainer="Hinterwaeldlers <mguethle@xunit.de>"
-license="LGPL-2.1-or-later"
+license="custom:noncommercial-MIT-like, LGPL-2.1-or-later, GPL-2.0-only, LGPL-2.0-only, GPL-3.0-only"
 homepage="http://www.snes9x.com/"
 distfiles="https://github.com/snes9xgit/snes9x/archive/${version}.tar.gz
  https://github.com/KhronosGroup/SPIRV-Cross/archive/${_spirvcrossver}.tar.gz
@@ -28,3 +28,7 @@ post_extract() {
 	mv SPIRV-Cross-${_spirvcrossver} snes9x-${version}/shaders/SPIRV-Cross
 	mv glslang-${_glslangver} snes9x-${version}/shaders/glslang
 }
+
+post_install() {
+	vlicense ../LICENSE
+}