Install headers and pkg-config files, MkII #3834

flibitijibibo · 2024-02-04T18:55:55Z

This reworks #3325 to apply to the latest dxvk revision, and is based on #3738 and #3743. As a result, only the last 3 commits are actually for this specific PR.

CC @smcv, I had to adjust a few of the patches, so we'll need to re-confirm the signoffs for those.

Fixes #3323

Part of #3451

Supercedes #3325

smcv · 2024-02-05T12:51:06Z

I have no problem with the versions of my commits that appear here. Feel free to add a Co-authored-by, or not, as you prefer.

smcv · 2024-02-05T12:52:41Z

On #3325 I wrote:

It's a bit unfortunate that [the name prefix for *.so] is dxvk_ and [the name prefix for *.pc] is dxvk-. I've kept the naming from the Fedora packaging for now, but I'd be very tempted to change it to dxvk_d3d9.pc, dxvk_glfw_dxgi.pc and so on, to be consistent with the library names and avoid having two subtly different name-prefixes.

What do maintainers think about that? This PR is changing the pkg-config API anyway, so if there was a time to make that change, now would probably be that time.

flibitijibibo · 2024-02-05T13:01:03Z

I'd be okay with doing _ over -, I'll check with Neal to see if this is an okay change for Fedora.

meson.build

src/wsi/sdl2/wsi_platform_sdl2.cpp

src/wsi/sdl2/wsi_platform_sdl2.h

Conan-Kudo · 2024-02-05T15:26:16Z

I'd be okay with doing _ over -, I'll check with Neal to see if this is an okay change for Fedora.

Does Meson's pkgconfig generator not support setting Provides names? It's documented in pc(5).

smcv · 2024-02-05T15:30:01Z

Does Meson's pkgconfig generator not support setting Provides names? It's documented in pc(5).

Not as far as I can see in https://mesonbuild.com/Pkgconfig-module.html.

Does original freedesktop.org pkg-config support Provides, or are they a pkgconf-ism?

smcv · 2024-02-05T15:31:37Z

I believe the way the equivalent of Provides was traditionally implemented is as a symlink oldname.pc -> newname.pc, as is done in the Debian packaging of sdl12-compat and sdl2-compat.

[edited to add]

sdl12_compat.pc does have Provides: sdl, and Debian uses pkgconf now, so maybe we don't actually need that symlink any more; but there are other modules (e.g. libpng, libplist, libxcrypt) for which the symlinks are still used, and there's no Provides in those cases.

Conan-Kudo · 2024-02-05T15:35:59Z

It was always part of the spec, but not implemented fully in pkg-config. pkgconf actually implemented it to work. You see this with pkg-config --provides sdl12-compat across the two implementations.

flibitijibibo · 2024-03-01T19:54:51Z

Rebased and updated with the latest changes from the other two PRs.

Did we ever make a call with the - v. _ change? Left that part alone for now.

Conan-Kudo · 2024-03-01T20:09:19Z

Well, I'm shipping dxvk-native-2.3 now with -, so... 🤷🏾‍♂️

flibitijibibo · 2024-05-13T13:20:33Z

Latest push is just a rebase, this PR now only depends on #3743

meson.build

misyltoad · 2024-05-21T17:21:44Z

If you fix that comment and the commit commit names, I will merge it.

flibitijibibo · 2024-05-21T17:33:00Z

Looks like Meson made the choice for us:

src/dxgi/meson.build:24:0: ERROR: Invalid Shared library version "0.2.3.1". Must be of the form X.Y.Z where all three are numbers. Y and Z are optional.

So I guess I need to revert that...? Also, what were the commit/comment changes I needed to make, I couldn't see them in this thread.

misyltoad · 2024-05-21T17:33:43Z

Just make the commit names match up with the style of the rest of the repo.

misyltoad · 2024-05-21T17:33:49Z

Looks like Meson made the choice for us:
src/dxgi/meson.build:24:0: ERROR: Invalid Shared library version "0.2.3.1". Must be of the form X.Y.Z where all three are numbers. Y and Z are optional.
So I guess I need to revert that...? Also, what were the commit/comment changes I needed to make, I couldn't see them in this thread.

lol let's make it 0.231 or whatever then

flibitijibibo · 2024-05-21T17:37:46Z

Latest push changes to be the '231' style, and adjusts the commit tag to use [].

Zips can't preserve the symlink, so make the .tar.gz package with package_native.sh and zip that up instead.

This is necessary for compatibility with Meson's pkg module, which generates pkg-config metadata containing "-lNAME" where NAME is the first argument to shared_library(). Changing the name_prefix parameter would break that. Conversely, including .dll or .so in the first parameter would also break that, so remove the `+dll_ext` part (in practice this is not a functional change, because `dll_ext` is always set to an empty string). Signed-off-by: Simon McVittie <[email protected]>

misyltoad · 2024-05-21T17:53:23Z

One final nit, the tarball for Steam Runtime binaries contains a .git file inside of the include folder :P

When building a game that has been ported to Linux using DXVK Native, these headers are necessary to provide the Direct3D and DXVK APIs. Signed-off-by: Simon McVittie <[email protected]>

