September 2020 - Wine-commits

Alexandre Julliard : makefiles: Generate a single non-recursive makefile at the top level.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 1dd3051cca5cafe90ce44460731df61abb680b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd3051cca5cafe90ce44460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 12 11:40:00 2020 +0200 makefiles: Generate a single non-recursive makefile at the top level. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 20 +- configure | 14 +- configure.ac | 14 +- dlls/ntdll/Makefile.in | 6 - dlls/wineandroid.drv/Makefile.in | 4 - dlls/wineandroid.drv/build.gradle.in | 12 +- programs/winetest/Makefile.in | 9 - tools/makedep.c | 400 ++++++++++++----------------------- 8 files changed, 173 insertions(+), 306 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1dd3051cca5cafe90ce4…

1 0

Alexandre Julliard : packaging: Add OBS mirroring scripts.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: tools Branch: master Commit: bb0628a4343b992d36b61d5749f2f11e8e87faea URL: https://source.winehq.org/git/tools.git/?a=commit;h=bb0628a4343b992d36b61d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 12 10:04:41 2020 +0200 packaging: Add OBS mirroring scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 41 ++++++++ packaging/obs/apt-override | 2 + packaging/obs/apt.cfg | 7 ++ packaging/obs/obs-sync | 242 +++++++++++++++++++++++++++++++++++++++++++ packaging/obs/rpmmacros | 7 ++ packaging/obs/rsync-filter | 25 +++++ packaging/obs/yum.conf | 13 +++ 7 files changed, 337 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=bb0628a4343b992d36b…

1 0

