diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk index 63de195c36..5206c1df6e 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mesa-demos" -PKG_VERSION="8.3.0" -PKG_SHA256="c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef" +PKG_VERSION="8.4.0" +PKG_SHA256="01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" -PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="toolchain libX11 mesa glu glew" PKG_LONGDESC="Mesa 3D demos - installed are the well known glxinfo and glxgears." PKG_TOOLCHAIN="autotools" diff --git a/packages/multimedia/libaacs/package.mk b/packages/multimedia/libaacs/package.mk index e6b6106548..0b82def679 100644 --- a/packages/multimedia/libaacs/package.mk +++ b/packages/multimedia/libaacs/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) PKG_NAME="libaacs" -PKG_VERSION="0.9.0" -PKG_SHA256="47e0bdc9c9f0f6146ed7b4cc78ed1527a04a537012cf540cf5211e06a248bace" +PKG_VERSION="0.11.0" +PKG_SHA256="6d884381fbb659e2a565eba91e72499778635975e4b3d6fd94ab364a25965387" PKG_LICENSE="GPL" PKG_SITE="http://www.videolan.org/developers/libaacs.html" PKG_URL="http://download.videolan.org/pub/videolan/libaacs/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/tools/grub/package.mk b/packages/tools/grub/package.mk index 35c877f79c..bf34ac8cdc 100755 --- a/packages/tools/grub/package.mk +++ b/packages/tools/grub/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="grub" -PKG_VERSION="6a34fdb76a07305b95e31659bc27b1d190101cbf" -PKG_SHA256="825328841e2e7e8654518808965afe19a421f6e272d946a5fe11bd90b8582f76" +PKG_VERSION="2df291226638261d50fadcab1f5edb6c12ab6cfd" +PKG_SHA256="d9a5be34e11e61295fd1e542fd5f213bf1e954a0eaf55d836dbc187b85aa64ee" PKG_ARCH="x86_64" PKG_LICENSE="GPLv3" PKG_SITE="https://www.gnu.org/software/grub/index.html" diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 11855a065d..2a1fcedad3 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xkeyboard-config" -PKG_VERSION="2.29" -PKG_SHA256="1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" +PKG_VERSION="2.31" +PKG_SHA256="da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3" PKG_LICENSE="MIT" PKG_SITE="http://www.X.org" PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch index cdcbf5cd2c..03c61059ac 100644 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch @@ -1,41 +1,3 @@ -From 02d24ce4001d2ef9c821566867599f41fbc3d1d1 Mon Sep 17 00:00:00 2001 -From: Andreas Boll -Date: Sun, 16 Feb 2020 02:34:56 +0000 -Subject: [PATCH 1/3] Revert "Map evdev keycode KEY_BRIGHTNESS_CYCLE to - XF86MonBrightnessCycle" - -This reverts commit ed67b29ecc639f1bafa9530cb9307fee57241458. - -XF86MonBrightnessCycle currently depends on an unreleased xorgproto. - -See also -https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/123 -https://gitlab.freedesktop.org/xorg/proto/xorgproto/commit/4e9f4e6136a7c35b0b3d341424eb4e0585f2f0a7 - -Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 -Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 -Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 ---- - symbols/inet | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/symbols/inet b/symbols/inet -index 049ac18..5ab6feb 100644 ---- a/symbols/inet -+++ b/symbols/inet -@@ -212,7 +212,7 @@ xkb_symbols "evdev" { - key { [ XF86WLAN ] }; - // key { [ ] }; // KEY_VIDEO_NEXT -- drive next video source - // key { [ ] }; // KEY_VIDEO_PREV -- drive previous video source -- key { [ XF86MonBrightnessCycle ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min -+// key { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min - // key { [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off - // key { [ ] }; // KEY_DISPLAY_OFF -- turn off display - key { [ XF86WWAN ] }; // KEY_WWAN --- -2.7.4 - - From 5bb6d783f40d8aa61da2095c08a6933bb1ee7bf3 Mon Sep 17 00:00:00 2001 From: Andreas Boll Date: Sun, 16 Feb 2020 02:35:03 +0000 @@ -63,25 +25,29 @@ diff --git a/keycodes/evdev b/keycodes/evdev index d41799d..e08ea0a 100644 --- a/keycodes/evdev +++ b/keycodes/evdev -@@ -285,7 +285,6 @@ default xkb_keycodes "evdev" { +@@ -285,9 +285,8 @@ default xkb_keycodes "evdev" { = 255; // #define KEY_RFKILL 247 = 372; // #define KEY_FAVORITES 364 + = 380; // #define KEY_FULL_SCREEN 372 - = 382; // #define KEY_KEYBOARD 374 - = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 - = 380; // #define KEY_FULL_SCREEN 372 + = 442; // #define KEY_DOLLAR 434 + = 443; // #define KEY_EURO 435 + = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 diff --git a/symbols/inet b/symbols/inet index 5ab6feb..72cc45d 100644 --- a/symbols/inet +++ b/symbols/inet -@@ -219,7 +219,6 @@ xkb_symbols "evdev" { +@@ -219,9 +219,8 @@ xkb_symbols "evdev" { key { [ XF86RFKill ] }; // KEY_RFKILL key { [ XF86Favorites ] }; -- key { [ XF86Keyboard ] }; - key { [ XF86RotationLockToggle ] }; key { [ XF86FullScreen ] }; +- key { [ XF86Keyboard ] }; + key { [ dollar ] }; + key { [ EuroSign ] }; + key { [ XF86RotationLockToggle ] }; -- 2.7.4 @@ -119,8 +85,8 @@ index e08ea0a..8ed0fa9 100644 = 255; // #define KEY_RFKILL 247 - = 372; // #define KEY_FAVORITES 364 - = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 = 380; // #define KEY_FULL_SCREEN 372 + = 442; // #define KEY_DOLLAR 434 diff --git a/symbols/inet b/symbols/inet index 72cc45d..2a5ab74 100644 @@ -131,8 +97,8 @@ index 72cc45d..2a5ab74 100644 key { [ XF86RFKill ] }; // KEY_RFKILL - key { [ XF86Favorites ] }; - key { [ XF86RotationLockToggle ] }; key { [ XF86FullScreen ] }; + key { [ dollar ] }; -- 2.7.4 diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch index d7153fbdb2..2d0ca80754 100644 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch @@ -18,12 +18,14 @@ diff --git a/keycodes/evdev b/keycodes/evdev index 8ed0fa9..f7d5c7b 100644 --- a/keycodes/evdev +++ b/keycodes/evdev -@@ -284,9 +284,6 @@ default xkb_keycodes "evdev" { +@@ -284,11 +284,8 @@ default xkb_keycodes "evdev" { = 254; // #define KEY_WWAN 246 = 255; // #define KEY_RFKILL 247 -- = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 - = 380; // #define KEY_FULL_SCREEN 372 + = 442; // #define KEY_DOLLAR 434 + = 443; // #define KEY_EURO 435 +- = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 - // Fake keycodes for virtual keys = 92; @@ -32,12 +34,14 @@ diff --git a/symbols/inet b/symbols/inet index 2a5ab74..0fb78cd 100644 --- a/symbols/inet +++ b/symbols/inet -@@ -218,9 +218,6 @@ xkb_symbols "evdev" { +@@ -218,11 +218,8 @@ xkb_symbols "evdev" { key { [ XF86WWAN ] }; // KEY_WWAN key { [ XF86RFKill ] }; // KEY_RFKILL -- key { [ XF86RotationLockToggle ] }; - key { [ XF86FullScreen ] }; + key { [ dollar ] }; + key { [ EuroSign ] }; +- key { [ XF86RotationLockToggle ] }; - key { [ XF86Tools ] }; key { [ XF86Launch5 ] }; diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0004-fix-python3-support.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0004-fix-python3-support.patch deleted file mode 100644 index 6f15ec983d..0000000000 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0004-fix-python3-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bb68466121aa7a4fd5e5af0ef781235b8dbc4ce7 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Sun, 16 Feb 2020 09:41:43 +0000 -Subject: [PATCH] fix python3 support - -https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197 ---- - rules/compat/map-variants.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py -index ebbfec9..979ba43 100755 ---- a/rules/compat/map-variants.py -+++ b/rules/compat/map-variants.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - - import argparse - import re -@@ -12,8 +12,8 @@ class Layout(object): - assert variant is None - # parse a layout(variant) string - match = re.match(r'([^(]+)\(([^)]+)\)', layout) -- self.layout = match[1] -- self.variant = match[2] -+ self.layout = match.groups()[0] -+ self.variant = match.groups()[1] - - def __str__(self): - if self.variant: --- -2.7.4 -