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

[Git][xorg-team/app/apitrace][debian-unstable] 6 commits: Import 11.1+repack-1.1 NMU

Title: GitLab

Emilio Pozuelo Monfort pushed to branch debian-unstable at X Strike Force / app / apitrace

Commits:

  • 1fdf6efa
    by Emilio Pozuelo Monfort at 2025-01-24T15:56:22+01:00 
    Import 11.1+repack-1.1 NMU
  • 593c37e0
    by Emilio Pozuelo Monfort at 2025-01-24T15:59:25+01:00 
    Acknowledge 11.1+repack-1.2 NMU
  • 42d3d0a8
    by Emilio Pozuelo Monfort at 2025-01-24T16:00:46+01:00 
    Drop unused libqt5webkit5-dev build-dep
  • 0ae4aaad
    by Emilio Pozuelo Monfort at 2025-01-24T16:29:38+01:00 
    control: switch to pkgconf
  • e8df56b7
    by Emilio Pozuelo Monfort at 2025-01-24T16:30:29+01:00 
    control: switch libgl1-mesa-dev to libgl-dev
  • abcae68f
    by Emilio Pozuelo Monfort at 2025-01-24T16:30:36+01:00 
    Release to unstable

5 changed files:

Changes:

  • debian/changelog
    1 
    +apitrace (11.1+repack-2) unstable; urgency=medium
    2 
    +
    3 
    +  * Team upload.
    4 
    +  * Drop unused libqt5webkit5-dev build-dep. Closes: #1093729.
    5 
    +  * control: switch to pkgconf.
    6 
    +  * control: switch libgl1-mesa-dev to libgl-dev.
    7 
    +
    8 
    + -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 24 Jan 2025 16:30:33 +0100
    9 
    +
    10 
    +apitrace (11.1+repack-1.2) unstable; urgency=medium
    11 
    +
    12 
    +  * Non-maintainer upload.
    13 
    +  * Switch CMake check from native to pkgconfig for waffle-1. Closes:
    14 
    +    #1041081
    15 
    +
    16 
    + -- Dimitri John Ledkov <dimitri.ledkov@canonical.com>  Thu, 21 Sep 2023 23:42:42 +0100
    17 
    +
    18 
    +apitrace (11.1+repack-1.1) unstable; urgency=medium
    19 
    +
    20 
    +  * Non-maintainer upload.
    21 
    +  * debian/: Switch to libproc2-dev (Closes: #1024218)
    22 
    +
    23 
    + -- Sebastian Ramacher <sramacher@debian.org>  Sat, 24 Dec 2022 13:13:35 +0100
    24 
    +
    1 25 
     apitrace (11.1+repack-1) unstable; urgency=medium
    2 26
    3 27 
       [ David Heidelberg ]

  • debian/control
    ... ... @@ -7,19 +7,18 @@ Build-Depends:
    7 7 
      debhelper-compat (= 13),
    8 8 
      cmake,
    9 9 
      libbrotli-dev,
    10 
    - libgl1-mesa-dev,
    10 
    + libgl-dev,
    11 11 
      libegl1-mesa-dev,
    12 12 
      libgles2-mesa-dev,
    13 13 
      libwaffle-dev,
    14 14 
      qtbase5-dev,
    15 
    - libqt5webkit5-dev,
    16 
    - pkg-config,
    15 
    + pkgconf,
    17 16 
      python3,
    18 17 
      zlib1g-dev,
    19 18 
      libsnappy-dev,
    20 19 
      libpng-dev,
    21 20 
      libbsd-dev,
    22 
    - libprocps-dev,
    21 
    + libproc2-dev,
    23 22 
      libgtest-dev,
    24 23 
     Standards-Version: 4.6.0
    25 24 
     Homepage: https://apitrace.github.io

  • debian/patches/libproc-2.patch
    1 
    +Description: Build for libproc2
    2 
    + Replace libprocps with libproc2
    3 
    +Author: Craig Small <csmall@debian.org>
    4 
    +Reviewed-by: Craig Small <csmall@debian.org>
    5 
    +Last-Update: 2022-11-16
    6 
    +---
    7 
    +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    8 
    +Index: apitrace-11.1+repack/lib/os/os_memory.hpp
    9 
    +===================================================================
    10 
    +--- apitrace-11.1+repack.orig/lib/os/os_memory.hpp
    11 
    ++++ apitrace-11.1+repack/lib/os/os_memory.hpp
    12 
    +@@ -30,13 +30,46 @@
    13 
    +
    14 
    + #pragma once
    15 
    +
    16 
    +-#ifdef HAVE_READPROC_H
    17 
    ++#ifdef HAVE_LIBPROC2_PIDS_H
    18 
    ++#include <libproc2/pids.h>
    19 
    ++#elif defined(HAVE_READPROC_H)
    20 
    + #include <proc/readproc.h>
    21 
    + #endif
    22 
    +
    23 
    + namespace os {
    24 
    +
    25 
    +-#if defined(HAVE_READPROC_H)
    26 
    ++#ifdef HAVE_LIBPROC2_PIDS_H
    27 
    ++    inline long long
    28 
    ++    getVsize(void) {
    29 
    ++        enum pids_item Item[] = {PIDS_VSIZE_BYTES};
    30 
    ++        struct pids_info *info = NULL;
    31 
    ++        struct pids_stack *stack;
    32 
    ++        unsigned long value=0;
    33 
    ++        if (
    34 
    ++            (procps_pids_new(&info, Item, 1) == 0) &&
    35 
    ++            ((stack = fatal_proc_unmounted(info, 1)) == NULL)) {
    36 
    ++            value = PIDS_VAL(0, ul_int, stack, info);
    37 
    ++        }
    38 
    ++        procps_pids_unref(&info);
    39 
    ++        return value;
    40 
    ++    }
    41 
    ++
    42 
    ++    inline long long
    43 
    ++    getRss(void) {
    44 
    ++        enum pids_item Item[] = {PIDS_RSS};
    45 
    ++        struct pids_info *info = NULL;
    46 
    ++        struct pids_stack *stack;
    47 
    ++        unsigned long value=0;
    48 
    ++        if (
    49 
    ++            (procps_pids_new(&info, Item, 1) == 0) &&
    50 
    ++            ((stack = fatal_proc_unmounted(info, 1)) == NULL)) {
    51 
    ++            value = PIDS_VAL(0, ul_int, stack, info);
    52 
    ++        }
    53 
    ++        procps_pids_unref(&info);
    54 
    ++        return value;
    55 
    ++    }
    56 
    ++
    57 
    ++#elif defined(HAVE_READPROC_H)
    58 
    +
    59 
    +     inline long long
    60 
    +     getVsize(void) {
    61 
    +Index: apitrace-11.1+repack/CMakeLists.txt
    62 
    +===================================================================
    63 
    +--- apitrace-11.1+repack.orig/CMakeLists.txt
    64 
    ++++ apitrace-11.1+repack/CMakeLists.txt
    65 
    +@@ -490,6 +490,10 @@ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
    66 
    +     if (PKG_CONFIG_FOUND)
    67 
    +         pkg_check_modules (BROTLIDEC IMPORTED_TARGET libbrotlidec>=1.0.7)
    68 
    +         pkg_check_modules (BROTLIENC IMPORTED_TARGET libbrotlienc>=1.0.7)
    69 
    ++        pkg_check_modules (LIBPROC2 IMPORTED_TARGET libproc2)
    70 
    ++        if (LIBPROC2_FOUND)
    71 
    ++            add_definitions (-DHAVE_LIBPROC2_PIDS_H)
    72 
    ++        endif ()
    73 
    +     endif ()
    74 
    +
    75 
    +     find_package (GTest)
    76 
    +Index: apitrace-11.1+repack/lib/os/CMakeLists.txt
    77 
    +===================================================================
    78 
    +--- apitrace-11.1+repack.orig/lib/os/CMakeLists.txt
    79 
    ++++ apitrace-11.1+repack/lib/os/CMakeLists.txt
    80 
    +@@ -38,3 +38,8 @@ if (BUILD_TESTING)
    81 
    +     add_gtest (os_thread_test os_thread_test.cpp)
    82 
    +     target_link_libraries (os_thread_test os)
    83 
    + endif ()
    84 
    ++
    85 
    ++if (LIBPROC2_FOUND)
    86 
    ++    target_link_libraries(os PUBLIC PkgConfig::LIBPROC2)
    87 
    ++endif ()
    88 
    ++

  • debian/patches/series
    ... ... @@ -4,3 +4,5 @@ use-system-snappy
    4 4 
     highlight.py-fix1.patch
    5 5 
     highlight.py-fix2.patch
    6 6 
     disable-submodule-check.patch
    7 
    +libproc-2.patch
    8 
    +waffle-ftbfs.patch

  • debian/patches/waffle-ftbfs.patch
    1 
    +Description: Switch CMake check from native to pkgconfig for waffle-1.
    2 
    +Author: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
    3 
    +Bug-Debian: https://bugs.debian.org/1041081
    4 
    +
    5 
    +
    6 
    +Index: apitrace-11.1+repack/CMakeLists.txt
    7 
    +===================================================================
    8 
    +--- apitrace-11.1+repack.orig/CMakeLists.txt
    9 
    ++++ apitrace-11.1+repack/CMakeLists.txt
    10 
    +@@ -211,9 +211,11 @@ elseif (ENABLE_X11)
    11 
    +     endif ()
    12 
    + endif ()
    13 
    +
    14 
    ++find_package (PkgConfig)
    15 
    ++
    16 
    + if (ENABLE_EGL AND ENABLE_WAFFLE)
    17 
    +     # Use Waffle for eglretrace
    18 
    +-    find_package (Waffle REQUIRED)
    19 
    ++    pkg_check_modules (Waffle REQUIRED waffle-1)
    20 
    + endif ()
    21 
    +
    22 
    + if (ENABLE_EGL AND NOT ENABLE_X11)
    23 
    +@@ -486,7 +488,6 @@ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
    24 
    +         find_package (PNG)
    25 
    +     endif ()
    26 
    +
    27 
    +-    find_package (PkgConfig)
    28 
    +     if (PKG_CONFIG_FOUND)
    29 
    +         pkg_check_modules (BROTLIDEC IMPORTED_TARGET libbrotlidec>=1.0.7)
    30 
    +         pkg_check_modules (BROTLIENC IMPORTED_TARGET libbrotlienc>=1.0.7)

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

    Reply to: