Commit graph

967 commits

Author SHA1 Message Date
Damjan Jovanovic
865fc1ddb5 emulators/wine-devel: update to version 7.1 2022-01-31 15:21:52 +01:00
Gerald Pfeifer
c5928b7bac emulators/wine-devel: Don't depend on faudio and libxml2
Wine now ships and builds faudio and libxml2 itself, so remove
the external dependencies on those two ports.

Approved by:	damjan.jov@gmail.com (maintainer)
2022-01-28 07:52:07 +00:00
Damjan Jovanovic
1f883daf79 emulators/wine-devel: update to 7.0-rc6 2022-01-17 13:31:33 +01:00
Damjan Jovanovic
e676927ad7 emulators/wine-devel: Update to 7.0-rc5
The fifth milestone of the soon to be released Wine 7.0 with
30 bug fixes.

Also do not extract the wine-staging files twice, symlink them
instead. [1]

PR:		260612 [1]
Submitted by:	Ivan Rozhuk <rozhuk.im@gmail.com> [1]
Approved by:	maintainer (= author)
2022-01-13 07:32:15 +00:00
Damjan Jovanovic
ee7c59732f emulators/wine-devel: update to 7.0-rc4
The 4th milestone of the soon to be released Wine 7.0 with 38 bug
fixes, and another 22 bug fixes from the (skipped) RC3 release.

In addition to the patch provided by Damjan, part of the PLIST change
in PR 260612 has been applied to install some files that used to be
dependent on the STAGING option.
2022-01-08 11:45:48 +01:00
Damjan Jovanovic
fcc24493a9 emulators/wine-devel: Update to Wine 7.0 RC2
This is the second milestone of the forthcoming Wine 7.0 release
series. It fixes 34 bugs in addition to the 32 bugs RC1 (which we
skipped) did in addition to the following features it brought:
 - Reimplementation of the WinMM joystick driver.
 - All Unix libraries converted to the syscall-based interface.
2021-12-20 11:05:51 +00:00
Gerald Pfeifer
abcff57bed emulators/wine-devel: Remove two obsolete configure options
Upstream recently removed support for HAL and QuickTime and
with that the --with-hal/--without-hal and --with-quicktime/
-without-quicktime configure options.

Accordingly do not use --without-hal and -without-quicktime
any more.
2021-12-18 10:00:08 +00:00
Gerald Pfeifer
4c95831d8f emulators/wine-devel: Explicitly build without GSSAPI
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.

Approved by:	maintainer (pre-approval)
2021-12-18 09:58:41 +00:00
Alex S
6344ed87cd emulators/wine-devel: Use the right libgcc_s for 32-bit on amd64
Forward port 316c372c7d from the main
wine 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
2021-12-11 19:25:53 +00:00
Damjan Jovanovic
5678d834dc emulators/wine-devel: Update to Wine 6.23
This includes the following changes:
 - Mount manager and CoreAudio driver converted to PE.
 - Support for exception handling in Wow64 mode.
 - Optional support for using the distribution's PE libraries.
 - A number of UI improvements in WineDbg.
 - Various bug fixes.

Also fix a pkg-plist issue on i386. [1]

PR:		260125 [1]
Submitted by:   Filipe da Silva Santos <contact@shiori.com.br> [1]
2021-12-06 20:31:36 +00:00
Alexander Vereeken
d1eb332c0e emulators/wine-devel: Fix message in wine-wow64.sh
The reference to wine for i386 really needs to be wine-devel to match
this port.

PR:		259827
2021-12-04 16:08:07 +00:00
Gerald Pfeifer
e3632b1fd1 emulators/wine-devel: Build without Quicktime support
Quicktime support shouldn't trigger on FreeBSD. Still explicitly
configure --without-quicktime in line with our push for deterministic
builds.

Approved by:	maintainer (pre-approval)
2021-12-03 16:11:47 +00:00
Gerald Pfeifer
7ca1a772ea emulators/wine-devel: Configure without libhal support
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.

Approved by:	maintainer (pre-approval)
2021-11-30 08:19:27 +00:00
Gerald Pfeifer
e2fc94a07d emulators/wine-devel: Unconditionally set MAINTAINER and COMMENT
The MAINTAINER and COMMENT variables, as well as PKGNAMESUFFIX and
WINELIBDIR, could be overridden for the sake of the i386-wine-devel
port. With that port gone, simply set these unconditionally.

