From 6177104eae2a051d272f5d43ce473cd943c99a71 Mon Sep 17 00:00:00 2001 From: Andreas Baierl Date: Thu, 14 Sep 2023 17:06:26 +0200 Subject: [PATCH] librsvg: simplify package.mk and use the onboard-rust Signed-off-by: Andreas Baierl --- packages/vdr/vdr-depends/_librsvg/package.mk | 55 ++-------------- .../_librsvg/patches/configure.patch | 59 ----------------- packages/vdr/vdr-depends/_rust/package.mk | 63 ------------------- .../vdr/vdr-depends/_rustup.rs/package.mk | 12 ---- 4 files changed, 4 insertions(+), 185 deletions(-) delete mode 100644 packages/vdr/vdr-depends/_librsvg/patches/configure.patch delete mode 100644 packages/vdr/vdr-depends/_rust/package.mk delete mode 100644 packages/vdr/vdr-depends/_rustup.rs/package.mk diff --git a/packages/vdr/vdr-depends/_librsvg/package.mk b/packages/vdr/vdr-depends/_librsvg/package.mk index ea7c052c..360af84e 100644 --- a/packages/vdr/vdr-depends/_librsvg/package.mk +++ b/packages/vdr/vdr-depends/_librsvg/package.mk @@ -1,61 +1,14 @@ # SPDX-License-Identifier: GPL-2.0-or-later PKG_NAME="_librsvg" -# PKG_VERSION="fb67478360b8b09a7b2cf52adedf95b02dd8c1df" -# PKG_SHA256="4717ea3b342036a7f8612085ea84f01f21bb3822cc7c19a067e9895a37c7cebc" -# PKG_URL="https://gitlab.gnome.org/GNOME/librsvg/-/archive/${PKG_VERSION}/librsvg-${PKG_VERSION}.tar.gz" - -PKG_VERSION="2.54" -PKG_SHA256="baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085" +PKG_VERSION="2.57" +PKG_SHA256="335fe2e0c2cbf1b7bf0668651224a23e135451f0b1793cd813649be2bffa74e8" PKG_LICENSE="LGPL 2.1" PKG_SITE="https://gitlab.gnome.org/GNOME/librsvg.git" PKG_URL="https://download.gnome.org/sources/librsvg/${PKG_VERSION}/librsvg-${PKG_VERSION}.0.tar.xz" PKG_BRANCH="main" -PKG_DEPENDS_HOST="" -PKG_DEPENDS_TARGET="toolchain cairo _rust gdk-pixbuf pango glib libjpeg-turbo libXft libpng jasper shared-mime-info tiff freetype" +PKG_DEPENDS_TARGET="toolchain cairo rust gdk-pixbuf pango glib libjpeg-turbo libXft libpng jasper shared-mime-info tiff freetype" PKG_DEPENDS_CONFIG="shared-mime-info pango gdk-pixbuf pango libXft" PKG_LONGDESC="A library to render SVG images to Cairo surfaces." -PKG_TOOLCHAIN="configure" -PKG_BUILD_FLAGS="" - -PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_z_zlibVersion=yes \ - --enable-shared \ - --disable-static \ - --with-sysroot=${SYSROOT_PREFIX} \ - --enable-introspection=no \ - --disable-pixbuf-loader \ - --prefix=/usr/local \ - --bindir=/usr/local/bin \ - --libdir=/usr/local/lib \ - --libexecdir=/usr/local/bin \ - --sbindir=/usr/local/sbin \ - " - -PKG_CONFIGURE_OPTS_HOST="-disable-static --enable-shared" - -if [ "${TARGET_ARCH}" = arm ]; then - PKG_CONFIGURE_OPTS_TARGET+=" --target=arm-unknown-linux-gnueabihf --host=arm-unknown-linux-gnueabihf " -elif [ "${TARGET_ARCH}" = aarch64 ]; then - PKG_CONFIGURE_OPTS_TARGET+=" --target=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu " -elif [ "${TARGET_ARCH}" = x86_64 ]; then - PKG_CONFIGURE_OPTS_TARGET+=" --target=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu " -fi; - -make_target() { - make -} - -pre_configure_target() { - cd $(get_build_dir _librsvg) - aclocal --install || exit 1 - autoreconf --verbose --force --install || exit 1 - - export CPPFLAGS="${CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include" - . "$(get_build_dir _rust)/cargo/env" - - export PKG_CONFIG_PATH="$(get_install_dir shared-mime-info)/usr/share/pkgconfig":"$(get_install_dir pango)/usr/lib/pkgconfig":"$(get_install_dir libXft)/usr/lib/pkgconfig":${PKG_CONFIG_PATH} - export PATH="${SYSROOT_PREFIX}/usr/local/bin":$PATH - export LDFLAGS="$(echo ${LDFLAGS} | sed -e "s|-Wl,--as-needed||") -L${SYSROOT_PREFIX}/usr/local/lib" - export CFLAGS="-I${SYSROOT}/usr/local/include" -} +PKG_CONFIGURE_OPTS_TARGET="--enable-introspection=no --disable-pixbuf-loader" diff --git a/packages/vdr/vdr-depends/_librsvg/patches/configure.patch b/packages/vdr/vdr-depends/_librsvg/patches/configure.patch deleted file mode 100644 index 8ee4ce17..00000000 --- a/packages/vdr/vdr-depends/_librsvg/patches/configure.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index a2ec6f42e22dee2ca8a7300c35ac243e9b4d3be3..83e73c385c3c6fe6e9633bd25ab5a625fd79e792 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,8 @@ --SUBDIRS = . gdk-pixbuf-loader tests doc win32 -+if HAVE_GI_DOCGEN -+RSVG_DOC = doc -+endif -+ -+SUBDIRS = . gdk-pixbuf-loader tests $(RSVG_DOC) win32 - - NULL = - -@@ -229,11 +233,20 @@ rsvg-convert$(EXEEXT): $(RSVG_CONVERT_BIN) - cd $(LIBRSVG_BUILD_DIR) && mv $(RSVG_CONVERT_BIN) rsvg-convert$(EXEEXT) - - rsvg-convert.1: rsvg-convert.rst -+if HAVE_RST2MAN - $(RST2MAN) $(top_srcdir)/rsvg-convert.rst rsvg-convert.1 -+else -+ @echo "========================================" -+ @echo "You need rst2man installed to make dist" -+ @echo "========================================" -+ @false -+endif - -+if HAVE_RST2MAN - man1_MANS = rsvg-convert.1 - - CLEANFILES += rsvg-convert.1 -+endif - - dist_doc_DATA = \ - COMPILING.md \ -diff --git a/configure.ac b/configure.ac -index 0bc556125bfd088e3458db120fe39807a261386b..594197f7a865b8175ee365f013ab3f38c5a65733 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -117,15 +117,17 @@ dnl Man page generator - - AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [no]) - AS_IF(test x$RST2MAN = xno, -- AC_MSG_ERROR([rst2man is required. Please install python3-docutils.]) -+ AC_MSG_WARN([rst2man not found - not building man pages]) - ) -+AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"]) - - dnl Gi-docgen - - AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no]) - AS_IF(test x$GI_DOCGEN = xno, -- AC_MSG_ERROR([gi-docgen is required. Please install it.]) -+ AC_MSG_WARN([gi-docgen not found - not building docs]) - ) -+AM_CONDITIONAL(HAVE_GI_DOCGEN, [test "x$GI_DOCGEN" != "xno"]) - - dnl =========================================================================== - diff --git a/packages/vdr/vdr-depends/_rust/package.mk b/packages/vdr/vdr-depends/_rust/package.mk deleted file mode 100644 index 71031b38..00000000 --- a/packages/vdr/vdr-depends/_rust/package.mk +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="_rust" -PKG_VERSION="1.60.0" -PKG_LICENSE="MIT" -PKG_SITE="https://www.rust-lang.org" -PKG_DEPENDS_TARGET="toolchain _rustup.rs" -PKG_LONGDESC="A systems programming language that prevents segfaults, and guarantees thread safety." -PKG_TOOLCHAIN="manual" - -make_target() { - export CARGO_HOME="${PKG_BUILD}/cargo" - export RUSTUP_HOME="${CARGO_HOME}" - export PATH="${CARGO_HOME}/bin:${PATH}" - case "${TARGET_ARCH}" in - aarch64) - RUST_TARGET_TRIPLE="aarch64-unknown-linux-gnu" - ;; - arm) - RUST_TARGET_TRIPLE="arm-unknown-linux-gnueabihf" - ;; - x86_64) - RUST_TARGET_TRIPLE="x86_64-unknown-linux-gnu" - ;; - esac - "$(get_build_dir _rustup.rs)/rustup-init.sh" \ - --default-toolchain none \ - --no-modify-path \ - --profile minimal \ - --target "${RUST_TARGET_TRIPLE}" \ - -y - cargo/bin/rustup toolchain install ${PKG_VERSION} --allow-downgrade --profile minimal --component clippy - cargo/bin/rustup target add ${RUST_TARGET_TRIPLE} - - cat <"${CARGO_HOME}/config" -[build] -target = "${RUST_TARGET_TRIPLE}" - -[target.${RUST_TARGET_TRIPLE}] -ar = "${AR}" -linker = "${CC}" -EOF - - cat <"${CARGO_HOME}/env" -export CARGO_HOME="${CARGO_HOME}" -export CARGO_TARGET_DIR="\${PKG_BUILD}/.\${TARGET_NAME}" -if [ "${HOSTTYPE}" = "${TARGET_ARCH}" ]; then - # Until target-applies-to-host is incorporated into stable this - # option is required for a matching host-target triple to be compiled - # by the cross compiler. Read more here. - # https://doc.rust-lang.org/cargo/reference/unstable.html#target-applies-to-host - export __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" - export CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" - export CARGO_TARGET_APPLIES_TO_HOST="false" -fi -export PATH="${CARGO_HOME}/bin:${PATH}" -export PKG_CONFIG_ALLOW_CROSS="1" -export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}" -export RUSTUP_HOME="${CARGO_HOME}" -unset CFLAGS -EOF -} diff --git a/packages/vdr/vdr-depends/_rustup.rs/package.mk b/packages/vdr/vdr-depends/_rustup.rs/package.mk deleted file mode 100644 index 36c005ef..00000000 --- a/packages/vdr/vdr-depends/_rustup.rs/package.mk +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="_rustup.rs" -PKG_VERSION="1.24.3" -PKG_SHA256="24a8cede4ccbbf45ab7b8de141d92f47d1881bb546b3b9180d5a51dc0622d0f6" -PKG_LICENSE="MIT" -PKG_SITE="https://www.rust-lang.org" -PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="The Rust toolchain installer." -PKG_TOOLCHAIN="manual"