Alexandre Julliard : packaging: Add Ubuntu 20.04.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: tools Branch: master Commit: bb02e074f46bfc5f46e1fadb3155693d68cb1c51 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bb02e074f46bfc5f46e1fad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 25 20:49:28 2020 +0200 packaging: Add Ubuntu 20.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 3 ++- packaging/obs/rsync-filter | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 8124626..b962e1f 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -38,4 +38,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 384831a..b0b9e66 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="30 31 stretch buster bullseye xenial bionic eoan" +distros="30 31 stretch buster bullseye xenial bionic eoan focal" dry_run= while [ $# -ge 1 ] @@ -223,6 +223,7 @@ do xenial) add_deb ubuntu xenial xUbuntu_16.04 ;; bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; eoan) add_deb ubuntu eoan xUbuntu_19.10 ;; + focal) add_deb ubuntu focal xUbuntu_20.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 8b75290..1cd280c 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -18,6 +18,7 @@ + /ubuntu/dists + /ubuntu/dists/bionic + /ubuntu/dists/eoan ++ /ubuntu/dists/focal + /ubuntu/dists/xenial - /ubuntu/dists/* - /ubuntu/*

1 0

Alexandre Julliard : packaging: Add Fedora 32.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: tools Branch: master Commit: f8d299a66f7e2160aa1af49842458a4e8ed3715b URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8d299a66f7e2160aa1af49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 9 19:07:16 2020 +0200 packaging: Add Fedora 32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 5 ++--- packaging/obs/rsync-filter | 1 + packaging/obs/yum.conf | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index b0b9e66..a03faef 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="30 31 stretch buster bullseye xenial bionic eoan focal" +distros="30 31 32 stretch buster bullseye xenial bionic eoan focal" dry_run= while [ $# -ge 1 ] @@ -215,8 +215,7 @@ do for i in $distros do case $i in - 30) add_rpm 30 Fedora_30 ;; - 31) add_rpm 31 Fedora_31 ;; + 30|31|32) add_rpm $i Fedora_$i ;; stretch) add_deb debian stretch Debian_9.0 oldstable ;; buster) add_deb debian buster Debian_10 stable ;; bullseye) add_deb debian bullseye Debian_Testing_standard testing ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 1cd280c..d18a7e0 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,6 +1,7 @@ + /fedora + /fedora/30 + /fedora/31 ++ /fedora/32 - /fedora/* + /debian diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 1559aab..692822c 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -11,3 +11,7 @@ baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… [fedora-31] name = Fedora 31 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… + +[fedora-32] +name = Fedora 32 +baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_32

1 0

Alexandre Julliard : packaging: Remove Fedora 30.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: tools Branch: master Commit: 70b73395c23567be054537b997aeeaafa2d3fd51 URL: https://source.winehq.org/git/tools.git/?a=commit;h=70b73395c23567be054537b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 08:20:19 2020 +0200 packaging: Remove Fedora 30. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 4 ++-- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index a03faef..085999e 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="30 31 32 stretch buster bullseye xenial bionic eoan focal" +distros="31 32 stretch buster bullseye xenial bionic eoan focal" dry_run= while [ $# -ge 1 ] @@ -215,7 +215,7 @@ do for i in $distros do case $i in - 30|31|32) add_rpm $i Fedora_$i ;; + 31|32) add_rpm $i Fedora_$i ;; stretch) add_deb debian stretch Debian_9.0 oldstable ;; buster) add_deb debian buster Debian_10 stable ;; bullseye) add_deb debian bullseye Debian_Testing_standard testing ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index d18a7e0..fd4df46 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/30 + /fedora/31 + /fedora/32 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 692822c..9a0c44f 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-30] -name = Fedora 30 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_30 - [fedora-31] name = Fedora 31 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0

Alexandre Julliard : packaging: Remove Ubuntu 19.10.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: tools Branch: master Commit: a35b7d7d6462734e844579d02c642aeaad99c537 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a35b7d7d6462734e844579d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 18 11:03:41 2020 +0200 packaging: Remove Ubuntu 19.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index b962e1f..fcea1b3 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,10 +34,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 085999e..6092d03 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="31 32 stretch buster bullseye xenial bionic eoan focal" +distros="31 32 stretch buster bullseye xenial bionic focal" dry_run= while [ $# -ge 1 ] @@ -221,7 +221,6 @@ do bullseye) add_deb debian bullseye Debian_Testing_standard testing ;; xenial) add_deb ubuntu xenial xUbuntu_16.04 ;; bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; - eoan) add_deb ubuntu eoan xUbuntu_19.10 ;; focal) add_deb ubuntu focal xUbuntu_20.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index fd4df46..58292f5 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -17,7 +17,6 @@ + /ubuntu + /ubuntu/dists + /ubuntu/dists/bionic -+ /ubuntu/dists/eoan + /ubuntu/dists/focal + /ubuntu/dists/xenial - /ubuntu/dists/*

1 0

Alexandre Julliard : packaging: Update Android build script for latest Wine.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: tools Branch: master Commit: c0a97c6e581eb45252bd4ea8b37e2d4035a8884b URL: https://source.winehq.org/git/tools.git/?a=commit;h=c0a97c6e581eb45252bd4ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 12 10:54:15 2020 +0200 packaging: Update Android build script for latest Wine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/android/build-apks | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/android/build-apks b/packaging/android/build-apks index 314bc69..68fea8e 100755 --- a/packaging/android/build-apks +++ b/packaging/android/build-apks @@ -249,7 +249,8 @@ install_all () test -d wine || config_wine cd wine destdir=$(pwd)/dlls/wineandroid.drv - install=../../wine/tools/install-sh + srcdir=../../wine + install=$srcdir/tools/install-sh rm -rf $destdir/assets assets-tmp $destdir/lib make $makeflags all install-lib DESTDIR=$(pwd) prefix=/assets-tmp @@ -274,7 +275,7 @@ install_all () $install -m 644 $sourcedir/LICENSE.txt assets-tmp/LICENSE.txt mv assets-tmp $destdir/assets - (cd $destdir && make build.gradle && gradle -q -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug) + (cd $destdir && gradle -q -Psrcdir=../../$srcdir/dlls/wineandroid.drv -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug) mv $destdir/build/outputs/apk/wine-debug.apk ../../wine-${release:-debug}-$arch.apk }

1 0

Alexandre Julliard : winetest: Update build scripts for non-recursive makefile.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: tools Branch: master Commit: feffe620187db331c69591edd151602cc34046dd URL: https://source.winehq.org/git/tools.git/?a=commit;h=feffe620187db331c69591e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 14 14:12:38 2020 +0200 winetest: Update build scripts for non-recursive makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/parse_resfiles.php | 4 ++-- winetest/make-winetest | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/transl/parse_resfiles.php b/transl/parse_resfiles.php index 23eb191..bdfa063 100644 --- a/transl/parse_resfiles.php +++ b/transl/parse_resfiles.php @@ -25,7 +25,7 @@ function create_resfiles($dir, $files) continue; } - $targets .= preg_replace("/\.[mr]c$/", ".res", $file). " "; + $targets .= "$dir/" . preg_replace("/\.[mr]c$/", ".res", $file). " "; $objs .= "$objdir/$dir/" . preg_replace("/\.[mr]c$/", ".res", $file) . " "; } if ($targets == "") @@ -35,7 +35,7 @@ function create_resfiles($dir, $files) $norm_fn = preg_replace("/[^a-zA-Z0-9]/", "-", $dir); - system("make -C $objdir/$dir -s $targets"); + system("make -C $objdir -s $targets"); system("$toolsdir/tools/winebuild/winebuild --resources -o $workdir/res/$norm_fn.res $objs"); } diff --git a/winetest/make-winetest b/winetest/make-winetest index a0637b6..13c97c5 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -79,7 +79,7 @@ umask 022 cd build64 && ../wine/configure --enable-win64 --with-mingw --without-x --without-freetype) || exit - (cd build64 && make depend && make __builddeps__) || exit + (cd build64 && make depend) || exit # update the translations status

1 0

Alexandre Julliard : Wine release 5.17
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: website Branch: master Commit: 6cd12248b52fe11999a9125e0dca66f5c78e07a9 URL: https://source.winehq.org/git/website.git/?a=commit;h=6cd12248b52fe11999a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 21:52:09 2020 +0200 Wine release 5.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020091101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2020091101.xml b/news/en/2020091101.xml new file mode 100644 index 00000000..ed5304a5 --- /dev/null +++ b/news/en/2020091101.xml @@ -0,0 +1,15 @@ +<news> +<date>September 11, 2020</date> +<title>Wine 5.17 Released</title> +<body> + The Wine development release 5.17 is now available. + <a href="{$root}/announce/5.17">What's new</a> in this release: +<ul> + <li>ADVAPI32 library converted to PE.</li> + <li>Beginnings of an NDIS network driver.</li> + <li>Still more restructuration of the console support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.17.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Matteo Bruni : d3d11: Report D3D11_FORMAT_SUPPORT_MIP_AUTOGEN in CheckFormatSupport().
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: e84eaa1bb8c135d6bf861511161f479bb5330427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e84eaa1bb8c135d6bf861511… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 10 21:20:40 2020 +0200 d3d11: Report D3D11_FORMAT_SUPPORT_MIP_AUTOGEN in CheckFormatSupport(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 + dlls/d3d11/tests/d3d11.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0d38a2f194..cfcd4acace 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3344,6 +3344,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_WRAPANDMIP, D3D11_FORMAT_SUPPORT_MIP}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_GENMIPMAP, D3D11_FORMAT_SUPPORT_MIP_AUTOGEN}, }; HRESULT hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b9bb50a89..3099d22d27 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18514,6 +18514,11 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) ok(hr == S_OK || (hr == E_FAIL && !format_support[format]), "Got unexpected result for format %#x: hr %#x, format_support %#x.\n", format, hr, format_support[format]); + if (format_support[format] & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN) + { + ok(format_support[format] & D3D11_FORMAT_SUPPORT_TEXTURE2D, + "Got unexpected format support %#x for format %#x", format_support[format], format); + } } for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format)

1 0