From 423ca50d5db9bcdbb6d09183208c0a2f7a274f19 Mon Sep 17 00:00:00 2001 From: zlice 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 -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 ---- - 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 " 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