Merge pull request #2007 from spycat88/textproc-cleanup

textproc: use upstream packages
This commit is contained in:
spycat88
2025-11-12 19:33:10 +00:00
committed by GitHub
14 changed files with 26 additions and 275 deletions

View File

@@ -6,7 +6,7 @@ PKG_VERSION="3.8"
PKG_LICENSE="GPLv2"
PKG_SITE="https://sourceforge.net/projects/vice-emu"
PKG_URL="${PKG_SITE}/files/releases/vice-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain xa:host SDL2 SDL2_image ncurses readline dos2unix:host"
PKG_DEPENDS_TARGET="toolchain xa:host SDL2 SDL2_image ncurses readline"
PKG_LONGDESC="Commodore 8-bit Emulator"
PKG_CONFIGURE_OPTS_TARGET+=" --disable-pdf-docs --enable-gtk3ui=no --without-alsa --with-pulse --enable-sdl2ui"

View File

@@ -1,14 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="dos2unix"
PKG_VERSION="7.5.1"
PKG_LICENSE="GPLv3"
PKG_SITE="https://sourceforge.net/projects/dos2unix"
PKG_URL="https://downloads.sourceforge.net/project/${PKG_NAME}/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="toolchain"
PKG_LONGDESC="Dos2Unix / Unix2Dos - Text file format converters"
post_unpack() {
sed -i "s|prefix = /usr|prefix = ${TOOLCHAIN}|" ${PKG_BUILD}/Makefile
}

View File

@@ -1,22 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="harfbuzz"
PKG_VERSION="8.3.0"
PKG_LICENSE="GPL"
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 \
-Ddocs=disabled \
-Dfreetype=enabled \
-Dglib=enabled \
-Dgobject=disabled \
-Dgraphite=disabled \
-Dicu=disabled \
-Dtests=disabled"

View File

@@ -1,15 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX)
PKG_NAME="jsoncpp"
PKG_VERSION="1.9.5"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/open-source-parsers/jsoncpp/"
PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="A C++ library for interacting with JSON."
PKG_TOOLCHAIN="cmake"
PKG_BUILD_FLAGS="+pic"
. ${ROOT}/packages/textproc/jsoncpp/package.mk
PKG_CMAKE_OPTS_TARGET="-DJSONCPP_WITH_TESTS=OFF"
PKG_MESON_OPTS_TARGET="-Dtests=false"

View File

@@ -1,14 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
# Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX)
PKG_NAME="libiconv"
PKG_VERSION="1.17"
PKG_LICENSE="GPL"
PKG_SITE="https://savannah.gnu.org/projects/libiconv/"
PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="A tool that converts from one character encoding to another through Unicode conversion."
PKG_BUILD_FLAGS="+pic"
. ${ROOT}/packages/textproc/libiconv/package.mk
PKG_CONFIGURE_OPTS_TARGET="--host=${TARGET_NAME} \
--build=${HOST_NAME} \
@@ -17,6 +10,7 @@ PKG_CONFIGURE_OPTS_TARGET="--host=${TARGET_NAME} \
--libdir=/usr/lib/iconv \
--sysconfdir=/etc \
--enable-shared \
--disable-statuc \
--disable-static \
--disable-nls \
--disable-extra-encodings \
--with-gnu-ld"

View File

