Merge pull request #41 from osmc/master

Update

installer/noobs/os-pi1.json

@@ -1,8 +1,8 @@
 {
 	"name": "OSMC_Pi1",
 	"url":	"https://osmc.tv",
-	"version": "2019.04-1",
-	"release_date": "2019-04-21",
+	"version": "2019.05-1",
+	"release_date": "2019-05-19",
 	"kernel": "4.14.78",
 	"description": "A fast and feature filled open source media center",
 	"username": "osmc",

installer/noobs/os-pi2.json

@@ -1,8 +1,8 @@
 {
 	"name": "OSMC_Pi2",
 	"url":	"https://osmc.tv",
-	"version": "2019.04-1",
-	"release_date": "2019-04-21",
+	"version": "2019.05-1",
+	"release_date": "2019-05-19",
 	"kernel": "4.14.78",
 	"description": "A fast and feature filled open source media center",
 	"username": "osmc",

installer/target/patches/all-012-bump-automake-version.patch

@@ -0,0 +1,12 @@
+--- b/package/automake/automake.mk	2019-04-22 18:55:25.525608073 +0100
++++ b/package/automake/automake.mk	2019-04-22 18:55:33.545636039 +0100
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-AUTOMAKE_VERSION = 1.14.1
++AUTOMAKE_VERSION = 1.16.1
+ AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz
+ AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
+ AUTOMAKE_LICENSE = GPLv2+
+

installer/target/qt_target/qt_target_installer/extractworker.cpp

@@ -17,15 +17,20 @@ ExtractWorker::ExtractWorker(QString sourcename, QString targetname, Logger *log
 
 void ExtractWorker::extract()
 {
-    logger->addLine("Starting extract progress...");
+    logger->addLine("Starting extract process ...");
     process = new QProcess();
     connect(process, SIGNAL(readyReadStandardOutput()), this, SLOT(readFromStdOut()));
     connect(process, SIGNAL(readyReadStandardError()), this, SLOT(readFromStdErr()));
     if (sourceName.endsWith("xz"))
+    {
+        logger->addLine("Extracting from " + sourceName);
         process->start("/bin/sh -c \"/usr/bin/pv -n " + sourceName + " | tar xJf - -C " + destName + "\"");
+    }
     else
-        process->start("/bin/sh -c \"/usr/bin/pv -n " + sourceName + " | tar xf - -C " + destName + "\"");
-
+    {
+        logger->addLine("Running " + sourceName);
+        process->start("/bin/sh -c \"" + sourceName + "\"");
+    }
     process->waitForFinished(-1);
     if (process->exitCode() != 0)
     {

installer/target/qt_target/qt_target_installer/mainwindow.cpp

@@ -104,17 +104,18 @@ void MainWindow::install()
         haltInstall("could not mount bootfs");
         return;
     }
-    /* Sanity check: need filesystem.tar.xz or filesystem.tar */
+    /* Sanity check: need filesystem.tar.xz or filesystem.sh */
     QFile fileSystem(QString(MNT_BOOT) + "/filesystem.tar.xz");
     if (! fileSystem.exists())
     {
-        QFile fileSystem(QString(MNT_BOOT) + "/filesystem.tar");
+        fileSystem.setFileName(QString(MNT_BOOT) + "/filesystem.sh");
         if (! fileSystem.exists())
         {
             haltInstall("no filesystem found");
             return;
         }
     }
+    logger->addLine("Filesystem defined by " + fileSystem.fileName());
     /* Load in preseeded values */
     preseed = new PreseedParser();
     if (preseed->isLoaded())

package/base-files-osmc/files/DEBIAN/control

@@ -1,6 +1,6 @@
 Origin: OSMC
 Package: base-files-osmc
-Version: 2.7.6
+Version: 2.7.8
 Section: admin
 Priority: required
 Architecture: all

package/base-files-osmc/files/etc/os-release

@@ -1,7 +1,7 @@
 PRETTY_NAME="Open Source Media Center"
 NAME="OSMC"
-VERSION="April 2019"
-VERSION_ID="2019.04-1"
+VERSION="May 2019"
+VERSION_ID="2019.05-2"
 ID=osmc
 ID_LIKE=debian
 

package/eventlircd-osmc/build.sh

@@ -24,7 +24,7 @@ then
 	sed '/Package/d' -i files/DEBIAN/control
 	sed '/Depends/d' -i files/DEBIAN/control
 	echo "Package: ${1}-eventlircd-osmc" >> files/DEBIAN/control
-	echo "Depends: ${1}-lirc-osmc, udev" >> files/DEBIAN/control
+	echo "Depends: ${1}-lirc-osmc, udev, ir-keytable" >> files/DEBIAN/control
 	pushd src/eventlircd*
 	sed -i 's/\s\-Werror//' configure.ac # Disable warnings being errors
 	autoreconf -vif

package/eventlircd-osmc/files/DEBIAN/control

@@ -1,5 +1,5 @@
 Origin: OSMC
-Version: 1.3.4
+Version: 1.3.9
 Section: utils
 Essential: No
 Priority: optional

package/eventlircd-osmc/files/DEBIAN/postinst

@@ -17,6 +17,8 @@ if [ "$1" = "configure" ]; then
 	systemctl daemon-reload
 	systemctl enable eventlircd.service >/dev/null 2>&1
 	if ischroot; then exit 0; fi
+	udevadm control --reload
+	udevadm trigger --subsystem-match=input
 	systemctl start eventlircd.service >/dev/null 2>&1
 	exit 0
 fi

package/eventlircd-osmc/files/lib/systemd/system/eventlircd.service

@@ -5,7 +5,7 @@ Before = mediacenter.service
 [Service]
 Type = simple
 ExecStartPre = /bin/mkdir -p /var/run/lirc
-ExecStart = /usr/sbin/eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --repeat-filter --release=_UP -f
+ExecStart = /usr/sbin/eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd -f
 ExecStartPost = /bin/sh -c "for f in /var/run/lirc/lircd-*.sh; do if [ -e $f ]; then s=$(basename $f .sh | sed 's/lircd-//g'); systemctl start lircd_helper@$s; fi; done"
 Restart = on-abort
 

package/eventlircd-osmc/files/lib/udev/rules.d/70-input-repeat.rules

@@ -0,0 +1,16 @@
+ACTION=="add|change", SUBSYSTEM=="input", KERNEL=="event[0-9]*", GOTO="start"
+GOTO="end"
+LABEL="start"
+
+ATTRS{name}=="lircd", GOTO="lircd"
+
+# set default repeat delay to 500ms like rc remotes
+RUN+="/usr/bin/ir-keytable --delay=500 --period=50 --device=$devnode"
+
+GOTO="end"
+
+LABEL="lircd"
+# longer repeat delay for lircd remotes as lircd is slow to recognise button up
+RUN+="/usr/bin/ir-keytable --delay=700 --period=50 --device=$devnode"
+
+LABEL="end"

package/kernel-osmc/build.sh

@@ -14,7 +14,7 @@ test $1 == rbp1 && VERSION="4.14.78" && REV="4" && FLAGS_INITRAMFS=$(($INITRAMFS
 test $1 == rbp2 && VERSION="4.14.78" && REV="4" && FLAGS_INITRAMFS=$(($INITRAMFS_BUILD + $INITRAMFS_EMBED)) && IMG_TYPE="zImage"
 test $1 == vero2 && VERSION="3.10.105" && REV="12" && FLAGS_INITRAMFS=$(($INITRAMFS_BUILD)) && IMG_TYPE="uImage"
 test $1 == pc && VERSION="4.2.3" && REV="16" && FLAGS_INITRAMFS=$(($INITRAMFS_BUILD + $INITRAMFS_EMBED)) && IMG_TYPE="zImage"
-test $1 == vero364 && VERSION="3.14.29" && REV="143" && FLAGS_INITRAMFS=$(($INITRAMFS_BUILD)) && IMG_TYPE="zImage"
+test $1 == vero364 && VERSION="3.14.29" && REV="144" && FLAGS_INITRAMFS=$(($INITRAMFS_BUILD)) && IMG_TYPE="zImage"
 if [ $1 == "rbp1" ] || [ $1 == "rbp2" ] || [ $1 == "pc" ]
 then
 	if [ -z $VERSION ]; then echo "Don't have a defined kernel version for this target!" && exit 1; fi

package/kernel-osmc/files/DEBIAN/control

@@ -1,5 +1,5 @@
 Origin: OSMC
-Version: 3.9.136
+Version: 3.9.137
 Section: kernel
 Essential: No
 Priority: required

package/kernel-osmc/patches/vero364-000-add-kernel-config.patch

@@ -1,6 +1,6 @@
---- /dev/null	2019-01-01 21:52:11.567126521 +0000
-+++ b/.config	2019-01-03 07:25:44.977964524 +0000
-@@ -0,0 +1,3744 @@
+--- /dev/null	2019-03-25 09:36:08.447153074 +0000
++++ b/.config	2019-06-04 14:39:20.656815873 +0100
+@@ -0,0 +1,3752 @@
 +#
 +# Automatically generated file; DO NOT EDIT.
 +# Linux/arm64 3.14.29 Kernel Configuration
@@ -488,6 +488,7 @@
 +CONFIG_IP_MULTIPLE_TABLES=y
 +# CONFIG_IP_ROUTE_MULTIPATH is not set
 +# CONFIG_IP_ROUTE_VERBOSE is not set
++CONFIG_IP_ROUTE_CLASSID=y
 +CONFIG_IP_PNP=y
 +CONFIG_IP_PNP_DHCP=y
 +CONFIG_IP_PNP_BOOTP=y
@@ -553,15 +554,16 @@
 +# Core Netfilter Configuration
 +#
 +CONFIG_NETFILTER_NETLINK=m
-+# CONFIG_NETFILTER_NETLINK_ACCT is not set
-+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
++CONFIG_NETFILTER_NETLINK_ACCT=m
++CONFIG_NETFILTER_NETLINK_QUEUE=m
 +CONFIG_NETFILTER_NETLINK_LOG=m
 +CONFIG_NF_CONNTRACK=m
-+# CONFIG_NF_CONNTRACK_MARK is not set
++CONFIG_NF_CONNTRACK_MARK=y
 +# CONFIG_NF_CONNTRACK_PROCFS is not set
 +# CONFIG_NF_CONNTRACK_EVENTS is not set
 +# CONFIG_NF_CONNTRACK_TIMEOUT is not set
 +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
++CONFIG_NF_CONNTRACK_LABELS=y
 +# CONFIG_NF_CT_PROTO_DCCP is not set
 +# CONFIG_NF_CT_PROTO_SCTP is not set
 +# CONFIG_NF_CT_PROTO_UDPLITE is not set
@@ -578,6 +580,7 @@
 +# CONFIG_NF_CONNTRACK_TFTP is not set
 +CONFIG_NF_CT_NETLINK=m
 +# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
++# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
 +CONFIG_NF_NAT=m
 +CONFIG_NF_NAT_NEEDED=y
 +# CONFIG_NF_NAT_AMANDA is not set
@@ -591,77 +594,78 @@
 +#
 +# Xtables combined modules
 +#
-+# CONFIG_NETFILTER_XT_MARK is not set
-+# CONFIG_NETFILTER_XT_CONNMARK is not set
++CONFIG_NETFILTER_XT_MARK=m
++CONFIG_NETFILTER_XT_CONNMARK=m
 +
 +#
 +# Xtables targets
 +#
-+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
-+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
-+# CONFIG_NETFILTER_XT_TARGET_LED is not set
-+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
-+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-+# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
-+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
++CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
++CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
++CONFIG_NETFILTER_XT_TARGET_HMARK=m
++CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
++CONFIG_NETFILTER_XT_TARGET_LED=m
++CONFIG_NETFILTER_XT_TARGET_LOG=m
++CONFIG_NETFILTER_XT_TARGET_MARK=m
++CONFIG_NETFILTER_XT_TARGET_NETMAP=m
++CONFIG_NETFILTER_XT_TARGET_NFLOG=m
++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
++CONFIG_NETFILTER_XT_TARGET_RATEEST=m
++CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
++CONFIG_NETFILTER_XT_TARGET_TEE=m
++CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 +
 +#
 +# Xtables matches
 +#
 +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
-+# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
-+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
++CONFIG_NETFILTER_XT_MATCH_BPF=m
++CONFIG_NETFILTER_XT_MATCH_CGROUP=m
++CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
++CONFIG_NETFILTER_XT_MATCH_COMMENT=m
++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
++CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
++CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
-+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-+# CONFIG_NETFILTER_XT_MATCH_HL is not set
-+# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
++CONFIG_NETFILTER_XT_MATCH_CPU=m
++CONFIG_NETFILTER_XT_MATCH_DCCP=m
++CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
++CONFIG_NETFILTER_XT_MATCH_DSCP=m
++CONFIG_NETFILTER_XT_MATCH_ECN=m
++CONFIG_NETFILTER_XT_MATCH_ESP=m
++CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_HELPER=m
++CONFIG_NETFILTER_XT_MATCH_HL=m
++CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+# CONFIG_NETFILTER_XT_MATCH_IPVS is not set
-+# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
-+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
-+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
++CONFIG_NETFILTER_XT_MATCH_IPVS=m
++CONFIG_NETFILTER_XT_MATCH_L2TP=m
++CONFIG_NETFILTER_XT_MATCH_LENGTH=m
++CONFIG_NETFILTER_XT_MATCH_LIMIT=m
++CONFIG_NETFILTER_XT_MATCH_MAC=m
++CONFIG_NETFILTER_XT_MATCH_MARK=m
++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
++CONFIG_NETFILTER_XT_MATCH_NFACCT=m
++CONFIG_NETFILTER_XT_MATCH_OSF=m
 +CONFIG_NETFILTER_XT_MATCH_OWNER=m
 +CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-+# CONFIG_NETFILTER_XT_MATCH_QUOTA2 is not set
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
++CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
++CONFIG_NETFILTER_XT_MATCH_QUOTA=m
++CONFIG_NETFILTER_XT_MATCH_QUOTA2=m
++CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
++CONFIG_NETFILTER_XT_MATCH_RATEEST=m
++CONFIG_NETFILTER_XT_MATCH_REALM=m
++CONFIG_NETFILTER_XT_MATCH_RECENT=m
++CONFIG_NETFILTER_XT_MATCH_SCTP=m
++CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 +CONFIG_NETFILTER_XT_MATCH_STATE=m
-+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
++CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
++CONFIG_NETFILTER_XT_MATCH_STRING=m
++CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
++CONFIG_NETFILTER_XT_MATCH_TIME=m
++CONFIG_NETFILTER_XT_MATCH_U32=m
 +# CONFIG_IP_SET is not set
 +CONFIG_IP_VS=m
 +# CONFIG_IP_VS_IPV6 is not set
@@ -807,7 +811,7 @@
 +CONFIG_RFS_ACCEL=y
 +CONFIG_XPS=y
 +# CONFIG_CGROUP_NET_PRIO is not set
-+# CONFIG_CGROUP_NET_CLASSID is not set
++CONFIG_CGROUP_NET_CLASSID=y
 +CONFIG_NET_RX_BUSY_POLL=y
 +CONFIG_BQL=y
 +CONFIG_NET_FLOW_LIMIT=y
@@ -3729,6 +3733,10 @@
 +CONFIG_REED_SOLOMON=y
 +CONFIG_REED_SOLOMON_ENC8=y
 +CONFIG_REED_SOLOMON_DEC8=y
++CONFIG_TEXTSEARCH=y
++CONFIG_TEXTSEARCH_KMP=m
++CONFIG_TEXTSEARCH_BM=m
++CONFIG_TEXTSEARCH_FSM=m
 +CONFIG_ASSOCIATIVE_ARRAY=y
 +CONFIG_HAS_IOMEM=y
 +CONFIG_HAS_DMA=y

package/libsqlite-osmc/build.sh

@@ -5,7 +5,7 @@
 
 . ../common.sh
 
-pull_source "https://www.sqlite.org/2017/sqlite-autoconf-3260000.tar.gz" "$(pwd)/src"
+pull_source "https://sqlite.org/2019/sqlite-autoconf-3280000.tar.gz" "$(pwd)/src"
 if [ $? != 0 ]; then echo -e "Error downloading" && exit 1; fi
 # Build in native environment
 build_in_env "${1}" $(pwd) "libsqlite-osmc"

package/libsqlite-osmc/files/DEBIAN/control

@@ -1,5 +1,5 @@
 Origin: OSMC
-Version: 3.26.0-1
+Version: 3.28.0-1
 Section: libs
 Essential: No
 Priority: optional

package/mediacenter-addon-osmc/files/DEBIAN/control

@@ -1,6 +1,6 @@
 Origin: OSMC
 Package: mediacenter-addon-osmc
-Version: 3.0.671
+Version: 3.0.673
 Section: utils
 Essential: No
 Priority: optional

package/mediacenter-addon-osmc/files/usr/bin/readgui

@@ -0,0 +1 @@
+/usr/share/kodi/addons/script.module.osmcsetting.logging/resources/lib/readgui.py