Bug 241752 - emulators/fs-uae: Update to 3.0.2
Summary: emulators/fs-uae: Update to 3.0.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Tobias C. Berner
Keywords: buildisok
Depends on:
Reported: 2019-11-06 07:51 UTC by sirdice
Modified: 2020-03-08 18:44 UTC (History)
2 users (show)

See Also:

svn diff update to 3.0.2 (790 bytes, patch)
2019-11-06 07:51 UTC, sirdice
no flags Details | Diff
svn diff update to 3.0.2 (including JIT) (2.08 KB, patch)
2019-11-07 00:06 UTC, sirdice
no flags Details | Diff
svn diff update to 3.0.2 (including JIT; fixed patches) (2.76 KB, patch)
2020-02-05 20:58 UTC, sirdice
sirdice: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description sirdice 2019-11-06 07:51:51 UTC
Created attachment 208907 [details]
svn diff update to 3.0.2

Update to 3.0.1 was posted yesterday and quickly after that 3.0.2.

This will update fs-uae to 3.0.2.

Comment 1 Mikael Urankar freebsd_committer 2019-11-06 10:20:29 UTC
any reason to not enable JIT?
Comment 2 sirdice 2019-11-06 10:33:28 UTC
On previous versions (<2.8.4) it broke the build with a message that stated that the option was unsupported on FreeBSD. I have read that the developers had changed the JIT code a lot for 3.0.x and it is definitely on my TODO list to give it another try.

A quick test shows that it's still an issue:
configure: error: in `/tmp/build/usr/home/dice/Sources/FreeBSD/ports/fs-uae/work/fs-uae-3.0.2':
configure: error: JIT is not supported on amd64-portbld-freebsd12.1
Comment 3 Mikael Urankar freebsd_committer 2019-11-06 10:37:58 UTC
It seems to build with this but I don't know how to test it:
--- configure.orig      2019-11-06 11:37:10.261102000 +0100
+++ configure   2019-11-06 11:37:21.930023000 +0100
@@ -13526,9 +13526,6 @@ main ()
         #if !defined(__i386__) && !defined(__x86_64__)
         #error JIT is only supported on x86/x86-64
-        #if defined(__OpenBSD__) || defined(__FreeBSD__)
-        #error no JIT on OpenBSD/FreeBSD right now
-        #endif
   return 0;
Comment 4 sirdice 2019-11-06 10:49:32 UTC
Don't exactly know how to test the difference either. But I do have a large collection of Amiga stuff that's running fine on fs-uae without JIT. I'm going to try and patch out that test, if it builds properly I have enough material to see if it continues to work or not.
Comment 5 sirdice 2019-11-06 12:13:44 UTC
With the test patched out it does build but I need to do some further testing if it actually works or not. I also need to keep that option disabled for anything other than i386 or amd64. I'm probably going to make it a port option, so it can be easily turned on or off in case it causes problems. 

Created the submitted patch this morning before I went to work. Will continue testing it when I get back home and provide an updated patch. I'm pretty sure my boss doesn't like me playing Amiga games while at work ;)
Comment 6 Automation User 2019-11-06 19:22:56 UTC
Build info is available at https://gitlab.com/swills/freebsd-ports/pipelines/94102917
Comment 7 sirdice 2019-11-07 00:06:40 UTC
Created attachment 208926 [details]
svn diff update to 3.0.2 (including JIT)

I have good news and bad news. The bad news is that it didn't work for me. With JIT enabled fs-uae seemingly loops forever on something and either quits on its own or I have to kill it. I'm going to need a lot more time to figure out why. With JIT disabled everything works as before.

The good news is that I've added it as an option in the port as experimental. It's off by default. Added a patchfile for configure, couldn't figure out how to make the patch itself optional though. But it's harmless if JIT is disabled.

% svn status
M       Makefile
M       distinfo
A       files/patch-configure

svn add files/patch-configure
Comment 8 Mikael Urankar freebsd_committer 2019-11-07 07:41:02 UTC
(In reply to sirdice from comment #7)
Ok, it probably not worth the trouble
Comment 9 sirdice 2019-11-07 11:02:42 UTC
I was kind of hopeful when it built cleanly. But alas, it's going to need more work to get it actually working. 

This is my first maintainer job, I'm not yet familiar with the process. I've submitted patches before, but never as maintainer. Do I need to do anything more?
Comment 10 Mikael Urankar freebsd_committer 2019-11-07 18:03:54 UTC
(In reply to sirdice from comment #9)
Check point 3.4 3.5 3.6 of the porters handbook:
Comment 11 Automation User 2020-01-09 00:38:45 UTC
Build info is available at https://gitlab.com/swills/freebsd-ports/pipelines/107958989
Comment 12 sirdice 2020-02-05 20:58:37 UTC
Created attachment 211388 [details]
svn diff update to 3.0.2 (including JIT; fixed patches)

Sorry about the long hiatus. Got some personal issues at the end of the year, then the holidays and after the new year it kind of slipped my mind. 

Thanks for pointing me to portlint, I definitely forgot to check it. It complained about both patch files. Even the old, original one that already existed before I took over maintenance. In any case, I redid both of them and portlint is now happy. It does suggest adding an NLS option but I can't get fs-uae to build without gettext, so I decided not to add NLS as an option. I did add a DEBUG option (off by default) for good measure, I'm probably going to need it anyway. 

Patch needs 'svn add files/patch-configure', it's a new file. 

% svn status
M       Makefile
M       distinfo
A       files/patch-configure
M       files/patch-src_od-win32_picasso96__win.cpp
Comment 13 commit-hook freebsd_committer 2020-03-08 18:44:32 UTC
A commit references this bug:

Author: tcberner
Date: Sun Mar  8 18:44:06 UTC 2020
New revision: 528068
URL: https://svnweb.freebsd.org/changeset/ports/528068

  emulators/fs-uae: Update to 3.0.2

  PR:		241752
  Submitted by:	sirdice@gmail.com  (maintainer)

Comment 14 Tobias C. Berner freebsd_committer 2020-03-08 18:44:51 UTC
Committed. Thanks.