From 1b2f78956b7d20d1326a54876cb336e3426f5c73 Mon Sep 17 00:00:00 2001 From: mglae Date: Mon, 16 Nov 2020 23:53:04 +0100 Subject: [PATCH 1/5] at-spi2-core: set dbus-daemon path to fix build --- .../addon-depends/chrome-depends/at-spi2-core/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk index 0b6b29a5e9..3784b3e677 100644 --- a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk +++ b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk @@ -12,7 +12,8 @@ PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst" PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi." PKG_MESON_OPTS_TARGET="-Denable_docs=false \ - -Denable-introspection=no" + -Denable-introspection=no \ + -Ddbus_daemon=/usr/bin/dbus-daemon" pre_configure_target() { LDFLAGS="$LDFLAGS -lXext" From c45e2ec1599b06dd558b5d6c2bac504b8af31fbb Mon Sep 17 00:00:00 2001 From: mglae Date: Tue, 24 Nov 2020 19:32:14 +0100 Subject: [PATCH 2/5] chrome: fix getting default audio device Setting "audiooutput.audiodevice" was not found any more because settings format has be changed to version 2. Read the setting value via Kodi json RPC. --- .../addons/browser/chrome/source/default.py | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/packages/addons/browser/chrome/source/default.py b/packages/addons/browser/chrome/source/default.py index 67a9607524..522ac38e7b 100644 --- a/packages/addons/browser/chrome/source/default.py +++ b/packages/addons/browser/chrome/source/default.py @@ -7,7 +7,7 @@ import sys import time import xbmcaddon import subprocess -from xml.dom.minidom import parse +import json sys.path.append('/usr/share/kodi/addons/service.libreelec.settings') @@ -59,21 +59,22 @@ def isRuning(pname): return False def getAudioDevice(): - try: - dom = parse("/storage/.kodi/userdata/guisettings.xml") - audiooutput=dom.getElementsByTagName('audiooutput') - for node in audiooutput: - dev = node.getElementsByTagName('audiodevice')[0].childNodes[0].nodeValue - if dev.startswith("ALSA:"): - dev = dev.split("ALSA:")[1] - if dev == "@": - return None - if dev.startswith("@:"): - dev = dev.split("@:")[1] - else: - # not ALSA + dev = json.loads(xbmc.executeJSONRPC(json.dumps({ + "jsonrpc": "2.0", + "method": "Settings.GetSettingValue", + "params": { + "setting": "audiooutput.audiodevice", + }, + "id": 1, + })))['result']['value'] + if dev.startswith("ALSA:"): + dev = dev.split("ALSA:")[1] + if dev == "@": return None - except: + if dev.startswith("@:"): + dev = dev.split("@:")[1] + else: + # not ALSA return None if dev.startswith("CARD="): dev = "plughw:" + dev From 3b7b13400e6b88966d2104ceb5f0a0359ed656a3 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 22 Nov 2020 23:02:22 +0100 Subject: [PATCH 3/5] chrome-libxkbcommon: initial package --- .../chrome-libxkbcommon/package.mk | 25 +++++++++++++++++++ 1 file changed, 25 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..b1ac532c88 --- /dev/null +++ b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk @@ -0,0 +1,25 @@ +# 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" +# linking failed with meson +PKG_TOOLCHAIN="autotools" + +PKG_CONFIGURE_OPTS_TARGET="--enable-docs \ + --disable-wayland \ + --disable-static \ + --enable-shared" + +unpack() { + mkdir -p $PKG_BUILD + tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.xz -C $PKG_BUILD +} + +makeinstall_target() { + : +} From dfb4009b56af161d8fc9ba725a7ed99190df6ada Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 22 Nov 2020 23:02:43 +0100 Subject: [PATCH 4/5] chrome: add libxkbcommon --- packages/addons/browser/chrome/package.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 9e103b9098..8f8debdaeb 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -9,8 +9,8 @@ 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 \ - libXcursor libxss nss pango scrnsaverproto unclutter" + 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" PKG_LONGDESC="Google Chrome Browser" @@ -83,6 +83,9 @@ addon() { # libXi cp -PL $(get_build_dir chrome-libXi)/.$TARGET_NAME/src/.libs/libXi.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib + # libxkbcommon + cp -PL $(get_build_dir chrome-libxkbcommon)/.$TARGET_NAME/.libs/libxkbcommon.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + # libXrender cp -PL $(get_build_dir chrome-libXrender)/.$TARGET_NAME/src/.libs/libXrender.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib From 09ad2a55ca3755f180c99ff5f1d993104e7147b7 Mon Sep 17 00:00:00 2001 From: mglae Date: Tue, 24 Nov 2020 19:33:26 +0100 Subject: [PATCH 5/5] browser.chrome: rev 104 --- packages/addons/browser/chrome/changelog.txt | 4 ++++ packages/addons/browser/chrome/package.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/browser/chrome/changelog.txt b/packages/addons/browser/chrome/changelog.txt index 99b8819c58..96fbadc998 100644 --- a/packages/addons/browser/chrome/changelog.txt +++ b/packages/addons/browser/chrome/changelog.txt @@ -1,3 +1,7 @@ +104 +- fix getting default audio device +- support for latest Chrome + 103 - add flag for dark mode diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 8f8debdaeb..de0d09e949 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -3,7 +3,7 @@ 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"