From 69d48eea6156fc6a41a60a50952c7577f63cd1a5 Mon Sep 17 00:00:00 2001 From: jc Date: Sun, 19 Jun 2016 17:10:10 +0200 Subject: [PATCH 1/2] unclutter: initial package --- .../addons/addon-depends/unclutter/package.mk | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 packages/addons/addon-depends/unclutter/package.mk diff --git a/packages/addons/addon-depends/unclutter/package.mk b/packages/addons/addon-depends/unclutter/package.mk new file mode 100644 index 0000000000..5484ad2c37 --- /dev/null +++ b/packages/addons/addon-depends/unclutter/package.mk @@ -0,0 +1,43 @@ +################################################################################ +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2016 Team LibreELEC +# +# LibreELEC is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# LibreELEC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LibreELEC. If not, see . +################################################################################ + +PKG_NAME="unclutter" +PKG_VERSION="1.09" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="Public Domain" +PKG_SITE="https://sourceforge.net/projects/unclutter/" +PKG_URL="http://jaist.dl.sourceforge.net/project/unclutter/unclutter/source_$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS_TARGET="toolchain libX11" +PKG_PRIORITY="optional" +PKG_SECTION="x11" +PKG_SHORTDESC="Unclutter: Hide X11 Cursor" +PKG_LONGDESC="Unclutter runs in the background of an X11 session and after a specified period of inactivity hides the cursor from display. When the cursor is moved its display is restored. Users may specify specific windows to be ignored by unclutter." + +PKG_IS_ADDON="no" +PKG_AUTORECONF="no" + +make_target() { + rm -f Makefile + LDFLAGS="$LDFLAGS -lX11" $MAKE unclutter +} + +makeinstall_target() { + mkdir -p .install_pkg/usr/bin + install -m 755 unclutter .install_pkg/usr/bin/ +} From 60477340183aba053f9ba99383f6094316a636f4 Mon Sep 17 00:00:00 2001 From: jc Date: Sun, 19 Jun 2016 19:39:53 +0200 Subject: [PATCH 2/2] chromium: add unclutter --- packages/addons/browser/chromium/changelog.txt | 3 +++ packages/addons/browser/chromium/package.mk | 7 +++++-- .../addons/browser/chromium/source/bin/chromium | 16 ++++++++++++++++ .../resources/language/English/strings.xml | 1 + .../chromium/source/resources/settings.xml | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/packages/addons/browser/chromium/changelog.txt b/packages/addons/browser/chromium/changelog.txt index 9d4e565247..26e521c1d6 100644 --- a/packages/addons/browser/chromium/changelog.txt +++ b/packages/addons/browser/chromium/changelog.txt @@ -1,3 +1,6 @@ +8.0.102 +- add unclutter + 7.0.101 - update to version 50.0.2661.75 diff --git a/packages/addons/browser/chromium/package.mk b/packages/addons/browser/chromium/package.mk index c87032b216..92e60041c5 100644 --- a/packages/addons/browser/chromium/package.mk +++ b/packages/addons/browser/chromium/package.mk @@ -20,12 +20,12 @@ PKG_NAME="chromium" PKG_VERSION="50.0.2661.75" -PKG_REV="101" +PKG_REV="102" PKG_ARCH="x86_64" PKG_LICENSE="Mixed" PKG_SITE="http://www.chromium.org/Home" PKG_URL="https://commondatastorage.googleapis.com/chromium-browser-official/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain pciutils dbus libXcomposite libXcursor libXtst alsa-lib bzip2 yasm nss libXScrnSaver libexif ninja:host libpng harfbuzz atk gtk+ libva-vdpau-driver" +PKG_DEPENDS_TARGET="toolchain pciutils dbus libXcomposite libXcursor libXtst alsa-lib bzip2 yasm nss libXScrnSaver libexif ninja:host libpng harfbuzz atk gtk+ libva-vdpau-driver unclutter" PKG_PRIORITY="optional" PKG_SECTION="browser" PKG_SHORTDESC="Chromium Browser: the open-source web browser from Google" @@ -171,4 +171,7 @@ addon() { # libva-vdpau-driver cp -PL $(get_build_dir libva-vdpau-driver)/.install_pkg/usr/lib/va/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib + + # unclutter + cp -P $(get_build_dir unclutter)/.install_pkg/usr/bin/unclutter $ADDON_BUILD/$PKG_ADDON_ID/bin } diff --git a/packages/addons/browser/chromium/source/bin/chromium b/packages/addons/browser/chromium/source/bin/chromium index 07ee195662..e0c7549cd1 100644 --- a/packages/addons/browser/chromium/source/bin/chromium +++ b/packages/addons/browser/chromium/source/bin/chromium @@ -17,6 +17,9 @@ # along with OpenELEC. If not, see . ################################################################################ +. /etc/profile +oe_setup_addon browser.chromium + # make sure we use "own" gtk/pango/nss/etc export LD_LIBRARY_PATH=/storage/.kodi/addons/browser.chromium/lib @@ -27,7 +30,20 @@ export GDK_PIXBUF_MODULE_FILE=/storage/.kodi/addons/browser.chromium/config/pixb # font rendering in gtk widgets is brokeen with nvidia blob. use our Xdefaults export XENVIRONMENT=/storage/.kodi/addons/browser.chromium/config/Xdefaults +# start unclutter +if [ "$HIDE_CURSOR" == "true" ] +then + unclutter & + UNCLUTTER_PID=$! +fi + # start chromium LD_PRELOAD=/usr/lib/libGL.so /storage/.kodi/addons/browser.chromium/bin/chromium.bin \ --user-data-dir=/storage/.kodi/userdata/addon_data/browser.chromium/profile \ --test-type $@ + +# kill unclutter +if [ "$HIDE_CURSOR" == "true" ] +then + kill $UNCLUTTER_PID +fi diff --git a/packages/addons/browser/chromium/source/resources/language/English/strings.xml b/packages/addons/browser/chromium/source/resources/language/English/strings.xml index 8add108e03..c3837d366d 100644 --- a/packages/addons/browser/chromium/source/resources/language/English/strings.xml +++ b/packages/addons/browser/chromium/source/resources/language/English/strings.xml @@ -10,6 +10,7 @@ Default Homepage Use Custom Audio Device Audio Device + Hide Cursor Chromium Actions Install libwidevinecdm.so (Netflix Support) Install libpepflashplayer.so (Flash Player Support) diff --git a/packages/addons/browser/chromium/source/resources/settings.xml b/packages/addons/browser/chromium/source/resources/settings.xml index 65fc47d8cd..670c222fca 100644 --- a/packages/addons/browser/chromium/source/resources/settings.xml +++ b/packages/addons/browser/chromium/source/resources/settings.xml @@ -10,6 +10,7 @@ +