This allows dependent projects to query the version and location of DXVK via the pkg-config interface. The include directories aren't yet set, because the headers aren't installed; that will follow in a subsequent commit. The naming of these pkg-config files is based on proposed Fedora packages for DXVK 2.0, and is not compatible with older Fedora packages for DXVK 1.x (which used the naming convention dxvk-native-d3d9 and so on). Packagers can create symlinks such as dxvk-native-d3d9.pc -> dxvk-d3d9.pc if they want to retain compatibility with older names. Signed-off-by: Simon McVittie <[email protected]>

flibitijibibo · 2024-05-21T18:02:23Z

Added an exclude_files to the directx install block to ignore a possible .git file when packaging a repo clone (shouldn't happen with source tarballs).

flibitijibibo mentioned this pull request Feb 4, 2024

[native] Establish a libdxvk ABI #3451

Open

3 tasks

smcv reviewed Feb 5, 2024

View reviewed changes

meson.build Outdated Show resolved Hide resolved

src/wsi/sdl2/wsi_platform_sdl2.cpp Outdated Show resolved Hide resolved

src/wsi/sdl2/wsi_platform_sdl2.h Outdated Show resolved Hide resolved

flibitijibibo mentioned this pull request May 9, 2024

Add FreeBSD support #3956

Merged

misyltoad reviewed May 21, 2024

View reviewed changes

meson.build Outdated Show resolved Hide resolved

misyltoad requested changes May 21, 2024

View reviewed changes

meson.build Outdated Show resolved Hide resolved

[build] Add soversion to dxvk-native binaries

a1bbed5

flibitijibibo and others added 2 commits May 21, 2024 13:39

[ci] Use a tarball for the steamrt-sniper artifact.

b33ad22

Zips can't preserve the symlink, so make the .tar.gz package with package_native.sh and zip that up instead.

smcv added 2 commits May 21, 2024 14:00

[build] Install headers for native builds

f7130fd

When building a game that has been ported to Linux using DXVK Native, these headers are necessary to provide the Direct3D and DXVK APIs. Signed-off-by: Simon McVittie <[email protected]>

misyltoad merged commit 2ff2c82 into doitsujin:master May 21, 2024
3 checks passed

flibitijibibo mentioned this pull request May 21, 2024

[build] Add soversion to dxvk-native binaries #3743

Closed

flibitijibibo deleted the install-w-depend branch May 21, 2024 19:19

This was referenced May 22, 2024

Install headers and pkg-config files #3325

Closed

Compile for Linux like dxvk-native AlpyneDreams/d8vk#15

Closed

smcv mentioned this pull request May 24, 2024

native: Please plan for what happens to SOVERSION when minor/micro version has 2 digits #4025

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Install headers and pkg-config files, MkII #3834

Install headers and pkg-config files, MkII #3834

flibitijibibo commented Feb 4, 2024 •

edited

Loading

smcv commented Feb 5, 2024

smcv commented Feb 5, 2024

flibitijibibo commented Feb 5, 2024

Conan-Kudo commented Feb 5, 2024

smcv commented Feb 5, 2024

smcv commented Feb 5, 2024 •

edited

Loading

Conan-Kudo commented Feb 5, 2024 •

edited

Loading

flibitijibibo commented Mar 1, 2024

Conan-Kudo commented Mar 1, 2024

flibitijibibo commented May 13, 2024

misyltoad commented May 21, 2024

flibitijibibo commented May 21, 2024

misyltoad commented May 21, 2024

misyltoad commented May 21, 2024 •

edited

Loading

flibitijibibo commented May 21, 2024 •

edited

Loading

misyltoad commented May 21, 2024

flibitijibibo commented May 21, 2024 •

edited

Loading

Install headers and pkg-config files, MkII #3834

Install headers and pkg-config files, MkII #3834

Conversation

flibitijibibo commented Feb 4, 2024 • edited Loading

smcv commented Feb 5, 2024

smcv commented Feb 5, 2024

flibitijibibo commented Feb 5, 2024

Conan-Kudo commented Feb 5, 2024

smcv commented Feb 5, 2024

smcv commented Feb 5, 2024 • edited Loading

Conan-Kudo commented Feb 5, 2024 • edited Loading

flibitijibibo commented Mar 1, 2024

Conan-Kudo commented Mar 1, 2024

flibitijibibo commented May 13, 2024

misyltoad commented May 21, 2024

flibitijibibo commented May 21, 2024

misyltoad commented May 21, 2024

misyltoad commented May 21, 2024 • edited Loading

flibitijibibo commented May 21, 2024 • edited Loading

misyltoad commented May 21, 2024

flibitijibibo commented May 21, 2024 • edited Loading

flibitijibibo commented Feb 4, 2024 •

edited

Loading

smcv commented Feb 5, 2024 •

edited

Loading

Conan-Kudo commented Feb 5, 2024 •

edited

Loading

misyltoad commented May 21, 2024 •

edited

Loading

flibitijibibo commented May 21, 2024 •

edited

Loading

flibitijibibo commented May 21, 2024 •

edited

Loading