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
on options chosen and packages installed (or not).
Temporarily add a patch files/patch-dlls_qcap_v4l.c to resolve problems
where v4l (multimedia/libv4l) is used when present, even if explicitly
disabled during ./configure.
PR: 254601
Submitted by: Felix Palmen <felix@palmen-it.de>
use GCC.
This avoids troubles for users disabling the option and then encountering
failures without knowing how to go about that. (And there is not much one
can even do given upstream focuses on GCC.)
PR: 242202
Wine is now able to use mingw-w64 to build components. When mingw-w64
is installed on FreeBSD, users might inadvertedly use that when we have
not set up things properly yet (and it probably should be an option to
choose, at least initially). For example, mingw-w64 produces .dll files
instead of the current .dll.so files, breaking pkg-plist.
So for now explicitly disable the use of mingw-w64. In a next step,
once mingw-w64 is available, we probably should make this an option.
PR: 237213
Reported by: Damjan Jovanovic <damjan.jov@gmail.com>
MFH: 2020Q4 (blanket: build issue)
Add an option SDL that uses SDL 2, a cross-platform multimedia development
API which can be useful particularly when it comes to supporting games.
This is off by default for now in alignment with the status quo.
Submitted by: Alex S <iwtcex@gmail.com>
PR: 249869
No longer hack tools/wineapploader.in to account for wine64 vs wine.
Since upstream commit
https://source.winehq.org/git/wine.git/commitdiff/57f9c33c08782399d6729bc58b
68d73812560638
this hasn't been necessary any longer and it did actually break things
afterwards by replacing wine64 with wine6464.
PR: 249868
Submitted by: Alex S <iwtcex@gmail.com>
Explicitly configure --without-usb. There does not appear to be a way
for the configure test to pass on FreeBSD right now (even with extra
ports available), so this simply makes this explicit and avoids a
warning from configure.
MFH: 2020Q3 (blanket: missing dependency)
Push USES=pkgconfig to the global level instead just contingent on the
VKD3D option.
This makes a real difference for the GNUTLS option (on by default) and
others. Accordingly bump PORTREVISION.
Reported by: Benny Goemans <benny.goemans@belgacom.net>
MFH: 2020Q2 (blanket: missing dependency)
devel/libinotify port does not pull in an implicit dependency that
is not tracked properly.
Reported by: Andy Mender <andymenderunix@gmail.com>
PR: 245172
MFH: 2020Q2 (blanket: missing dependency)
Explicitly configure --without-unwind so that the presence of the
devel/libunwind port does not pull in an implicit dependency that
is not tracked properly.
Reported by: Andy Mender <andymenderunix@gmail.com>
PR: 245172
This commit is the analogous for i386-wine of r528249 that concerns
emulators/i386-wine-devel.
Until now i386-wine defined its own ARCH variable and manually included
Makefile.i386 for i386 systems and Makefile.inc for amd64 systems. This
commit makes use of the standard ARCH variable and renames Makefile.inc to
Makefile.amd64 so that the proper Makefile.${ARCH} is automatically
included.
This requires conditional inclusion bsd.ports.pre.mk and bsd.ports.post.mk
by emulators/wine [1], master port for i386-wine: those files must be
included only if they have not already been included by i386-wine.
Approved by: gerald (mentor, maintainer [1])
This represents a year of development effort with over 7,400 individual
changes. This port and the wine-devel port have been in sync as closely
as possible, and this update is mostly copying over from the -devel port
minus support for the Wine Staging patchset (and STAGING option).
Highlights of this new release include built-in modules in PE format,
multi-monitor support, Vulkan 1.1 support, and an XAudio2 reimplementation.
This also comes with updates of the emulators/wine-gecko and
emulators/wine-mono ports to match their -devel counterparts:
version 2.47.1 for wine-gecko and version 4.9.4 for wine-mono.
And we "lose" four local patches that got integrated or became obsolete
upstream.
The following is a more detailed list extracted from the extensive
release notes:
== Graphics
- Multiple display adapters and monitors are properly supported, including
dynamic configuration changes.
- The Vulkan driver supports up to version 1.1.126 of the Vulkan spec.
- The WindowsCodecs library is able to convert more bitmap formats,
including palette-indexed formats.
== Direct3D
- Fullscreen Direct3D applications inhibit the screensaver.
- DXGI swapchain presents inform the application when the corresponding
window is minimized. This typically allows applications to reduce CPU
usage while minimized, and is in some cases required to allow the
application window to be restored again.
- Switching between fullscreen and windowed modes using the standard
Alt+Enter combination is implemented for DXGI applications.
- The following features are implemented for Direct3D 12 applications:
- Switching between fullscreen and windowed.
- Changing display modes.
- Scaled presents.
- Swap intervals.
These features were previously already implemented for earlier
versions of the Direct3D API.
- The handling of various edge cases is improved. Among others:
- Out of range reference values for the alpha and stencil tests.
- Sampling 2D resources with 3D samplers and vice versa.
- Drawing with mapped textures and buffers.
- Usage of invalid DirectDraw clipper objects.
- Creating Direct3D devices on invalid Windows, like the desktop window.
- Viewports with a minimum Z larger than or equal to the maximum Z.
- Resources bound through both shader-resource views and render-target
or depth-stencil views at the same time.
- Blits between formats with and without alpha components.
Since well-behaved applications don't rely on these edge cases, they
typically only affect one or two applications each. There are
nevertheless quite a number of them.
- Dirty texture regions are tracked more accurately for Direct3D 8 and 9
texture uploads.
- Uploads of S3TC-compressed 3D textures require less address space.
Since 3D textures can be potentially large, and address space
exhaustion is a concern for 32-bit applications, S3TC-compressed 3D
textures are uploaded per-slice, instead of in a single upload.
- The ID3D11Multithread interface is implemented.
- Various lighting calculation fixes and improvements for older DirectDraw
applications have been made.
- Limited support for blits across swapchains is implemented.
- More shader reflection APIs are implemented.
- The wined3d CPU blitter can handle compressed source resources.
Support for compressed destination resources was already implemented
in a previous release.
- The Direct3D graphics card database recognizes more graphics cards.
- New HKEY_CURRENT_USER\Software\Wine\Direct3D registry keys:
- "shader_backend" (REG_SZ)
The shader backend to use. Possible values are "glsl" (default)
for GLSL, "arb" for ARB vertex/fragment programs and "none" to
disable shader support.
- "strict_shader_math" (REG_DWORD)
Enable (0x1) or disable (0x0, default) stricter translation of
Direct3D shaders, potentially at a performance cost. This
currently only makes a difference with the default GLSL shader
backend in combination with the proprietary NVIDIA drivers.
- Deprecated HKEY_CURRENT_USER\Software\Wine\Direct3D registry key:
- "UseGLSL"
This has been superseded by the "shader_backend" setting above.
== D3DX
- Support for compressing textures using S3TC-compression.
- Various operations, like e.g. texture fills, on unmappable surfaces
are implemented more correctly. Previously their implementation
relied on the underlying Direct3D implementation not enforcing
mapping restrictions.
- Various improvements and fixes have been made to the effect framework.
== Kernel
- Most of the functions that used to be in Kernel32 are moved to
KernelBase, to follow the architecture of recent Windows versions.
- Libraries of the wrong 32/64-bitness are ignored when found in the
search path, to enable loading the correct one if it's found further
in the path.
- Kernel objects are better emulated for device drivers that expect to
manipulate objects from the kernel side.
- The kernel-level synchronization objects like spin locks, fast
mutexes, remove locks, and resource variables are implemented.
- The system battery state is properly reported to applications.
== User interface
- Minimized windows are displayed using their title bar instead of the
old Windows 3.1-style icons.
- The new button styles Split Buttons and Command Links are implemented.
- The Edit control sets margins correctly also for CJK fonts.
== Desktop integration
- Symbolic links to the corresponding Unix directories are created for
the 'Downloads' and 'Templates' folders.
== Input devices
- Plug & Play device drivers can be installed and loaded on startup.
- Game controllers are better supported, including proper support for
hat switch, wheel, gas and brake controls.
== .NET
- The Mono engine is updated to version 4.9.4, including parts of the
Windows Presentation Foundation (WPF) framework.
- The Gecko and Mono add-ons support shared installation, where the
files are used directly from a global location under /usr/share/wine
instead of being copied into every new prefix.
== Internet and networking
- The Gecko engine is refreshed to support recent toolchains.
- A number of new HTML APIs are implemented.
- MSHTML supports some SVG elements.
- Error object and exception propagation are supported in VBScript.
- A number of VBScript builtin functions are implemented.
- JScript EcmaScript compliant mode supports more features.
- JScript and VBScript script objects expose type info interfaces.
- The HTTP proxy configuration can be retrieved through DHCP.
- Passport HTTP redirects are supported.
- The HTTP service and corresponding client-side library (HTTPAPI) are
partially implemented.
== Cryptography
- ECC (elliptic-curve) keys are supported when using GnuTLS.
- Importing keys and certificates from PFX blobs is implemented.
- The PBKDF2 key derivation algorithm is supported.
== Text and fonts
- OpenType positioning features are supported in DirectWrite, and
enabled for Latin script by default, including kerning.
- Font data access is made safer by validating the various data tables
before using them.
- DirectWrite interfaces are updated to a recent SDK, implementing
some of the latest API additions.
== Audio / Video
- The XAudio2 libraries are reimplemented to use the external FAudio
library, for better compatibility.
- The Media Foundation libraries are fleshed out, including:
- Support for builtin and user async work queues.
- Ability to submit periodic callbacks, waiting, scheduled, and
regular work items, with support for item priority.
- Support for media event queues.
- Various core API to handle media type objects, stream and
presentation descriptors, object attributes, byte stream objects,
samples and buffers.
- Initial Source Resolver implementation.
- Initial implementation of Source Reader API.
- Implementation for Sample Grabber object.
- Core support for building topology objects.
- Builtin presentation clock implementation, started implementing
Media Session functionality.
- The video capture filter has been ported to use v4l2 instead of the
deprecated v4l1 API, allowing the use of some cameras which do not
support v4l1.
- Support for YUV to RGB translation and reading from v4l2 devices
using mmap() has been removed; we now depend on libv4l2 for both of
these things.
- The builtin AVI, MPEG-I, and WAVE decoders have been removed; we now
depend on GStreamer or the Mac QuickTime Toolkit to decode such
media files.
- Some more VMR7 configuration APIs are implemented.
- The sound drivers support per-channel volume adjustments.
== Internationalization
- Unicode character tables are based on version 12.1.0 of the standard.
- Unicode normalization is implemented.
- The geographic region id is automatically set in the registry based
on the current locale. It can be modified if necessary under
HKEY_CURRENT_USER\Control Panel\International\Geo.
- The Sinhalese and Asturian locales are supported.
- Codepage 28601 (Latin/Thai) is supported.
== RPC/COM
- The typelib marshaller supports complex structs and arrays.
- There is an initial implementation of the Windows Script runtime library.
- There is an initial implementation of the Microsoft ActiveX Data
Objects (ADO) library.
== Installers
- Microsoft Installer (MSI) Patch Files are supported.
- The WUSA tool (Windows Update Standalone Installer) supports
installing .MSU update files.
== PE modules
- The actual PE binaries are copied into the Wine prefix instead of
the fake DLL files. This makes the prefix look more like a real
Windows installation, at the cost of some extra disk space.
- Modules that have been converted to PE can use standard wide-char C
functions, as well as wide-char character constants like L"abc".
This makes the code easier to read.
- Not all modules have been converted to PE yet; this is an ongoing
process that will continue during the Wine 5.x development series.
== Development tools / Winelib
- The Visual Studio remote debugger can be used to debug applications
running under Wine.
- The Debug Engine library (DBGENG) is partially implemented.
- The Resource Compiler and IDL Compiler support a '--sysroot' option
to allow locating header files in cross-compile environments.
- Winegcc supports the options '--target', '--wine-objdir',
'--winebuild' and '-fuse-ld' that make it easier to use as a
cross-compiler, or with custom toolchains.
- The wine/unicode.h header is no longer available to applications,
since the functions will ultimately be removed and replaced by the
standard C runtime wide character functions.
== Build infrastructure
- The 'fastcall' calling convention is supported in spec files. It
uses the correct name mangling for Windows builds.
- A '-import' entry point flag is supported in spec files, to mark
functions that need a hotpatch code prefix to be generated for their
import thunks.
- Winebuild supports a '--builtin' option to add a special signature
to PE binaries to mark them as Wine builtins.
== Builtin applications
- The CHCP tool is implemented. It allows setting the console codepage.
- The MSIDB tool is implemented. It allows manipulating MSI databases.
== Performance improvements
- The various time functions use higher performance system clocks if
available, to reduce the overhead in the rendering loop of many games.
- File lookups take advantage of the ext4 filesystem case folding
support if it's enabled on the directory being searched.
- No-data style listboxes (LBS_NODATA) have better performance for
large numbers of items.
- Slim Reader/Writer locks, keyed events, and condition variables use
futexes on Linux to avoid wineserver round trips.
== New external dependencies
- The FAudio library is used to implement XAudio2.
- The Inotify library is used for file change notifications on BSD
platforms.
- The Video4Linux version 2 library is used instead of version 1.
