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

[Git][xorg-team/lib/waffle][debian-unstable] 5 commits: d/changelog: Start 1.8.0-2 changelog

Title: GitLab

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

Commits:

  • 76abeb10
    by Jordan Justen at 2023-10-20T00:14:45-07:00 
    d/changelog: Start 1.8.0-2 changelog

Signed-off-by: Jordan Justen <jljusten@debian.org>
  • 383c0cbe
    by Simon McVittie at 2023-10-21T03:18:47-07:00 
    d/control: Add missing dependency libwaffle-dev -> libdrm-dev

libwaffle-dev contains waffle-1.pc, which has a Requires on libdrm;
therefore libwaffle-dev should depend on the package that contains
libdrm.pc, which is libdrm-dev.

I've verified that this is sufficient to allow a simple test program
to be linked to libwaffle in an otherwise minimal container.

Fixes: 5ab2d5a2 "d/control: Upstream replaced libudev dep with libdrm"
Closes: #1053836
Signed-off-by: Simon McVittie <smcv@collabora.com>
  • bf98fe93
    by Simon McVittie at 2023-10-21T03:19:09-07:00 
    d/control: libwaffle-dev no longer needs to depend on libudev-dev

waffle-1.pc no longer depends on udev.pc.

Fixes: 5ab2d5a2 "d/control: Upstream replaced libudev dep with libdrm"
Signed-off-by: Simon McVittie <smcv@collabora.com>
  • c92e1c2d
    by Simon McVittie at 2023-10-21T03:19:14-07:00 
    d/tests: Add superficial autopkgtests

Even superficial tests like these are surprisingly good at detecting
packaging issues, like a missing dependency on libdrm-dev.

Signed-off-by: Simon McVittie <smcv@collabora.com>
  • 5cbdca10
    by Jordan Justen at 2023-10-21T03:22:58-07:00 
    d/changelog: Release 1.8.0-2 to unstable

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

5 changed files:

Changes:

  • debian/changelog
    1 
    +waffle (1.8.0-2) unstable; urgency=medium
    2 
    +
    3 
    +  [ Simon McVittie ]
    4 
    +  * d/control: Add missing dependency libwaffle-dev -> libdrm-dev
    5 
    +    (Closes: #1053836)
    6 
    +  * d/control: libwaffle-dev no longer needs to depend on libudev-dev
    7 
    +  * d/tests: Add superficial autopkgtests
    8 
    +
    9 
    + -- Jordan Justen <jljusten@debian.org>  Sat, 21 Oct 2023 03:21:58 -0700
    10 
    +
    1 11 
     waffle (1.8.0-1) unstable; urgency=medium
    2 12
    3 13 
       * New upstream release

  • debian/control
    ... ... @@ -40,10 +40,10 @@ Package: libwaffle-dev
    40 40 
     Architecture: any
    41 41 
     Multi-Arch: same
    42 42 
     Section: libdevel
    43 
    -Depends: libegl-dev,
    43 
    +Depends: libdrm-dev,
    44 
    +         libegl-dev,
    44 45 
              libgbm-dev,
    45 46 
              libgl-dev,
    46 
    -         libudev-dev,
    47 47 
              libwaffle-1-0 (= ${binary:Version}),
    48 48 
              libwayland-dev,
    49 49 
              libx11-xcb-dev,

  • debian/tests/build
    1 
    +#!/bin/sh
    2 
    +# Copyright © 2019-2023 Collabora Ltd.
    3 
    +# SPDX-License-Identifier: BSD-2-Clause
    4 
    +# (see debian/copyright)
    5 
    +
    6 
    +# Check that the library can be linked by using pkgconf in the most
    7 
    +# obvious way.
    8 
    +
    9 
    +set -e
    10 
    +set -u
    11 
    +set -x
    12 
    +
    13 
    +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
    14 
    +    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
    15 
    +else
    16 
    +    CROSS_COMPILE=
    17 
    +fi
    18 
    +
    19 
    +CC="${CROSS_COMPILE}gcc"
    20 
    +PKG_CONFIG="${CROSS_COMPILE}pkgconf"
    21 
    +
    22 
    +tempdir="$(mktemp -d)"
    23 
    +cd "$tempdir"
    24 
    +
    25 
    +cat > trivial.c <<'EOF'
    26 
    +#undef NDEBUG
    27 
    +#include <assert.h>
    28 
    +
    29 
    +#include <waffle.h>
    30 
    +
    31 
    +int main (void)
    32 
    +{
    33 
    +  assert (waffle_enum_to_string (WAFFLE_DONT_CARE) != NULL);
    34 
    +  return 0;
    35 
    +}
    36 
    +EOF
    37 
    +
    38 
    +# Deliberately word-splitting pkgconf output
    39 
    +# shellcheck disable=SC2046
    40 
    +"$CC" -o trivial trivial.c $("$PKG_CONFIG" --cflags --libs waffle-1)
    41 
    +test -x trivial
    42 
    +./trivial
    43 
    +
    44 
    +rm -fr "$tempdir"

  • debian/tests/control
    1 
    +Tests: build
    2 
    +Restrictions: allow-stderr, superficial
    3 
    +Depends:
    4 
    + build-essential,
    5 
    + libwaffle-dev,
    6 
    + pkgconf,
    7 
    +
    8 
    +Tests: info
    9 
    +Restrictions: superficial
    10 
    +Depends:
    11 
    + waffle-utils,

  • debian/tests/info
    1 
    +#!/bin/sh
    2 
    +
    3 
    +# Copyright © 2019-2021 Collabora Ltd.
    4 
    +# SPDX-License-Identifier: BSD-2-Clause
    5 
    +# (see debian/copyright)
    6 
    +
    7 
    +set -eu
    8 
    +
    9 
    +# We don't actually check for a GL context here, because there's no
    10 
    +# guarantee that the test system has working GL: we just check that
    11 
    +# an executable linked to the shared library can run at all.
    12 
    +wflinfo --help

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

    Reply to: