Merge pull request #4791 from heitbaum/avahi

avahi: update to 0.8 and dependencies

packages/devel/gettext/package.mk

@@ -3,12 +3,13 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gettext"
-PKG_VERSION="0.20.2"
-PKG_SHA256="ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1"
+PKG_VERSION="0.21"
+PKG_SHA256="d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/s/gettext/"
-PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A program internationalization library and tools."
 
 PKG_CONFIGURE_OPTS_HOST="--disable-static --enable-shared \

packages/network/avahi/package.mk

@@ -1,13 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="avahi"
-PKG_VERSION="0.7"
-PKG_SHA256="fd45480cef0559b3eab965ea3ad4fe2d7a8f27db32c851a032ee0b487c378329"
+PKG_VERSION="0.8"
+PKG_SHA256="c15e750ef7c6df595fb5f2ce10cac0fee2353649600e6919ad08ae8871e4945f"
 PKG_LICENSE="GPL"
 PKG_SITE="http://avahi.org/"
 PKG_URL="https://github.com/lathiat/avahi/archive/v$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain expat libdaemon dbus connman"
+PKG_DEPENDS_TARGET="toolchain expat libdaemon dbus connman libevent gettext"
 PKG_LONGDESC="Service Discovery for Linux using mDNS/DNS-SD, compatible with Bonjour."
 PKG_TOOLCHAIN="configure"
 
@@ -19,6 +20,7 @@ PKG_CONFIGURE_OPTS_TARGET="py_cv_mod_gtk_=yes \
                            --disable-gobject \
                            --disable-qt3 \
                            --disable-qt4 \
+                           --disable-qt5 \
                            --disable-gtk \
                            --disable-gtk3 \
                            --enable-dbus \

packages/network/avahi/patches/avahi-0001_fix-autoconf.patch

@@ -1,11 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2016-02-18 21:17:52.000000000 +0100
-+++ b/configure.ac	2016-02-18 23:22:37.384875431 +0100
-@@ -417,7 +417,6 @@
- GETTEXT_PACKAGE=avahi
- AC_SUBST([GETTEXT_PACKAGE])
- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
--AM_GLIB_GNU_GETTEXT
- 
- avahilocaledir='${prefix}/${DATADIRNAME}/locale'
- AC_SUBST(avahilocaledir)

packages/network/libevent/package.mk

@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libevent"
+PKG_VERSION="2.1.12"
+PKG_SHA256="92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb"
+PKG_LICENSE="BSB-3c"
+PKG_SITE="https://github.com/libevent/libevent"
+PKG_URL="https://github.com/libevent/libevent/releases/download/release-$PKG_VERSION/libevent-$PKG_VERSION-stable.tar.gz"
+PKG_LONGDESC="Event notification library"
+PKG_DEPENDS_TARGET="toolchain openssl"
+PKG_TOOLCHAIN="cmake"
+
+PKG_CMAKE_OPTS_TARGET="-DCMAKE_CXX_EXTENSIONS:BOOL=OFF \
+                       -DCMAKE_CXX_STANDARD=14 \
+                       -DSPDLOG_BUILD_EXAMPLE=OFF \
+                       -DSPDLOG_BUILD_TESTS=OFF \
+                       -DSPDLOG_FMT_EXTERNAL=ON"