* [Buildroot] [PATCH v3 1/3] package/pkg-cargo: add support to bundle a custom Cargo.lock file
@ 2025-09-25 20:06 Thomas Devoogdt
2025-09-25 20:06 ` [Buildroot] [PATCH v3 2/3] package/cargo-c: add new package Thomas Devoogdt
2025-09-25 20:06 ` [Buildroot] [PATCH v3 3/3] package/librsvg: bump version to 2.61.1 Thomas Devoogdt
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Devoogdt @ 2025-09-25 20:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Fabrice Fontaine, Guillaume Chaye, Thomas Devoogdt
E.g. https://github.com/lu-zero/cargo-c/releases/tag/v0.10.15
Cargo-c releases a separate Cargo.lock file, but doesn't bundle
one in its normal .tar.gz code source target.
We can't use extra downloads/patches/... as cargo is a vendored
package, which is done quite early in the chain.
This patch allows us to define a custom Cargo.lock source.
Both a local bundled file and remote (only wget) file can be linked.
Usage:
<PKG>_CARGO_LOCK_FILE = <PKG>_PKGDIR/Cargo.lock
<PKG>_CARGO_LOCK_FILE = https://.../Cargo.lock
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
Superseeds https://patchwork.ozlabs.org/project/buildroot/patch/20250324173246.100112-1-guillaume.chaye@zeetim.com/.
v2: no change
v3: no change
---
package/pkg-cargo.mk | 5 +++++
support/download/cargo-post-process | 14 +++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk
index 47a6353f25..626e5ea472 100644
--- a/package/pkg-cargo.mk
+++ b/package/pkg-cargo.mk
@@ -195,6 +195,11 @@ ifneq ($$($(2)_SUBDIR),)
$(2)_DOWNLOAD_POST_PROCESS_OPTS += -m$$($(2)_SUBDIR)/Cargo.toml
endif
+# Allow to download a custom Cargo.lock file.
+ifneq ($$($(3)_CARGO_LOCK_FILE),)
+$(2)_DOWNLOAD_POST_PROCESS_OPTS += -l$$($(3)_CARGO_LOCK_FILE)
+endif
+
# Because we append vendored info, we can't rely on the values being empty
# once we eventually get into the generic-package infra. So, we duplicate
# the heuristics here
diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process
index b0e59ad74d..7913724fe2 100755
--- a/support/download/cargo-post-process
+++ b/support/download/cargo-post-process
@@ -11,11 +11,12 @@ if [ "${BR_CARGO_MANIFEST_PATH}" ]; then
fi
manifest=Cargo.toml
-while getopts "n:o:m:" OPT; do
+while getopts "n:o:m:l:" OPT; do
case "${OPT}" in
o) output="${OPTARG}";;
n) base_name="${OPTARG}";;
m) manifest="${OPTARG}";;
+ l) lockfile="${OPTARG}";;
:) error "option '%s' expects a mandatory argument\n" "${OPTARG}";;
\?) error "unknown option '%s'\n" "${OPTARG}";;
esac
@@ -31,6 +32,17 @@ post_process_unpack "${base_name}" "${output}"
# Do the Cargo vendoring
pushd "${base_name}" > /dev/null
+# Copy the custom lockfile path if given
+# TODO: use --lockfile-path once stable
+if [ -n "${lockfile}" ] ; then
+ rm -f "${lockfile}"
+ if [ -f "${lockfile}" ] ; then
+ cp "${lockfile}" Cargo.lock
+ else
+ ${WGET} "${lockfile}" -O Cargo.lock
+ fi
+fi
+
# Create the local .cargo/config.toml with vendor info
mkdir -p .cargo/
mkdir -p "${CARGO_HOME}"
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 2/3] package/cargo-c: add new package
2025-09-25 20:06 [Buildroot] [PATCH v3 1/3] package/pkg-cargo: add support to bundle a custom Cargo.lock file Thomas Devoogdt
@ 2025-09-25 20:06 ` Thomas Devoogdt
2025-09-25 20:06 ` [Buildroot] [PATCH v3 3/3] package/librsvg: bump version to 2.61.1 Thomas Devoogdt
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Devoogdt @ 2025-09-25 20:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Fabrice Fontaine, Guillaume Chaye, Thomas Devoogdt
From: Guillaume Chaye <guillaume.chaye@zeetim.com>
Cargo-c is a cargo applet to build and install C-ABI
compatible dynamic and static libraries.
It will be required for librsvg.
Signed-off-by: Guillaume Chaye <guillaume.chaye@zeetim.com>
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
Superseeds https://patchwork.ozlabs.org/project/buildroot/patch/20250324173246.100112-2-guillaume.chaye@zeetim.com/.
v2: no change
v3: no change
---
DEVELOPERS | 1 +
package/cargo-c/cargo-c.hash | 3 +++
package/cargo-c/cargo-c.mk | 15 +++++++++++++++
3 files changed, 19 insertions(+)
create mode 100644 package/cargo-c/cargo-c.hash
create mode 100644 package/cargo-c/cargo-c.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index fc561eb1ea..4f017cb03b 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1364,6 +1364,7 @@ F: package/rpi-rgb-led-matrix/
N: Guillaume Chaye <guillaume.chaye@zeetim.com>
F: package/sane-airscan/
+F: package/cargo-c/
N: Guillaume William Brs <guillaume.bressaix@gmail.com>
F: package/libnids/
diff --git a/package/cargo-c/cargo-c.hash b/package/cargo-c/cargo-c.hash
new file mode 100644
index 0000000000..64353c5628
--- /dev/null
+++ b/package/cargo-c/cargo-c.hash
@@ -0,0 +1,3 @@
+# locally computed
+sha256 757034535d42b345cd7b47c9d5e3624073332437805634153a19259439491be2 cargo-c-0.10.15-cargo4.tar.gz
+sha256 d69f24ad84ec2ade64c0b68bdb31b41170e997b158370342056918329cc9af1e LICENSE
diff --git a/package/cargo-c/cargo-c.mk b/package/cargo-c/cargo-c.mk
new file mode 100644
index 0000000000..1f9e1f786b
--- /dev/null
+++ b/package/cargo-c/cargo-c.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# cargo-c
+#
+################################################################################
+
+CARGO_C_VERSION = 0.10.15
+CARGO_C_SITE = $(call github,lu-zero,cargo-c,v$(CARGO_C_VERSION))
+CARGO_C_CARGO_LOCK_FILE = https://github.com/lu-zero/cargo-c/releases/download/v$(CARGO_C_VERSION)/Cargo.lock
+CARGO_C_LICENSE = MIT
+CARGO_C_LICENSE_FILES = LICENSE
+
+HOST_CARGO_C_DEPENDENCIES = host-libopenssl host-pkgconf
+
+$(eval $(host-cargo-package))
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 3/3] package/librsvg: bump version to 2.61.1
2025-09-25 20:06 [Buildroot] [PATCH v3 1/3] package/pkg-cargo: add support to bundle a custom Cargo.lock file Thomas Devoogdt
2025-09-25 20:06 ` [Buildroot] [PATCH v3 2/3] package/cargo-c: add new package Thomas Devoogdt
@ 2025-09-25 20:06 ` Thomas Devoogdt
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Devoogdt @ 2025-09-25 20:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Fabrice Fontaine, Guillaume Chaye, Thomas Devoogdt
This is a major update, which replaces autotools with meson.
The package uses cargo in the background, so copy the relevant
environment from the cargo package to get things working.
Note that the download URL has been changed because cargo
vendoring needs .tar.gz for it's post_process_unpack.
Announcement (for what it's worth):
- https://gitlab.gnome.org/GNOME/librsvg/-/releases/2.61.1
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
cat libgtk4.config
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_LIBGTK4=y
./utils/test-pkg -p libgtk4 -c libgtk4.config -a
arm-aarch64 [ 1/35]: OK
bootlin-aarch64-glibc [ 2/35]: OK
bootlin-arcle-hs38-uclibc [ 3/35]: SKIPPED
bootlin-armv5-uclibc [ 4/35]: SKIPPED
bootlin-armv7-glibc [ 5/35]: OK
bootlin-armv7m-uclibc [ 6/35]: SKIPPED
bootlin-armv7-musl [ 7/35]: OK
bootlin-m68k-5208-uclibc [ 8/35]: SKIPPED
bootlin-m68k-68040-uclibc [ 9/35]: SKIPPED
bootlin-microblazeel-uclibc [10/35]: SKIPPED
bootlin-mipsel32r6-glibc [11/35]: SKIPPED
bootlin-mipsel-uclibc [12/35]: SKIPPED
bootlin-openrisc-uclibc [13/35]: SKIPPED
bootlin-powerpc64le-power8-glibc [14/35]: OK
bootlin-powerpc-e500mc-uclibc [15/35]: SKIPPED
bootlin-riscv32-glibc [16/35]: SKIPPED
bootlin-riscv64-glibc [17/35]: SKIPPED
bootlin-riscv64-musl [18/35]: SKIPPED
bootlin-s390x-z13-glibc [19/35]: OK
bootlin-sh4-uclibc [20/35]: SKIPPED
bootlin-sparc64-glibc [21/35]: OK
bootlin-sparc-uclibc [22/35]: SKIPPED
bootlin-x86-64-glibc [23/35]: OK
bootlin-x86-64-musl [24/35]: OK
bootlin-x86-64-uclibc [25/35]: SKIPPED
bootlin-x86-i686-musl [26/35]: OK
bootlin-xtensa-uclibc [27/35]: SKIPPED
br-arm-basic [28/35]: SKIPPED
br-arm-full-nothread [29/35]: SKIPPED
br-arm-full-static [30/35]: SKIPPED
br-i386-pentium4-full [31/35]: SKIPPED
br-mips64-n64-full [32/35]: SKIPPED
br-mips64r6-el-hf-glibc [33/35]: SKIPPED
br-powerpc-603e-basic-cpp [34/35]: SKIPPED
br-powerpc64-power7-glibc [35/35]: OK
35 builds, 24 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
v2:
- added cargo vendoring for the DL phase
- disabled rsvg-convert by default to fix some compile errors
v3:
- Ensure that -cargo4 is part of the dl file.
---
...o_wrapper-fixup-the-usage-of-cargo_c.patch | 57 +++++++++++++++++
...r-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 -------------
...ake-building-rsvg-convert-selectable.patch | 59 ++++++++++++++++++
package/librsvg/librsvg.hash | 4 +-
package/librsvg/librsvg.mk | 61 +++++++++++++------
5 files changed, 160 insertions(+), 62 deletions(-)
create mode 100644 package/librsvg/0001-cargo_wrapper-fixup-the-usage-of-cargo_c.patch
delete mode 100644 package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch
create mode 100644 package/librsvg/0002-meson-make-building-rsvg-convert-selectable.patch
diff --git a/package/librsvg/0001-cargo_wrapper-fixup-the-usage-of-cargo_c.patch b/package/librsvg/0001-cargo_wrapper-fixup-the-usage-of-cargo_c.patch
new file mode 100644
index 0000000000..b9410f2ad7
--- /dev/null
+++ b/package/librsvg/0001-cargo_wrapper-fixup-the-usage-of-cargo_c.patch
@@ -0,0 +1,57 @@
+From 487eabde9ddac7571cbfdbccb33fd911ad4b17da Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas@devoogdt.com>
+Date: Sat, 20 Sep 2025 18:36:19 +0200
+Subject: [PATCH] cargo_wrapper: fixup the usage of cargo_c
+
+The wrong bin file was used, so add a second --cargo-c arg,
+which point to the right bin.
+
+Upstream: https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1136
+Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
+---
+ meson.build | 1 +
+ meson/cargo_wrapper.py | 9 ++++++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ed8989939..3e7387348 100644
+--- a/meson.build
++++ b/meson.build
+@@ -466,6 +466,7 @@ endif
+
+ cargo_wrapper_args = [
+ '--cargo', cargo.full_path(),
++ '--cargo-c', cargo_c.full_path(),
+ '--manifest-path', cargo_toml,
+ '--project-build-root', meson.project_build_root(),
+ '--prefix', get_option('prefix'),
+diff --git a/meson/cargo_wrapper.py b/meson/cargo_wrapper.py
+index 5f1761cd2..54293154a 100755
+--- a/meson/cargo_wrapper.py
++++ b/meson/cargo_wrapper.py
+@@ -20,6 +20,10 @@ parser.add_argument(
+ "--cargo", required=True, type=Path, help="Path to the cargo executable"
+ )
+
++parser.add_argument(
++ "--cargo-c", required=True, type=Path, help="Path to the cargo-c executable"
++)
++
+ parser.add_argument(
+ "--manifest-path", required=True, type=Path, help="Path to Cargo.toml"
+ )
+@@ -136,7 +140,10 @@ cargo_prefixes = [
+ (Path(args.prefix) / args.libdir).as_posix(),
+ ]
+
+-cargo_cmd = [Path(args.cargo).as_posix()]
++if args.command == "cbuild":
++ cargo_cmd = [Path(args.cargo_c).as_posix()]
++else:
++ cargo_cmd = [Path(args.cargo).as_posix()]
+
+ if args.toolchain_version is not None:
+ if args.build_triplet is not None:
+--
+2.43.0
+
diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch
deleted file mode 100644
index 761ff92605..0000000000
--- a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 19 Feb 2022 12:02:10 +0100
-Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR
-
-Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling
-gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and
-gdk-pixbuf.loaders on 'exotic' systems
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status:
-https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668]
----
- gdk-pixbuf-loader/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am
-index c3493736..de1f9641 100644
---- a/gdk-pixbuf-loader/Makefile.am
-+++ b/gdk-pixbuf-loader/Makefile.am
-@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \
- EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders
-
- gdk-pixbuf-loaders: Makefile
-- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
-+ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
-
- if CROSS_COMPILING
- RUN_QUERY_LOADER_TEST=false
-@@ -68,7 +68,7 @@ endif
- install-data-hook:
- @if $(RUN_QUERY_LOADER_TEST) ; then \
- $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \
-- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \
-+ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \
- else \
- echo "***" ; \
- echo "*** Warning: loaders.cache not built" ; \
---
-2.34.1
-
diff --git a/package/librsvg/0002-meson-make-building-rsvg-convert-selectable.patch b/package/librsvg/0002-meson-make-building-rsvg-convert-selectable.patch
new file mode 100644
index 0000000000..4f37a5eaaf
--- /dev/null
+++ b/package/librsvg/0002-meson-make-building-rsvg-convert-selectable.patch
@@ -0,0 +1,59 @@
+From 4b37621cd911def0157359322289c93cd56b05ba Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas@devoogdt.com>
+Date: Tue, 23 Sep 2025 21:42:44 +0200
+Subject: [PATCH] meson: make building rsvg-convert selectable
+
+E.g. if only the lib is needed.
+
+Upstream: https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1138
+Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
+---
+ meson.build | 6 +++++-
+ meson_options.txt | 7 +++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ed8989939..2642b92b5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -161,6 +161,8 @@ else
+ endif
+ build_vala = get_option('vala').require(meson.can_run_host_binaries() and vapigen_dep.found())
+
++build_rsvg_convert = get_option('rsvg-convert')
++
+ build_pixbuf_loader = get_option('pixbuf-loader').require(pixbuf_dep.found())
+
+ build_docs = get_option('docs')
+@@ -520,7 +522,9 @@ subdir('rsvg')
+ if build_tests
+ subdir('librsvg-c/tests-c')
+ endif
+-subdir('rsvg_convert')
++if build_rsvg_convert.allowed()
++ subdir('rsvg_convert')
++endif
+ if build_pixbuf_loader.allowed()
+ subdir('gdk-pixbuf-loader')
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index a044ae601..d7211192c 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,13 @@ option('pixbuf',
+ description: 'Build with GDK-Pixbuf'
+ )
+
++option('rsvg-convert',
++ type: 'feature',
++ value: 'enabled',
++ yield: true,
++ description: 'Build the rsvg-convert util to convert SVG files to other image formats'
++ )
++
+ option('pixbuf-loader',
+ type: 'feature',
+ value: 'auto',
+--
+2.43.0
+
diff --git a/package/librsvg/librsvg.hash b/package/librsvg/librsvg.hash
index 4eab8cdfba..c033682314 100644
--- a/package/librsvg/librsvg.hash
+++ b/package/librsvg/librsvg.hash
@@ -1,5 +1,3 @@
-# From https://download.gnome.org/sources/librsvg/2.50/librsvg-2.50.9.sha256sum
-sha256 518905fffa879b6c7f3db1aae961cf31333e0eadc7b4cdd4f531707868c54b53 librsvg-2.50.9.tar.xz
-
# Locally computed
+sha256 902edb88757cdb33bb2c660527768733a57487a8b6ed597ea492055f25345b13 librsvg-2.61.1-cargo4.tar.gz
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index 81a6667817..0a672b4d94 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -4,31 +4,56 @@
#
################################################################################
-LIBRSVG_VERSION_MAJOR = 2.50
-LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).9
-LIBRSVG_SITE = https://download.gnome.org/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
-LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz
+LIBRSVG_VERSION = 2.61.1
+LIBRSVG_SITE = https://gitlab.gnome.org/GNOME/librsvg/-/archive/$(LIBRSVG_VERSION)
+LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION)$(BR_FMT_VERSION_cargo).tar.gz
LIBRSVG_INSTALL_STAGING = YES
-LIBRSVG_CONF_ENV = \
- LIBS=$(TARGET_NLS_LIBS) \
- RUST_TARGET=$(RUSTC_TARGET_NAME)
-LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools
-HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no
-LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf host-rustc libglib2 libxml2 pango \
- $(TARGET_NLS_DEPENDENCIES)
-HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml2 host-pango host-rustc
LIBRSVG_LICENSE = LGPL-2.1+
LIBRSVG_LICENSE_FILES = COPYING.LIB
LIBRSVG_CPE_ID_VENDOR = gnome
-# We're patching gdk-pixbuf-loader/Makefile.am
-LIBRSVG_AUTORECONF = YES
+
+LIBRSVG_DOWNLOAD_POST_PROCESS = cargo
+LIBRSVG_DL_ENV = $(PKG_CARGO_ENV)
+
+LIBRSVG_CONF_ENV = $(PKG_CARGO_ENV)
+LIBRSVG_NINJA_ENV = $(PKG_CARGO_ENV)
+LIBRSVG_CONF_OPTS = \
+ -Dtriplet=$(RUSTC_TARGET_NAME) \
+ -Drsvg-convert=disabled \
+ -Dpixbuf-loader=disabled \
+ -Ddocs=disabled \
+ -Dtests=false
+LIBRSVG_DEPENDENCIES = \
+ host-cairo \
+ host-cargo-c \
+ host-libxml2 \
+ host-pango \
+ host-rustc \
+ cairo \
+ gdk-pixbuf \
+ libglib2 \
+ libxml2 \
+ pango \
+ $(TARGET_NLS_DEPENDENCIES)
+
+HOST_LIBRSVG_CONF_ENV = $(HOST_PKG_CARGO_ENV)
+HOST_LIBRSVG_NINJA_ENV = $(HOST_PKG_CARGO_ENV)
+HOST_LIBRSVG_CONF_OPTS = -Dintrospection=disabled
+HOST_LIBRSVG_DEPENDENCIES = \
+ host-cairo \
+ host-cargo-c \
+ host-gdk-pixbuf \
+ host-libglib2 \
+ host-libxml2 \
+ host-pango \
+ host-rustc
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-LIBRSVG_CONF_OPTS += --enable-introspection
+LIBRSVG_CONF_OPTS += -Dintrospection=enabled
LIBRSVG_DEPENDENCIES += gobject-introspection
else
-LIBRSVG_CONF_OPTS += --disable-introspection
+LIBRSVG_CONF_OPTS += -Dintrospection=disabled
endif
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+$(eval $(meson-package))
+$(eval $(host-meson-package))
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-25 20:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-25 20:06 [Buildroot] [PATCH v3 1/3] package/pkg-cargo: add support to bundle a custom Cargo.lock file Thomas Devoogdt
2025-09-25 20:06 ` [Buildroot] [PATCH v3 2/3] package/cargo-c: add new package Thomas Devoogdt
2025-09-25 20:06 ` [Buildroot] [PATCH v3 3/3] package/librsvg: bump version to 2.61.1 Thomas Devoogdt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox