When ALSA option is selected, Wine build corresponded drivers
but they are missing in plist and thus missed in package
Bump PORTREVISION to force rebuild package to include missed drivers
Reported by: poudriere bulk -t
Approved by: portmgr blanket
Sponsored by: Serenity Cybersecurity, LLC
WoW64 currently uses i386 packages on amd64 under special PREFIX, so
- Include mesa-devel paths to LIBGL_DRIVERS_PATH override
- Respect libmap.conf(5) in 32-bit packages
To use simply install mesa-devel as regular and WoW64 package e.g.,
$ pkg install mesa-devel
$ /usr/local/share/wine/pkg32.sh install mesa-devel
In case of issues simply remove mesa-devel e.g.,
$ pkg delete mesa-devel
$ /usr/local/share/wine/pkg32.sh delete mesa-devel
PR: 271140
Reviewed by: Alex S
Approved by: maintainer timeout (2 months)
Convert the USE_LDAP=yes to USES=ldap and adds the following features:
- Adds the argument USES=ldap:server to add openldap2{4|5|6}-server as
RUN_DEPENDS
- Adds the argument USES=ldap<version> and replaces WANT_OPENLDAP_VER
- Adds OPENLDAP versions in bsd.default-versions.mk
- Adds USE_OPENLDAP/WANT_OPENLDAP_VER in Mk/bsd.sanity.mk
- Changes consumers to use the features
Reviewed by: delphij
Approved by: portmgr
Differential Revision: https://reviews.freebsd.org/D38233
Move from the Wine 6.0 to the Wine 7.0 release series, specifically
(still) Wine 7.0 there.
This represents a year of development effort and over 9,100 individual
changes. It contains a large number of improvements. Areas of major
changes are:
- Most modules have been converted to PE format.
- Better theming support, with a bundled theme for a more modern look.
All builtin applications support theming, as well as High DPI rendering.
- Vastly improved HID stack and joystick support.
- New WoW64 architecture (which supports running a 32-bit Windows
application inside a 64-bit Unix host process, using thunks to map
32-bit NT system calls to the 64-bit NTDLL).
- Direct3D has seen significant improvements.
Specifically on FreeBSD more low-level system information queries like
memory and battery status are now supported. And we no longer need to
refer to /proc and procfs in our installation message.
The Mono engine is now at version 7.0.0 with quite some changes,
Packaging changes come on two levels: Firstly, many support libraries
such as FAudio, GSM, LCMS2, libjpeg, libjxr, libmpg123, libpng, libtiff,
libxml, libxslt, zlib are now directly bundled in where we used many
of those via other ports (or completely disabled their use). On the way
we shed the LIBXSLT and MPG123 options.
Secondly, the directory structure under lib/ has been completely revamped.
Update MASTER_SITES to the new winehq.org download site.
Extensive release notes are at https://www.winehq.org/announce/7.0 .
PR: 266976
The WWW: lines in the pkg-descr files of these ports where not at the
end of those files and have been missed in prior conversion runs.
Approved by: portmgr (implicit)
ASLR has been enabled by default on -CURRENT and -STABLE and this
causes Wine to crash. The clean solution would be to implement some
memory mapping code that already exists for macOS and Linux, but this
is not an essy task.
In order to allow use of Wine on systems with ASLR mark the Wine
executables as not compatible with ASLR using elfctl. This allows
to keeps ASLR enabled on the system for all other binaries.
If the required memory mapping functionality is made available, the
elfctl commands should be removed from this and the other Wine ports.
Approved by: portmgr (implicit)
Backport ce1e733047 and
2895c1dc9c from wine-devel:
Our Wine ports have solely relied on OSS for sound so far. Add
support to optionally switch to ALSA by establishing two options,
OSS and ALSA.
This does not change default behavior (and packages created), rather
it adds the ability to choose. It particularly may prove beneficial
for USB MIDI keyboards.
Submitted by: hselasky
There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.
This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.
Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).
A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.
These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,
Approved by: portmgr (implicit)
Explicitly building without GSSAPI (Kerberos SSP) support should not
make any difference, in particular for clean builds. Still this is a
step towards ensuring reproducible builds.
This back ports 62ea2531bf79d02a75cd0e57a4501af4c775c5d3 from the
wine-devel port.
This back ports the patch I pushed upstream and that wine-devel has
inherited from there a few months ago. It will go away with the next
major release.
PR: 257398, 260165 [1]
Suggested by: alt2600@icloud.com [1]
Quicktime support shouldn't trigger on FreeBSD. Still explicitly
configure --without-quicktime in line with our push for deterministic
builds.
This back ports e3632b1fd1 from the
wine-devel port.
In our situation, where we leverage 32-bit, i386 executables of Wine
in an amd64 world running 64-bit executables of Wine, the rpath of
$PREFIX/lib/gcc10 which Mk/bsd.gcc.mk sets for the former makes the
dynamic linker attempt to load a 64-bit version of libgcc_s.so which
happens to be at that location on amd64.
Removing this rpath setting at compilation time would be comparatively
more involved, so leverage LD_32_LIBMAP which we are already using in
wine-wow64.sh to point to the system version of libgcc_s.so.
This works since for C code both flavors of libgcc_s.so are fully
compatible and Wine's C++ dependencies Wine (like openal-soft and
various Mesa userspace graphics drivers) are actually compiled with
clang. In other words we are only reverting to the version of the
library they would normally load without rpath interference.
Bump PORTREVISION so new packages with the tweaked script will be
generated.
PR: 259926
Reported by: nc
Tested by: nc
In de47ffe65c the option to leverage
libhal was removed, alas configure was not adjusted. Ensure that
even if libhal somehow is present we explicitly do not use it.
This back ports 7ca1a772ea from the
wine-devel port.
The MAINTAINER and COMMENT variables, as well as WINELIBDIR, could
be overridden for the sake of the i386-wine port. With that port
gone, simply set these unconditionally.
In commit 5933ac0b09 CONFLICTS_INSTALL definitions in multiple ports
have been fixed to omit the unneeded version patterns they had.
The commit of the wine port did not include that fix, but instead
local changes to deal with an issue introduced by recent changes to
sched.h.
This commit reverts the accidentially committed changes, but retains
the intended removal of a version wildcard in CONFLICTS_INSTALL.
Reported by: gerald
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").
Approved by: portmgr (blanket)
We have been building without NetAPI support forever and explicitly
disabling it should not change anything. Still configure with
--without-netapi now in our move towards reproducible builds.
This back ports c648c4b24c from the
wine-devel port.
This port and its pre-built binaries have not been updated lately and
emulators/wine is now providing i386 support on amd64, so remove the
i386-wine port.
Adjust CONFLICTS_INSTALL on related ports and simplify (and update both
user and developer documentation in emulators/wine).
PR: 259589
Differential Revision: https://reviews.freebsd.org/D32322
This port and its pre-built binaries have not been updated lately and
emulators/wine-devel is now providing i386 support on amd64, so remove
i386-wine-devel.
Adjust CONFLICTS_INSTALL on related ports and simplify (and update both
user and developer documentation in wine-devel).
Approved by: maintainer (= submitter)
PR: 259589
Differential Revision: https://reviews.freebsd.org/D32322
Core Audio is Apple-specific and should never trigger on FreeBSD.
Still explicitly configure --without-coreaudio in the spirit of
deterministic builds, independent of packages that happen to be
installed on the build system.
This back ports bd28318975 from the
wine-devel port.
libpcap and libpthread are generally present and we have been using
them all along. Explicitly require them to detect any potential issues
in the future.
This back ports a44dd394ce from wine-devel.
This minor release addresses 51 bug reports and brings 101 commits,
including compilation fixes for GCC 11 and FreeType in addition
to various bug fixes.
This likely won't be necessary with the next major version any longer
due to upstream work by Damjan; for the time being it is still required.
PR: 258795
After recent changes, given an uninitialized root dir pkg now fails
with:
pkg: Error opening the trusted directory /usr/share/keys/pkg/trusted
pkg: Error loading trusted certificates
This works around it for our WoW setup.
PR: 259404
Back port a26036d024 from the wine-devel
port (and integrate 8189a2a276):
Vulkan and vkd3d have few additional dependencies on top of OpenGL
(via Mesa) so fold them into the general X11 switch.
This further reduces the number of options in this port.
PR: 258375
Back port 799f2a3769 from the wine-devel
port:
Simplify GECKO_RUN_DEPENDS along the lines of what we did with
MONO_RUN_DEPENDS in 996345a04d some
months ago.
That way updates of that other port won't require adjustments here
any longer while the system becomes more resilient.
Back port commit 3f4627fc27 from the
wine-devel port:
SDL2 is indirectly pulled in via our (unconditional) FAudio dependency
anyway, so always use it, remove the SDL option, and simplify the port
accordingly.
PR: 258375
This back ports 3d5484b928 and
5a1f2db457 from emulators/wine-devel:
When Wine gained support for the Vulkan API and D3D support via
Vulkan we added two options (both off by default): VULKAN and
VKD3D.
Simplify things, in particular also from a user perspective, by only
keeping the VKD3D option which now subsumes the former VULKAN option
(and hence Vulkan API support).
No change in defaults - yet.
On the way adjust CONFIGURE_ARGS to only feature on option per line,
which was mostly the case already anyway.
PR: 258375
Since upstream commit 3e390b1aafff47df63376a8ca4293c515d74f4ba on
2019-02-20 XAudio2 uses FAudio (which already is an unconditional
dependency) and no longer depends on OpenAL, so adjust the packing
list accordingly. [1]
We did not detect this via regular testing due to false negatives
in Mk/Scripts/check-stagedir.sh in the presence of %%OPTION%%s in
pkg-plist. [2]
PR: 257651 [1], 220950 [2]
Submitted by: Alex S <iwtcex@gmail.com> [1]
Instead of hard coding the actual version number use a generic
dependency on simply the port. This makes maintenance easier and
reduces the chance for mistakes.
(We have been using this in emulators/wine-devel for some four
months already since 996345a04d .)
PR: 257630
In my original commit I missed the last line actually invoking pkg.
Fix this up and add a comment above.
PR: 257284
Reported by: Alex S <iwtcex@gmail.com>
Wine 6.0 and later need LD_BIND_NOW / LD_32_BIND_NOW on FreeBSD,
cf. https://bugs.winehq.org/show_bug.cgi?id=50257 and
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252307
so move the actual binaries to wine64.bin / wine.bin and invoke
them via a script that does those settings.
Also revamp the WoW handling/packging which combines 32-bit/i386
Wine into 64-bit/amd64 Wine.
Submitted by: Alex S <iwtcex@gmail.com>
PR: 257284, 252307
Move from the Wine 5.0 release serious to the Wine 6.0 series and
specifically Wine 6.0.1.
This represents another year of development effort and over 8,300
individual changes. It contains a large number of improvements.
Areas of major changes are:
- Core modules in PE format.
- Vulkan backend for WineD3D.
- DirectShow and Media Foundation support.
- Text console redesign.
In terms of packaging changes are moderate this time:
- As in case of 8c03aa8bb1 which has
sat with wine-devel for eight months remove
files/patch-dlls_kernel32_Makefile.in which is not needed any longer.
- Our special dependency emulators/wine-gecko goes to version 2.47.2
and emulators/wine-mono to version 5.1.1.
- The GLU library is not used any longer.
Extensive release notes are at https://www.winehq.org/announce/6.0
and https://www.winehq.org/announce/6.0.1 .
PR: 257284
