[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/waffle][debian-unstable] 17 commits: release: Publish 1.8.0

Title: GitLab

Jordan Justen pushed to branch debian-unstable at X Strike Force / lib / waffle

Commits:

  • a040684f
    by Emil Velikov at 2023-09-25T15:27:00+01:00 
    release: Publish 1.8.0

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
  • 651bd641
    by Emil Velikov at 2023-09-25T15:27:00+01:00 
    waffle: Bump post-release version to 1.8.90

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
  • 24d2d64e
    by Emil Velikov at 2023-10-02T13:58:21+01:00 
    editorconfig: expand meson files, handle yml

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit 3af1462a334bfb27ca43008fd47f95d64fa8725f)
  • b34bf41f
    by Emil Velikov at 2023-10-02T13:58:22+01:00 
    gitlab-ci: run clang-format only on MRs

We need a proper range to correctly check for issues. As-is it runs on
all pushes and since CI does some fancy caching, the MRs will be stuck
(if failing).

Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/118
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit c3692afcf251c945154aa90f9d9f1527f641a6eb)
  • e369b178
    by Emil Velikov at 2023-10-02T13:58:23+01:00 
    clang-format: correctly track the commit range in CI

Atm we don't handle all the variables, used to determine the range.

Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/118
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit 5e1ffe72f57c9baf23892d797b334eee49e4a341)
  • 147377de
    by Emil Velikov at 2023-10-02T13:58:24+01:00 
    clang-format: pass correct reference to git-clang-format

When using git-clang-format we need to give it either:
 - $remote/$branch
 - $branch, or
 - $commit

Currently we may pass it $remote/$commit, which does not work.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 0b04448e38b9ecadaf1163a1c4d251051670bf98)
  • 45f9db8a
    by Emil Velikov at 2023-10-02T14:20:17+01:00 
    Revert "waffle: Bump post-release version to 1.8.90"

This reverts commit 651bd641fc51bcb21da837701ac81717971a4497.

Was never meant to land in this branch - seems like we had a bug in the
release script.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
  • 86b261f6
    by Emil Velikov at 2023-10-29T17:50:21+00:00 
    meson: properly set the partial_dependency(es)

Our current loop creates a local dependency, only to discard it. Instead
it should be overriding the proper dependency variables, via set_variable()

As-is we end-up linking against the libraries, where some are discarded
by the linker, since meson uses `-Wl,--as-needed' by default.

With this fixed, issues like 2c33597245bb74f19104f0a858cd40e80b26991d
become apparent, instead of being masked out.

Fixes: b6d9448 ("meson: use include/compile_args dependencies")
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit 48f18f09dc7c68f41ce3c0a956dc7be4f2f6ed23)
  • 9669dd4b
    by Emil Velikov at 2023-10-29T18:29:46+00:00 
    clang-format: fix the post-merge commit range

Pick some tricks from holo - we need stricter CI check. More
importantly, once in post-merge we have other variables.

Namely: CI_COMMIT_BRANCH and CI_COMMIT_BEFORE_SHA

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit e006a34fa354d2dcb00e0666f04c05397b1a57ec)
  • d109dec5
    by Emil Velikov at 2024-07-30T18:54:07+01:00 
    wayland: restore support for pre wayland 1.20

The wl_proxy_marshal_{array_,}flags API was introduced with wayland
1.19.91, so guard on those when building waffle. Otherwise we'll fail to
dlsym the respective symbols at runtime.

Cc: Philipp Zabel <p.zabel@pengutronix.de>
Fixes: 2c33597 ("wayland: fix build against version 1.20")
Reported-by: Loïc Yhuel <loic.yhuel@softathome.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit d90b0cb5df892eb3569672882fba721093e92179)
  • d665128b
    by Emil Velikov at 2024-07-30T19:21:05+01:00 
    waffle: Bump version to 1.8.1

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
  • 49abc7cb
    by Emil Velikov at 2024-07-30T19:21:30+01:00 
    doc: Add release notes for 1.8.1

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
  • bb13c10f
    by Jordan Justen at 2024-08-09T14:25:49-07:00 
    Merge tag 'v1.8.1' into debian-unstable

Waffle 1.8.1
  • 9979c0a7
    by Jordan Justen at 2024-08-09T14:28:58-07:00 
    d/changelog: Start 1.8.1-1 changelog

Signed-off-by: Jordan Justen <jljusten@debian.org>
  • b079511d
    by Jordan Justen at 2024-08-09T14:30:56-07:00 
    d/control: Update Standards-Version to 4.7.0

Signed-off-by: Jordan Justen <jljusten@debian.org>
  • 98f229be
    by Jordan Justen at 2024-08-09T14:39:50-07:00 
    d/control: Change build-dep pkg-config to pkgconf

Signed-off-by: Jordan Justen <jljusten@debian.org>
  • 620554e2
    by Jordan Justen at 2024-08-09T14:41:13-07:00 
    d/changelog: Release 1.8.1-1 to unstable

Signed-off-by: Jordan Justen <jljusten@debian.org>

12 changed files:

Changes:

  • .editorconfig
    ... ... @@ -9,5 +9,8 @@ insert_final_newline = true
    9 9 
     indent_style = space
    10 10 
     indent_size = 4
    11 11
    12 
    -[meson*]
    12 
    +[*.yml]
    13 
    +indent_size = 2
    14 
    +
    15 
    +[{meson.build,meson_options.txt}]
    13 16 
     indent_size = 2

  • .gitlab-ci.yml
    ... ... @@ -8,6 +8,11 @@ include:
    8 8 
         ref: &ci-templates-sha 52dd4a94044449c8481d18dcdc221a3c636366d2
    9 9 
         file: '/templates/debian.yml'
    10 10
    11 
    +workflow:
    12 
    +  rules:
    13 
    +    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
    14 
    +    - if: $CI_PIPELINE_SOURCE == 'push'
    15 
    +
    11 16 
     stages:
    12 17 
       - container
    13 18 
       - style-check

  • .gitlab-ci/clang-format.sh
    ... ... @@ -5,7 +5,8 @@ set -euo pipefail
    5 5
    6 6 
     # The following approach was shamelessly copied from ci-fairy
    7 7 
     # https://gitlab.freedesktop.org/freedesktop/ci-templates/-/blob/master/tools/ci_fairy.py
    8 
    -if [[ "${CI-}" ]]; then
    8 
    +# CHANGES: Swap CI for CI_MERGE_REQUEST_ID, add CI_COMMIT_BRANCH.
    9 
    +if [[ ${CI_MERGE_REQUEST_ID-} ]]; then
    9 10 
         upstream="${FDO_UPSTREAM_REPO-}"
    10 11 
         if [[ ! "$upstream" ]]; then
    11 12 
             echo "$FDO_UPSTREAM_REPO not set, using local branches to compare"
    ... ... @@ -20,18 +21,31 @@ if [[ "${CI-}" ]]; then
    20 21 
             git remote add "$remote" "$url"
    21 22 
         fi
    22 23 
         git fetch "$remote"
    23 
    -    remote_prefix="$remote/"
    24 
    +
    25 
    +    # There are two types of MRs apparently
    26 
    +    if [[ ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA-} ]]; then
    27 
    +        echo "Using CI_MERGE_REQUEST_SOURCE_BRANCH_SHA"
    28 
    +        commit=$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA
    29 
    +    elif [[ ${CI_MERGE_REQUEST_DIFF_BASE_SHA-} ]]; then
    30 
    +        echo "Using CI_MERGE_REQUEST_DIFF_BASE_SHA"
    31 
    +        commit=$CI_MERGE_REQUEST_DIFF_BASE_SHA
    32 
    +    else
    33 
    +        echo "Looking like a MR, but CI variables are not set."
    34 
    +        echo "Using the default branch \"$CI_DEFAULT_BRANCH\"."
    35 
    +        commit="$remote/$CI_DEFAULT_BRANCH"
    36 
    +    fi
    37 
    +elif [[ ${CI_COMMIT_BRANCH-} ]]; then
    38 
    +    echo "Using CI_COMMIT_BEFORE_SHA"
    39 
    +    commit=$CI_COMMIT_BEFORE_SHA
    24 40 
     else
    25 
    -    remote_prefix=""
    41 
    +    commit="master"
    26 42 
     fi
    27 43
    28 
    -branch="${CI_MERGE_REQUEST_DIFF_BASE_SHA-}"
    29 
    -[[ $branch ]] || branch="master"
    30 44 
     # End of the shameless copy
    31 45
    32 46 
     # Older versions of clang-format like 6 and 7 print an annoying message.
    33 47 
     # "no modified files to format". Newer ones like 12 (earlier?), do not.
    34 
    -formatting_changes=$(git-clang-format --commit "$remote_prefix$branch" -q --diff | grep -v "no modified files to format" || true)
    48 
    +formatting_changes=$(git-clang-format --commit "$commit" -q --diff | grep -v "no modified files to format" || true)
    35 49 
     [[ "$formatting_changes" ]] || exit 0
    36 50
    37 51 
     echo "ERROR: Formatting issues detected"

  • Android.mk
    ... ... @@ -8,7 +8,7 @@ waffle_top := $(LOCAL_PATH)
    8 8 
     #
    9 9 
     waffle_major_version := 1
    10 10 
     waffle_minor_version := 8
    11 
    -waffle_patch_version := 0
    11 
    +waffle_patch_version := 1
    12 12 
     waffle_api_version := 0x0108
    13 13
    14 14 
     waffle_android_major_version := $(word 1, $(subst ., , $(PLATFORM_VERSION)))

  • cmake/Modules/WaffleDefineVersion.cmake
    ... ... @@ -40,7 +40,7 @@
    40 40 
     #
    41 41 
     set(waffle_major_version "1")
    42 42 
     set(waffle_minor_version "8")
    43 
    -set(waffle_patch_version "0")
    43 
    +set(waffle_patch_version "1")
    44 44
    45 45 
     set(waffle_version "${waffle_major_version}.${waffle_minor_version}.${waffle_patch_version}")
    46 46

  • debian/changelog
    1 
    +waffle (1.8.1-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release
    4 
    +  * d/control: Update Standards-Version to 4.7.0
    5 
    +  * d/control: Change build-dep pkg-config to pkgconf
    6 
    +
    7 
    + -- Jordan Justen <jljusten@debian.org>  Fri, 09 Aug 2024 14:40:30 -0700
    8 
    +
    1 9 
     waffle (1.8.0-2) unstable; urgency=medium
    2 10
    3 11 
       [ Simon McVittie ]

  • debian/control
    ... ... @@ -15,12 +15,12 @@ Build-Depends: bash-completion,
    15 15 
                    libwayland-dev,
    16 16 
                    libx11-xcb-dev,
    17 17 
                    meson,
    18 
    -               pkg-config,
    18 
    +               pkgconf,
    19 19 
                    python3,
    20 20 
                    python3-setuptools,
    21 21 
                    wayland-protocols,
    22 22 
                    xsltproc
    23 
    -Standards-Version: 4.6.2
    23 
    +Standards-Version: 4.7.0
    24 24 
     Rules-Requires-Root: no
    25 25 
     Homepage: https://waffle.freedesktop.org/
    26 26 
     Vcs-Git: https://salsa.debian.org/xorg-team/lib/waffle.git

  • doc/release-notes/waffle-1.8.1.md
    1 
    +
    2 
    +The Waffle bugfix release 1.8.1 is now available.
    3 
    +
    4 
    +What is new in this release:
    5 
    +  - Fix the meson build to avoid (over)linking against dependencies
    6 
    +  - Reinstate support for wayland/wayland-scanner older than 1.20
    7 
    +  - Run the clang-format CI stage as applicable, on the correct commits
    8 
    +
    9 
    +The source is available at:
    10 
    +
    11 
    +  https://waffle.freedesktop.org/files/release/waffle-1.8.1/waffle-1.8.1.tar.xz
    12 
    +
    13 
    +You can also get the current source directly from the git
    14 
    +repository. See https://waffle.freedesktop.org for details.
    15 
    +
    16 
    +----------------------------------------------------------------
    17 
    +
    18 
    +Changes since 1.8.0:
    19 
    +
    20 
    +Emil Velikov (11):
    21 
    +      release: Publish 1.8.0
    22 
    +      waffle: Bump post-release version to 1.8.90
    23 
    +      editorconfig: expand meson files, handle yml
    24 
    +      gitlab-ci: run clang-format only on MRs
    25 
    +      clang-format: correctly track the commit range in CI
    26 
    +      clang-format: pass correct reference to git-clang-format
    27 
    +      Revert "waffle: Bump post-release version to 1.8.90"
    28 
    +      meson: properly set the partial_dependency(es)
    29 
    +      clang-format: fix the post-merge commit range
    30 
    +      wayland: restore support for pre wayland 1.20
    31 
    +      waffle: Bump version to 1.8.1
    32 
    +

  • meson.build
    ... ... @@ -28,7 +28,7 @@
    28 28 
     project(
    29 29 
       'waffle',
    30 30 
       ['c'],
    31 
    -  version : '1.8.0',
    31 
    +  version : '1.8.1',
    32 32 
       license : 'BSD2',
    33 33 
       meson_version : '>= 0.53',
    34 34 
       # ubproject cmocka throws a Wclobbered ... make this a level=2 once it's fixed
    ... ... @@ -126,10 +126,17 @@ else
    126 126
    127 127 
       # We're interested only in the headers provided
    128 128 
       # FINISHME: make x11_xcb compile-only dependency
    129 
    -  _include_deps = [ dep_gl, dep_drm, dep_egl, dep_gbm, dep_wayland_client, dep_wayland_egl ]
    129 
    +  _include_deps = [
    130 
    +    ['gl', dep_gl],
    131 
    +    ['drm', dep_drm],
    132 
    +    ['egl', dep_egl],
    133 
    +    ['gbm', dep_gbm],
    134 
    +    ['wayland_client', dep_wayland_client],
    135 
    +    ['wayland_egl', dep_wayland_egl],
    136 
    +  ]
    130 137 
       foreach d : _include_deps
    131 
    -    if d.found()
    132 
    -      d = d.partial_dependency(compile_args : true)
    138 
    +    if d[1].found()
    139 
    +      set_variable('dep_' + d[0], d[1].partial_dependency(compile_args : true))
    133 140 
         endif
    134 141 
       endforeach
    135 142 
     endif

  • src/waffle/wayland/wayland_sym.h
    ... ... @@ -27,6 +27,9 @@ WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned,
    27 27 
                        (struct wl_proxy *proxy, uint32_t opcode,
    28 28 
                         const struct wl_interface *interface, uint32_t version, ...))
    29 29
    30 
    +#if WAYLAND_VERSION_MAJOR == 1 &&                                              \
    31 
    +    (WAYLAND_VERSION_MINOR > 19 ||                                             \
    32 
    +     (WAYLAND_VERSION_MINOR == 19 && WAYLAND_VERSION_MICRO >= 91))
    30 33 
     WAFFLE_WAYLAND_SYM(struct wl_proxy *,
    31 34 
                        wl_proxy_marshal_flags,
    32 35 
                        (struct wl_proxy * p,
    ... ... @@ -44,3 +47,4 @@ WAFFLE_WAYLAND_SYM(struct wl_proxy *,
    44 47 
                         uint32_t version,
    45 48 
                         uint32_t flags,
    46 49 
                         union wl_argument *args))
    50 
    +#endif

  • src/waffle/wayland/wayland_wrapper.h
    ... ... @@ -28,6 +28,7 @@
    28 28 
     #include <stdbool.h>
    29 29
    30 30 
     #include "wayland-util.h"
    31 
    +#include "wayland-version.h"
    31 32
    32 33 
     bool
    33 34 
     wayland_wrapper_init(void);
    ... ... @@ -65,7 +66,11 @@ struct wl_display;
    65 66 
     #define wl_proxy_marshal (*wfl_wl_proxy_marshal)
    66 67 
     #define wl_proxy_marshal_constructor (*wfl_wl_proxy_marshal_constructor)
    67 68 
     #define wl_proxy_marshal_constructor_versioned (*wfl_wl_proxy_marshal_constructor_versioned)
    69 
    +#if WAYLAND_VERSION_MAJOR == 1 &&                                              \
    70 
    +    (WAYLAND_VERSION_MINOR > 19 ||                                             \
    71 
    +     (WAYLAND_VERSION_MINOR == 19 && WAYLAND_VERSION_MICRO >= 91))
    68 72 
     #define wl_proxy_marshal_flags (*wfl_wl_proxy_marshal_flags)
    69 73 
     #define wl_proxy_marshal_array_flags (*wfl_wl_proxy_marshal_array_flags)
    74 
    +#endif
    70 75
    71 76 
     #include <wayland-client-protocol.h>

  • www/releases.html
    ... ... @@ -13,6 +13,16 @@
    13 13 
         <h2><a href="">"index.html">Waffle</a>/Releases</h2>
    14 14
    15 15 
         <ul>
    16 
    +      <li><a name="1.8.0" href="">"#1.8.0"><h3>1.8.0</h3></a>
    17 
    +        <ul>
    18 
    +          <li>Date: 2023-09-25</li>
    19 
    +          <li><a href="">"files/release-notes/waffle-1.8.0.md">Release Notes</a></li>
    20 
    +          <li><a href="">"files/release/waffle-1.8.0/waffle-1.8.0.tar.xz">waffle-1.8.0.tar.xz</a></li>
    21 
    +          <li><a href="">"files/release/waffle-1.8.0/waffle-1.8.0.tar.xz.asc" type="text/plain">waffle-1.8.0.tar.xz.asc</a></li>
    22 
    +          <li><a href="">"files/release/waffle-1.8.0/waffle-1.8.0.sha256sums" type="text/plain">waffle-1.8.0.sha256sums</a></li>
    23 
    +          <li><a href="">"files/release/waffle-1.8.0/waffle-1.8.0.sha256sums.asc" type="text/plain">waffle-1.8.0.sha256sums.asc</a></li>
    24 
    +        </ul>
    25 
    +      </li>
    16 26 
           <li><a name="1.7.2" href="">"#1.7.2"><h3>1.7.2</h3></a>
    17 27 
             <ul>
    18 28 
               <li>Date: 2023-03-05</li>

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: