From 61ec1137feba03f85169870ff42c73288a59270e Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 22 Nov 2020 23:01:04 +0100 Subject: [PATCH 1/3] cups: build fix --- packages/addons/addon-depends/chrome-depends/cups/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/addon-depends/chrome-depends/cups/package.mk b/packages/addons/addon-depends/chrome-depends/cups/package.mk index 0f7d3d59be..a4952f069d 100644 --- a/packages/addons/addon-depends/chrome-depends/cups/package.mk +++ b/packages/addons/addon-depends/chrome-depends/cups/package.mk @@ -15,6 +15,7 @@ PKG_BUILD_FLAGS="+pic -sysroot" PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \ --disable-gssapi \ --disable-avahi \ + --disable-dnssd \ --disable-systemd \ --disable-launchd \ --disable-unit-tests" From 7b577cc6a69f9c1b31ac58cfbb4a8b2e6b3f0757 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 22 Nov 2020 23:02:22 +0100 Subject: [PATCH 2/3] chrome-libxkbcommon: initial package --- .../chrome-libxkbcommon/package.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk new file mode 100644 index 0000000000..4f7431c89e --- /dev/null +++ b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) + +. $(get_pkg_directory libxkbcommon)/package.mk + +PKG_NAME="chrome-libxkbcommon" +PKG_LONGDESC="libxkbcommon for chrome" +PKG_URL="" +PKG_DEPENDS_UNPACK+=" libxkbcommon" +PKG_BUILD_FLAGS="-sysroot" + +PKG_MESON_OPTS_TARGET="$PKG_MESON_OPTS_TARGET \ + -Denable-static=false \ + -Denable-shared=true" + +unpack() { + mkdir -p $PKG_BUILD + tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.xz -C $PKG_BUILD +} From 53db15507a625c861bb40fa46dcbcdfef851e6c5 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 22 Nov 2020 23:02:43 +0100 Subject: [PATCH 3/3] chrome: add libxkbcommon --- packages/addons/browser/chrome/changelog.txt | 3 +++ packages/addons/browser/chrome/package.mk | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/addons/browser/chrome/changelog.txt b/packages/addons/browser/chrome/changelog.txt index 94ec6551df..56e3eac0dd 100644 --- a/packages/addons/browser/chrome/changelog.txt +++ b/packages/addons/browser/chrome/changelog.txt @@ -1,3 +1,6 @@ +104 +- support for latest Chrome + 103 - fix getting default audio device diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index d6c51452f7..c51b8d0d8c 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -3,13 +3,13 @@ PKG_NAME="chrome" PKG_VERSION="1.0" -PKG_REV="103" +PKG_REV="104" PKG_ARCH="x86_64" PKG_LICENSE="Custom" PKG_SITE="http://www.google.com/chrome" PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo chrome-libXcomposite \ chrome-libXdamage chrome-libXfixes chrome-libXi chrome-libXrender \ - chrome-libXtst chrome-libxcb cups gdk-pixbuf gtk3 harfbuzz \ + chrome-libXtst chrome-libxcb chrome-libxkbcommon cups gdk-pixbuf gtk3 harfbuzz \ libXcursor libxss nss pango scrnsaverproto unclutter" PKG_SECTION="browser" PKG_SHORTDESC="Google Chrome Browser" @@ -83,6 +83,9 @@ addon() { # libXi cp -PL $(get_install_dir chrome-libXi)/usr/lib/libXi.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib + # libxkbcommon + cp -PL $(get_install_dir chrome-libxkbcommon)/usr/lib/libxkbcommon.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + # libXrender cp -PL $(get_install_dir chrome-libXrender)/usr/lib/libXrender.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib