diff options
Diffstat (limited to 'emulators/wine-devel')
| -rw-r--r-- | emulators/wine-devel/Makefile | 19 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 6 | ||||
| -rw-r--r-- | emulators/wine-devel/files/extra-patch-tools-winebuild-res32 | 14 | ||||
| -rw-r--r-- | emulators/wine-devel/files/pkg-message.in | 11 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 20 |
5 files changed, 52 insertions, 18 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 60ff33bb3bcc..abc3e7c7ad52 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine -DISTVERSION= 10.15 +DISTVERSION= 10.19 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.x/ @@ -16,16 +16,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex +LIB_DEPENDS= libhwloc.so:devel/hwloc2 # Only devel/llvm17 and later come with necessary include files - PR274542 USES= bison cpe desktop-file-utils gmake llvm:min=17,build,noexport \ localbase pkgconfig sdl shebangfix tar:xz CPE_VENDOR= winehq USE_GCC= yes -WINELIBDIR= ${PREFIX}/lib -.if !defined(USE_LDCONFIG32) -USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine -.endif +USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/wine USE_SDL= sdl2 SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ @@ -38,10 +36,10 @@ CONFIGURE_ARGS= --verbose \ --without-capi \ --without-coreaudio \ --without-dbus \ - --without-ffmpeg \ --without-gettext --without-gettextpo \ --without-gphoto \ --without-gssapi \ + --with-hwloc \ --without-inotify \ --without-krb5 \ --with-mingw CROSSCC="clang" \ @@ -69,8 +67,10 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GECKO GNUTLS MONO V4L WAYLAND X11 -OPTIONS_DEFAULT= ALSA GNUTLS WAYLAND X11 +# GECKO and MONO are intentionally kept at the end since they are just +# used to depends at runtime on wine-gecko-devel and wine-mono-devel +OPTIONS_DEFINE= CUPS DOCS DOSBOX FFMPEG GNUTLS V4L WAYLAND X11 GECKO MONO +OPTIONS_DEFAULT= ALSA FFMPEG GNUTLS WAYLAND X11 OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS OPTIONS_SUB= yes @@ -91,6 +91,9 @@ CUPS_CONFIGURE_WITH= cups DOSBOX_RUN_DEPENDS= dosbox:emulators/dosbox +FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg +FFMPEG_CONFIGURE_WITH= ffmpeg + GECKO_RUN_DEPENDS= wine-gecko-devel>0:emulators/wine-gecko-devel GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 18fddc54f49b..87281014b61a 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757879331 -SHA256 (wine-10.15.tar.xz) = 307e21237c6e8bdea266f946d31f09ed27b1957df9a03516d8271fd13e1c261d -SIZE (wine-10.15.tar.xz) = 32785484 +TIMESTAMP = 1763308228 +SHA256 (wine-10.19.tar.xz) = 7cec58323c6f2aaee7aca93517379cbbfef96e2c2c580c68ff85dd000cbbdd46 +SIZE (wine-10.19.tar.xz) = 33032428 diff --git a/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 b/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 index 7c6c62b9fe58..4c77701ff27a 100644 --- a/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 +++ b/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 @@ -27,7 +27,7 @@ to minimize divergence and risk on 64-bit x86). const void *data; unsigned int data_size; unsigned int data_offset; -@@ -158,6 +156,28 @@ static void put_string( const struct string_id *str ) +@@ -139,6 +137,28 @@ static void put_string( const struct string_id *str ) } } @@ -56,7 +56,7 @@ to minimize divergence and risk on 64-bit x86). /* check the file header */ /* all values must be zero except header size */ static int check_header(void) -@@ -179,7 +199,7 @@ static int check_header(void) +@@ -160,7 +180,7 @@ static int check_header(void) } /* load the next resource from the current file */ @@ -64,8 +64,8 @@ to minimize divergence and risk on 64-bit x86). +static void load_next_resource( DLLSPEC *spec ) { unsigned int hdr_size; - struct resource *res = add_resource( spec ); -@@ -189,9 +209,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name ) + struct resource *res = ARRAY_ADD( &spec->resources, struct resource ); +@@ -170,9 +190,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name ) if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); @@ -75,7 +75,7 @@ to minimize divergence and risk on 64-bit x86). res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; if ((const unsigned char *)res->data < input_buffer || (const unsigned char *)res->data >= input_buffer + input_buffer_size) -@@ -220,7 +237,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) +@@ -201,7 +218,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) if ((ret = check_header())) { @@ -84,10 +84,10 @@ to minimize divergence and risk on 64-bit x86). } return ret; } -@@ -473,7 +490,7 @@ void output_resources( DLLSPEC *spec ) +@@ -441,7 +458,7 @@ void output_resources( DLLSPEC *spec ) { output( "\n\t.balign 4\n" ); - output( ".L__wine_spec_res_%d:\n", i ); + output( ".L__wine_spec_res_%d:\n", i++ ); - output( "\t.incbin \"%s\",%d,%d\n", res->input_name, res->input_offset, res->data_size ); + dump_res_data( res ); } diff --git a/emulators/wine-devel/files/pkg-message.in b/emulators/wine-devel/files/pkg-message.in index 18639d47533e..46bbc14aacc2 100644 --- a/emulators/wine-devel/files/pkg-message.in +++ b/emulators/wine-devel/files/pkg-message.in @@ -18,4 +18,15 @@ EOF $ wine64 regedit wayland.reg EOM } +{ type: upgrade + maximum_version: "10.17" + message: <<EOM +Since the version 10.17, wine require hwloc2 as an additional +dependency. If it was not automatically installed, then install it +for the 64bit part with: +# pkg install hwloc2 +And for the 32bit part do as the user that would use wine: +$ %%PREFIX%%/share/wine/pkg32.sh install hwloc2 +EOM +} ] diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index b678d1b41818..6f46bfa155cc 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -98,6 +98,7 @@ include/wine/msvcrt/wchar.h include/wine/msvcrt/wctype.h include/wine/svcctl.h include/wine/svcctl.idl +include/wine/unixlib.h include/wine/windows/accctrl.h include/wine/windows/access.idl include/wine/windows/aclapi.h @@ -908,6 +909,8 @@ include/wine/windows/robuffer.h include/wine/windows/robuffer.idl include/wine/windows/roerrorapi.h include/wine/windows/rometadata.h +include/wine/windows/rometadataapi.h +include/wine/windows/rometadataapi.idl include/wine/windows/rometadataresolution.h include/wine/windows/roparameterizediid.h include/wine/windows/roparameterizediid.idl @@ -1019,6 +1022,7 @@ include/wine/windows/tbs.h include/wine/windows/tchar.h include/wine/windows/tcpestats.h include/wine/windows/tcpmib.h +include/wine/windows/tdh.h include/wine/windows/textserv.h include/wine/windows/textstor.h include/wine/windows/textstor.idl @@ -1625,6 +1629,7 @@ lib/wine/%%WINEARCH%%-unix/libstrmiids.a lib/wine/%%WINEARCH%%-unix/libsxs.a lib/wine/%%WINEARCH%%-unix/libt2embed.a lib/wine/%%WINEARCH%%-unix/libtapi32.a +lib/wine/%%WINEARCH%%-unix/libtdh.a lib/wine/%%WINEARCH%%-unix/libucrtbase.a lib/wine/%%WINEARCH%%-unix/libuiautomationcore.a lib/wine/%%WINEARCH%%-unix/libunicows.a @@ -1752,6 +1757,7 @@ lib/wine/%%WINEARCH%%-windows/colorcnv.dll lib/wine/%%WINEARCH%%-windows/combase.dll lib/wine/%%WINEARCH%%-windows/comcat.dll lib/wine/%%WINEARCH%%-windows/comctl32.dll +lib/wine/%%WINEARCH%%-windows/comctl32_v6.dll lib/wine/%%WINEARCH%%-windows/comdlg32.dll lib/wine/%%WINEARCH%%-windows/coml2.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/comm.drv16 @@ -2188,6 +2194,7 @@ lib/wine/%%WINEARCH%%-windows/libstrmiids.a lib/wine/%%WINEARCH%%-windows/libsxs.a lib/wine/%%WINEARCH%%-windows/libt2embed.a lib/wine/%%WINEARCH%%-windows/libtapi32.a +lib/wine/%%WINEARCH%%-windows/libtdh.a lib/wine/%%WINEARCH%%-windows/libucrtbase.a lib/wine/%%WINEARCH%%-windows/libuiautomationcore.a lib/wine/%%WINEARCH%%-windows/libunicows.a @@ -2468,6 +2475,7 @@ lib/wine/%%WINEARCH%%-windows/rsaenh.dll lib/wine/%%WINEARCH%%-windows/rstrtmgr.dll lib/wine/%%WINEARCH%%-windows/rtutils.dll lib/wine/%%WINEARCH%%-windows/rtworkq.dll +lib/wine/%%WINEARCH%%-windows/runas.exe %%WINE32%%lib/wine/%%WINEARCH%%-windows/rundll.exe16 lib/wine/%%WINEARCH%%-windows/rundll32.exe lib/wine/%%WINEARCH%%-windows/samlib.dll @@ -2611,6 +2619,7 @@ lib/wine/%%WINEARCH%%-windows/win32u.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/win87em.dll16 %%WINE32%%lib/wine/%%WINEARCH%%-windows/winaspi.dll16 lib/wine/%%WINEARCH%%-windows/winbio.dll +lib/wine/%%WINEARCH%%-windows/winbrand.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/windebug.dll16 lib/wine/%%WINEARCH%%-windows/windows.applicationmodel.dll lib/wine/%%WINEARCH%%-windows/windows.devices.bluetooth.dll @@ -2635,6 +2644,7 @@ lib/wine/%%WINEARCH%%-windows/windows.storage.applicationdata.dll lib/wine/%%WINEARCH%%-windows/windows.storage.dll lib/wine/%%WINEARCH%%-windows/windows.system.profile.systemid.dll lib/wine/%%WINEARCH%%-windows/windows.system.profile.systemmanufacturers.dll +lib/wine/%%WINEARCH%%-windows/windows.ui.core.textinput.dll lib/wine/%%WINEARCH%%-windows/windows.ui.dll lib/wine/%%WINEARCH%%-windows/windows.ui.xaml.dll lib/wine/%%WINEARCH%%-windows/windows.web.dll @@ -2876,6 +2886,16 @@ share/man/pl.UTF-8/man1/wine.1.gz %%DATADIR%%/nls/normnfkd.nls %%DATADIR%%/nls/sortdefault.nls %%WINE64%%%%DATADIR%%/pkg32.sh +%%DATADIR%%/winmd/windows.applicationmodel.winmd +%%DATADIR%%/winmd/windows.globalization.winmd +%%DATADIR%%/winmd/windows.graphics.winmd +%%DATADIR%%/winmd/windows.media.winmd +%%DATADIR%%/winmd/windows.networking.winmd +%%DATADIR%%/winmd/windows.perception.winmd +%%DATADIR%%/winmd/windows.storage.winmd +%%DATADIR%%/winmd/windows.system.winmd +%%DATADIR%%/winmd/windows.ui.winmd +%%DATADIR%%/winmd/windows.ui.xaml.winmd %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE.md %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/README.md |