Jordan Justen pushed to branch debian-unstable at X Strike Force / lib / waffle
Commits: 65e2bc71 by Emil Velikov at 2021-03-07T22:02:26+00:00 doc: Add release notes for 1.7.0 Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 8185f876a458f342f5495df50582783596cd89d8) - - - - - cb3c668c by Jose Fonseca at 2021-03-16T23:44:04+00:00 gitlab-ci: Build and package with MinGW cross-compilers. This produces artifacts which can be consumed by downstream piglit builds. Further changes can be done to restrict this to specific branches, tags, or even releases, as publishing artifacts on every build is likely overkill. Acked-by: Erik Faye-Lund <erik.faye-l...@collabora.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 6c28e5f1c018b2a972c8c3d35344df6af52ba579) - - - - - bf017b82 by Emil Velikov at 2022-06-02T15:15:21+01:00 wflinfo: add zsh completion Signed-off-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit a2928750d75b0141fddfb3b52e39b6c241c2b4ac) - - - - - 062cb577 by Emil Velikov at 2022-06-02T15:15:30+01:00 gitlab-ci: use xvfb -noreset Drop the gratuitous wait and use the -noreset Xvfb option. This should resolve the intermittent fallouts that we're seeing. Huge thanks goes to Pekka and Daniel for pointing it out. Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/70 Signed-off-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 924a3b0b7e7cf8a9355cda7c3b8daaeb6759bfcf) - - - - - f880956b by Emil Velikov at 2022-06-02T15:15:38+01:00 wayland: silence waffle 1.7 deprecation warnings Keep the build clean by disabling the warnings locally. Using GCC-ism is fine here, since the code is build only with GCC or Clang both of which supporting it. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit c68525fff99a319686c8aa8eb5f6bfcab1a87c45) - - - - - fef9aa02 by Emil Velikov at 2022-06-02T15:16:02+01:00 third_party/threads: initialize abs_time Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 7966597b378bd99cbfbcf8a6b80a53952398fbf3) - - - - - 92841246 by Emil Velikov at 2022-06-02T15:16:10+01:00 tests/gl_basic_test: silence maybe-uninitialized warn GCC insists that assert_true(0) can return, thus assuming that we can end using a uninitialized variable. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 533d0a05705112c46a6a01a5c0e0b5b4b85fca36) - - - - - fb7f2b40 by Emil Velikov at 2022-06-02T15:17:43+01:00 waffle: consistently set WAFFLE_API_VERSION Consistently set the define across the project. With that done, we can enable -Werror=vla Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit e4f87fb5f2a8c212119ab867b9afdcf3ee781482) Conflicts: meson.build [Emil: fixup version] - - - - - b8af349e by Emil Velikov at 2022-06-02T15:18:20+01:00 waffle: use same version API across programs None of them uses the fancy new features, but hey at least we're consistent across the project. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit ebcd4fabd87d88576b319ad1c30b7ae4679d9f90) - - - - - 4550deae by Emil Velikov at 2022-06-02T15:18:28+01:00 core: use Wpointer-arith safe container_of Copy Wpointer-arith safe implementation from mesa and toggle the warning in the meson build. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit e4c04db9e46928395973dbf3ecfe1990f0daf708) - - - - - 25e3e7eb by Emil Velikov at 2022-06-02T15:18:38+01:00 core/tests: correct function type thrd_create() takes a `int (*)(void *)` callback, while currently we're giving it a `bool (*)(struct thread_arg *)` Flip the bool to an int. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 048809d5c1daf4e9c3a0347ecc19da1e202e9958) - - - - - 332632b6 by Emil Velikov at 2022-06-02T15:18:45+01:00 wflinfo: fixup sign-compare warnings Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit edaccebf2dbff83193c2f95985a5b1ea90ccdfe1) - - - - - d15a256c by Emil Velikov at 2022-06-02T15:18:54+01:00 tests/gl_basic_test: silence implicit-fallthrough warn The skip() function from cmocka is missing the noreturn notation. Thus the compiler assumes that it can return and results in implicit-fallthrough warnings. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 949292dd5fe078ec2543b698a5f25f4e89dfa4d5) - - - - - f50f20bb by Emil Velikov at 2022-06-02T15:20:31+01:00 tests/gl_basic_test: silence sign-compare warning Seems unhappy to compare int32_t vs enum, oops Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit d09451241795e10d38e7e3259ca14e30241c8a84) - - - - - 4aa3b392 by Emil Velikov at 2022-06-02T15:20:40+01:00 meson: enable all the warnings Enable warning level 1 (3 is too pedantic), alongside a few other warnings like init-self, missing-declarations and vla. Technically we're level=2, although cmocka throws a -Wclobbered which is a PITA to disable when subproject is used. Explicitly silence unused-parameter - there are too many instances throughout the project. No point in adding dozens of (void *) casts. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 7343ed02ceda6b06897d19f65bd041631997f41f) - - - - - b466cb0b by Emil Velikov at 2022-06-02T15:20:54+01:00 gitlab-ci: flip the error on any warning Flip the meson werror=true switch. It will help us catch extra issues before they creep in. Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/73 Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit c5a30de1b7b6e1ae5dfeee8a829b8d5ae8d777cf) - - - - - c1585a29 by Jason Ekstrand at 2022-06-02T15:22:40+01:00 wgbm: Don't destroy a surface if init fails Otherwise, we segfault trying to look up the platform from a window that was never properly initialized. Fixes: 6695ab42ae80 ("gbm: factor out gbm_window_{init,teardown}") (cherry picked from commit 0d3ac7c1b0d9aeb6a90363b9b477b028bcc156b1) - - - - - 43799854 by Simon McVittie at 2022-06-02T15:22:50+01:00 waffle_dl: Fix missing format string parameter Previously, this would print whatever uninitialized value happened to be on the stack. Signed-off-by: Simon McVittie <s...@collabora.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 31bd7b72d1246dc94063e84f5cb6387578f360fb) - - - - - d0ac2e7b by Simon McVittie at 2022-06-02T15:23:04+01:00 waffle_window_create2: Fix mismatch between format string and parameter Signed-off-by: Simon McVittie <s...@collabora.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 3b5b647641c3679e2bc951ae55da652b304edf6b) - - - - - 5c704041 by Simon McVittie at 2022-06-02T15:23:18+01:00 Mark printf-like functions with the appropriate gcc attribute Signed-off-by: Simon McVittie <s...@collabora.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 5df13f4fc209dd20ef7fa61c92532e3e38147d2a) - - - - - 3ca5c11f by Simon McVittie at 2022-06-02T15:23:35+01:00 meson: Enable format-string-related compiler warnings Signed-off-by: Simon McVittie <s...@collabora.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 60404b415aa7b6b2818478c482da21fe28b445f6) - - - - - 900e8807 by Simon McVittie at 2022-06-02T15:23:42+01:00 wflinfo: Print absence of GL context flags correctly >From context, it seems this was meant to check gl_context_flags, not the constant array context_flags. Detected by clang -Wtautological-pointer-compare. Signed-off-by: Simon McVittie <s...@collabora.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit f2029b1578bb15ba474ea9c2e436aa30aa00135f) - - - - - b981482c by Simon McVittie at 2022-06-02T15:23:50+01:00 wflinfo: Make context_flags more const-correct String constants aren't suitable for writing, so assign them to a const char *, not a plain char *. Detected by gcc -Wwrite-strings. Signed-off-by: Simon McVittie <s...@collabora.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 6403cdef6b88eda898f3708375b67b8588ad48ee) - - - - - d90679ea by Simon McVittie at 2022-06-02T15:24:05+01:00 meson: Detect non-const-correct uses of string constants Signed-off-by: Simon McVittie <s...@collabora.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 20cbf4553d1b83ebb1ea4d25c4328ca96f8c20ec) - - - - - d89e78b7 by Simon McVittie at 2022-06-02T15:24:22+01:00 wflinfo: Move context_flags array into constant data section Nothing needs to write to this. Signed-off-by: Simon McVittie <s...@collabora.com> Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 64c7b5417ee91de2b2ea31a127f003c4bfa4973c) - - - - - 822c4fab by Dylan Baker at 2022-06-02T15:24:29+01:00 meson: use override_dependency and override_find_program This allows automatic overrides of the waffle-1 dependency and wflifo program, when used as a subproject/dependency fallback without having to specify them in the consumer, as is current meson best practice. For projects using meson > 0.54, they can then just write: ```meson dependency('waffle-1') ``` and if they have the waffle-1 wrap installed then meson will automatically configure the project, and use the built libwaffle-1, without having to specify fallback parameters in the calling meson.build. This is quite similar to the find_program_override, which works for executables instead of dependencies. (cherry picked from commit 950a1f35a718bc2a8e1dda75845e52651bb331a7) - - - - - 39d48d2a by Emil Velikov at 2022-06-02T15:24:42+01:00 tree: update website references For a while now, we've had https://waffle.freedesktop.org/ and somewhat recently the original waffle-gl.org domain expired. Update (nearly) all the existing references. Be that waffle-gl.org ones or people.freedesktop.org/~chadversary/waffle. The latter redirect to the former. Nearly since some archive.waffle-gl.org artefacts are nowhere to be found ... at a glance. We can tweak or drop those with future commits. While we're here - httpS all the links :-) Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 09bce066c17b150b70a5f27e1edbc01874a6b3dc) - - - - - 51df3872 by Emil Velikov at 2022-06-02T15:24:57+01:00 doc: update references to new git location Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 8784f488ffb39557845701227a34232eaad17405) - - - - - bbbd8150 by Emil Velikov at 2022-06-02T15:25:07+01:00 tree: update maintainer Chad -> Emil Chad has been MIA for a few years now and I (Emil) have been doing the actual maintenance. Update the references to better indicate reality. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 2957dddc9764713136fe453f6ef061d503ccc55d) - - - - - 6aa51093 by Emil Velikov at 2022-06-02T15:25:22+01:00 man: meson: add all dependencies Add all author entries, otherwise meson will not flag a rebuild when they are updated. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 28ae862c37f6874ba77e2f12642d286ac1ce7d9d) - - - - - 3c92f7f6 by Philipp Zabel at 2022-06-02T15:26:07+01:00 wayland: fix build against version 1.20 Wayland 1.20 introduces two new symbols wl_proxy_marshal_flags and wl_proxy_marshal_array_flags, which need to be wrapped as well. Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/76 Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> (cherry picked from commit 2c33597245bb74f19104f0a858cd40e80b26991d) - - - - - 792dd6d0 by Simon McVittie at 2022-06-02T15:26:45+01:00 examples, wflinfo: Add missing NORETURN attributes Detected by clang -Wmissing-noreturn. I haven't added that warning in meson.build here, because it is also triggered by third-party code in third_party/threads/threads_posix.c. Signed-off-by: Simon McVittie <s...@collabora.com> (cherry picked from commit 2698f6f9f6aa50a7cb99cd51c0344dee9012c705) - - - - - d44ebfba by Emil Velikov at 2022-06-02T15:26:59+01:00 meson: omit bash completion, with custom prefix In order for bash completions to work, they must be installed in the respective folder. Often that folder is writable only by root. In order words, using a command line the following now is successful, providing indicative warning message. meson builddir --prefix `pwd`/inst ... meson.build:140: WARNING: User provided prefix '.../inst' differs from bash-completion one '/usr'. Disabling completion. Reported-by: Pekka Paalanen <pekka.paala...@collabora.com> Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 8867ab9a223aaa22d844d6d7977e57b491a68c86) - - - - - 82c5abfd by Romain Naour at 2022-09-14T00:02:56+01:00 cmake: forward cflags from *.pc files to waffle cflags When building mesa egl without x11 and gles2 the headers need a EGL_NO_X11 define to avoid including X11 headers. This define EGL_NO_X11 is lost while building waffle since CFLAGS defined by pc files are not used. EGL_NO_X11 is defined in CFLAGS from egl.pc. Signed-off-by: Romain Naour <romain.na...@gmail.com> [Retrieved from: https://git.buildroot.net/buildroot/tree/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch] Signed-off-by: Fabrice Fontaine <fontaine.fabr...@gmail.com> (cherry picked from commit 15727e0245106ec7e45e7cad17c2470c2bf4fae6) - - - - - a4cfc5fc by Emil Velikov at 2022-09-14T00:09:33+01:00 gitlab-ci: update container to bullseye The existing buster is oldstable, as such it's stuck with meson 0.49.2 Update it, alongside it we'll get newer clang/clang-format. Since bullseye features GLVND the whole GL/GLES/EGL/GLX and associated deps have been reshuffled. Signed-off-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit c1574bd8a22867832d27f2c1c3d89f669310ad33) Conflicts: .gitlab-ci.yml (drop clang bits, change tag) .gitlab-ci/clang-format.sh (remove) - - - - - 0de7576a by Emil Velikov at 2022-09-14T00:11:55+01:00 meson: use get_variable() update to meson 0.51 The current "get_pkgconfig_variable()" method is deprecated and due for removal. Replace it with the 0.51 introduced get_variable(pkgconfig) Signed-off-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 3a097f6a4153f4df51a2fb71a419061c96712d41) Conflicts: meson.build (trivial, version variance) - - - - - 3b2ab38b by Emil Velikov at 2022-09-14T00:12:58+01:00 meson: remove always true meson.version >= 0.46 The minimum required version is 0.49, ever since the meson build was introduced. Signed-off-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit 18cf48427b7bf906406bcd167e2148f8c4d54490) Conflicts: src/utils/meson.build (trivial, nacl context) - - - - - 05cd2643 by Emil Velikov at 2022-09-14T00:13:23+01:00 meson: generate cmake files only on Windows The pkgconfig file is sufficient for anything *nix-y. Unfortunately on Windows things are a bit more hairy. While it's technically possible to use it in there, the simpler option is to use the cmake equivalent. As such, omit installing them on non Windows platforms. Note: we already require meson 0.51, so the version check is safe to remove. Signed-off-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit a16983fea590491727c8119256c7b938fe1f9d10) - - - - - 25027360 by Alyssa Ross at 2023-03-02T13:23:20+00:00 meson: find wayland.xml from wayland-scanner.pc In wayland, it's the "scanner" meson option that controls whether wayland.xml is installed, not the "libraries" option (which enables wayland-client and wayland-server). This means that, if wayland-scanner is installed into one path, and wayland-client and wayland-server are installed into another (as we'd like to do in Nixpkgs), it's wayland-scanner's pkgdatadir that will contain wayland.xml. Signed-off-by: Alyssa Ross <h...@alyssa.is> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit b19a28e518c41b66727d1cd14d167e78fa6617da) - - - - - 6813f461 by Emil Velikov at 2023-03-02T14:21:44+00:00 waffle: Bump version to 1.7.1 Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> - - - - - f6fee190 by Emil Velikov at 2023-03-02T14:22:17+00:00 doc: Add release notes for 1.7.1 Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> - - - - - 358cd442 by Emil Velikov at 2023-03-05T18:26:58+00:00 meson: don't run TLS checks on mingw Align with the cmake build. Using TLS seems to just work, but it pulls the extra libwinpthread-1.dll, which makes distribution cumbersome. Fixes: acf1333 ("Initial meson build system") Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 47f1615d85cba9a33fb8f7e919a78fe621510608) - - - - - c25b33e3 by Emil Velikov at 2023-03-05T18:27:29+00:00 wgl: remove unused dummy wgl_error.[ch] The files contain a couple of unused dummy functions. Namely wgl_error_to_string wgl_error_failed_func. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit dcf783f2e89717be549e1d979bf870ae5fa002e6) - - - - - fff178ad by Emil Velikov at 2023-03-05T18:27:30+00:00 all: use format(gnu_printf), enable in mingw The printf attribute is too generic - it usually comes in two variants gnu_ and ms_. Since we're using the former, annotate it as such. Kindly highlighted by the mingw-w64 compiler Fixes: 5df13f4 ("Mark printf-like functions with the appropriate gcc attribute") Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> (cherry picked from commit 15bd869108868a3f75e2a0f335c96578301e6bc1) - - - - - 9cdcc623 by Emil Velikov at 2023-03-05T18:43:40+00:00 waffle: Bump version to 1.7.2 Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> - - - - - f3b42a72 by Emil Velikov at 2023-03-05T18:43:59+00:00 doc: Add release notes for 1.7.2 Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> - - - - - 5b05cd01 by Jordan Justen at 2023-03-10T11:19:39-08:00 Merge tag 'v1.7.2' into debian-unstable Waffle 1.7.2 - - - - - 16d4e470 by Jordan Justen at 2023-03-10T11:20:10-08:00 d/changelog: Start 1.7.2-1 changelog Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - 2375b0c4 by Jordan Justen at 2023-03-10T11:20:19-08:00 d/control: Update Standards-Version to 4.6.2 Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - dd34772d by Jordan Justen at 2023-03-10T11:20:23-08:00 d/source/lintian-overrides: Override patch-not-forwarded-upstream Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - 4b32ece8 by Jordan Justen at 2023-03-10T11:20:27-08:00 d/libwaffle-dev: Drop cmake files from dev package Upstream decided that these should only be needed for windows. Ref: 05cd264 ("meson: generate cmake files only on Windows") Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - 532671be by Jordan Justen at 2023-03-10T11:20:56-08:00 d/control: Drop cmake build dependency Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - c7da3bee by Jordan Justen at 2023-03-10T11:21:10-08:00 d/waffle-utils: Add zsh completion Ref: bf017b8 ("wflinfo: add zsh completion") Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - 9f51b053 by Jordan Justen at 2023-03-10T11:21:13-08:00 d/control: Drop deprecated libgl1-mesa-dev dependency Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - d5010507 by Jordan Justen at 2023-03-10T11:22:22-08:00 d/changelog: Release 1.7.2-1 to unstable Signed-off-by: Jordan Justen <jljus...@debian.org> - - - - - 30 changed files: - .gitlab-ci.yml - + .gitlab-ci/build-cmake-mingw.sh - .gitlab-ci/build-meson.sh - + .gitlab-ci/mingw32.cmake - + .gitlab-ci/mingw64.cmake - Android.mk - README.md - cmake/Modules/WaffleDefineVersion.cmake - debian/changelog - debian/control - debian/libwaffle-dev.install - + debian/source/lintian-overrides - debian/waffle-utils.install - doc/release-notes/waffle-1.0.0.txt - doc/release-notes/waffle-1.0.1.txt - doc/release-notes/waffle-1.1.0.txt - doc/release-notes/waffle-1.1.1.txt - doc/release-notes/waffle-1.1.2.txt - doc/release-notes/waffle-1.2.0.txt - doc/release-notes/waffle-1.2.1.txt - doc/release-notes/waffle-1.2.2.txt - doc/release-notes/waffle-1.3.0.txt - doc/release-notes/waffle-1.4.0.txt - + doc/release-notes/waffle-1.7.0.md - + doc/release-notes/waffle-1.7.1.md - + doc/release-notes/waffle-1.7.2.md - examples/gl_basic.c - examples/simple-x11-egl.c - man/common/author-chad.versace.xml - man/common/author-emil.velikov.xml The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/xorg-team/lib/waffle/-/compare/731e17b5f5daffb519733f9019e4d8f2566f178d...d50105078126e8256ed44f51ff76a9ad7d977ddf -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/waffle/-/compare/731e17b5f5daffb519733f9019e4d8f2566f178d...d50105078126e8256ed44f51ff76a9ad7d977ddf You're receiving this email because of your account on salsa.debian.org.