@@ -1,37 +1,18 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX)
PKG_NAME="libxml2"
PKG_VERSION="2.11.5"
PKG_LICENSE="MIT"
PKG_SITE="http://xmlsoft.org"
PKG_URL="https://gitlab.gnome.org/GNOME/${PKG_NAME}/-/archive/v${PKG_VERSION}/${PKG_NAME}-v${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_HOST="zlib:host Python3:host"
PKG_DEPENDS_TARGET="toolchain zlib"
PKG_LONGDESC="The libxml package contains an XML library, which allows you to manipulate XML files."
PKG_TOOLCHAIN="autotools"
. ${ROOT}/packages/textproc/libxml2/package.mk
PKG_CONFIGURE_OPTS_ALL="ac_cv_header_ansidecl_h=no \
--enable-static \
--enable-shared \
--disable-silent-rules \
--enable-ipv6 \
--without-lzma"
PKG_CMAKE_OPTS_ALL="-DBUILD_SHARED_LIBS=ON \
-DLIBXML2_WITH_ICONV=OFF \
-DLIBXML2_WITH_ICU=OFF \
-DLIBXML2_WITH_LZMA=OFF \
-DLIBXML2_WITH_TESTS=OFF \
-DLIBXML2_WITH_THREADS=ON \
-DLIBXML2_WITH_ZLIB=ON"
PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_ALL} \
--with-zlib=${TOOLCHAIN} \
--with-python"
PKG_CMAKE_OPTS_HOST="${PKG_CMAKE_OPTS_ALL} \
-DLIBXML2_WITH_PYTHON=ON"
PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_ALL} \
--with-zlib=${SYSROOT_PREFIX}/usr \
--without-python \
--with-sysroot=${SYSROOT_PREFIX}"
post_makeinstall_target() {
sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xml2-config
rm -rf ${INSTALL}/usr/bin
rm -rf ${INSTALL}/usr/lib/xml2Conf.sh
}
PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_ALL} \
-DLIBXML2_WITH_PYTHON=OFF"

View File

@@ -1,38 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="libxslt"
PKG_VERSION="1.1.38"
PKG_LICENSE="MIT"
PKG_SITE="http://xmlsoft.org/xslt/"
PKG_URL="https://gitlab.gnome.org/GNOME/${PKG_NAME}/-/archive/v${PKG_VERSION}/${PKG_NAME}-v${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_HOST="libxml2:host"
PKG_DEPENDS_TARGET="toolchain libxml2"
PKG_LONGDESC="A XSLT C library."
PKG_BUILD_FLAGS="+pic"
PKG_TOOLCHAIN="autotools"
PKG_CONFIGURE_OPTS_HOST=" ac_cv_header_ansidecl_h=no \
ac_cv_header_xlocale_h=no \
--enable-static \
--disable-shared \
--without-python \
--with-libxml-prefix=${TOOLCHAIN} \
--without-crypto"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \
ac_cv_header_xlocale_h=no \
--enable-static \
--disable-shared \
--without-python \
--with-libxml-prefix=${SYSROOT_PREFIX}/usr \
--without-crypto"
post_makeinstall_target() {
sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xslt-config
rm -rf ${INSTALL}/usr/bin/xsltproc
rm -rf ${INSTALL}/usr/lib/xsltConf.sh
}

View File

@@ -1,13 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="nlohmann-json"
PKG_VERSION="3.11.3"
PKG_LICENSE="MIT"
PKG_SITE="https://nlohmann.github.io/json/"
PKG_URL="https://github.com/nlohmann/json/archive/v${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="JSON for Modern C++"
PKG_TOOLCHAIN="cmake"
PKG_CMAKE_OPTS_TARGET="-DJSON_BuildTests=OFF"

View File

@@ -1,18 +0,0 @@
# Pango Modules file
# Automatically generated file, do not edit
#
# ModulesPath = /usr/lib/pango/1.8.0/modules
#
/usr/lib/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
/usr/lib/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common:
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*

View File

@@ -1,6 +0,0 @@
[Pango]
ModuleFiles = /etc/pango/pango.modules
ModulesPath = /usr/lib/pango/1.8.0/modules
[PangoX]
AliasFiles = /etc/pango/pangox.aliases

View File

@@ -1,26 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pango"
PKG_VERSION="1.51.0"
PKG_LICENSE="GPL"
PKG_SITE="http://www.pango.org/"
PKG_URL="https://download.gnome.org/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain cairo freetype fontconfig fribidi glib json-glib harfbuzz"
PKG_DEPENDS_CONFIG="cairo"
PKG_LONGDESC="The Pango library for layout and rendering of internationalized text."
configure_package() {
# Build with X11 support
if [ ${DISPLAYSERVER} = "x11" ]; then
PKG_DEPENDS_TARGET+=" libX11 libXft"
PKG_DEPENDS_CONFIG+=" libXft"
PKG_BUILD_FLAGS="-sysroot"
fi
}
pre_configure_target() {
PKG_MESON_OPTS_TARGET="-Dgtk_doc=false \
-Dintrospection=disabled"
}

