Permalink
Browse files

Merge remote-tracking branch 'LibreELEC/master'

  • Loading branch information...
adamg88 committed Aug 28, 2018
2 parents 1d325bd + 88bb9f8 commit 5ba2a5813df6d5474f2107b0b3d3150dc680d262
Showing with 455 additions and 507 deletions.
  1. +8 −11 config/functions
  2. +4 −0 packages/addons/addon-depends/game-tools/bchunk/package.mk
  3. +0 −16 packages/addons/addon-depends/game-tools/bchunk/patches/bchunk-0001-fix-makefile.patch
  4. +3 −5 packages/addons/addon-depends/libmpdclient/package.mk
  5. +4 −6 packages/addons/addon-depends/pcsc-lite/package.mk
  6. +3 −0 packages/addons/service/mpd/changelog.txt
  7. +5 −5 packages/addons/service/mpd/package.mk
  8. +3 −0 packages/addons/service/oscam/changelog.txt
  9. +7 −5 packages/addons/service/oscam/package.mk
  10. +2 −2 packages/compress/lz4/package.mk
  11. +3 −2 packages/compress/xz/package.mk
  12. +3 −4 packages/databases/mariadb-connector-c/package.mk
  13. +0 −22 packages/databases/mariadb-connector-c/patches/001_PR39-fix-static.patch
  14. +2 −2 packages/devel/libfmt/package.mk
  15. +4 −3 packages/devel/pcre/package.mk
  16. +2 −2 packages/graphics/mesa/package.mk
  17. +4 −1 packages/linux/package.mk
  18. +0 −30 packages/linux/patches/default/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
  19. +52 −0 packages/linux/patches/default/linux-901-extend-rc6-toggle-support.patch
  20. +0 −30 ...ges/linux/patches/raspberrypi/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
  21. +52 −0 packages/linux/patches/raspberrypi/linux-901-extend-rc6-toggle-support.patch
  22. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
  23. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk
  24. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
  25. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk
  26. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
  27. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
  28. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
  29. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk
  30. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk
  31. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk
  32. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk
  33. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk
  34. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk
  35. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
  36. +2 −2 packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
  37. +2 −2 packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk
  38. +2 −2 packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk
  39. +0 −3 packages/mediacenter/kodi/config/appliance.xml
  40. +4 −4 packages/mediacenter/kodi/package.mk
  41. +18 −9 packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch
  42. +2 −2 packages/network/samba/package.mk
  43. +7 −1 packages/network/samba/patches/samba-950-no-man.patch
  44. +2 −2 packages/x11/driver/xf86-video-nvidia/package.mk
  45. +1 −0 packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
  46. +56 −116 projects/RPi/devices/Slice/config/slice-overlay.dts
  47. +38 −28 projects/RPi/devices/Slice/config/ws2812-overlay.dts
  48. +56 −116 projects/RPi/devices/Slice3/config/slice-overlay.dts
  49. +38 −28 projects/RPi/devices/Slice3/config/ws2812-overlay.dts
  50. +1 −1 projects/RPi/options
  51. +5 −0 scripts/create_addon
  52. +21 −11 scripts/extract
  53. +2 −1 tools/mkpkg/mkpkg_bcm2835-driver
  54. +2 −1 tools/mkpkg/mkpkg_libcec
  55. +1 −1 tools/mkpkg/mkpkg_libretro-ppsspp
  56. +2 −1 tools/mkpkg/mkpkg_linux-amlogic
  57. +2 −1 tools/mkpkg/mkpkg_lockdev
  58. +2 −1 tools/mkpkg/mkpkg_rtmpdump
@@ -238,14 +238,8 @@ kernel_version() {
kernel_config_path() {
local cfg pkg_linux_dir pkg_linux_version config_name
# avoid infinite recursion if this is called by linux
if [ "$PKG_NAME" = "linux" ]; then
pkg_linux_version="$PKG_VERSION"
pkg_linux_dir="$PKG_DIR"
else
pkg_linux_version="$(get_pkg_version linux)"
pkg_linux_dir="$(get_pkg_directory linux)"
fi
pkg_linux_version="$(get_pkg_version linux)"
pkg_linux_dir="$(get_pkg_directory linux)"
config_name="linux.${TARGET_PATCH_ARCH:-$TARGET_ARCH}.conf"
@@ -349,11 +343,14 @@ get_pkg_directory() {
echo "$_PKG_DIR"
}
# get variable ($2) for package ($1)
# get variable ($2) for package ($1).
# avoid infinite recursion if required package is already loaded.
get_pkg_variable() {
if [ -n "$1" -a -n "$2" ] ; then
cd $ROOT
. config/options $1 &>/dev/null
if [ "$1" != "$PKG_NAME" ]; then
cd $ROOT
. config/options $1 &>/dev/null
fi
echo "${!2}"
fi
}
@@ -16,3 +16,7 @@ PKG_LONGDESC="binchunker converts a CD image in a .bin / .cue format (sometimes
makeinstall_target() {
:
}
make_target() {
make $PKG_MAKE_OPTS_TARGET CC=$CC LD=$CC
}

This file was deleted.

Oops, something went wrong.
@@ -2,13 +2,11 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libmpdclient"
PKG_VERSION="2.13"
PKG_SHA256="e1583fbcae89ad543a6cc44caeaf16b31e709831f5b7eac4413f78c54a21db95"
PKG_VERSION="2.14"
PKG_SHA256="0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372"
PKG_ARCH="any"
PKG_LICENSE="BSD-3c"
PKG_SITE="https://www.musicpd.org"
PKG_URL="https://github.com/MusicPlayerDaemon/libmpdclient/archive/v${PKG_VERSION}.tar.gz"
PKG_URL="https://www.musicpd.org/download/libmpdclient/2/libmpdclient-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain"
PKG_SECTION="service"
PKG_SHORTDESC="is a C library which implements the Music Player Daemon protocol"
PKG_LONGDESC="is a C library which implements the Music Player Daemon protocol"
@@ -2,15 +2,13 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pcsc-lite"
PKG_VERSION="1.8.22"
PKG_SHA256="6a358f61ed3b66a7f6e1f4e794a94c7be4c81b7a58ec360c33791e8d7d9bd405"
PKG_VERSION="1.8.23"
PKG_SHA256="5a27262586eff39cfd5c19aadc8891dd71c0818d3d629539bd631b958be689c9"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"
PKG_URL="https://alioth.debian.org/frs/download.php/latestfile/39/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_SITE="https://pcsclite.apdu.fr"
PKG_URL="https://pcsclite.apdu.fr/files/pcsc-lite-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_TARGET="toolchain libusb"
PKG_SECTION="service/system"
PKG_SHORTDESC="Middleware to access a smart card using SCard API (PC/SC)"
PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)"
PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
@@ -1,3 +1,6 @@
106
- updated mpd to 0.20.21
105
- updated mpd to 0.20.19
- added mpd cli client mpc
@@ -3,13 +3,13 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mpd"
PKG_VERSION="0.20.19"
PKG_SHA256="01cdef1b9217588a8fa64dc2cba900c138e1363a787837b4c8327c652b7956c3"
PKG_REV="105"
PKG_VERSION="0.20.21"
PKG_SHA256="8322764dc265c20f05c8c8fdfdd578b0722e74626bef56fcd8eebfb01acc58dc"
PKG_REV="106"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://www.musicpd.org"
PKG_URL="http://www.musicpd.org/download/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://www.musicpd.org/download/mpd/${PKG_VERSION%.*}/mpd-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain alsa-lib boost curl faad2 ffmpeg flac glib lame libcdio libiconv libid3tag \
libmad libmpdclient libsamplerate libvorbis libnfs libogg mpd-mpc opus pulseaudio samba yajl"
PKG_SECTION="service.multimedia"
@@ -54,7 +54,7 @@ PKG_CONFIGURE_OPTS_TARGET=" \
--disable-libwrap \
--enable-lsr \
--enable-mad \
--disable-mikmod\
--disable-mikmod \
--disable-mms \
--disable-modplug \
--disable-mpc \
@@ -1,3 +1,6 @@
106
- update OScam to 11431
105
- update OScam to 11420
- add SSL support
@@ -2,14 +2,15 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="oscam"
PKG_VERSION="d785952"
PKG_SHA256="3f698e522b8d47667a2c2841f75d5d790613664a8eea460f98b396ed7ca22c90"
PKG_VERSION_NUMBER="11420"
PKG_REV="105"
PKG_VERSION="57496438f69e92ad0b7b7797a05e34f0e512ac07"
PKG_SHA256="544df425690c8c7157fb9f0e69f497fec67bc3641247d9a45f0eb20c1c1d705b"
PKG_VERSION_NUMBER="11431"
PKG_REV="106"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
PKG_URL="http://repo.or.cz/oscam.git/snapshot/$PKG_VERSION.tar.gz"
PKG_SOURCE_DIR="oscam-*"
PKG_DEPENDS_TARGET="toolchain openssl pcsc-lite"
PKG_SECTION="service.softcam"
PKG_SHORTDESC="OSCam: an Open Source Conditional Access Modul"
@@ -28,7 +29,8 @@ PKG_CMAKE_OPTS_TARGET="-DLIBUSBDIR=$SYSROOT_PREFIX/usr \
-DWITH_DEBUG=0 \
-DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
-DSTATIC_LIBUSB=1 \
-DCLOCKFIX=0"
-DCLOCKFIX=0 \
-DCARDREADER_DB2COM=OFF"
pre_configure_target() {
export OSCAM_ADDON_VERSION="$PKG_VERSION_NUMBER"
@@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="lz4"
PKG_VERSION="1.8.0"
PKG_SHA256="2ca482ea7a9bb103603108b5a7510b7592b90158c151ff50a28f1ca8389fccf6"
PKG_VERSION="1.8.2"
PKG_SHA256="0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/lz4/lz4"
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="xz"
PKG_VERSION="5.2.3"
PKG_SHA256="fd9ca16de1052aac899ad3495ad20dfa906c27b4a5070102a2ec35ca3a4740c1"
PKG_VERSION="5.2.4"
PKG_SHA256="3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://tukaani.org/xz/"
@@ -2,16 +2,15 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mariadb-connector-c"
PKG_VERSION="3.0.2"
PKG_SHA256="f44f436fc35e081db3a56516de9e3bb11ae96838e75d58910be28ddd2bc56d88"
PKG_VERSION="3.0.6"
PKG_SHA256="46181f8c95c096ac1aa6cb0ca80f4ed0e746873cfd6af84f3bac925d7e2cd091"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="https://mariadb.org/"
PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain zlib openssl"
PKG_SECTION="database"
PKG_SHORTDESC="mariadb-connector: library to conntect to mariadb/mysql database server"
PKG_LONGDESC="mariadb-connector: library to conntect to mariadb/mysql database server"
PKG_BUILD_FLAGS="-gold"
PKG_CMAKE_OPTS_TARGET="-DWITH_EXTERNAL_ZLIB=ON
-DAUTH_CLEARTEXT=STATIC

This file was deleted.

Oops, something went wrong.
@@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libfmt"
PKG_VERSION="3.0.2"
PKG_SHA256="fa4a062897b2f3712badfdb8583e6d938252e1156cb5705c3af87705dfef3957"
PKG_VERSION="5.1.0"
PKG_SHA256="73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="https://github.com/fmtlib/fmt"
@@ -1,13 +1,14 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pcre"
PKG_VERSION="8.40"
PKG_SHA256="00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4"
PKG_VERSION="8.42"
PKG_SHA256="2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.pcre.org/"
PKG_URL="http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="https://ftp.pcre.org/pub/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_HOST=""
PKG_DEPENDS_TARGET="toolchain"
PKG_SECTION="devel"
@@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mesa"
PKG_VERSION="18.1.6"
PKG_SHA256="bb7ce759069801804fcfb8152da3457f76cd7b4e0096e4870ff5adcb5c894289"
PKG_VERSION="18.1.7"
PKG_SHA256="655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.mesa3d.org/"
@@ -216,7 +216,10 @@ make_target() {
done
fi
kernel_make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD
# the modules target is required to get a proper Module.symvers
# file with symbols from built-in and external modules.
# Without that it'll contain only the symbols from the kernel
kernel_make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD modules
if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
DTB_BLOBS=($(ls arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/*.dtb 2>/dev/null || true))

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,52 @@
From 3f1f8303b6e0be751d7a7c55031c8ab840ed5c1a Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Fri, 24 Aug 2018 23:31:51 +0200
Subject: [PATCH] media: rc: ir-rc6-decoder: enable toggle bit for Kathrein
RCU-676 remote
The Kathrein RCU-676 remote uses the 32-bit rc6 protocol and toggles
bit 15 (0x8000) on repeated button presses, like MCE remotes.
Add it's customer code 0x80460000 to the 32-bit rc6 toggle
handling code to get proper scancodes and toggle reports.
Signed-off-by: Matthias Reichl <hias@horus.com>
---
drivers/media/rc/ir-rc6-decoder.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index 68487ce9f79b..d96aed1343e4 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -40,6 +40,7 @@
#define RC6_6A_MCE_TOGGLE_MASK 0x8000 /* for the body bits */
#define RC6_6A_LCC_MASK 0xffff0000 /* RC6-6A-32 long customer code mask */
#define RC6_6A_MCE_CC 0x800f0000 /* MCE customer code */
+#define RC6_6A_KATHREIN_CC 0x80460000 /* Kathrein RCU-676 customer code */
#ifndef CHAR_BIT
#define CHAR_BIT 8 /* Normally in <limits.h> */
#endif
@@ -242,13 +243,17 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
toggle = 0;
break;
case 32:
- if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) {
+ switch (scancode & RC6_6A_LCC_MASK) {
+ case RC6_6A_MCE_CC:
+ case RC6_6A_KATHREIN_CC:
protocol = RC_PROTO_RC6_MCE;
toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK);
scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
- } else {
+ break;
+ default:
protocol = RC_PROTO_RC6_6A_32;
toggle = 0;
+ break;
}
break;
default:
--
2.11.0
Oops, something went wrong.

0 comments on commit 5ba2a58

Please sign in to comment.