[PR PATCH] vba-m: update to 2.1.5

[PR PATCH] vba-m: update to 2.1.5

[zlice]

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

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

https://github.com/zlice/void-packages vba-m_2.1.5
https://github.com/void-linux/void-packages/pull/41110

vba-m: update to 2.1.5
#### Testing the changes
- I tested the changes in this PR: **NO**

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


#### Comments

Haven't tested yet, just saw the release drop. Part of ffmpeg5 list https://github.com/void-linux/void-packages/pull/36315

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vba-m_2.1.5-41110.patch --]
[-- Type: text/x-diff, Size: 3169 bytes --]

From 423ca50d5db9bcdbb6d09183208c0a2f7a274f19 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 15 Dec 2022 08:45:39 -0500
Subject: [PATCH] vba-m: update to 2.1.5

---
 srcpkgs/vba-m/patches/x86-asm.patch | 37 -----------------------------
 srcpkgs/vba-m/template              |  9 ++++---
 2 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/vba-m/patches/x86-asm.patch

diff --git a/srcpkgs/vba-m/patches/x86-asm.patch b/srcpkgs/vba-m/patches/x86-asm.patch
deleted file mode 100644
index 116751d10250..000000000000
--- a/srcpkgs/vba-m/patches/x86-asm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From af0de1c4b308ef8d9a081ecf407805b75a99d877 Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Fri, 4 Oct 2019 07:35:49 +0000
-Subject: [PATCH] xbrz: fix inline asm check
-
-Use correct cpp code to detect x86/amd64 architecture to use inline asm.
-
-Signed-off-by: Rafael Kitover <rkitover@gmail.com>
----
- src/filters/xBRZ/xbrz.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git src/filters/xBRZ/xbrz.cpp src/filters/xBRZ/xbrz.cpp
-index 36d70be26..13e6cdc13 100644
---- a/src/filters/xBRZ/xbrz.cpp
-+++ b/src/filters/xBRZ/xbrz.cpp
-@@ -66,17 +66,17 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c
- 
- inline double fastSqrt(double n)
- {
--#ifdef __GNUC__ || __clang__ || __MINGW64_VERSION_MAJOR || __MINGW32_MAJOR_VERSION
-+#if (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__))
-     __asm__ ("fsqrt" : "+t" (n));
-     return n;
--#elif _MSC_VER && _M_IX86
-+#elif defined(_MSC_VER) && defined(_M_IX86)
-     // speeds up xBRZ by about 9% compared to std::sqrt which internally uses
-     // the same assembler instructions but adds some "fluff"
-     __asm {
-         fld n
-         fsqrt
-     }
--#else // _MSC_VER && _M_X64 OR other platforms
-+#else // defined(_MSC_VER) && defined(_M_X64) OR other platforms
-     // VisualStudio x86_64 does not allow inline ASM
-     return std::sqrt(n);
- #endif
diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 4f28d2fcc1c2..bbd27590f8f1 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -1,10 +1,9 @@
 # Template file for 'vba-m'
 pkgname=vba-m
-reverts=1292_2
-version=2.1.4
-revision=4
+version=2.1.5
+revision=1
 build_style=cmake
-configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
+configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE -DCMAKE_BUILD_TYPE=Release"
 hostmakedepends="gettext pkg-config unzip zip yasm wxWidgets-gtk3-devel"
 makedepends="zlib-devel libpng-devel MesaLib-devel libopenal-devel SDL2-devel
  gtkmm2-devel ffmpeg-devel gtk+3-devel
@@ -14,4 +13,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/visualboyadvance-m/visualboyadvance-m/"
 distfiles="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${version}.tar.gz"
-checksum=8342e017212842de66b0d86bc7610c82349af2d4e59951d969a33fff956c39ba
+checksum=5ece12815f0a6d2ee70ebcdbc072bb0885184e3c89332c2bdeba03c779a2329a

Re: [PR REVIEW] vba-m: update to 2.1.5

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41110#discussion_r1049714092

Comment:
You can't throw out this line until `version` exceeds `1292`.

Re: [PR REVIEW] vba-m: update to 2.1.5

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41110#discussion_r1049713127

Comment:
Why is this necessary?

Re: [PR REVIEW] vba-m: update to 2.1.5

[zlice]

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

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/41110#discussion_r1049718472

Comment:
Build was failing otherwise. Is there a xbps way to do it I overlooked?

Re: [PR REVIEW] vba-m: update to 2.1.5

[zlice]

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

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/41110#discussion_r1049718917

Comment:
I thought that was a commit or something, I'll add it back.

Re: [PR PATCH] [Updated] vba-m: update to 2.1.5

[zlice]

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

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

https://github.com/zlice/void-packages vba-m_2.1.5
https://github.com/void-linux/void-packages/pull/41110

vba-m: update to 2.1.5
#### Testing the changes
- I tested the changes in this PR: **NO**

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


#### Comments

Haven't tested yet, just saw the release drop. Part of ffmpeg5 list https://github.com/void-linux/void-packages/pull/36315

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vba-m_2.1.5-41110.patch --]
[-- Type: text/x-diff, Size: 3170 bytes --]

From 83e2baef5a22d96d683295a8ff6d07ad6d662090 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 15 Dec 2022 08:45:39 -0500
Subject: [PATCH] vba-m: update to 2.1.5

---
 srcpkgs/vba-m/patches/x86-asm.patch | 37 -----------------------------
 srcpkgs/vba-m/template              |  8 +++----
 2 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/vba-m/patches/x86-asm.patch

diff --git a/srcpkgs/vba-m/patches/x86-asm.patch b/srcpkgs/vba-m/patches/x86-asm.patch
deleted file mode 100644
index 116751d10250..000000000000
--- a/srcpkgs/vba-m/patches/x86-asm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From af0de1c4b308ef8d9a081ecf407805b75a99d877 Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Fri, 4 Oct 2019 07:35:49 +0000
-Subject: [PATCH] xbrz: fix inline asm check
-
-Use correct cpp code to detect x86/amd64 architecture to use inline asm.
-
-Signed-off-by: Rafael Kitover <rkitover@gmail.com>
----
- src/filters/xBRZ/xbrz.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git src/filters/xBRZ/xbrz.cpp src/filters/xBRZ/xbrz.cpp
-index 36d70be26..13e6cdc13 100644
---- a/src/filters/xBRZ/xbrz.cpp
-+++ b/src/filters/xBRZ/xbrz.cpp
-@@ -66,17 +66,17 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c
- 
- inline double fastSqrt(double n)
- {
--#ifdef __GNUC__ || __clang__ || __MINGW64_VERSION_MAJOR || __MINGW32_MAJOR_VERSION
-+#if (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__))
-     __asm__ ("fsqrt" : "+t" (n));
-     return n;
--#elif _MSC_VER && _M_IX86
-+#elif defined(_MSC_VER) && defined(_M_IX86)
-     // speeds up xBRZ by about 9% compared to std::sqrt which internally uses
-     // the same assembler instructions but adds some "fluff"
-     __asm {
-         fld n
-         fsqrt
-     }
--#else // _MSC_VER && _M_X64 OR other platforms
-+#else // defined(_MSC_VER) && defined(_M_X64) OR other platforms
-     // VisualStudio x86_64 does not allow inline ASM
-     return std::sqrt(n);
- #endif
diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 4f28d2fcc1c2..ba153e0b58ca 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -1,10 +1,10 @@
 # Template file for 'vba-m'
 pkgname=vba-m
 reverts=1292_2
-version=2.1.4
-revision=4
+version=2.1.5
+revision=1
 build_style=cmake
-configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
+configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE -DCMAKE_BUILD_TYPE=Release"
 hostmakedepends="gettext pkg-config unzip zip yasm wxWidgets-gtk3-devel"
 makedepends="zlib-devel libpng-devel MesaLib-devel libopenal-devel SDL2-devel
  gtkmm2-devel ffmpeg-devel gtk+3-devel
@@ -14,4 +14,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/visualboyadvance-m/visualboyadvance-m/"
 distfiles="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${version}.tar.gz"
-checksum=8342e017212842de66b0d86bc7610c82349af2d4e59951d969a33fff956c39ba
+checksum=5ece12815f0a6d2ee70ebcdbc072bb0885184e3c89332c2bdeba03c779a2329a

Re: [PR REVIEW] vba-m: update to 2.1.5

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41110#discussion_r1049736412

Comment:
No, I just wanted to make sure it was actually required.

Re: vba-m: update to 2.1.5

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/41110#issuecomment-1471161297

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: vba-m: update to 2.1.5

[zlice]

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

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

vba-m: update to 2.1.5
https://github.com/void-linux/void-packages/pull/41110

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

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


#### Comments

Haven't tested yet, just saw the release drop. Part of ffmpeg5 list https://github.com/void-linux/void-packages/pull/36315

Re: vba-m: update to 2.1.5

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/41110#issuecomment-1478054194

Comment:
Apparently this was done a few days after?

https://github.com/void-linux/void-packages/commit/906ab93ad851c043426ce634051d18934484525c