View File

@@ -1,40 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
PKG_NAME="xmlstarlet"
PKG_VERSION="1.6.1"
PKG_SHA256="15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca"
PKG_LICENSE="MIT"
PKG_SITE="http://xmlstar.sourceforge.net"
PKG_URL="http://netcologne.dl.sourceforge.net/project/xmlstar/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="libxml2:host libxslt:host"
PKG_DEPENDS_TARGET="toolchain libxml2 libxslt"
PKG_LONGDESC="XMLStarlet is a command-line XML utility which allows the modification and validation of XML documents."
PKG_CONFIGURE_OPTS_HOST=" ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
--enable-static-libs \
LIBXML_CONFIG=${TOOLCHAIN}/bin/xml2-config \
LIBXSLT_CONFIG=${TOOLCHAIN}/bin/xslt-config \
--with-libxml-include-prefix=${TOOLCHAIN}/include/libxml2 \
--with-libxml-libs-prefix=${TOOLCHAIN}/lib \
--with-libxslt-include-prefix=${TOOLCHAIN}/include \
--with-libxslt-libs-prefix=${TOOLCHAIN}/lib"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
--enable-static-libs \
LIBXML_CONFIG=${SYSROOT_PREFIX}/usr/bin/xml2-config \
LIBXSLT_CONFIG=${SYSROOT_PREFIX}/usr/bin/xslt-config \
--with-libxml-include-prefix=${SYSROOT_PREFIX}/usr/include/libxml2 \
--with-libxml-libs-prefix=${SYSROOT_PREFIX}/usr/lib \
--with-libxslt-include-prefix=${SYSROOT_PREFIX}/usr/include \
--with-libxslt-libs-prefix=${SYSROOT_PREFIX}/usr/lib"
post_makeinstall_host() {
ln -sf xml ${TOOLCHAIN}/bin/xmlstarlet
}
post_makeinstall_target() {
ln -sf xml ${INSTALL}/usr/bin/xmlstarlet
}

View File

@@ -1,37 +0,0 @@
Upstream-Status: Submitted [sourceforge]
From 75d789d0ea9716c9a9ae72f42a2fcfa907cf4a12 Mon Sep 17 00:00:00 2001
From: Matthieu Crapet <mcrapet@gmail.com>
Date: Mon, 30 Jun 2014 13:52:25 +0200
Subject: [PATCH] usage2c.awk: fix wrong basename regexp
Previously not matching with filename argument with absolute path.
Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
---
usage2c.awk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usage2c.awk b/usage2c.awk
index 94b897a..9aea212 100755
--- a/usage2c.awk
+++ b/usage2c.awk
@@ -6,13 +6,13 @@ BEGIN {
}
# text in src/foo-bar.txt results in
-# static const char foo_text[] = {
+# static const char foo_bar[] = {
# 't', 'h', 'e', ' ', 't', 'e', 'x', 't', ...
# }
length(command_name) == 0 {
command_name = FILENAME;
sub(/\.txt$/, "", command_name);
- sub(/^([^\/]+\/)*/, "", command_name);
+ sub(/^.*\//, "", command_name);
gsub(/-/, "_", command_name);
printf("static const char %s[] = {\n", command_name);
progs = 0;
--
2.0.0

View File

@@ -2,14 +2,13 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="wayland"
PKG_VERSION="1.23.1"
PKG_LICENSE="OSS"
PKG_SITE="https://wayland.freedesktop.org/"
PKG_DEPENDS_HOST="libffi:host expat:host libxml2:host"
PKG_URL="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PKG_VERSION}/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="libffi:host expat:host libxml2:host meson:host"
PKG_DEPENDS_TARGET="toolchain wayland:host libffi expat libxml2"
PKG_LONGDESC="a display server protocol"
PKG_VERSION="1.23.1"
PKG_SHA256="864fb2a8399e2d0ec39d56e9d9b753c093775beadc6022ce81f441929a81e5ed"
PKG_URL="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PKG_VERSION}/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_MESON_OPTS_HOST="-Dlibraries=true \
-Dscanner=true \