Skip to content

Commit c93ff9c

Browse files
committed
Drop the 32-bit libyabridge support for EnergyXT
I don't think anyone is using this, and it's triggering a bug in recent Meson versions so just removing it for now should be fine.
1 parent ce2e9c7 commit c93ff9c

File tree

3 files changed

+7
-31
lines changed

3 files changed

+7
-31
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ Versioning](https://semver.org/spec/v2.0.0.html).
3030
- The `editor_coordinate_hack` compatibility option has been removed. This was a
3131
very specific option to work around a very specific problem, and its existence
3232
resulted in more confusion than it solved problems.
33+
- Out of the box support for building a 32-bit version of yabridge for use in
34+
64-bit machines has been dropped as part of solving a compatibility issue with
35+
newer Meson versions
36+
([#431](https://github.com/robbert-vdh/yabridge/issues/431)). This was only
37+
relevant for using 64-bit Windows plugins in the old 32-bit Linux version of
38+
**EnergyXT**, and should not affect most users.
3339

3440
### yabridgectl
3541

README.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -874,26 +874,6 @@ Yabridge will detect whether the plugin you're trying to load is 32-bit or
874874
64-bit, and will run either the regular version or the `*-32.exe` variant
875875
accordingly.
876876
877-
### 32-bit libraries
878-
879-
It also possible to build 32-bit versions of yabridge's libraries, which would
880-
let you use both 32-bit and 64-bit Windows VST2, VST3, and CLAP plugins from a
881-
32-bit Linux plugin host. This is mostly untested since 32-bit only Linux
882-
applications don't really exist anymore, but it should work! The build system
883-
will still assume you're compiling from a 64-bit system, so if you're compiling
884-
on an actual 32-bit system you would need to comment out the 64-bit
885-
`yabridge-host` and `yabridge-group` binaries in `meson.build`:
886-
887-
```shell
888-
meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true -Dbuild.cpp_args='-m32' -Dbuild.cpp_link_args='-m32'
889-
ninja -C build
890-
```
891-
892-
Like the above commands, you might need to tweak the unity size based on the
893-
amount of system memory available. See the CI build definitions for some
894-
examples on how to add static linking in the mix if you're going to run this
895-
version of yabridge on some other machine.
896-
897877
## Debugging
898878
899879
Wine's error messages and warning are usually very helpful whenever a plugin

meson.build

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ project(
66
default_options : [
77
'warning_level=3',
88
'cpp_std=c++2a',
9-
# Even though Meson will complain that this option does not exist, without
10-
# this Meson will not apply the above option to native targets
11-
'build.cpp_std=c++2a',
129
],
1310
)
1411

@@ -20,19 +17,12 @@ project(
2017
# need to pass `-Dbitbridge=true`. We just make sure that we won't build
2118
# any 64-bit binaries in that situation.
2219
is_64bit_system = build_machine.cpu_family() not in ['x86', 'arm']
23-
with_32bit_libraries = (not is_64bit_system) or get_option('build.cpp_args').contains('-m32')
2420
with_bitbridge = get_option('bitbridge')
2521
with_clap = get_option('clap')
2622
with_system_asio = get_option('system-asio')
2723
with_winedbg = get_option('winedbg')
2824
with_vst3 = get_option('vst3')
2925

30-
# Cookies can't be stored correctly when the native host is 32-bit and the
31-
# bridged plugin is 64-bit
32-
if with_clap and with_32bit_libraries and is_64bit_system
33-
error('CLAP support will not work correctly when using 32-bit yabridge libraries together with 64-bit host binaries.')
34-
endif
35-
3626
#
3727
# Compiler flags
3828
#
@@ -225,7 +215,7 @@ winegcc = meson.get_compiler('cpp', native : false)
225215
if is_64bit_system
226216
xcb_64bit_dep = dependency('xcb')
227217
endif
228-
if with_32bit_libraries or with_bitbridge
218+
if with_bitbridge
229219
xcb_32bit_dep = winegcc.find_library('xcb')
230220
endif
231221

0 commit comments

Comments
 (0)