https://bugzilla.redhat.com/show_bug.cgi?id=2152207
Bug ID: 2152207 Summary: Review Request: dxvk - Vulkan-based D3D11 and D3D10 implementation for Linux / Wine Product: Fedora Version: rawhide Status: NEW Component: Package Review Assignee: nobody@fedoraproject.org Reporter: fzatlouk@redhat.com QA Contact: extras-qa@fedoraproject.org CC: package-review@lists.fedoraproject.org Target Milestone: --- Classification: Fedora
SPEC: https://download.copr.fedorainfracloud.org/results/frantisekz/dxvk-merge/fed...
SRPM: https://download.copr.fedorainfracloud.org/results/frantisekz/dxvk-merge/fed...
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
Neal Gompa ngompa13@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Flags| |fedora-review? Assignee|nobody@fedoraproject.org |ngompa13@gmail.com Status|NEW |ASSIGNED
--- Comment #1 from Neal Gompa ngompa13@gmail.com --- Taking this review.
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
Neal Gompa ngompa13@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |manisandro@gmail.com
--- Comment #2 from Neal Gompa ngompa13@gmail.com ---
%global debug_package %{nil} %{?mingw_package_header}
Do we still want to do it this way? This would mean that the native subpackage doesn't get proper debuginfo, I think?
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
--- Comment #3 from Neal Gompa ngompa13@gmail.com ---
Requires(posttrans): %{_sbindir}/alternatives wine-core%{?_isa} >= 6.8
Can you break this up into one per line, please?
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
František Zatloukal fzatlouk@redhat.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Flags| |needinfo?(manisandro@gmail. | |com)
--- Comment #4 from František Zatloukal fzatlouk@redhat.com --- (In reply to Neal Gompa from comment #2)
%global debug_package %{nil} %{?mingw_package_header}
Do we still want to do it this way? This would mean that the native subpackage doesn't get proper debuginfo, I think?
@manisandro@gmail.com Do you have any ideas here? Whenever I drop out %global debug_package %{nil} I get "error: Empty %files file /builddir/build/BUILD/dxvk-2.0/debugsourcefiles.list".
(Note that I am moving the .dll files in the spec around a bit and the package isn't mingw- prefixed, compared to other mingw packages).
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
Sandro Mani manisandro@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Flags|needinfo?(manisandro@gmail. | |com) |
--- Comment #5 from Sandro Mani manisandro@gmail.com --- I'll look into it. FWIW, %{?mingw_package_header} is empty nowadays.
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
--- Comment #6 from Sandro Mani manisandro@gmail.com --- You need
%{?mingw_debug_package}
and after %install
%mingw_debug_install_post
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
--- Comment #7 from František Zatloukal fzatlouk@redhat.com --- (In reply to Sandro Mani from comment #6)
You need
%{?mingw_debug_package}
and after %install
%mingw_debug_install_post
Thanks!
It, however, ended the same way. Posting here the updated section of the spec:
%description wine-d3d9 %{summary}
%{?mingw_debug_package}
%prep %autosetup -n dxvk-%{version} -p1
# Copy out system include directories for spirv, vulkan and DirectX mkdir -p ./include/vulkan/include && cp -R /usr/include/vulkan ./include/vulkan/include mkdir -p ./include/spirv/include && cp -R /usr/include/spirv ./include/spirv/include
%build ### Wine %mingw_meson --buildtype=plain --wrap-mode=nodownload --auto-features=enabled --cross-file ../build-win%{target_x86_type}.txt --buildtype release %mingw_ninja
%install ### Wine %mingw_ninja_install %mingw_debug_install_post
If I get %mingw_debug_install_post at the absolute end of the install section, the error is different... Processing files: mingw64-dxvk-debuginfo-2.0-1.fc38.noarch error: Could not open %files file /builddir/build/BUILD/dxvk-2.0/mingw64-debugfiles.list: No such file or directory
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
--- Comment #8 from Sandro Mani manisandro@gmail.com --- The problem is that /usr/lib/rpm/mingw-find-debuginfo.sh expects any windows binaries to exist below the respective mingw prefix (say /usr/x86_64-w64-mingw32). Here however, the binaries are installed to a native prefix, say
/usr/lib64/wine/x86_64-windows/dxvk-d3d11.dll
The problem with the binaries being placed outside a mingw prefix is that mingw-find-debuginfo.sh wouldn't be able to easily figure out whether they belong to mingw32, mingw64 or ucrt64 (at least, without inspecting the binaries themselves to figure out 32 vs 64 vs ucrt).
A hacky solution here would be to manually generate the mingw64-debugfiles.list file with
%{buildroot}/usr/lib/debug/usr/lib64/wine/x86_64-windows/dxvk-d3d9.dll.debug %{buildroot}/usr/lib/debug/usr/lib64/wine/x86_64-windows/dxvk-d3d10core.dll.debug %{buildroot}/usr/lib/debug/usr/lib64/wine/x86_64-windows/dxvk-d3d11.dll.debug %{buildroot}/usr/lib/debug/usr/lib64/wine/x86_64-windows/dxvk-dxgi.dll.debug
since you can be sure that these dlls are mingw64 (resp mingw32-debugfiles.list in the 32bit case).
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
--- Comment #9 from František Zatloukal fzatlouk@redhat.com --- (In reply to Sandro Mani from comment #8)
A hacky solution here would be to manually generate the mingw64-debugfiles.list file with
%{buildroot}/usr/lib/debug/usr/lib64/wine/x86_64-windows/dxvk-d3d9.dll.debug %{buildroot}/usr/lib/debug/usr/lib64/wine/x86_64-windows/dxvk-d3d10core.dll. debug %{buildroot}/usr/lib/debug/usr/lib64/wine/x86_64-windows/dxvk-d3d11.dll.debug %{buildroot}/usr/lib/debug/usr/lib64/wine/x86_64-windows/dxvk-dxgi.dll.debug
Thanks, this did the trick, -debuginfo processing went fine, however, I am now back to "Empty %files file /builddir/build/BUILD/dxvk-2.0/debugsourcefiles.list" with -debugsource :'(
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
Dominik 'Rathann' Mierzejewski dominik@greysector.net changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |dominik@greysector.net
--- Comment #10 from Dominik 'Rathann' Mierzejewski dominik@greysector.net --- Out of curiosity, how is this related to wine-dxvk[1]?
[1] https://src.fedoraproject.org/rpms/wine-dxvk
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
--- Comment #11 from Neal Gompa ngompa13@gmail.com --- (In reply to Dominik 'Rathann' Mierzejewski from comment #10)
Out of curiosity, how is this related to wine-dxvk[1]?
This is intended to replace that package and dxvk-native.
https://bugzilla.redhat.com/show_bug.cgi?id=2152207
Neal Gompa ngompa13@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Flags| |needinfo?(fzatlouk@redhat.c | |om)
--- Comment #12 from Neal Gompa ngompa13@gmail.com --- František, can you please refresh this package and update this to the latest version?
package-review@lists.fedoraproject.org