From 8d0361f1dcdef18a7559260e354939c91ff07eb2 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 19:43:08 +0000 Subject: [PATCH 1/6] libc: add libidn2 as target depend Signed-off-by: Ian Leonard --- packages/virtual/libc/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk index 1f92ddaed2c..01f646d185c 100644 --- a/packages/virtual/libc/package.mk +++ b/packages/virtual/libc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain glibc tz" +PKG_DEPENDS_TARGET="toolchain glibc tz libidn2" PKG_DEPENDS_INIT="toolchain glibc:init" PKG_SECTION="virtual" PKG_LONGDESC="Meta package for installing various tools and libs needed for libc" From b5b939e8a999a3fd11a4fd13810eabeaba72ec67 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 20:10:44 +0000 Subject: [PATCH 2/6] libidn2: update to 2.1.1a, disable doc, static libs and idn2 binary Signed-off-by: Ian Leonard --- packages/textproc/libidn2/package.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/textproc/libidn2/package.mk b/packages/textproc/libidn2/package.mk index 2bd18e54fc6..1be8dd5728e 100644 --- a/packages/textproc/libidn2/package.mk +++ b/packages/textproc/libidn2/package.mk @@ -2,10 +2,18 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libidn2" -PKG_VERSION="2.1.0" -PKG_SHA256="032398dbaa9537af43f51a8d94e967e3718848547b1b2a4eb3138b20cad11d32" +PKG_VERSION="2.1.1a" +PKG_SHA256="57666bcf6ecf54230d7bac95c392379561954b57a673903aed4d3336b3048b72" PKG_LICENSE="LGPL3" PKG_SITE="https://www.gnu.org/software/libidn/" PKG_URL="http://ftpmirror.gnu.org/gnu/libidn/libidn2-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Free software implementation of IDNA2008, Punycode and TR46." + +PKG_CONFIGURE_OPTS_TARGET="--disable-doc \ + --enable-shared \ + --disable-static" + +post_makeinstall_target() { + safe_remove ${INSTALL}/usr/bin +} From db4c0fa053884a570f9e5fa789a7f84e48efae72 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 23:04:24 +0000 Subject: [PATCH 3/6] lftp: add libidn2 as depend Signed-off-by: Ian Leonard --- .../addons/addon-depends/network-tools-depends/lftp/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk index 6fe70955564..0b1d5c90c9e 100644 --- a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62" PKG_LICENSE="GPLv3" PKG_SITE="http://lftp.yar.ru/" PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_TARGET="toolchain readline openssl zlib" +PKG_DEPENDS_TARGET="toolchain readline openssl zlib libidn2" PKG_LONGDESC="A sophisticated ftp/http client, and a file transfer program supporting a number of network protocols." PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ From 011503324ec252f69f4cf5056b0aac0094df9f8c Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 23:04:55 +0000 Subject: [PATCH 4/6] ffmpeg-tools: use system libidn2 Signed-off-by: Ian Leonard --- packages/addons/tools/ffmpeg-tools/changelog.txt | 3 +++ packages/addons/tools/ffmpeg-tools/package.mk | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addons/tools/ffmpeg-tools/changelog.txt b/packages/addons/tools/ffmpeg-tools/changelog.txt index 349ed13ce17..a54f371b969 100644 --- a/packages/addons/tools/ffmpeg-tools/changelog.txt +++ b/packages/addons/tools/ffmpeg-tools/changelog.txt @@ -1,3 +1,6 @@ +106 +- Use system libidn2 + 105 - Removed FDK-AAC - Build with GNUTLS diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index bb28817857d..9a08a1c2030 100644 --- a/packages/addons/tools/ffmpeg-tools/package.mk +++ b/packages/addons/tools/ffmpeg-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="ffmpeg-tools" PKG_VERSION="1.0" -PKG_REV="105" +PKG_REV="106" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" @@ -25,7 +25,6 @@ addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir gmp)/.install_pkg/usr/lib/libgmp.so.10 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/libgnutls.so.30 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PL $(get_build_dir libidn2)/.install_pkg/usr/lib/libidn2.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libhogweed.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libnettle.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib } From 7be495fdc704c673d29127eaa85677bbfa39001c Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 23:05:30 +0000 Subject: [PATCH 5/6] tvheadend42: use system libidn2 Signed-off-by: Ian Leonard --- packages/addons/service/tvheadend42/changelog.txt | 3 +++ packages/addons/service/tvheadend42/package.mk | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt index ceffabb08c4..907458ec73c 100644 --- a/packages/addons/service/tvheadend42/changelog.txt +++ b/packages/addons/service/tvheadend42/changelog.txt @@ -1,3 +1,6 @@ +119 +- Use system libidn2 + 118 - update to 4.2.7-44 - fix tv_grab_file usage of & in urls diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index 16cb0f731fb..6b9524798d9 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -5,7 +5,7 @@ PKG_NAME="tvheadend42" PKG_VERSION="5c218500579d5bd1c1f7e7a4b5f7f0fb35baa626" PKG_SHA256="a9fe5a4c36aa185e3f0a73a709f0dc05794ae9c12f5d888985b559ff68a2508d" PKG_VERSION_NUMBER="4.2.7-44" -PKG_REV="118" +PKG_REV="119" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org" @@ -114,7 +114,6 @@ addon() { cp -PL $(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/libgnutls.so.30 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libnettle.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libhogweed.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PL $(get_build_dir libidn2)/.install_pkg/usr/lib/libidn2.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir gmp)/.install_pkg/usr/lib/libgmp.so.10 $ADDON_BUILD/$PKG_ADDON_ID/lib # set only version (revision will be added by buildsystem) From e8db57f8a9e21c4a852fcd9f41afed91d35ae9b8 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 14 Apr 2019 21:17:10 +0000 Subject: [PATCH 6/6] systemd: add depend on libidn2 Signed-off-by: Ian Leonard --- packages/sysutils/systemd/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 13618cd697a..d545fe27bae 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14" PKG_LICENSE="LGPL2.1+" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" PKG_URL="https://github.com/systemd/systemd/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy" +PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy libidn2" PKG_LONGDESC="A system and session manager for Linux, compatible with SysV and LSB init scripts." PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ @@ -31,7 +31,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ -Dlibcryptsetup=false \ -Dlibcurl=false \ -Dlibidn=false \ - -Dlibidn2=false \ + -Dlibidn2=true \ -Dlibiptc=false \ -Dqrencode=false \ -Dgcrypt=false \