Bug 281331 - devel/librashader: update to 0.4.2
Summary: devel/librashader: update to 0.4.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: Zsolt Udvari
URL: https://github.com/SnowflakePowered/l...
Keywords:
Depends on:
Blocks:
 
Reported: 2024-09-07 08:17 UTC by Stefan Schlosser
Modified: 2024-09-14 11:58 UTC (History)
1 user (show)

See Also:


Attachments
update to 0.4.0 (35.19 KB, patch)
2024-09-07 08:17 UTC, Stefan Schlosser
bsdcode: maintainer-approval+
Details | Diff
update to 0.4.1 (35.27 KB, patch)
2024-09-08 19:18 UTC, Stefan Schlosser
bsdcode: maintainer-approval+
Details | Diff
update to 0.4.1 (35.82 KB, patch)
2024-09-13 12:53 UTC, Stefan Schlosser
no flags Details | Diff
update to 0.4.2 (37.75 KB, patch)
2024-09-14 07:22 UTC, Stefan Schlosser
bsdcode: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Stefan Schlosser 2024-09-07 08:17:03 UTC
Created attachment 253394 [details]
update to 0.4.0

Changes:
https://github.com/SnowflakePowered/librashader/releases/tag/librashader-v0.4.0
Comment 1 Zsolt Udvari freebsd_committer freebsd_triage 2024-09-07 18:07:19 UTC
Really depends on rust-nightly? Would the basic rust not be good?
Comment 2 Stefan Schlosser 2024-09-07 18:14:48 UTC
(In reply to Zsolt Udvari from comment #1)
> Really depends on rust-nightly? Would the basic rust not be good?
Unfortunately it does depend on features only present in rust-nightly. Upstream is tracking its requirements for building with stable rust in https://github.com/SnowflakePowered/librashader/issues/55. Still not there yet...
Comment 3 Zsolt Udvari freebsd_committer freebsd_triage 2024-09-08 05:48:42 UTC
(In reply to Stefan Schlosser from comment #2)
Okay, thanks!
Comment 4 Stefan Schlosser 2024-09-08 18:32:46 UTC
Upstream has just released a bugfix release 0.4.1. I would like to update my patch to this version. Will provide an updated patch soon.
Comment 5 Stefan Schlosser 2024-09-08 19:18:13 UTC
Created attachment 253434 [details]
update to 0.4.1

Changes:
https://github.com/SnowflakePowered/librashader/releases/tag/librashader-v0.4.0
https://github.com/SnowflakePowered/librashader/releases/tag/librashader-v0.4.1


I have updated to 0.4.1. The difference between 0.4.0 and 0.4.1 is solely in librashader itself, the cargo dependencies stay the same.
Comment 6 Zsolt Udvari freebsd_committer freebsd_triage 2024-09-13 05:53:51 UTC
The emulators/ares port doesn't build with new librashader:

Compiling ares/a26/controller/controller.cpp ...
In file included from ../ruby/ruby.cpp:31:
In file included from ../ruby/video/video.cpp:10:
In file included from ../ruby/video/glx.cpp:1:
In file included from ../ruby/video/opengl/opengl.hpp:21:
/usr/local/include/librashader/librashader_ld.h:1458:9: error: assigning to 'PFN_libra_gl_filter_chain_get_param' (aka '_libra_error *(*)(_filter_chain_gl *const *, const char *, float *)') from incompatible type 'libra_error_t (libra_gl
_filter_chain_t *, const char *, float *)' (aka '_libra_error *(_filter_chain_gl **, const char *, float *)'): type mismatch at 1st parameter ('const libra_gl_filter_chain_t *' (aka '_filter_chain_gl *const *') vs 'libra_gl_filter_chain_
t *' (aka '_filter_chain_gl **'))
 1458 |         __librashader__noop_gl_filter_chain_get_param;
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
gmake[1]: *** [../ruby/GNUmakefile:134: obj/ruby.o] Error 1
gmake[1]: *** Waiting for unfinished jobs....
gmake[1]: Leaving directory '/wrkdirs/usr/ports/emulators/ares/work/ares-140/desktop-ui'
gmake: *** [GNUmakefile:4: all] Error 2

Could you please check?
Comment 7 Stefan Schlosser 2024-09-13 10:18:29 UTC
Ah sorry, that's what I get for not properly testing the dependent port... I'm currently investigating the problem and will report back soon.
Comment 8 Stefan Schlosser 2024-09-13 12:53:26 UTC
Created attachment 253539 [details]
update to 0.4.1

I opened a PR upstream for this problem:
https://github.com/SnowflakePowered/librashader/pull/118

My updated patch uses this PR commit. Compilation of emulators/ares is successful with my new patch.
Comment 9 Stefan Schlosser 2024-09-13 14:37:24 UTC
According to the recent comments from upstream in the mentioned PR, there is a little bit more to sort out before we can continue updating the port confidently.
Comment 10 Stefan Schlosser 2024-09-13 20:59:44 UTC
Upstream will revert the change which caused the incompatibility between the function signatures. It was not intended. So there's probably a new bugfix release 0.4.2 around the corner. We should wait for this bugfix.
Comment 12 commit-hook freebsd_committer freebsd_triage 2024-09-14 11:54:08 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9f032e6cbf0b1374fd5e3038322b15697789efce

commit 9f032e6cbf0b1374fd5e3038322b15697789efce
Author:     Stefan Schlosser <bsdcode@disroot.org>
AuthorDate: 2024-09-14 11:52:33 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-09-14 11:53:51 +0000

    devel/librashader: Update to 0.4.2

    Changes:
    https://github.com/SnowflakePowered/librashader/releases/tag/librashader-v0.4.0
    https://github.com/SnowflakePowered/librashader/releases/tag/librashader-v0.4.1
    https://github.com/SnowflakePowered/librashader/releases/tag/librashader-v0.4.2

    PR:             281331
    Approved by:    submitter is maintainer

 devel/librashader/Makefile        |   2 +-
 devel/librashader/Makefile.crates |  76 +++++++++---------
 devel/librashader/distinfo        | 158 ++++++++++++++++++++------------------
 3 files changed, 127 insertions(+), 109 deletions(-)
Comment 13 Zsolt Udvari freebsd_committer freebsd_triage 2024-09-14 11:58:58 UTC
Thanks for your work! Committed, thanks!