* [PR PATCH] fceux: update to 2.6.6.
@ 2023-08-29 22:13 tm512
2023-09-24 20:10 ` [PR PATCH] [Updated] " tm512
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: tm512 @ 2023-08-29 22:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1097 bytes --]
There is a new pull request by tm512 against master on the void-packages repository
https://github.com/tm512/void-packages fceux-2.6.6
https://github.com/void-linux/void-packages/pull/45818
fceux: update to 2.6.6.
<!-- 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/45818.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fceux-2.6.6-45818.patch --]
[-- Type: text/x-diff, Size: 969 bytes --]
From 1a4a41563ed74957a688cbf68dabb9d6889e3910 Mon Sep 17 00:00:00 2001
From: tm512 <elykdav@gmail.com>
Date: Tue, 29 Aug 2023 15:08:14 -0700
Subject: [PATCH] fceux: update to 2.6.6.
---
srcpkgs/fceux/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fceux/template b/srcpkgs/fceux/template
index 7408811484000..8cde308e06a2c 100644
--- a/srcpkgs/fceux/template
+++ b/srcpkgs/fceux/template
@@ -1,6 +1,6 @@
# Template file for 'fceux'
pkgname=fceux
-version=2.6.5
+version=2.6.6
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
homepage="https://fceux.com/web/home.html"
changelog="https://fceux.com/web/version.html"
distfiles="https://github.com/TASVideos/fceux/archive/v${version}.tar.gz"
-checksum=78156f3685c55849351178773940871ed607bc4fc37f233fdab58c232e3208fa
+checksum=0320241d45c6d609f7aeb6f85fdd9019552047206b0864a7f9fddff15b004daa
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] fceux: update to 2.6.6.
2023-08-29 22:13 [PR PATCH] fceux: update to 2.6.6 tm512
@ 2023-09-24 20:10 ` tm512
2023-09-24 20:13 ` tm512
2023-10-02 7:31 ` [PR PATCH] [Merged]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: tm512 @ 2023-09-24 20:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There is an updated pull request by tm512 against master on the void-packages repository
https://github.com/tm512/void-packages fceux-2.6.6
https://github.com/void-linux/void-packages/pull/45818
fceux: update to 2.6.6.
<!-- 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/45818.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fceux-2.6.6-45818.patch --]
[-- Type: text/x-diff, Size: 2576 bytes --]
From 738d54a7a7c4e02468a1a028d2ee7c63cbb4f8d6 Mon Sep 17 00:00:00 2001
From: tm512 <elykdav@gmail.com>
Date: Sun, 24 Sep 2023 13:10:04 -0700
Subject: [PATCH] fceux: update to 2.6.6.
---
.../patches/2.6.6-timestamp-nonx86.patch | 42 +++++++++++++++++++
srcpkgs/fceux/template | 4 +-
2 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fceux/patches/2.6.6-timestamp-nonx86.patch
diff --git a/srcpkgs/fceux/patches/2.6.6-timestamp-nonx86.patch b/srcpkgs/fceux/patches/2.6.6-timestamp-nonx86.patch
new file mode 100644
index 0000000000000..7096d5934851c
--- /dev/null
+++ b/srcpkgs/fceux/patches/2.6.6-timestamp-nonx86.patch
@@ -0,0 +1,42 @@
+diff --git a/src/utils/timeStamp.cpp b/src/utils/timeStamp.cpp
+index f62d019f..efb45aac 100644
+--- a/src/utils/timeStamp.cpp
++++ b/src/utils/timeStamp.cpp
+@@ -14,6 +14,7 @@
+ //-------------------------------------------------------------------------
+ //---- Time Stamp Record
+ //-------------------------------------------------------------------------
++#ifdef __FCEU_X86_TSC_ENABLE
+ #if defined(WIN32)
+ #include <intrin.h>
+ #pragma intrinsic(__rdtsc)
+@@ -25,6 +26,7 @@ static uint64_t rdtsc()
+ {
+ return __rdtsc();
+ }
++#endif
+
+ namespace FCEU
+ {
+@@ -36,12 +38,15 @@ uint64_t timeStampRecord::qpcFreq = 0;
+
+ void timeStampRecord::readNew(void)
+ {
+-#if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
+- clock_gettime( CLOCK_REALTIME, &ts );
+-#else
+- QueryPerformanceCounter((LARGE_INTEGER*)&ts);
+-#endif
+- tsc = rdtsc();
++ #ifdef __FCEU_X86_TSC_ENABLE
++ tsc = rdtsc();
++ #endif
++
++ #if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
++ clock_gettime( CLOCK_REALTIME, &ts );
++ #else
++ QueryPerformanceCounter((LARGE_INTEGER*)&ts);
++ #endif
+ }
+ #if defined(WIN32)
+ void timeStampRecord::qpcCalibrate(void)
diff --git a/srcpkgs/fceux/template b/srcpkgs/fceux/template
index 7408811484000..8cde308e06a2c 100644
--- a/srcpkgs/fceux/template
+++ b/srcpkgs/fceux/template
@@ -1,6 +1,6 @@
# Template file for 'fceux'
pkgname=fceux
-version=2.6.5
+version=2.6.6
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
homepage="https://fceux.com/web/home.html"
changelog="https://fceux.com/web/version.html"
distfiles="https://github.com/TASVideos/fceux/archive/v${version}.tar.gz"
-checksum=78156f3685c55849351178773940871ed607bc4fc37f233fdab58c232e3208fa
+checksum=0320241d45c6d609f7aeb6f85fdd9019552047206b0864a7f9fddff15b004daa
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: fceux: update to 2.6.6.
2023-08-29 22:13 [PR PATCH] fceux: update to 2.6.6 tm512
2023-09-24 20:10 ` [PR PATCH] [Updated] " tm512
@ 2023-09-24 20:13 ` tm512
2023-10-02 7:31 ` [PR PATCH] [Merged]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: tm512 @ 2023-09-24 20:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
New comment by tm512 on void-packages repository
https://github.com/void-linux/void-packages/pull/45818#issuecomment-1732659508
Comment:
Non-x86 builds were failing due to https://github.com/TASEmulators/fceux/issues/663, so I applied the fix (tested working locally with a quick aarch64 cross-build).
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: fceux: update to 2.6.6.
2023-08-29 22:13 [PR PATCH] fceux: update to 2.6.6 tm512
2023-09-24 20:10 ` [PR PATCH] [Updated] " tm512
2023-09-24 20:13 ` tm512
@ 2023-10-02 7:31 ` classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2023-10-02 7:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 946 bytes --]
There's a merged pull request on the void-packages repository
fceux: update to 2.6.6.
https://github.com/void-linux/void-packages/pull/45818
Description:
<!-- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-02 7:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-29 22:13 [PR PATCH] fceux: update to 2.6.6 tm512
2023-09-24 20:10 ` [PR PATCH] [Updated] " tm512
2023-09-24 20:13 ` tm512
2023-10-02 7:31 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).