This is mostly 6387592817 forward
ported from emulators/wine.
2021-11-28 19:32:39 +00:00
Stefan Eßer
5933ac0b09 */*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL
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)
2021-11-23 23:11:40 +01:00
Damjan Jovanovic
f339ae325a emulators/wine-devel: Update to Wine 6.22
This includes the following changes:
 - More improvements to HID joystick support.
 - WoW64 thunks in a number of Unix libraries.
 - Beginnings of moving USER32 to Win32u.
 - Various bug fixes.

The Mono engine has been updated to version 7.0.0 in a separate
update to emulators/wine-mono-devel.

Approved by:	maintainer (= author)
2021-11-22 13:16:30 +00:00
Alexander Vereeken
056135a38e emulators/i386-wine: Remove 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
2021-11-19 06:55:03 +00:00
Gerald Pfeifer
c648c4b24c emulators/wine-devel: Never use the Samba NetAPI library
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.

Approved by:	maintainer (pre-approval)
2021-11-18 07:14:40 +00:00
Alexander Vereeken
99af2239fc emulators/i386-wine-devel: Remove port.
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
2021-11-16 14:33:56 +00:00
Gerald Pfeifer
7fa3c7cc2f emulators/wine-devel: Account for bundled jpeg library
Since version 6.20 Wine bundles its own copy of a jpeg library.

The --with-jpeg configure option became a no-op, so remove it, and
also remove the dependency on our own port via USES=jpeg.

Approved by:	maintainer (pre-approval)
2021-11-15 07:25:19 +00:00
Gerald Pfeifer
bd28318975 emulators/wine-devel: Configure without Core Audio support
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.

Approved by:	maintainer (pre-approval)
2021-11-13 08:32:19 +00:00
Gerald Pfeifer
a44dd394ce emulators/wine-devel: Configure with pcap and pthread
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.

Approved by:	maintainer (pre-approval)
2021-11-09 07:48:44 +00:00
Damjan Jovanovic
00078ad233 emulators/wine-devel: Update to Wine 6.21
This includes the following changes:
 - WinSpool, GPhoto, and a few other modules converted to PE.
 - Better support for inline functions in DbgHelp.
 - Beginnings of a MSDASQL implementation.
 - Various bug fixes.

files/patch-dlls-winebus-6.20 and files/patch-no-procfs have been
accepted upstream, so remove our local copies.

With that, and additional upstream changes, mounting /proc is no
longer required on FreeBSD, so we don't need to document it. [1]

PR:		258795 [1]
Approved by:	maintainer (= author)
2021-11-07 08:31:42 +00:00
Gerald Pfeifer
c81b56b9e9 emulators/wine-devel: Account for bundled lcms2 library
Since version 6.20 Wine bundles its own copy of lcms2.

The --with-cms configure option became a no-op, so remove it, and also
remove the dependency on our own graphics/lcms2 port.

Approved by:	maintainer (pre-approval)
2021-11-06 08:21:32 +00:00
Gerald Pfeifer
4ab8088077 emulators/wine-devel: Account for bundled png library
Since version 6.20 Wine bundles its own copy of libpng.

The --with-png configure option became a no-op, so remove it, and also
remove the dependency on our own graphics/png port.

Approved by:	maintainer (pre-approval)
2021-11-04 14:12:10 +00:00
Gerald Pfeifer
09fcd562eb emulators/wine-devel: Account for further bundled libs
Since version 6.20 Wine bundles and unconditionally uses copies of
the gsm, jxr, tiff and xslt libraries.

Accordingly, the --without-gsm, --without-jxrlib, and --without-tiff
configure options we have been using became no-ops, so remove those.

Also remove the LIBXSLT option, which was off by default before that
bundling, and associated logic.

(None of these simplifications should change generated packages.)

Approved by:	maintainer (pre-approval)
2021-11-03 07:25:05 +00:00
Gerald Pfeifer
e32f90cfd0 emulators/wine-devel: Account for bundled mpg123 library
Since version 6.20 Wine bundles and unconditionally uses its own copy of
the mpg123 library.

Accordingly remove the MPG123 option and associated logic, unconditionally
package associated files (Mk/Scripts/check-stagedir.sh missed those [1]),
and bump PORTREVISION.

PR:		220950 [1]
2021-11-02 06:27:04 +00:00
Damjan Jovanovic
e041ced513 emulators/wine-devel: Update to Wine 6.20
This includes the following changes:
 - MSXml, XAudio, DInput and a few other modules converted to PE.
 - A few system libraries are bundled with the source to support PE builds.
 - HID joystick is now the only supported joystick backend in DirectInput.
 - Better support for MSVCRT builds in Winelib.
 - Various bug fixes.

Also, using our patches within this Port (for now):
 - procfs no longer needs to be mounted on /proc, we use sysctl() instead.
 - The Staging patchset will apply even if $PORTSDIR is a Git repository.

The latter requires lang/gawk as an additional EXTRACT_DEPENDS.

(The now bundled system libraries will trigger some follow-up changes,
but for now we're okay.)

Approved by:	maintainer (= author)
2021-11-01 08:57:10 +00:00
Gerald Pfeifer
db74b2d979 emulators/wine-devel: Pare down pkg-message
Forward port commit 7758a5695f from
the emulators/wine port.

Approved by:	maintainer
2021-10-31 06:39:33 +00:00
Alex S
d10bf5d0be emulators/wine-devel: Adjust pkg32.sh to pkg 1.17.3
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
Approved by:	Damjan Jovanovic <damjan.jov@gmail.com>
2021-10-26 08:21:18 +00:00
Alex S
48fcd1c226 emulators/wine-devel: Point Vulkan loader at 32-bit Mesa libs
PR:		259211
Approved by:	Damjan Jovanovic <damjan.jov@gmail.com> (maintainer)
2021-10-25 14:31:53 +00:00
Damjan Jovanovic
58a766e89f emulators/wine-devel: Package win32u.dll on 64-bit, too
Since upstream commit 80df54a407680859ea777ae0b60aef6f8f378719
in early October 2021, and thus the recent 6.19 release, user32
directly links to win32u which has evolved from a pure stub
during that period.

We have been packaging win32u since FreeBSD commit
1b62862f14 and the update to Wine 6.11,
alas only on i386. Now it builds and is necessary universally, so
package it everywhere.

Bump PORTREVISION.

PR:		259223
Reported by:	Thibault Payet <monwarez@mailoo.org>
Approved by:	maintainer (= author)
2021-10-24 01:50:34 +00:00
Gerald Pfeifer
8189a2a276 emulators/wine-devel: Fix pkg-plist when X11 is off
Mark three files that are only installed when the X11 option is
enabled accordingly.
2021-10-19 06:18:38 +00:00
Damjan Jovanovic
a5156f506f emulators/wine-devel: Update to Wine 6.19
This includes the following changes:
 - IPHlpApi, NsiProxy, WineDbg and a few other modules converted to PE.
 - More HID joystick work.
 - Kernel parts of GDI moved to Win32u.
 - More work towards Dwarf 3/4 debug support.
 - Various bug fixes.

It also brings minor packaging changes related to the Staging patch set.
2021-10-13 20:54:19 +00:00
Gerald Pfeifer
01db8ddf52 emulators/wine-devel: Pass maintainership to Damjan Jovanovic
Usually assuming maintainership goes along with a patch to update
or fix something. The former will come soon, with next week's
snapshot, and Damjan has been active upstream and in direct
conversations with me, and I will be supporting and mentoring him.
2021-10-01 19:03:18 +00:00
Gerald Pfeifer
19a630ac24 emulators/wine-devel: Relinquish maintainership
After working on our Wine ports for more than 21 years, maintaining
for more than 19 years, time has come to hand over the baton. Sadly
despite multiple requests to committers as well as some non-committers
nobody stepped up yet, so return to the pool.

Still happy to provide guidance and help on working with upstream or
operating the (crucial) nightly testers I have been running.
2021-09-29 12:07:42 +00:00
Gerald Pfeifer
9688dadd0b emulators/wine-devel: Update to Wine 6.18
This includes the following changes:
 - Shell32 and WineBus libraries converted to PE.
 - Unicode data updated to Unicode version 14.
 - More work towards Dwarf 3/4 debug support.
 - HID joystick enabled by default.
 - Various bug fixes.

files/patch-amd64-vs-x86-64, which I submitted upstream, is obsolete
now and the issue has been addressed upstream even more thoroughly,
so drop our local patch.
2021-09-29 11:56:01 +00:00
Gerald Pfeifer
3f4627fc27 emulators/wine-devel: Unconditionally use SDL
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
2021-09-28 06:42:30 +00:00
Gerald Pfeifer
799f2a3769 emulators/wine-devel: Make GECKO_RUN_DEPENDS more flexible
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.
2021-09-27 06:24:52 +00:00
Gerald Pfeifer
aecef2b44c emulators/wine-devel: Bump PORTREVISION
The previous two commits changed default options, explicitly in
the case of OPENAL, implicitly in the case of VKD3D, so we need
to bump PORTREVISION.
2021-09-26 13:43:01 +00:00
Gerald Pfeifer
7846849011 emulators/wine-devel: Enable OPENAL by default
PR:		258375
2021-09-26 13:28:55 +00:00
Gerald Pfeifer
a26036d024 emulators/wine-devel: Merge the VKD3D option into X11
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
2021-09-26 13:27:50 +00:00
Gerald Pfeifer
5a1f2db457 emulators/wine-devel: Refine VKD3D_DESC
PR:		258375
Suggested by:	Alex S <iwtcex@gmail.com>
2021-09-24 04:37:58 +00:00
Gerald Pfeifer
3d5484b928 emulators/wine-devel: Merge the VULKAN option into VKD3D
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
2021-09-21 22:32:06 +00:00
Gerald Pfeifer
24336172a3 emulators/wine-devel: Translate amd64 to x86_64
In a02e3c6686 we translated amd64
to x86-64, which is the marketing name, alas we need to use x86_64,
the technical name used on the GNU universe (and by Wine). What a
difference underscore vs dash makes.
2021-09-17 14:29:25 +00:00
Gerald Pfeifer
a02e3c6686 emulators/wine-devel: Update to Wine 6.17
This includes the following changes:
 - WineCfg program converted to PE.
 - Better high-DPI support in builtin applications.
 - More preparation work for the GDI syscall interface.
 - Improved debugger support in Wow64 mode.
 - Various bug fixes.

My patch files/patch-dlls-nsiproxy.sys has been accepted upstream,
so remove it on our end.

Work around FreeBSD calling x86-64 by the name of amd64 and the
Ports Collection using this in a variable ARCH, which interferes
with Wine's variable of the same name and messes things up badly.
I have hope to be able to upstream files/patch-amd64-vs-x86-64. [1]

PR:		257020 [1]
Inspired by:	Ivan Rozhuk <rozhuk.im@gmail.com> [1]
2021-09-16 21:57:50 +00:00
Gerald Pfeifer
5b6ae6008a emulators/wine-devel: Complete the packaging list on amd64
On the way alphabetically sort two other files (both of which are
conditionals).
2021-09-10 07:46:40 +00:00
Bernhard Froehlich
47e4bd0d74
emulators/wine-devel: Add CPE information
Approved by:	portmgr (blanket)
2021-09-08 20:53:40 +00:00
Gerald Pfeifer
210a5da8ef emulators/wine-devel: Fix build on newer versions
Yet another recent breakage in dlls/nsiproxy.sys, this time only on
newer versions of FreeBSD, yet another patch submitted upstream (and
included locally temporarily).
2021-09-06 18:58:24 +00:00
Gerald Pfeifer
4e8baba14a emulators/wine-devel: Update to Wine 6.16
This includes the following changes:
 - Initial version of a HID-based joystick backend.
 - Improved high-DPI theming support.
 - More preparation work for the GDI syscall interface.
 - Better CodeView support in WineDump.
 - Various bug fixes.

It also addresses a couple of FreeBSD-specific build issues I had to
address due to system headers not including others actually required:

 nsiproxy: Include sys/param.h.
 nsiproxy: Include netinet/in_pcb.h.
 nsiproxy: Include stddef.h.
 ntdll: Always return a value in get_builtin_init_funcs.
 nsiproxy: Include sys/types.h from udp.c.
 nsiproxy: Add $(PROCSTAT_LIBS) to EXTRALIBS.
 nsiproxy: Include netinet/in.h in udp.c.
 nsiproxy: Include sys/queue.h from tcp.c.

My patch files/patch-dlls-nsiproxy.sys has been integrated upstream,
so remove it here.
2021-08-31 07:11:18 +00:00