summaryrefslogtreecommitdiff
path: root/games-emulation/vbam
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-11-13 13:10:00 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-11-13 13:10:00 +0000
commite9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /games-emulation/vbam
parentfc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)
gentoo resync : 13.11.2021
Diffstat (limited to 'games-emulation/vbam')
-rw-r--r--games-emulation/vbam/Manifest3
-rw-r--r--games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch33
-rw-r--r--games-emulation/vbam/vbam-2.1.4.ebuild1
3 files changed, 36 insertions, 1 deletions
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 7faf67a767c0..7ca2d7f84b91 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,6 +1,7 @@
+AUX vbam-2.1.4-arm-asm.patch 1288 BLAKE2B cee8723a05887cef699864e90a5cc14db826721a4c65adc12058fdfc0c84d5b59fa8053f923edb9914147117f4fab327e7cd72498e78342123f89b66885be6d6 SHA512 3ac82dfa44c228fafadbb2cc67a6ef634eb79c8ef6bac31b1f76c6707af03a136c6ec16a1cb5b800a2232cee44e9db9ea76b2a88bdf44fb1d2c74b1dc3940a6d
AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247
AUX vbam-2.1.4-libsdl2-2.0.14.patch 783 BLAKE2B 36d4f89965b5097ec848e5d88b2cb600438baca4c73be0d5897a0b528275e433f596a6bb7fe6fd5a5cb3518ed9d7ff8a6f4166152ba6aa15ef90cff23a6159b5 SHA512 f97772215b857069ef881e859fa846400592c437ee85b5b2fd0f463df8be8f5cb40b322361ffa4718e89ab7460ec96a696c0a5683ef0914b2d901af4aacfaa8c
DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
-EBUILD vbam-2.1.4.ebuild 2217 BLAKE2B 98fa777793850a90ae5fbcf66a216558c7510257416cab28b7704ea6be912bf5bc695a7b702e28108bca86b3d35360410e2b68a042b37841f26283c5654f7af1 SHA512 6492dedea6c134f1a556e49c25fbc08c5ba8ebaa2002aa9234113aefdf905116b0ea83d36fb909f7e3bf5df8abd62da35682f5736ec3eaff27717dea5dd3507e
+EBUILD vbam-2.1.4.ebuild 2251 BLAKE2B 9bb3ca90cfd3bec44a598002ad917dcc6b7a8312e538bc25ca2f59cbd7f532c7fa513fa6c5771d731da7971df50c02891829cfc77f3430bff9d2daa12ea4c4cd SHA512 1fa521b6579892189ed9046785de17a4a68575f95ffe35ef86ac92c92224ec45a109124befba9709c421b2e4b5d46342c5847fd9f6fa1a171547d1d3ead69512
EBUILD vbam-9999.ebuild 2119 BLAKE2B 9d3e53a9c113dd5c63bc133e3bd58734fbe8c1c338621a3696d9435be51883b85994fb12f2a417bd82a6764a9641abb5c2002b0172b25de8e1012d0798b75fe6 SHA512 0dea0eda480ad7876c58c665e2d3ecaf3b90d7d20ac2ab4174a7bca529ad654650507b97272939d5a1c9ae87e454b42fa55615554d1d886c89e5c15c9103d5b7
MISC metadata.xml 480 BLAKE2B 43f103fa39cc5a54114a29e5a4d9f317a4cb05233dbeccd74a99218d22f1b93916873756c688fecb09f14d8b84772623d9e66fa64009a014f90cc95329d38d27 SHA512 f9a74a97be6da5686189baa7c5fcb05d9742e41611383b97d071f09fd36944b37d6dbf94309de661d7cd6e17349084f0cdb25ba2b761b44064504ad28f20a76a
diff --git a/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch b/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch
new file mode 100644
index 000000000000..bf6e2bd70e9e
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.1.4-arm-asm.patch
@@ -0,0 +1,33 @@
+https://github.com/visualboyadvance-m/visualboyadvance-m/commit/af0de1c4b308ef8d9a081ecf407805b75a99d877.patch
+https://bugs.gentoo.org/799362
+
+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>
+--- 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/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
index 21f3c2cf4a23..8fe87b4e1480 100644
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -57,6 +57,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-cmake_fix.patch
"${FILESDIR}"/${P}-libsdl2-2.0.14.patch #762208
+ "${FILESDIR}"/${P}-arm-asm.patch
)
src_configure() {