Peter Hutterer authored 1 month ago and Simon Ser committed 4 weeks ago

We effectively already required that anyway:

WARNING: Project specifies a minimum meson_version '>= 0.47' but
  uses features which were added in newer versions:
 * 0.49.0: {'/ with string arguments'}

And once we use 0.56 we can use dependency.get_variable:
WARNING: Project targets '>= 0.56' but uses feature deprecated
  since '0.56.0': dependency.get_pkgconfig_variable. use dependency.get_variable(pkgconfig : ...) instead

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

See-also: freedesktop/freedesktop#438

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

Just a small cosmetic change in the code.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Fixes: 1469c7e5 - wayland-info: add drm-lease-v1 support

Displays the device path from advertised `wp_drm_lease_device_v1` and its
associated `wp_drm_lease_connector_v1` id, name and descriptions.

Signed-off-by: Simon Zeni <simon@bl4ckb0ne.ca>

This commit reworks how the protocols are stored before generating the source
code and header files in preparation to add protocols from the `staging` folder.

Signed-off-by: Simon Zeni <simon@bl4ckb0ne.ca>

The dmabuf_feedback proxy was leaked, causing the following runtime
warning with recent Wayland libraries:

warning: queue 0x15c8390 destroyed while proxies still attached:
zwp_linux_dmabuf_feedback_v1@14 still attached

Make sure to destroy the dmabuf_feedback proxy along with the rest of
the dmabuf info.

Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Closes: #8
Fixes: 240cb739 - wayland-info: Add support for linux_dmabuf version 4

Robert Mader authored 2 years ago and Olivier Fourdan committed 2 years ago

There are still compositors out there not supporting recent
versions (e.g. Exo). Supporting it is simple enough, so let's
do it.

Signed-off-by: Robert Mader <robert.mader@collabora.com>

Currently, wayland-info will query the wl_display and print information
about all the interfaces available.

In some cases however, information about just one specific interface is
required.

This adds a command line option --interface (or -i for short) which
prints the information only for the given interface.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Closes: #7

When building with libdrm, use drmGetDeviceFromDevId() to get the
device path. It's easier to read than the dev_t.

Signed-off-by: Simon Ser <contact@emersion.fr>

Protects against typos in #if. For instance, the following would
silently disable the code block because of the typo:

    #if HAVE_LIBDRN
    name = drmGetFormatName(format);
    #endif

Signed-off-by: Simon Ser <contact@emersion.fr>

There's no point in linking to libdrm if it doesn't have the
features we need. Replace HAVE_HUMAN_FORMAT_MODIFIER with
HAVE_LIBDRM.

Signed-off-by: Simon Ser <contact@emersion.fr>

Signed-off-by: Simon Ser <contact@emersion.fr>

wayland-info can optionally use libdrm to provide a description of the
dmabuf format modifiers.

When not using libdrm however, the build fails because "dev_t" is not
defined.

The definition of "dev_t" comes from <sys/types.h> which is included
from <libdrm.h>, which is not included without libdrm support, hence the
build failure.

Simply include <sys/types.h> unconditionally to make sure "dev_t" is
defined regardless of libdrm support, to fix the build failure.

Closes: wayland/wayland-utils#6


Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Fixes: 240cb739 - "Add support for linux_dmabuf version 4"
Reviewed-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

The release script from the Wayland repository is simpler than the
script from Xorg, uses the releases from gitlab and is now generic
enough to be used by different projects.

Update the release procedure to use that script instead.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Simon Ser <contact@emersion.fr>

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

Link Mauve authored 3 years ago and Simon Ser committed 2 years ago

This version changes how formats and modifiers are sent to the client,
which now has to mmap() a file descriptor to get the list of
known formats, and then receives the preferred formats in tranches, from
best to worst.

We keep the deprecated version 3 handling, for legacy compositors.

Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>

Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>

Link Mauve authored 3 years ago and Simon Ser committed 2 years ago

One line per format, and using the same layout.

This also removes the special case for RGB565, only ARGB8888 and
XRGB8888 need to be special-cased.

Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Reviewed-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>

Link Mauve authored 3 years ago and Simon Ser committed 2 years ago

Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Reviewed-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>

We don't use these.

Signed-off-by: Simon Ser <contact@emersion.fr>

Simple CI manifest based on FDO ci-templates.

Signed-off-by: Simon Ser <contact@emersion.fr>

This allows packagers to specify -Ddrm=enabled to make fail if
libdrm isn't found, and developers to specify -Ddrm=disabled to
make sure the build works correctly without libdrm.

Signed-off-by: Simon Ser <contact@emersion.fr>

Signed-off-by: Simon Ser <contact@emersion.fr>

It uses GitLab now.

Signed-off-by: Simon Ser <contact@emersion.fr>

Jan Beich authored 4 years ago and Simon Ser committed 3 years ago

Previously, building on DragonFly, FreeBSD, NetBSD, OpenBSD failed with:
wayland-info/wayland-info.c:1783:4: error: use of undeclared identifier 'CLOCK_MONOTONIC_RAW'
             [CLOCK_MONOTONIC_RAW] = "CLOCK_MONOTONIC_RAW",
              ^
wayland-info/wayland-info.c:1784:4: error: use of undeclared identifier 'CLOCK_REALTIME_COARSE'
             [CLOCK_REALTIME_COARSE] =       "CLOCK_REALTIME_COARSE",
              ^
wayland-info/wayland-info.c:1785:4: error: use of undeclared identifier 'CLOCK_MONOTONIC_COARSE'
             [CLOCK_MONOTONIC_COARSE] =      "CLOCK_MONOTONIC_COARSE",
              ^
wayland-info/wayland-info.c:1791:40: error: invalid application of 'sizeof' to an incomplete type 'const char *[]'
        if (clk_id < 0 || (unsigned)clk_id >= ARRAY_LENGTH(names))
                                              ^~~~~~~~~~~~~~~~~~~
wayland-info/wayland-info.c:49:33: note: expanded from macro 'ARRAY_LENGTH'
 #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
                                 ^~~

Signed-off-by: Jan Beich <jbeich@FreeBSD.org>

Jan Beich authored 4 years ago and Simon Ser committed 3 years ago

program_invocation_short_name isn't available on Android and most
non-Linux libc. Some imported getprogname() from NetBSD. Instead of
detecting for a single-use consumer just hardcode the current value.

Previously, building on DragonFly, FreeBSD, NetBSD, OpenBSD failed with:
wayland-info/wayland-info.c:262:28: error: use of undeclared identifier 'program_invocation_short_name'
                fprintf(stderr, "[%s] ", program_invocation_short_name);
                                         ^

Signed-off-by: Jan Beich <jbeich@FreeBSD.org>

Print the name and description.

Signed-off-by: Simon Ser <contact@emersion.fr>

build: remove wayland-server dep

See merge request !5

wayland-info: explain dmabuf formats/modifiers

See merge request !4

This client doesn't need to depend on the server lib. In fact, the
dep is unused.

This introduces an optional dependency on libdrm.

Signed-off-by: Manuel Stoeckl <code@mstoeckl.com>

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

While "wayland-info" is just one (and only) tool for now, use the more
general name "wayland-utils" for the meson project.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

A simplified version of the Weston procedure.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

Adjust the build instructions to pull from the new repository under the
wayland organization in Gitlab.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>