From 8c29298943541ba4521a8c975f3eac3e217f416c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 03:32:27 +0000 Subject: [PATCH 01/19] nv-codec-headers: drop PKG_TOOLCHAIN hardcoding - already defaults to make --- packages/multimedia/nv-codec-headers/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/multimedia/nv-codec-headers/package.mk b/packages/multimedia/nv-codec-headers/package.mk index 5ef9f37546..f8d349f2eb 100644 --- a/packages/multimedia/nv-codec-headers/package.mk +++ b/packages/multimedia/nv-codec-headers/package.mk @@ -9,7 +9,6 @@ PKG_SITE="https://github.com/FFmpeg/nv-codec-headers" PKG_URL="https://github.com/FFmpeg/nv-codec-headers/archive/n${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="FFmpeg version of headers required to interface with Nvidias codec APIs." -PKG_TOOLCHAIN="make" makeinstall_target(){ make DESTDIR=${SYSROOT_PREFIX} PREFIX=/usr install From 888e522ea88e0c0c16c9c9db900f254d09c7e883 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 03:19:38 +0000 Subject: [PATCH 02/19] spdlog: drop PKG_TOOLCHAIN hardcoding - already defaults to cmake --- packages/devel/spdlog/package.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/devel/spdlog/package.mk b/packages/devel/spdlog/package.mk index 046b3a314c..2acc277a3e 100644 --- a/packages/devel/spdlog/package.mk +++ b/packages/devel/spdlog/package.mk @@ -9,6 +9,9 @@ PKG_SITE="https://github.com/gabime/spdlog" PKG_URL="https://github.com/gabime/spdlog/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libfmt" PKG_LONGDESC="Very fast, header only, C++ logging library." -PKG_TOOLCHAIN="cmake" -PKG_CMAKE_OPTS_TARGET="-DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS:BOOL=OFF -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_BUILD_TESTS=OFF" +PKG_CMAKE_OPTS_TARGET="-DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \ + -DSPDLOG_FMT_EXTERNAL=ON \ + -DSPDLOG_BUILD_EXAMPLE=OFF \ + -DSPDLOG_BUILD_TESTS=OFF" From f13ca1082df6608896e366dae5a71453acf69431 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 03:17:22 +0000 Subject: [PATCH 03/19] pcre2: drop PKG_TOOLCHAIN hardcoding - already defaults to cmake --- packages/devel/pcre2/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/devel/pcre2/package.mk b/packages/devel/pcre2/package.mk index d7f8daa546..f9c223b514 100644 --- a/packages/devel/pcre2/package.mk +++ b/packages/devel/pcre2/package.mk @@ -10,7 +10,6 @@ PKG_URL="https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PKG_VER PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A set of functions that implement regular expression pattern matching using the same syntax." -PKG_TOOLCHAIN="cmake" PKG_BUILD_FLAGS="+pic" PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=OFF \ From b8683e7c9bb68c3225c848ef29bf29bedb8aed4c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 03:10:38 +0000 Subject: [PATCH 04/19] vadumpcaps: drop PKG_TOOLCHAIN hardcoding - already defaults to make --- packages/debug/vadumpcaps/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/debug/vadumpcaps/package.mk b/packages/debug/vadumpcaps/package.mk index 26751f7075..8d7596510d 100644 --- a/packages/debug/vadumpcaps/package.mk +++ b/packages/debug/vadumpcaps/package.mk @@ -9,7 +9,6 @@ PKG_SITE="https://github.com/fhvwy/vadumpcaps" PKG_URL="https://github.com/fhvwy/vadumpcaps/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="This is a utility to show all capabilities of a VAAPI device/driver." PKG_DEPENDS_TARGET="toolchain libva" -PKG_TOOLCHAIN="make" makeinstall_target() { mkdir -p ${INSTALL}/usr/bin From f7d07553d3903f1e2ea8380c1fdb627e2f6c160b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 03:04:35 +0000 Subject: [PATCH 05/19] lz4: drop PKG_TOOLCHAIN hardcoding - already defaults to cmake --- packages/compress/lz4/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk index a81f108163..03537b276f 100644 --- a/packages/compress/lz4/package.mk +++ b/packages/compress/lz4/package.mk @@ -10,7 +10,6 @@ PKG_URL="https://github.com/lz4/lz4/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="lz4 data compressor/decompressor" -PKG_TOOLCHAIN="cmake" configure_package() { PKG_CMAKE_SCRIPT="${PKG_BUILD}/build/cmake/CMakeLists.txt" From ac9efca5442f778dc6153664ffbd6fe3b33b50b9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:55:45 +0000 Subject: [PATCH 06/19] libva: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/multimedia/libva/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk index 66496da69e..109e65a7f7 100644 --- a/packages/multimedia/libva/package.mk +++ b/packages/multimedia/libva/package.mk @@ -10,7 +10,6 @@ PKG_LICENSE="GPL" PKG_SITE="https://01.org/linuxmedia" PKG_URL="https://github.com/intel/libva/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Libva is an implementation for VA-API (VIdeo Acceleration API)." -PKG_TOOLCHAIN="meson" if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm" From 7428a1b3b4327542f3900629cbe079bdb8d42e02 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:54:45 +0000 Subject: [PATCH 07/19] intel-vaapi-driver: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/multimedia/intel-vaapi-driver/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk index 3bfe5e1d75..290bc07ddb 100644 --- a/packages/multimedia/intel-vaapi-driver/package.mk +++ b/packages/multimedia/intel-vaapi-driver/package.mk @@ -11,7 +11,6 @@ PKG_SITE="https://01.org/linuxmedia" PKG_URL="https://github.com/intel/intel-vaapi-driver/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libva libdrm" PKG_LONGDESC="intel-vaapi-driver: VA-API user mode driver for Intel GEN Graphics family" -PKG_TOOLCHAIN="meson" if [ "${DISPLAYSERVER}" = "x11" ]; then DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_wayland=no" From 4f31a7497caec396425573838349042935c888d0 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:53:53 +0000 Subject: [PATCH 08/19] mesa: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/graphics/mesa/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 9cbc12d2c7..81a79449eb 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -10,7 +10,6 @@ PKG_SITE="http://www.mesa3d.org/" PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain expat libdrm Mako:host" PKG_LONGDESC="Mesa is a 3-D graphics library with an API." -PKG_TOOLCHAIN="meson" get_graphicdrivers From 7633827cbb9c639787b1e5ac6b99c7a3d6ba0c52 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:53:04 +0000 Subject: [PATCH 09/19] libdrm: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/graphics/libdrm/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk index b8c7ce8592..4b9415ef0b 100644 --- a/packages/graphics/libdrm/package.mk +++ b/packages/graphics/libdrm/package.mk @@ -10,7 +10,6 @@ PKG_SITE="https://dri.freedesktop.org" PKG_URL="https://dri.freedesktop.org/libdrm/libdrm-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libpciaccess" PKG_LONGDESC="The userspace interface library to kernel DRM services." -PKG_TOOLCHAIN="meson" get_graphicdrivers From 4d4ca4367bda68a0e67a1699e846a8b1765acb2f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:52:11 +0000 Subject: [PATCH 10/19] harfbuzz: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/graphics/harfbuzz/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/graphics/harfbuzz/package.mk b/packages/graphics/harfbuzz/package.mk index 00e62ef691..6915571900 100644 --- a/packages/graphics/harfbuzz/package.mk +++ b/packages/graphics/harfbuzz/package.mk @@ -10,7 +10,6 @@ PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" PKG_URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PKG_VERSION}/harfbuzz-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain cairo freetype glib" PKG_LONGDESC="HarfBuzz is an OpenType text shaping engine." -PKG_TOOLCHAIN="meson" PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \ -Dcairo=enabled \ From c9754ce01406065356dedf2de64da93940319d52 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:48:37 +0000 Subject: [PATCH 11/19] glib: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/devel/glib/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index e4558b5c72..2ba667182e 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -11,7 +11,6 @@ PKG_URL="https://download.gnome.org/sources/glib/$(get_pkg_version_maj_min)/${PK PKG_DEPENDS_HOST="libffi:host pcre2:host Python3:host meson:host ninja:host" PKG_DEPENDS_TARGET="toolchain pcre2 zlib libffi Python3:host util-linux" PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation." -PKG_TOOLCHAIN="meson" PKG_MESON_OPTS_HOST="-Ddefault_library=static \ -Dinstalled_tests=false \ From 938548909151b279d3e552ecd6f3669b0059e10e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:47:38 +0000 Subject: [PATCH 12/19] fribidi: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/devel/fribidi/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk index 00fc4ca52a..7c858cc3fa 100644 --- a/packages/devel/fribidi/package.mk +++ b/packages/devel/fribidi/package.mk @@ -10,7 +10,6 @@ PKG_SITE="http://fribidi.freedesktop.org/" PKG_URL="https://github.com/fribidi/fribidi/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A bidirectional algorithm library." -PKG_TOOLCHAIN="meson" PKG_BUILD_FLAGS="+pic" PKG_MESON_OPTS_TARGET="-Ddeprecated=false \ From 01de633f81d5a7645f05c73cb887e3843f77cdb0 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:43:02 +0000 Subject: [PATCH 13/19] xorg-intel-gpu-tools: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/debug/xorg-intel-gpu-tools/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/debug/xorg-intel-gpu-tools/package.mk b/packages/debug/xorg-intel-gpu-tools/package.mk index bafd429fa6..1f68b31e0c 100644 --- a/packages/debug/xorg-intel-gpu-tools/package.mk +++ b/packages/debug/xorg-intel-gpu-tools/package.mk @@ -9,7 +9,6 @@ PKG_DEPENDS_TARGET="toolchain cairo procps-ng" PKG_SITE="https://gitlab.freedesktop.org/drm/igt-gpu-tools" PKG_URL="https://www.x.org/releases/individual/app/igt-gpu-tools-${PKG_VERSION}.tar.xz" PKG_LONGDESC="Test suite and tools for DRM/KMS drivers" -PKG_TOOLCHAIN="meson" PKG_MESON_OPTS_TARGET="-Dchamelium=disabled \ -Ddocs=disabled \ From 9d5b179fad622e6b3bd791e8654e7d3707e3a640 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:41:09 +0000 Subject: [PATCH 14/19] libva-utils: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/debug/libva-utils/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/debug/libva-utils/package.mk b/packages/debug/libva-utils/package.mk index f210202545..45a25f607c 100644 --- a/packages/debug/libva-utils/package.mk +++ b/packages/debug/libva-utils/package.mk @@ -8,7 +8,6 @@ PKG_LICENSE="GPL" PKG_SITE="https://github.com/01org/libva-utils" PKG_URL="https://github.com/intel/libva-utils/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Libva-utils is a collection of tests for VA-API (VIdeo Acceleration API)" -PKG_TOOLCHAIN="meson" if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET="toolchain libva libdrm libX11" From 0b00ecea057d0429d8b84218e45ca4e349023542 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:38:37 +0000 Subject: [PATCH 15/19] zstd: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/compress/zstd/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk index 7adfcc06be..1c583d6d36 100644 --- a/packages/compress/zstd/package.mk +++ b/packages/compress/zstd/package.mk @@ -10,7 +10,6 @@ PKG_URL="https://github.com/facebook/zstd/releases/download/v${PKG_VERSION}/${PK PKG_DEPENDS_HOST="ccache:host meson:host ninja:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A fast real-time compression algorithm." -PKG_TOOLCHAIN="meson" configure_package() { PKG_MESON_SCRIPT="${PKG_BUILD}/build/meson/meson.build" From 5e79fd633a5286199c8c6d8e7aac0e6e1066e1b2 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:32:28 +0000 Subject: [PATCH 16/19] pipewire: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/audio/pipewire/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/audio/pipewire/package.mk b/packages/audio/pipewire/package.mk index d5c20f6aab..109b1fb207 100644 --- a/packages/audio/pipewire/package.mk +++ b/packages/audio/pipewire/package.mk @@ -9,7 +9,6 @@ PKG_SITE="https://pipewire.org" PKG_URL="https://github.com/PipeWire/pipewire/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libpthread-stubs dbus ncurses alsa-lib systemd libsndfile libusb" PKG_LONGDESC="PipeWire is a server and user space API to deal with multimedia pipeline" -PKG_TOOLCHAIN="meson" if [ "${BLUETOOTH_SUPPORT}" = "yes" ]; then PKG_DEPENDS_TARGET+=" bluez sbc ldacBT libfreeaptx" From 195d74e001d5b2580bd80844b34b48f81e189a75 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:31:35 +0000 Subject: [PATCH 17/19] mpd-mpc: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/addons/addon-depends/mpd-mpc/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/addons/addon-depends/mpd-mpc/package.mk b/packages/addons/addon-depends/mpd-mpc/package.mk index d97d1cc827..44b0d5d716 100644 --- a/packages/addons/addon-depends/mpd-mpc/package.mk +++ b/packages/addons/addon-depends/mpd-mpc/package.mk @@ -9,5 +9,4 @@ PKG_SITE="https://www.musicpd.org" PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libiconv libmpdclient" PKG_LONGDESC="Command-line client for MPD." -PKG_TOOLCHAIN="meson" PKG_BUILD_FLAGS="-sysroot" From e49cc9525127b6bffa75c9eba1c3a142871b8b1f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:28:42 +0000 Subject: [PATCH 18/19] gtk3: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/addons/addon-depends/chrome-depends/gtk3/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk index 305a4c2ccc..ecf633003a 100644 --- a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk @@ -11,7 +11,6 @@ PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${ PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango libxkbcommon" PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info" PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System." -PKG_TOOLCHAIN="meson" PKG_BUILD_FLAGS="-sysroot" PKG_MESON_OPTS_TARGET="-Dbroadway_backend=false \ From ec86af32318099a349caaf4541193ba91d2889d9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:23:34 +0000 Subject: [PATCH 19/19] libevdev: drop PKG_TOOLCHAIN hardcoding - was already meson --- packages/sysutils/libevdev/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/sysutils/libevdev/package.mk b/packages/sysutils/libevdev/package.mk index 1258d316ed..b204d0f9aa 100644 --- a/packages/sysutils/libevdev/package.mk +++ b/packages/sysutils/libevdev/package.mk @@ -11,7 +11,6 @@ PKG_URL="http://www.freedesktop.org/software/libevdev/${PKG_NAME}-${PKG_VERSION} PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="libevdev is a wrapper library for evdev devices." PKG_BUILD_FLAGS="+pic" -PKG_TOOLCHAIN="meson" PKG_MESON_OPTS_TARGET=" \ -Ddefault_library=shared \